Comment change.

[bpt/emacs.git] / lisp / avoid.el

diff --git a/lisp/avoid.el b/lisp/avoid.el
index e99d09d..341aaf0 100644 (file)
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -1,7 +1,7 @@
 ;;; avoid.el --- make mouse pointer stay out of the way of editing
 
-;; Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -124,6 +124,7 @@ Only applies in mouse-avoidance-modes `animate' and `jump'."
 (defvar mouse-avoidance-pointer-shapes nil)
 (defvar mouse-avoidance-n-pointer-shapes 0)
 (defvar mouse-avoidance-old-pointer-shape nil)
+(defvar mouse-avoidance-animating-pointer nil)
 
 ;; This timer is used to run something when Emacs is idle.
 (defvar mouse-avoidance-timer nil)
@@ -139,23 +140,13 @@ Only applies in mouse-avoidance-modes `animate' and `jump'."
 (defun mouse-avoidance-point-position ()
   "Return the position of point as (FRAME X . Y).
 Analogous to `mouse-position'."
-  (let* ((w (selected-window))
-        (edges (window-inside-edges w))
-        (list
-         (compute-motion (max (window-start w) (point-min))   ; start pos
-                         ;; window-start can be < point-min if the
-                         ;; latter has changed since the last redisplay
-                         '(0 . 0)                             ; start XY
-                         (point)                              ; stop pos
-                         nil                                  ; stop XY: none
-                         nil                                  ; width
-                         (cons (window-hscroll w) 0)          ; 0 may not be right?
-                         (selected-window))))
-    ;; compute-motion returns (pos HPOS VPOS prevhpos contin)
-    ;; we want:               (frame hpos . vpos)
+  (let ((edges (window-inside-edges))
+       (x-y (posn-x-y (posn-at-point))))
     (cons (selected-frame)
-         (cons (+ (car edges)       (car (cdr list)))
-               (+ (car (cdr edges)) (car (cdr (cdr list))))))))
+         (cons (+ (car edges)
+                  (/ (car x-y) (frame-char-width)))
+               (+ (car (cdr edges))
+                  (/ (cdr x-y) (frame-char-height)))))))
 
 ;(defun mouse-avoidance-point-position-test ()
 ;  (interactive)
@@ -253,16 +244,19 @@ You can redefine this if you want the mouse banished to a different corner."
                (+ (cdr mouse-avoidance-state) deltay)))
     (if (or (eq mouse-avoidance-mode 'animate)
            (eq mouse-avoidance-mode 'proteus))
-       (let ((i 0.0))
+       (let ((i 0.0)
+             (incr (max .1 (/ 1.0 mouse-avoidance-nudge-dist))))
+         (setq mouse-avoidance-animating-pointer t)
          (while (<= i 1)
            (mouse-avoidance-set-mouse-position
             (cons (+ (car cur-pos) (round (* i deltax)))
                   (+ (cdr cur-pos) (round (* i deltay)))))
-           (setq i (+ i (max .1 (/ 1.0 mouse-avoidance-nudge-dist))))
+           (setq i (+ i incr))
            (if (eq mouse-avoidance-mode 'proteus)
                (mouse-avoidance-set-pointer-shape
                 (mouse-avoidance-random-shape)))
-           (sit-for mouse-avoidance-animation-delay)))
+           (sit-for mouse-avoidance-animation-delay))
+         (setq mouse-avoidance-animating-pointer nil))
       (mouse-avoidance-set-mouse-position (cons (+ (car (cdr cur)) deltax)
                                                (+ (cdr (cdr cur)) deltay))))))
 
@@ -304,11 +298,11 @@ redefine this function to suit your own tastes."
                   (memq 'drag modifiers)
                   (memq 'down modifiers)))))))
 
-(defun mouse-avoidance-banish-hook ()
+(defun mouse-avoidance-banish ()
   (if (not (mouse-avoidance-ignore-p))
       (mouse-avoidance-banish-mouse)))
 
-(defun mouse-avoidance-exile-hook ()
+(defun mouse-avoidance-exile ()
   ;; For exile mode, the state is nil when the mouse is in its normal
   ;; position, and set to the old mouse-position when the mouse is in exile.
   (if (not (mouse-avoidance-ignore-p))
@@ -327,9 +321,10 @@ redefine this function to suit your own tastes."
               ;; but clear state anyway, to be ready for another move
               (setq mouse-avoidance-state nil))))))
 
-(defun mouse-avoidance-fancy-hook ()
+(defun mouse-avoidance-fancy ()
   ;; Used for the "fancy" modes, ie jump et al.
-  (if (and (not (mouse-avoidance-ignore-p))
+  (if (and (not mouse-avoidance-animating-pointer)
+          (not (mouse-avoidance-ignore-p))
           (mouse-avoidance-too-close-p (mouse-position)))
       (let ((old-pos (mouse-position)))
        (mouse-avoidance-nudge-mouse)
@@ -385,14 +380,14 @@ definition of \"random distance\".)"
             (eq mode 'animate)
             (eq mode 'proteus))
         (setq mouse-avoidance-timer
-              (run-with-idle-timer 0.1 t 'mouse-avoidance-fancy-hook))
+              (run-with-idle-timer 0.1 t 'mouse-avoidance-fancy))
         (setq mouse-avoidance-mode mode
               mouse-avoidance-state (cons 0 0)
               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))
+              (run-with-idle-timer 0.1 t 'mouse-avoidance-exile))
         (setq mouse-avoidance-mode mode
               mouse-avoidance-state nil))
        ((or (eq mode 'banish)
@@ -400,7 +395,7 @@ definition of \"random distance\".)"
             (and (null mode) (null mouse-avoidance-mode))
             (and mode (> (prefix-numeric-value mode) 0)))
         (setq mouse-avoidance-timer
-              (run-with-idle-timer 0.1 t 'mouse-avoidance-banish-hook))
+              (run-with-idle-timer 0.1 t 'mouse-avoidance-banish))
         (setq mouse-avoidance-mode 'banish))
        (t (setq mouse-avoidance-mode nil)))
   (force-mode-line-update))