[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117134: * lisp/avoid.el (mouse-avoidance-set-mou
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] emacs-24 r117134: * lisp/avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame. |
Date: |
Tue, 20 May 2014 21:14:56 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117134
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17439
committer: Juri Linkov <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-05-21 00:14:44 +0300
message:
* lisp/avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame.
(mouse-avoidance-ignore-p): Remove `switch-frame', add `focus-out'.
Add more modifiers: meta, control, shift, hyper, super, alt.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/avoid.el avoid.el-20091113204419-o5vbwnq5f7feedwu-640
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-05-20 20:12:30 +0000
+++ b/lisp/ChangeLog 2014-05-20 21:14:44 +0000
@@ -1,3 +1,10 @@
+2014-05-20 Juri Linkov <address@hidden>
+
+ * avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame.
+ (mouse-avoidance-ignore-p): Remove `switch-frame', add `focus-out'.
+ Add more modifiers: meta, control, shift, hyper, super, alt.
+ (Bug#17439)
+
2014-05-20 Stefan Monnier <address@hidden>
* progmodes/scheme.el (scheme-mode-syntax-table): Remove hack for
=== modified file 'lisp/avoid.el'
--- a/lisp/avoid.el 2014-01-01 07:43:34 +0000
+++ b/lisp/avoid.el 2014-05-20 21:14:44 +0000
@@ -52,9 +52,6 @@
;;
;; - Using this code does slow Emacs down. "banish" mode shouldn't
;; be too bad, and on my workstation even "animate" is reasonable.
-;;
-;; - It ought to find out where any overlapping frames are and avoid them,
-;; rather than always raising the frame.
;; Credits:
;; This code was helped by all those who contributed suggestions,
@@ -172,12 +169,8 @@
(defun mouse-avoidance-set-mouse-position (pos)
;; Carefully set mouse position to given position (X . Y)
- ;; Ideally, should check if X,Y is in the current frame, and if not,
- ;; leave the mouse where it was. However, this is currently
- ;; difficult to do, so we just raise the frame to avoid frame switches.
;; Returns t if it moved the mouse.
(let ((f (selected-frame)))
- (raise-frame f)
(set-mouse-position f (car pos) (cdr pos))
t))
@@ -342,12 +335,18 @@
(let ((modifiers (event-modifiers (car last-input-event))))
(or (memq (car last-input-event)
'(mouse-movement scroll-bar-movement
- select-window switch-frame))
+ select-window focus-out))
(memq 'click modifiers)
(memq 'double modifiers)
(memq 'triple modifiers)
(memq 'drag modifiers)
- (memq 'down modifiers)))))))
+ (memq 'down modifiers)
+ (memq 'meta modifiers)
+ (memq 'control modifiers)
+ (memq 'shift modifiers)
+ (memq 'hyper modifiers)
+ (memq 'super modifiers)
+ (memq 'alt modifiers)))))))
(defun mouse-avoidance-banish ()
(if (not (mouse-avoidance-ignore-p))
@@ -403,8 +402,6 @@
* cat-and-mouse: Same as `animate'.
* proteus: As `animate', but changes the shape of the mouse pointer too.
-Whenever the mouse is moved, the frame is also raised.
-
\(See `mouse-avoidance-threshold' for definition of \"too close\",
and `mouse-avoidance-nudge-dist' and `mouse-avoidance-nudge-var' for
definition of \"random distance\".)"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117134: * lisp/avoid.el (mouse-avoidance-set-mouse-position): Don't raise frame.,
Juri Linkov <=