From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: "Charles A. Roelli" Newsgroups: gmane.emacs.bugs Subject: bug#26816: mouse movement support for OS X Date: Mon, 15 May 2017 20:23:27 +0200 Message-ID: <76527b19-1f31-0642-ac3a-8e55fd9b0a90@aurox.ch> References: <20170507200034.GA661@breton.holly.idiocy.org> <20170509224435.GB8974@breton.holly.idiocy.org> <20170511214342.GA10431@breton.holly.idiocy.org> <3dc0d587-8290-f873-ceef-d059bec0b7f6@aurox.ch> <20170514135910.GA13710@breton.holly.idiocy.org> <83y3tz7bcp.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E360186C1A06C95F89B99723" X-Trace: blaine.gmane.org 1494872660 8045 195.159.176.226 (15 May 2017 18:24:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 15 May 2017 18:24:20 +0000 (UTC) User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 Cc: 26816@debbugs.gnu.org To: Eli Zaretskii , Alan Third Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon May 15 20:24:14 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAKfC-0001mX-JD for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 May 2017 20:24:10 +0200 Original-Received: from localhost ([::1]:38138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAKfE-0003Cs-OG for geb-bug-gnu-emacs@m.gmane.org; Mon, 15 May 2017 14:24:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAKf7-0003Ca-Qf for bug-gnu-emacs@gnu.org; Mon, 15 May 2017 14:24:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAKf4-00065I-H8 for bug-gnu-emacs@gnu.org; Mon, 15 May 2017 14:24:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:44221) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAKf4-000654-Cs for bug-gnu-emacs@gnu.org; Mon, 15 May 2017 14:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAKf3-0004zY-To for bug-gnu-emacs@gnu.org; Mon, 15 May 2017 14:24:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Charles A. Roelli" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 15 May 2017 18:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26816 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 26816-submit@debbugs.gnu.org id=B26816.149487261519155 (code B ref 26816); Mon, 15 May 2017 18:24:01 +0000 Original-Received: (at 26816) by debbugs.gnu.org; 15 May 2017 18:23:35 +0000 Original-Received: from localhost ([127.0.0.1]:46898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAKed-0004yt-C9 for submit@debbugs.gnu.org; Mon, 15 May 2017 14:23:35 -0400 Original-Received: from sinyavsky.aurox.ch ([37.35.109.145]:48120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dAKec-0004yg-0S for 26816@debbugs.gnu.org; Mon, 15 May 2017 14:23:34 -0400 Original-Received: from sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) by sinyavsky.aurox.ch (Postfix) with ESMTP id 6089922432 for <26816@debbugs.gnu.org>; Mon, 15 May 2017 18:19:10 +0000 (UTC) Authentication-Results: sinyavsky.aurox.ch (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=aurox.ch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aurox.ch; h= content-type:content-type:in-reply-to:mime-version:user-agent :date:date:message-id:from:from:references:to:subject:subject; s=dkim; t=1494872347; x=1495736348; bh=NKbbZNyWuZ5iipLrnFGLxeMH ABBxi5VWXHZNUNGnY9g=; b=FmiUfR0Stmmb65qO29sMDVb30wXwagkkvBLSWZsB /Stwl9x0PcTY3dNSp2bHwhMCimvBfi2DFw7KqVuTSqViYUBe2h31XHEc+x7eyS6z 1Xl4rVNvdaU4Ot+GS13pWzE641Vau4ZPYwqtC3BsFpiMXyw7KoJdm8MPoU4trhL9 yAo= X-Virus-Scanned: Debian amavisd-new at test.virtualizor.com Original-Received: from sinyavsky.aurox.ch ([127.0.0.1]) by sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LeuAemnnr31z for <26816@debbugs.gnu.org>; Mon, 15 May 2017 18:19:07 +0000 (UTC) Original-Received: from [192.168.1.121] (179.133.105.92.dynamic.wline.res.cust.swisscom.ch [92.105.133.179]) by sinyavsky.aurox.ch (Postfix) with ESMTPSA id 3F5EB22407; Mon, 15 May 2017 18:19:05 +0000 (UTC) In-Reply-To: <83y3tz7bcp.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:132525 Archived-At: This is a multi-part message in MIME format. --------------E360186C1A06C95F89B99723 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit I've added a `skip-unless' form to the beginning of the test: (skip-unless (display-graphic-p)) Seems to take care of the issue. Patch is attached, with a commit message. On 14/05/2017 16:37, Eli Zaretskii wrote: >> Date: Sun, 14 May 2017 14:59:10 +0100 >> From: Alan Third >> Cc: 26816@debbugs.gnu.org, martin rudalics , >> Eli Zaretskii >> >> On Sun, May 14, 2017 at 03:29:57PM +0200, Charles A. Roelli wrote: >>> Attached is a patch now working with multiple monitors. I also added >>> `ns-set-mouse-absolute-pixel-position', a test and a NEWS entry. The test >>> works interactively, but it requires a frame to run and I'm not sure whether >>> tests run with them by default. >> Usually you run tests with ’make check’, and there’s no frame >> available. > There's always a frame, even in batch sessions. Observe: > > emacs -batch --eval "(message \"%s\" (selected-frame))" > => # > > It's just that it's not a frame which this feature could use. > >> I’ve just checked and it does throw up an error for that >> test. I’m not sure how that should be handled. > You could explicitly test for non-interactive sessions, and skip the > test, or display a message that this test can only be run > interactively. Would that be good enough? --------------E360186C1A06C95F89B99723 Content-Type: text/x-patch; name="0001-Fix-macOS-mouse-movement.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-macOS-mouse-movement.patch" >From 66c9d13f9709d11dd06cf640a5873d39a8fb952c Mon Sep 17 00:00:00 2001 From: Charles A. Roelli Date: Mon, 15 May 2017 20:18:21 +0200 Subject: [PATCH] Fix macOS mouse movement * lisp/frame.el (ns-set-mouse-absolute-pixel-position): New function (Lisp). (set-mouse-absolute-pixel-position): Change it to call `ns-set-mouse-absolute-pixel-position' on macOS. * src/nsfns.m (Fns_set_mouse_absolute_pixel_position): New function. * src/nsterm.h (NS_PARENT_WINDOW_TOP_POS): Use the primary screen's height as a base for calculating global coordinates. * src/nsterm.m (frame_set_mouse_pixel_position): Fix it in macOS. * test/lisp/mouse-tests.el (bug26816-mouse-frame-movement): Test movement of mouse relative to frame. --- etc/NEWS | 3 +++ lisp/frame.el | 3 +++ src/nsfns.m | 39 +++++++++++++++++++++++++++++++++++++++ src/nsterm.h | 2 +- src/nsterm.m | 14 +++++++------- test/lisp/mouse-tests.el | 9 +++++++++ 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 6667a44..25f0f18 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1292,6 +1292,9 @@ This is in contrast to the default action on POSIX Systems, where it causes the receiving process to terminate with a core dump if no debugger has been attached to it. +** `set-mouse-position' and `set-mouse-absolute-pixel-position' work +on macOS. + ---------------------------------------------------------------------- This file is part of GNU Emacs. diff --git a/lisp/frame.el b/lisp/frame.el index 05db8cf..02871e0 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1465,6 +1465,7 @@ mouse-absolute-pixel-position (t (cons 0 0))))) +(declare-function ns-set-mouse-absolute-pixel-position "nsfns.m" (x y)) (declare-function w32-set-mouse-absolute-pixel-position "w32fns.c" (x y)) (declare-function x-set-mouse-absolute-pixel-position "xfns.c" (x y)) @@ -1474,6 +1475,8 @@ set-mouse-absolute-pixel-position position (0, 0) of the selected frame's terminal." (let ((frame-type (framep-on-display))) (cond + ((eq frame-type 'ns) + (ns-set-mouse-absolute-pixel-position x y)) ((eq frame-type 'x) (x-set-mouse-absolute-pixel-position x y)) ((eq frame-type 'w32) diff --git a/src/nsfns.m b/src/nsfns.m index cbe0ffb..e916f6a 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -3053,6 +3053,44 @@ value is a list of the form (LEFT, TOP, RIGHT, BOTTOM). All values are : Qnative_edges)); } +DEFUN ("ns-set-mouse-absolute-pixel-position", + Fns_set_mouse_absolute_pixel_position, + Sns_set_mouse_absolute_pixel_position, 2, 2, 0, + doc: /* Move mouse pointer to absolute pixel position (X, Y). +The coordinates X and Y are interpreted in pixels relative to a position +\(0, 0) of the selected frame's display. */) + (Lisp_Object x, Lisp_Object y) +{ + struct frame *f = SELECTED_FRAME (); + EmacsView *view = FRAME_NS_VIEW (f); + NSScreen *screen = [[view window] screen]; + NSRect screen_frame = [screen frame]; + int mouse_x, mouse_y; + + NSScreen *primary_screen = [[NSScreen screens] objectAtIndex:0]; + NSRect primary_screen_frame = [primary_screen frame]; + CGFloat primary_screen_height = primary_screen_frame.size.height; + + if (FRAME_INITIAL_P (f) || !FRAME_NS_P (f)) + return Qnil; + + CHECK_TYPE_RANGED_INTEGER (int, x); + CHECK_TYPE_RANGED_INTEGER (int, y); + + mouse_x = screen_frame.origin.x + XINT (x); + + if (screen == primary_screen) + mouse_y = screen_frame.origin.y + XINT (y); + else + mouse_y = (primary_screen_height - screen_frame.size.height + - screen_frame.origin.y) + XINT (y); + + CGPoint mouse_pos = CGPointMake(mouse_x, mouse_y); + CGWarpMouseCursorPosition (mouse_pos); + + return Qnil; +} + /* ========================================================================== Class implementations @@ -3241,6 +3279,7 @@ - (NSString *)panel: (id)sender userEnteredFilename: (NSString *)filename defsubr (&Sns_frame_edges); defsubr (&Sns_frame_list_z_order); defsubr (&Sns_frame_restack); + defsubr (&Sns_set_mouse_absolute_pixel_position); defsubr (&Sx_display_mm_width); defsubr (&Sx_display_mm_height); defsubr (&Sx_display_screens); diff --git a/src/nsterm.h b/src/nsterm.h index 9285178..ac339bf 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -1087,7 +1087,7 @@ struct x_output ? ([[FRAME_NS_VIEW (f) window] parentWindow].frame.origin.y \ + [[FRAME_NS_VIEW (f) window] parentWindow].frame.size.height \ - FRAME_NS_TITLEBAR_HEIGHT (FRAME_PARENT_FRAME (f))) \ - : [[[FRAME_NS_VIEW (f) window] screen] frame].size.height) + : [[[NSScreen screens] objectAtIndex: 0] frame].size.height) #define FRAME_NS_FONT_TABLE(f) (FRAME_DISPLAY_INFO (f)->font_table) diff --git a/src/nsterm.m b/src/nsterm.m index c22c5a7..a7ab73b 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -2321,14 +2321,14 @@ so some key presses (TAB) are swallowed by the system. */ -------------------------------------------------------------------------- */ { NSTRACE ("frame_set_mouse_pixel_position"); - ns_raise_frame (f); -#if 0 - /* FIXME: this does not work, and what about GNUstep? */ + + /* FIXME: what about GNUstep? */ #ifdef NS_IMPL_COCOA - [FRAME_NS_VIEW (f) lockFocus]; - PSsetmouse ((float)pix_x, (float)pix_y); - [FRAME_NS_VIEW (f) unlockFocus]; -#endif + CGPoint mouse_pos = + CGPointMake(f->left_pos + pix_x, + f->top_pos + pix_y + + FRAME_NS_TITLEBAR_HEIGHT(f) + FRAME_TOOLBAR_HEIGHT(f)); + CGWarpMouseCursorPosition (mouse_pos); #endif } diff --git a/test/lisp/mouse-tests.el b/test/lisp/mouse-tests.el index fffaa2f..70e932b 100644 --- a/test/lisp/mouse-tests.el +++ b/test/lisp/mouse-tests.el @@ -47,5 +47,13 @@ (should-not (mouse--down-1-maybe-follows-link)) (should (equal unread-command-events '((mouse-2 nil 1)))))) +(ert-deftest bug26816-mouse-frame-movement () + "Mouse moves relative to frame." + (skip-unless (display-graphic-p)) + (let ((frame (selected-frame))) + (set-mouse-position frame 0 0) + (should (equal (mouse-position) + (cons frame (cons 0 0)))))) + + ;;; mouse-tests.el ends here -- 1.7.4.4 --------------E360186C1A06C95F89B99723--