[Emacs-diffs] /srv/bzr/emacs/trunk r99845: Fix resizing for X and non-Gtk+ build. Bug #5848.

[Jan D]

------------------------------------------------------------
revno: 99845 [merge]
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Wed 2010-04-07 13:45:08 +0200
message:
  Fix resizing for X and non-Gtk+ build.  Bug #5848.
    
  * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
  FRAME_LINE_TO_PIXEL_Y.
  
  * xterm.c (x_set_window_size_1): Don't add border_width/height to
  pixelwidth/height.
modified:
  src/ChangeLog
  src/frame.h
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-07 06:11:45 +0000
+++ b/src/ChangeLog     2010-04-07 11:39:26 +0000
@@ -1,3 +1,11 @@
+2010-04-07  Jan Djärv  <address@hidden>
+
+       * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
+       FRAME_LINE_TO_PIXEL_Y.
+
+       * xterm.c (x_set_window_size_1): Don't add border_width/height to
+       pixelwidth/height.
+
 2010-04-07  Dan Nicolaescu  <address@hidden>
 
        Simplify code for HP machines.

=== modified file 'src/frame.h'
--- a/src/frame.h       2010-01-13 08:35:10 +0000
+++ b/src/frame.h       2010-04-07 11:39:26 +0000
@@ -997,8 +997,8 @@
    + FRAME_INTERNAL_BORDER_WIDTH (f))
 
 #define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \
-  (FRAME_LINE_TO_PIXEL_Y (f, lines) \
-   + FRAME_INTERNAL_BORDER_WIDTH (f))
+  ((lines) * FRAME_LINE_HEIGHT (f) \
+   + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
 
 
 /* Return the row/column (zero-based) of the character cell containing

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-04-02 03:10:33 +0000
+++ b/src/xterm.c       2010-04-07 11:39:26 +0000
@@ -8931,11 +8931,9 @@
 
   compute_fringe_widths (f, 0);
 
-  pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols)
-    + 2*f->border_width;
+  pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
   pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
-    + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f)
-    + 2*f->border_width;
+    + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
 
   if (change_gravity) f->win_gravity = NorthWestGravity;
   x_wm_set_size_hint (f, (long) 0, 0);