aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.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/w32term.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/w32term.c')
-rw-r--r--src/w32term.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/w32term.c b/src/w32term.c
index 3aabf92357a..aa65af4afd3 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6272,9 +6272,8 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
6272{ 6272{
6273 struct terminal *terminal; 6273 struct terminal *terminal;
6274 6274
6275 terminal = create_terminal (); 6275 terminal = create_terminal (output_w32, &w32_redisplay_interface);
6276 6276
6277 terminal->type = output_w32;
6278 terminal->display_info.w32 = dpyinfo; 6277 terminal->display_info.w32 = dpyinfo;
6279 dpyinfo->terminal = terminal; 6278 dpyinfo->terminal = terminal;
6280 6279
@@ -6284,11 +6283,8 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
6284 terminal->ins_del_lines_hook = x_ins_del_lines; 6283 terminal->ins_del_lines_hook = x_ins_del_lines;
6285 terminal->delete_glyphs_hook = x_delete_glyphs; 6284 terminal->delete_glyphs_hook = x_delete_glyphs;
6286 terminal->ring_bell_hook = w32_ring_bell; 6285 terminal->ring_bell_hook = w32_ring_bell;
6287 terminal->reset_terminal_modes_hook = NULL;
6288 terminal->set_terminal_modes_hook = NULL;
6289 terminal->update_begin_hook = x_update_begin; 6286 terminal->update_begin_hook = x_update_begin;
6290 terminal->update_end_hook = x_update_end; 6287 terminal->update_end_hook = x_update_end;
6291 terminal->set_terminal_window_hook = NULL;
6292 terminal->read_socket_hook = w32_read_socket; 6288 terminal->read_socket_hook = w32_read_socket;
6293 terminal->frame_up_to_date_hook = w32_frame_up_to_date; 6289 terminal->frame_up_to_date_hook = w32_frame_up_to_date;
6294 terminal->mouse_position_hook = w32_mouse_position; 6290 terminal->mouse_position_hook = w32_mouse_position;
@@ -6299,11 +6295,9 @@ w32_create_terminal (struct w32_display_info *dpyinfo)
6299 terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars; 6295 terminal->condemn_scroll_bars_hook = w32_condemn_scroll_bars;
6300 terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar; 6296 terminal->redeem_scroll_bar_hook = w32_redeem_scroll_bar;
6301 terminal->judge_scroll_bars_hook = w32_judge_scroll_bars; 6297 terminal->judge_scroll_bars_hook = w32_judge_scroll_bars;
6302
6303 terminal->delete_frame_hook = x_destroy_window; 6298 terminal->delete_frame_hook = x_destroy_window;
6304 terminal->delete_terminal_hook = x_delete_terminal; 6299 terminal->delete_terminal_hook = x_delete_terminal;
6305 6300 /* Other hooks are NULL by default. */
6306 terminal->rif = &w32_redisplay_interface;
6307 6301
6308 /* We don't yet support separate terminals on W32, so don't try to share 6302 /* We don't yet support separate terminals on W32, so don't try to share
6309 keyboards between virtual terminals that are on the same physical 6303 keyboards between virtual terminals that are on the same physical