Show
Ignore:
Timestamp:
08/18/06 08:35:31 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/avoid.el

    r4079 r4148  
    125125(defvar mouse-avoidance-n-pointer-shapes 0) 
    126126(defvar mouse-avoidance-old-pointer-shape nil) 
     127(defvar mouse-avoidance-animating-pointer nil) 
    127128 
    128129;; This timer is used to run something when Emacs is idle. 
    …… 
    244245    (if (or (eq mouse-avoidance-mode 'animate) 
    245246            (eq mouse-avoidance-mode 'proteus)) 
    246         (let ((i 0.0)) 
     247        (let ((i 0.0) 
     248              (incr (max .1 (/ 1.0 mouse-avoidance-nudge-dist)))) 
     249          (setq mouse-avoidance-animating-pointer t) 
    247250          (while (<= i 1) 
    248251            (mouse-avoidance-set-mouse-position 
    249252             (cons (+ (car cur-pos) (round (* i deltax))) 
    250253                   (+ (cdr cur-pos) (round (* i deltay))))) 
    251             (setq i (+ i (max .1 (/ 1.0 mouse-avoidance-nudge-dist)))) 
     254            (setq i (+ i incr)) 
    252255            (if (eq mouse-avoidance-mode 'proteus) 
    253256                (mouse-avoidance-set-pointer-shape 
    254257                 (mouse-avoidance-random-shape))) 
    255             (sit-for mouse-avoidance-animation-delay))) 
     258            (sit-for mouse-avoidance-animation-delay)) 
     259          (setq mouse-avoidance-animating-pointer nil)) 
    256260      (mouse-avoidance-set-mouse-position (cons (+ (car (cdr cur)) deltax) 
    257261                                                (+ (cdr (cdr cur)) deltay)))))) 
    …… 
    295299                   (memq 'down modifiers))))))) 
    296300 
    297 (defun mouse-avoidance-banish-hook () 
     301(defun mouse-avoidance-banish () 
    298302  (if (not (mouse-avoidance-ignore-p)) 
    299303      (mouse-avoidance-banish-mouse))) 
    300304 
    301 (defun mouse-avoidance-exile-hook () 
     305(defun mouse-avoidance-exile () 
    302306  ;; For exile mode, the state is nil when the mouse is in its normal 
    303307  ;; position, and set to the old mouse-position when the mouse is in exile. 
    …… 
    318322               (setq mouse-avoidance-state nil)))))) 
    319323 
    320 (defun mouse-avoidance-fancy-hook () 
     324(defun mouse-avoidance-fancy () 
    321325  ;; Used for the "fancy" modes, ie jump et al. 
    322   (if (and (not (mouse-avoidance-ignore-p)) 
     326  (if (and (not mouse-avoidance-animating-pointer) 
     327           (not (mouse-avoidance-ignore-p)) 
    323328           (mouse-avoidance-too-close-p (mouse-position))) 
    324329      (let ((old-pos (mouse-position))) 
    …… 
    376381             (eq mode 'proteus)) 
    377382         (setq mouse-avoidance-timer 
    378                (run-with-idle-timer 0.1 t 'mouse-avoidance-fancy-hook)) 
     383               (run-with-idle-timer 0.1 t 'mouse-avoidance-fancy)) 
    379384         (setq mouse-avoidance-mode mode 
    380385               mouse-avoidance-state (cons 0 0) 
    …… 
    383388        ((eq mode 'exile) 
    384389         (setq mouse-avoidance-timer 
    385                (run-with-idle-timer 0.1 t 'mouse-avoidance-exile-hook)) 
     390               (run-with-idle-timer 0.1 t 'mouse-avoidance-exile)) 
    386391         (setq mouse-avoidance-mode mode 
    387392               mouse-avoidance-state nil)) 
    …… 
    391396             (and mode (> (prefix-numeric-value mode) 0))) 
    392397         (setq mouse-avoidance-timer 
    393                (run-with-idle-timer 0.1 t 'mouse-avoidance-banish-hook)) 
     398               (run-with-idle-timer 0.1 t 'mouse-avoidance-banish)) 
    394399         (setq mouse-avoidance-mode 'banish)) 
    395400        (t (setq mouse-avoidance-mode nil)))