From: Nick Roberts <nickrob@snap.net.nz>
Date: Fri, 14 Jan 2005 07:36:50 +0000 (+0000)
Subject: (xterm-mouse-event): Compute window co-ordinates
X-Git-Tag: ttn-vms-21-2-B4~2766
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fcd9df1bf09a63ee2c7b39966f360e37d557fb71;p=emacs.git

(xterm-mouse-event): Compute window co-ordinates
more carefully.
---

diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index de93456ad5a..5709834ab91 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -138,15 +138,17 @@
 		       (t
 			(setq xterm-mouse-last type)
 			(format "down-mouse-%d" (+ 1 type))))))
-	 (w (window-at x y)))
+	 (w (window-at x y))
+         (ltrb (window-edges w))
+         (left (nth 0 ltrb))
+         (top (nth 1 ltrb)))
+
     (setq xterm-mouse-x x
 	  xterm-mouse-y y)
     (if w
-	(list mouse (posn-at-x-y x (if menu-bar-mode (- y 1) y) w))
+	(list mouse (posn-at-x-y (- x left) (- y top) w))
       (list mouse
-	    (append (list nil 'menu-bar)
-		    (nthcdr 2 (posn-at-x-y
-			       x (if menu-bar-mode (- y 1) y) w)))))))
+	    (append (list nil 'menu-bar) (nthcdr 2 (posn-at-x-y x y w)))))))
 
 ;;;###autoload
 (define-minor-mode xterm-mouse-mode