aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2008-09-18 18:14:03 +0000
committerChong Yidong2008-09-18 18:14:03 +0000
commita0fe6cca4f8a35681eb41bb2ccfcfd1309662961 (patch)
tree9e397a67116b47d174e828410017777eef30dd3d
parentfd2f80c65321ccc7ce7be535cb133bc923ae2ebf (diff)
downloademacs-a0fe6cca4f8a35681eb41bb2ccfcfd1309662961.tar.gz
emacs-a0fe6cca4f8a35681eb41bb2ccfcfd1309662961.zip
(x_fullscreen_adjust): Use x_display_pixel_height and
x_display_pixel_width.
-rw-r--r--src/frame.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/frame.c b/src/frame.c
index db8db6b8c36..50aae703f53 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2862,6 +2862,7 @@ x_fullscreen_adjust (f, width, height, top_pos, left_pos)
2862{ 2862{
2863 int newwidth = FRAME_COLS (f); 2863 int newwidth = FRAME_COLS (f);
2864 int newheight = FRAME_LINES (f); 2864 int newheight = FRAME_LINES (f);
2865 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
2865 2866
2866 *top_pos = f->top_pos; 2867 *top_pos = f->top_pos;
2867 *left_pos = f->left_pos; 2868 *left_pos = f->left_pos;
@@ -2870,7 +2871,7 @@ x_fullscreen_adjust (f, width, height, top_pos, left_pos)
2870 { 2871 {
2871 int ph; 2872 int ph;
2872 2873
2873 ph = FRAME_X_DISPLAY_INFO (f)->height; 2874 ph = x_display_pixel_height (dpyinfo);
2874 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph); 2875 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph);
2875 ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, newheight) - f->y_pixels_diff; 2876 ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, newheight) - f->y_pixels_diff;
2876 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph); 2877 newheight = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, ph);
@@ -2881,7 +2882,7 @@ x_fullscreen_adjust (f, width, height, top_pos, left_pos)
2881 { 2882 {
2882 int pw; 2883 int pw;
2883 2884
2884 pw = FRAME_X_DISPLAY_INFO (f)->width; 2885 pw = x_display_pixel_width (dpyinfo);
2885 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw); 2886 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw);
2886 pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, newwidth) - f->x_pixels_diff; 2887 pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, newwidth) - f->x_pixels_diff;
2887 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw); 2888 newwidth = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pw);