mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

(mouse-avoidance-too-close-p): If the frame lacks a

Browse Source 
tool-bar-lines parameter, behave as if its value were zero.
(mouse-avoidance-set-pointer-shape): Don't do anything if
x-pointer-shape is not boundp.
This commit is contained in:
Eli Zaretskii 2001-07-24 11:05:40 +00:00
parent f018895322
commit a9f7310463
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,10 @@
2001-07-24 Eli Zaretskii <eliz@is.elta.co.il>
* avoid.el (mouse-avoidance-too-close-p): If the frame lacks a
tool-bar-lines parameter, behave as if its value were zero.
(mouse-avoidance-set-pointer-shape): Don't do anything if
x-pointer-shape is not boundp.
2001-07-23 Francesco Potorti` <pot@gnu.org>
* uniquify.el: Overall speedup changes when using many buffers.

10
lisp/avoid.el
View File

@ -131,8 +131,9 @@ Only applies in mouse-avoidance-modes `animate' and `jump'."
(defsubst mouse-avoidance-set-pointer-shape (shape)
"Set the shape of the mouse pointer to SHAPE."
(setq x-pointer-shape shape)
(set-mouse-color nil))
(when (boundp 'x-pointer-shape)
(setq x-pointer-shape shape)
(set-mouse-color nil)))
(defun mouse-avoidance-point-position ()
"Return the position of point as (FRAME X . Y).
@ -179,6 +180,8 @@ Acceptable distance is defined by `mouse-avoidance-threshold'."
(let* ((frame (car mouse))
(mouse-y (cdr (cdr mouse)))
(tool-bar-lines (frame-parameter nil 'tool-bar-lines)))
(or tool-bar-lines
(setq tool-bar-lines 0))
(if (and mouse-y (< mouse-y tool-bar-lines))
nil
(let ((point (mouse-avoidance-point-position))
@ -386,7 +389,8 @@ definition of \"random distance\".)"
(run-with-idle-timer 0.1 t 'mouse-avoidance-fancy-hook))
(setq mouse-avoidance-mode mode
mouse-avoidance-state (cons 0 0)
mouse-avoidance-old-pointer-shape x-pointer-shape))
mouse-avoidance-old-pointer-shape
(and (boundp 'x-pointer-shape) x-pointer-shape)))
((eq mode 'exile)
(setq mouse-avoidance-timer
(run-with-idle-timer 0.1 t 'mouse-avoidance-exile-hook))