Mercurial > emacs

comparison src/frame.c @ 98225:e7da931942f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_fullscreen_adjust): Use x_display_pixel_height and x_display_pixel_width.
author Chong Yidong <cyd@stupidchicken.com>
date Thu, 18 Sep 2008 18:14:03 +0000
parents 8a36a3a1b31e
children 5f73593cabcd
comparison
equal deleted inserted replaced
98224:25a5f64dd9db 98225:e7da931942f1
2860 int *top_pos; 2860 int *top_pos;
2861 int *left_pos; 2861 int *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;
2868 2869
2869 if (f->want_fullscreen & FULLSCREEN_HEIGHT) 2870 if (f->want_fullscreen & FULLSCREEN_HEIGHT)
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);
2877 *top_pos = 0; 2878 *top_pos = 0;
2878 } 2879 }
2879 2880
2880 if (f->want_fullscreen & FULLSCREEN_WIDTH) 2881 if (f->want_fullscreen & FULLSCREEN_WIDTH)
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);
2888 *left_pos = 0; 2889 *left_pos = 0;
2889 } 2890 }