From: Martin Rudalics <rudalics@gmx.at>
Date: Wed, 4 Dec 2013 14:11:33 +0000 (+0100)
Subject: In XTflash fix coordinate of bottom area to flash (Bug#16044).
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~561
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2db4a1b6341b756b73fbdd996b3f6b119360ac99;p=emacs.git

In XTflash fix coordinate of bottom area to flash (Bug#16044).

* xterm.c (XTflash): Fix coordinate of bottom area to flash
(Bug#16044).
---

diff --git a/lisp/windmove.el b/lisp/windmove.el
index 01ae1804d01..638240347c1 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -438,24 +438,28 @@ Return value is a frame-based (HPOS . VPOS) value that should be moved
 to.  DIR is one of `left', `up', `right', or `down'; an optional ARG
 is handled as by `windmove-reference-loc'; WINDOW is the window that
 movement is relative to."
-  (let ((edges (window-edges window))   ; edges: (x0, y0, x1, y1)
+  (let ((edges (window-pixel-edges window))   ; edges: (x0, y0, x1, y1)
         (refpoint (windmove-reference-loc arg window))) ; (x . y)
     (cond
      ((eq dir 'left)
-      (cons (- (nth 0 edges)
+      (cons (- (ceiling (nth 0 edges)
+			(frame-char-width (window-frame window)))
                windmove-window-distance-delta)
             (cdr refpoint)))            ; (x0-d, y)
      ((eq dir 'up)
       (cons (car refpoint)
-            (- (nth 1 edges)
+            (- (ceiling (nth 1 edges)
+			(frame-char-height (window-frame window)))
                windmove-window-distance-delta))) ; (x, y0-d)
      ((eq dir 'right)
-      (cons (+ (1- (nth 2 edges))	; -1 to get actual max x
+      (cons (+ (1- (ceiling (nth 2 edges)
+			    (frame-char-width (window-frame window))))	; -1 to get actual max x
                windmove-window-distance-delta)
             (cdr refpoint)))            ; (x1+d-1, y)
      ((eq dir 'down)			; -1 to get actual max y
       (cons (car refpoint)
-            (+ (1- (nth 3 edges))
+            (+ (1- (ceiling (nth 3 edges)
+			    (frame-char-height (window-frame window))))
                windmove-window-distance-delta))) ; (x, y1+d-1)
      (t (error "Invalid direction of movement: %s" dir)))))
 
diff --git a/src/ChangeLog b/src/ChangeLog
index f67c02093ce..a877bc885e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04  Martin Rudalics  <rudalics@gmx.at>
+
+	* xterm.c (XTflash): Fix coordinate of bottom area to flash
+	(Bug#16044).
+
 2013-12-04  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	* font.c (font_list_entities): Remove dummy assignment.
diff --git a/src/xterm.c b/src/xterm.c
index a77279849d3..0dbc4ac1c74 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2920,7 +2920,7 @@ XTflash (struct frame *f)
 #endif
     {
       /* Get the height not including a menu bar widget.  */
-      int height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, FRAME_LINES (f));
+      int height = FRAME_PIXEL_HEIGHT (f);
       /* Height of each line to flash.  */
       int flash_height = FRAME_LINE_HEIGHT (f);
       /* These will be the left and right margins of the rectangles.  */