comparison src/xterm.c @ 50371:45e825260791

Remove unnecessary extern declarations. (x_fullscreen_adjust): Remove. Use generic instead. (x_redisplay_interface): Add x_frame_parm_handlers member.
author Kim F. Storm <storm@cua.dk>
date Mon, 31 Mar 2003 20:36:31 +0000
parents f139cd7e1d62
children 3b4cda88d7ef
comparison
equal deleted inserted replaced
50370:0c01548d7ed3 50371:45e825260791
295 295
296 static Lisp_Object Qvendor_specific_keysyms; 296 static Lisp_Object Qvendor_specific_keysyms;
297 static Lisp_Object Qlatin_1, Qutf_8; 297 static Lisp_Object Qlatin_1, Qutf_8;
298 298
299 extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); 299 extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *));
300 extern Lisp_Object x_icon_type P_ ((struct frame *));
301 300
302 301
303 static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *)); 302 static int x_alloc_nearest_color_1 P_ ((Display *, Colormap, XColor *));
304 static void x_set_window_size_1 P_ ((struct frame *, int, int, int)); 303 static void x_set_window_size_1 P_ ((struct frame *, int, int, int));
305 static const XColor *x_color_cells P_ ((Display *, int *)); 304 static const XColor *x_color_cells P_ ((Display *, int *));
8386 x_set_offset (f, expect_left, expect_top, 1); 8385 x_set_offset (f, expect_left, expect_top, 1);
8387 8386
8388 /* Just do this once */ 8387 /* Just do this once */
8389 f->output_data.x->want_fullscreen &= ~FULLSCREEN_MOVE_WAIT; 8388 f->output_data.x->want_fullscreen &= ~FULLSCREEN_MOVE_WAIT;
8390 } 8389 }
8391 }
8392
8393
8394 /* Calculate fullscreen size. Return in *TOP_POS and *LEFT_POS the
8395 wanted positions of the WM window (not emacs window).
8396 Return in *WIDTH and *HEIGHT the wanted width and height of Emacs
8397 window (FRAME_X_WINDOW).
8398 */
8399 void
8400 x_fullscreen_adjust (f, width, height, top_pos, left_pos)
8401 struct frame *f;
8402 int *width;
8403 int *height;
8404 int *top_pos;
8405 int *left_pos;
8406 {
8407 int newwidth = f->width, newheight = f->height;
8408
8409 *top_pos = f->output_data.x->top_pos;
8410 *left_pos = f->output_data.x->left_pos;
8411
8412 if (f->output_data.x->want_fullscreen & FULLSCREEN_HEIGHT)
8413 {
8414 int ph;
8415
8416 ph = FRAME_X_DISPLAY_INFO (f)->height;
8417 newheight = PIXEL_TO_CHAR_HEIGHT (f, ph);
8418 ph = CHAR_TO_PIXEL_HEIGHT (f, newheight)
8419 - f->output_data.x->y_pixels_diff;
8420 newheight = PIXEL_TO_CHAR_HEIGHT (f, ph);
8421 *top_pos = 0;
8422 }
8423
8424 if (f->output_data.x->want_fullscreen & FULLSCREEN_WIDTH)
8425 {
8426 int pw;
8427
8428 pw = FRAME_X_DISPLAY_INFO (f)->width;
8429 newwidth = PIXEL_TO_CHAR_WIDTH (f, pw);
8430 pw = CHAR_TO_PIXEL_WIDTH (f, newwidth)
8431 - f->output_data.x->x_pixels_diff;
8432 newwidth = PIXEL_TO_CHAR_WIDTH (f, pw);
8433 *left_pos = 0;
8434 }
8435
8436 *width = newwidth;
8437 *height = newheight;
8438 } 8390 }
8439 8391
8440 8392
8441 /* Change the size of frame F's X window to COLS/ROWS in the case F 8393 /* Change the size of frame F's X window to COLS/ROWS in the case F
8442 doesn't have a widget. If CHANGE_GRAVITY is 1, we change to 8394 doesn't have a widget. If CHANGE_GRAVITY is 1, we change to
10677 #endif /* USE_X_TOOLKIT */ 10629 #endif /* USE_X_TOOLKIT */
10678 10630
10679 10631
10680 /* Set up use of X before we make the first connection. */ 10632 /* Set up use of X before we make the first connection. */
10681 10633
10634 extern frame_parm_handler x_frame_parm_handlers[];
10635
10682 static struct redisplay_interface x_redisplay_interface = 10636 static struct redisplay_interface x_redisplay_interface =
10683 { 10637 {
10638 x_frame_parm_handlers,
10684 x_produce_glyphs, 10639 x_produce_glyphs,
10685 x_write_glyphs, 10640 x_write_glyphs,
10686 x_insert_glyphs, 10641 x_insert_glyphs,
10687 x_clear_end_of_line, 10642 x_clear_end_of_line,
10688 x_scroll_run, 10643 x_scroll_run,