aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/w32term.c50
1 files changed, 3 insertions, 47 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 4098ee54824..b6ff217a5a7 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5474,53 +5474,6 @@ x_check_fullscreen_move (f)
5474} 5474}
5475 5475
5476 5476
5477/* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the
5478 wanted positions of the WM window (not emacs window).
5479 Return in *WIDTH and *HEIGHT the wanted width and height of Emacs
5480 window (FRAME_X_WINDOW).
5481 */
5482void
5483x_fullscreen_adjust (f, width, height, top_pos, left_pos)
5484 struct frame *f;
5485 int *width;
5486 int *height;
5487 int *top_pos;
5488 int *left_pos;
5489{
5490 int newwidth = f->width, newheight = f->height;
5491
5492 *top_pos = f->output_data.w32->top_pos;
5493 *left_pos = f->output_data.w32->left_pos;
5494
5495 if (f->output_data.w32->want_fullscreen & FULLSCREEN_HEIGHT)
5496 {
5497 int ph;
5498
5499 ph = FRAME_X_DISPLAY_INFO (f)->height;
5500 newheight = PIXEL_TO_CHAR_HEIGHT (f, ph);
5501 ph = CHAR_TO_PIXEL_HEIGHT (f, newheight)
5502 - f->output_data.w32->y_pixels_diff;
5503 newheight = PIXEL_TO_CHAR_HEIGHT (f, ph);
5504 *top_pos = 0;
5505 }
5506
5507 if (f->output_data.w32->want_fullscreen & FULLSCREEN_WIDTH)
5508 {
5509 int pw;
5510
5511 pw = FRAME_X_DISPLAY_INFO (f)->width;
5512 newwidth = PIXEL_TO_CHAR_WIDTH (f, pw);
5513 pw = CHAR_TO_PIXEL_WIDTH (f, newwidth)
5514 - f->output_data.w32->x_pixels_diff;
5515 newwidth = PIXEL_TO_CHAR_WIDTH (f, pw);
5516 *left_pos = 0;
5517 }
5518
5519 *width = newwidth;
5520 *height = newheight;
5521}
5522
5523
5524/* Call this to change the size of frame F's x-window. 5477/* Call this to change the size of frame F's x-window.
5525 If CHANGE_GRAVITY is 1, we change to top-left-corner window gravity 5478 If CHANGE_GRAVITY is 1, we change to top-left-corner window gravity
5526 for this size change and subsequent size changes. 5479 for this size change and subsequent size changes.
@@ -6380,8 +6333,11 @@ void
6380x_flush (struct frame * f) 6333x_flush (struct frame * f)
6381{ /* Nothing to do */ } 6334{ /* Nothing to do */ }
6382 6335
6336extern frame_parm_handler w32_frame_parm_handlers[];
6337
6383static struct redisplay_interface w32_redisplay_interface = 6338static struct redisplay_interface w32_redisplay_interface =
6384{ 6339{
6340 w32_frame_parm_handlers,
6385 x_produce_glyphs, 6341 x_produce_glyphs,
6386 x_write_glyphs, 6342 x_write_glyphs,
6387 x_insert_glyphs, 6343 x_insert_glyphs,