procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(mouse-avoidance-point-position): Fix compute-motion

Browse source 
call to use (X . Y) relative to window, not frame.
Avoid errors if window-start < point-min.
This commit is contained in:
Richard M. Stallman 1994-06-11 12:14:28 +00:00
parent 2e7d3af41c
commit 96ae4787ad
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/avoid.el
View file

@ -109,18 +109,26 @@ Analogous to mouse-position."
(let* ((w (selected-window))
(edges (window-edges w))
(list
(compute-motion (window-start w) ; start pos
(cons (car edges) (car (cdr edges))) ; start XY
(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
(cons (nth 2 edges) (nth 3 edges)) ; stop XY: none
(cons (window-width) (window-height)); stop XY: none
(1- (window-width)) ; width
(cons (window-hscroll w) 0) ; 0 may not be right?
(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)
(setcar list (selected-frame))
(setcdr (cdr list) (car (cdr (cdr list))))
list))
(cons (selected-frame)
(cons (+ (car edges) (car (cdr list)))
(+ (car (cdr edges)) (car (cdr (cdr list))))))))
;(defun mouse-avoidance-point-position-test ()
; (interactive)
; (message (format "point=%s mouse=%s"
; (cdr (mouse-avoidance-point-position))
; (cdr (mouse-position)))))
(defun mouse-avoidance-set-mouse-position (pos)
;; Carefully set mouse position to given position (X . Y)