[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#10165: [PATCH] Allow setting corner in mouse avoidance mode.
From: |
Thierry Volpiatto |
Subject: |
bug#10165: [PATCH] Allow setting corner in mouse avoidance mode. |
Date: |
Mon, 05 Dec 2011 19:06:26 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
Juri Linkov <juri@jurta.org> writes:
>> Use this, as there is an error in precedent patch (still using value of
>> old variable), sorry.
>
> Thanks. I think names like `frame-or-window' and `top-or-bottom-pos'
> are quite confusing.
Yes, if you have better names tell me.
Also here on last version of patch I am using symbol instead of sexp
which is better.
> But fortunately we could avoid them.
Can you develop this?
Find here the last version of patch for review, (more or less what you
have actually) I will apply as soon Emacs is no more in feature freeze
if no objections.
##Merge of all patches applied from revision 118117
## patch-r118037: * lisp/avoid.el: Allow setting in which corner banish move
the mouse.
## patch-r118084: * lisp/avoid.el (mouse-avoidance-banish-distance-from-edge):
Allow banishing mouse in frame or window corner.
## patch-r118114: * lisp/avoid.el Allow specifying a vertical position when
banishing mouse.
##
diff --git a/lisp/avoid.el b/lisp/avoid.el
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -115,6 +115,23 @@
:type 'integer
:group 'avoid)
+(defcustom mouse-avoidance-banish-position '((frame-or-window . frame)
+ (side . right)
+ (side-pos . 3)
+ (top-or-bottom . top)
+ (top-or-bottom-pos . 0))
+ "Position to which Mouse Avoidance mode `banish' moves the mouse.
+An alist where keywords mean:
+FRAME-OR-WINDOW: banish the mouse to corner of frame or window.
+SIDE: banish the mouse on right or left corner of frame or window.
+SIDE-POS: Distance from right or left edge of frame or window.
+TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window.
+TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window."
+ :group 'avoid
+ :type '(alist :key-type symbol :value-type symbol)
+ :options '(frame-or-window side (side-pos integer)
+ top-or-bottom (top-or-bottom-pos integer)))
+
;; Internal variables
(defvar mouse-avoidance-state nil)
(defvar mouse-avoidance-pointer-shapes nil)
@@ -183,13 +200,45 @@
(defun mouse-avoidance-banish-destination ()
"The position to which Mouse Avoidance mode `banish' moves the mouse.
-You can redefine this if you want the mouse banished to a different corner."
- (let* ((pos (window-edges)))
- (cons (- (nth 2 pos) 2)
- (nth 1 pos))))
+
+If you want the mouse banished to a different corner set
+`mouse-avoidance-banish-position' as you need."
+ (let* ((fra-or-win (assoc-default
+ 'frame-or-window
+ mouse-avoidance-banish-position 'eq))
+ (list-values (case fra-or-win
+ (frame (list 0 0 (frame-width) (frame-height)))
+ (window (window-edges))))
+ (alist (loop for v in list-values
+ for k in '(left top right bottom)
+ collect (cons k v)))
+ (side (assoc-default
+ 'side
+ mouse-avoidance-banish-position 'eq))
+ (side-dist (assoc-default
+ 'side-pos
+ mouse-avoidance-banish-position 'eq))
+ (top-or-bottom (assoc-default
+ 'top-or-bottom
+ mouse-avoidance-banish-position 'eq))
+ (top-or-bottom-dist (assoc-default
+ 'top-or-bottom-pos
+ mouse-avoidance-banish-position 'eq))
+ (side-fn (case side
+ (left '+)
+ (right '-)))
+ (top-or-bottom-fn (case top-or-bottom
+ (top '+)
+ (bottom '-))))
+ (cons (funcall side-fn ; -/+
+ (assoc-default side alist 'eq) ; right or left
+ side-dist) ; distance from side
+ (funcall top-or-bottom-fn ; -/+
+ (assoc-default top-or-bottom alist 'eq) ; top/bottom
+ top-or-bottom-dist)))) ; distance from top/bottom
(defun mouse-avoidance-banish-mouse ()
- ;; Put the mouse pointer in the upper-right corner of the current frame.
+ "Put the mouse pointer to `mouse-avoidance-banish-position'."
(mouse-avoidance-set-mouse-position (mouse-avoidance-banish-destination)))
(defsubst mouse-avoidance-delta (cur delta dist var min max)
--
Thierry
Get my Gnupg key:
gpg --keyserver pgp.mit.edu --recv-keys 59F29997
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., (continued)
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/01
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Juri Linkov, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Juri Linkov, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/02
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/03
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/03
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Juri Linkov, 2011/12/05
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode.,
Thierry Volpiatto <=
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Juri Linkov, 2011/12/07
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/07
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Juri Linkov, 2011/12/07
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Thierry Volpiatto, 2011/12/08
- bug#10165: [PATCH] Allow setting corner in mouse avoidance mode., Stefan Monnier, 2011/12/08