[Emacs-diffs] trunk r115374: In XTflash fix coordinate of bottom area to flash (Bug#16044).

[Martin Rudalics]

------------------------------------------------------------
revno: 115374
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 15:11:33 +0100
message:
  In XTflash fix coordinate of bottom area to flash (Bug#16044).
  
  * xterm.c (XTflash): Fix coordinate of bottom area to flash
  (Bug#16044).
modified:
  lisp/windmove.el               
windmove.el-20091113204419-o5vbwnq5f7feedwu-1767
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'lisp/windmove.el'
--- a/lisp/windmove.el  2013-01-01 09:11:05 +0000
+++ b/lisp/windmove.el  2013-12-04 14:11:33 +0000
@@ -438,24 +438,28 @@
 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)))))
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-04 13:35:41 +0000
+++ b/src/ChangeLog     2013-12-04 14:11:33 +0000
@@ -1,3 +1,8 @@
+2013-12-04  Martin Rudalics  <address@hidden>
+
+       * xterm.c (XTflash): Fix coordinate of bottom area to flash
+       (Bug#16044).
+
 2013-12-04  Dmitry Antipov  <address@hidden>
 
        * font.c (font_list_entities): Remove dummy assignment.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-12-03 11:33:13 +0000
+++ b/src/xterm.c       2013-12-04 14:11:33 +0000
@@ -2920,7 +2920,7 @@
 #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.  */