aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-09-19 10:05:13 +0000
committerEli Zaretskii2008-09-19 10:05:13 +0000
commit3e7600a697749d3bc50c844e153647e0407ae503 (patch)
treef75917d86442e466d85757a439f639598879a371
parent05eb7cdce953e52faaeb88768f52ab1167498586 (diff)
downloademacs-3e7600a697749d3bc50c844e153647e0407ae503.tar.gz
emacs-3e7600a697749d3bc50c844e153647e0407ae503.zip
(x_wm_set_size_hint): Use x_display_pixel_width and x_display_pixel_height.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c8
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ed40d242b3e..cf29620c36b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-09-19 Eli Zaretskii <eliz@gnu.org>
2
3 * xterm.c (x_wm_set_size_hint): Use x_display_pixel_width and
4 x_display_pixel_height.
5
12008-09-19 Juanma Barranquero <lekktu@gmail.com> 62008-09-19 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * frame.c (x_fullscreen_adjust): Declare var as Display_Info. 8 * frame.c (x_fullscreen_adjust): Declare var as Display_Info.
diff --git a/src/xterm.c b/src/xterm.c
index b948f042b6a..f272c934043 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9619,10 +9619,10 @@ x_wm_set_size_hint (f, flags, user_position)
9619 9619
9620 size_hints.width_inc = FRAME_COLUMN_WIDTH (f); 9620 size_hints.width_inc = FRAME_COLUMN_WIDTH (f);
9621 size_hints.height_inc = FRAME_LINE_HEIGHT (f); 9621 size_hints.height_inc = FRAME_LINE_HEIGHT (f);
9622 size_hints.max_width 9622 size_hints.max_width = x_display_pixel_width (FRAME_X_DISPLAY_INFO (f))
9623 = FRAME_X_DISPLAY_INFO (f)->width - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0); 9623 - FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, 0);
9624 size_hints.max_height 9624 size_hints.max_height = x_display_pixel_height (FRAME_X_DISPLAY_INFO (f))
9625 = FRAME_X_DISPLAY_INFO (f)->height - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0); 9625 - FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 0);
9626 9626
9627 /* Calculate the base and minimum sizes. 9627 /* Calculate the base and minimum sizes.
9628 9628