mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-29 07:58:28 +00:00
Code Issues Releases Activity

* xterm.c (x_check_fullscreen): Fix pixel/character mixup.

Browse Source
This commit is contained in:
Jan Djärv 2010-12-24 11:14:44 +01:00
parent b0eab0848b
commit 84595ff0e3
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2010-12-24 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_check_fullscreen): Fix pixel/character mixup.
2010-12-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (Fformat_mode_line): Fix last change.

16
src/xterm.c
View File

@ -8764,9 +8764,13 @@ x_check_fullscreen (f)
if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
return; /* Only fullscreen without WM or with EWM hints (above). */
/* Setting fullscreen to nil doesn't do anything. We could save the
last non-fullscreen size and restore it, but it seems like a
lot of work for this unusual case (no window manager running). */
if (f->want_fullscreen != FULLSCREEN_NONE)
{
int width = FRAME_COLS (f), height = FRAME_LINES (f);
int width = FRAME_PIXEL_WIDTH (f), height = FRAME_PIXEL_HEIGHT (f);
struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
switch (f->want_fullscreen)
@ -8783,13 +8787,9 @@ x_check_fullscreen (f)
case FULLSCREEN_HEIGHT:
height = x_display_pixel_height (dpyinfo);
}
if (FRAME_COLS (f) != width || FRAME_LINES (f) != height)
{
change_frame_size (f, height, width, 0, 1, 0);
SET_FRAME_GARBAGED (f);
cancel_mouse_face (f);
}
XResizeWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
width, height);
}
}