aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorDmitry Antipov2014-05-14 17:55:37 +0400
committerDmitry Antipov2014-05-14 17:55:37 +0400
commit6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8 (patch)
tree18e260eef312d3459cb0908206bbfa621cf66808 /src/xterm.c
parentc5aed7bd9330c2bde33abfe1724af820273b457a (diff)
downloademacs-6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8.tar.gz
emacs-6f1d9822d972c418dbf2295fcd01b7b0a3dc5ef8.zip
Minor cleanup for terminal setup.
* termhooks.h (create_terminal): Adjust prototype. * terminal.c (create_terminal): Pass output method and RIF as args. (init_initial_terminal): * nsterm.m (ns_create_terminal): * term.c (init_tty): * w32term.c (w32_create_terminal): * xterm.c (x_create_terminal): Adjust users. Avoid redundant NULL initializers and add comments.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 5c21bfae144..0693d101f16 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10526,9 +10526,8 @@ x_create_terminal (struct x_display_info *dpyinfo)
10526{ 10526{
10527 struct terminal *terminal; 10527 struct terminal *terminal;
10528 10528
10529 terminal = create_terminal (); 10529 terminal = create_terminal (output_x_window, &x_redisplay_interface);
10530 10530
10531 terminal->type = output_x_window;
10532 terminal->display_info.x = dpyinfo; 10531 terminal->display_info.x = dpyinfo;
10533 dpyinfo->terminal = terminal; 10532 dpyinfo->terminal = terminal;
10534 10533
@@ -10539,11 +10538,8 @@ x_create_terminal (struct x_display_info *dpyinfo)
10539 terminal->delete_glyphs_hook = x_delete_glyphs; 10538 terminal->delete_glyphs_hook = x_delete_glyphs;
10540 terminal->ring_bell_hook = XTring_bell; 10539 terminal->ring_bell_hook = XTring_bell;
10541 terminal->toggle_invisible_pointer_hook = XTtoggle_invisible_pointer; 10540 terminal->toggle_invisible_pointer_hook = XTtoggle_invisible_pointer;
10542 terminal->reset_terminal_modes_hook = NULL;
10543 terminal->set_terminal_modes_hook = NULL;
10544 terminal->update_begin_hook = x_update_begin; 10541 terminal->update_begin_hook = x_update_begin;
10545 terminal->update_end_hook = x_update_end; 10542 terminal->update_end_hook = x_update_end;
10546 terminal->set_terminal_window_hook = NULL;
10547 terminal->read_socket_hook = XTread_socket; 10543 terminal->read_socket_hook = XTread_socket;
10548 terminal->frame_up_to_date_hook = XTframe_up_to_date; 10544 terminal->frame_up_to_date_hook = XTframe_up_to_date;
10549 terminal->mouse_position_hook = XTmouse_position; 10545 terminal->mouse_position_hook = XTmouse_position;
@@ -10554,11 +10550,9 @@ x_create_terminal (struct x_display_info *dpyinfo)
10554 terminal->condemn_scroll_bars_hook = XTcondemn_scroll_bars; 10550 terminal->condemn_scroll_bars_hook = XTcondemn_scroll_bars;
10555 terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar; 10551 terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar;
10556 terminal->judge_scroll_bars_hook = XTjudge_scroll_bars; 10552 terminal->judge_scroll_bars_hook = XTjudge_scroll_bars;
10557
10558 terminal->delete_frame_hook = x_destroy_window; 10553 terminal->delete_frame_hook = x_destroy_window;
10559 terminal->delete_terminal_hook = x_delete_terminal; 10554 terminal->delete_terminal_hook = x_delete_terminal;
10560 10555 /* Other hooks are NULL by default. */
10561 terminal->rif = &x_redisplay_interface;
10562 10556
10563 return terminal; 10557 return terminal;
10564} 10558}