Mercurial > emacs

comparison src/xdisp.c @ 83431:76396de7f50a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly. * src/termhooks.h (struct device): Rename to `terminal'. Rename member `next_device' to `next_terminal'. (device_list): Rename to `terminal_list'. (FRAME_DEVICE): Rename to `FRAME_TERMINAL'. (DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'. (TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'. (DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'. Update declarations and macro definitions. * src/termchar.h (tty_display_info): Rename member `device' to `terminal'. (FRAME_TTY): Update for renames. * src/xterm.h (x_display_info): Rename member `device' to `terminal'. * src/frame.h (frame): Rename `device' member to `terminal'. (FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p): Update for renames. * src/lisp.h (set_process_environment): Rename to `set_global_environment'. (device): Rename to `terminal'. * src/dispextern.h: Update declarations and macro definitions. * src/terminal.c (device_list): Rename to `terminal_list'. (next_device_id): Rename to `next_terminal_id'. (initial_device): Rename to `initial_terminal'. (get_device): Rename to `get_terminal'. (create_device): Rename to `create_terminal'. (mark_devices): Rename to `mark_terminals'. (delete_device): Rename to `delete_terminal'. (Fdelete_display): Rename to `Fdelete_terminal'. (Fframe_terminal): Move here from frame.c. (Fdisplay_live_p): Rename to `Fterminal_live_p'. (Fdisplay_list): Rename to `Fterminal_list'. (Fdisplay_name): Rename to `Fterminal_name'. (init_initial_device): Rename to `init_initial_terminal'. (delete_initial_device): Rename to `delete_initial_terminal'. (ring_bell, update_begin, update_end, set_terminal_window) (cursor_to, raw_cursor_to, clear_to_end, clear_frame) (clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs) (ins_del_lines, get_terminal_param, store_terminal_param) (Fterminal_parameters, Fterminal_parameter) (Fmodify_terminal_parameters, Fset_terminal_parameter) (syms_of_terminal): Update for renames. * src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update. (Fdisplay_tty_type): Rename to `Ftty_type'. (Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'. (delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes) (Ftty_display_color_p, Ftty_display_color_cells, get_named_tty) (Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output) (init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename. * src/frame.c (Qdevice): Rename to `Qterminal'. (Qdisplay_live_p): Rename to `Qterminal_live_p'. (terminal_frame_count): Rename to `tty_frame_count'. (Fframe_display): Move to terminal.c, rename to `Fframe_terminal'. (make_frame_without_minibuffer, make_initial_frame) (make_terminal_frame, Fmodify_frame_parameters) (do_switch_frame, Fdelete_frame, Fmouse_position) (Fmouse_pixel_position, Fraise_frame, Flower_frame) (Fredirect_frame_focus, set_term_frame_name, syms_of_frame): Update for renames. * src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal) (set_vertical_scroll_bar, redisplay_window, check_x_display_info) (x_set_scroll_bar_foreground, x_set_scroll_bar_background) (Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p) (Fx_display_pixel_width, Fx_display_pixel_height) (Fx_display_planes, Fx_display_color_cells) (Fx_server_max_request_size, Fx_server_vendor, Fx_server_version) (Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width) (Fx_display_backing_store, Fx_display_visual_class) (Fx_display_save_under, Fx_close_connection, x_create_tip_frame): Update for renames. * xterm.c (handle_one_xevent): Initialize `f' to NULL. (x_delete_device): Rename to `x_delete_terminal'. (x_create_device): Rename to `x_create_terminal'. (XTset_terminal_modes, XTreset_terminal_modes) (XTread_socket, x_connection_closed, x_term_init) (x_term_init, x_delete_display): Update for renames. * src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal) (Fsend_string_to_terminal, init_display): Update for renames. * src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard) (kbd_buffer_get_event, read_avail_input, tty_read_avail_input) (interrupt_signal, Fset_output_flow_control) (Fset_input_meta_mode, Fset_quit_char, delete_kboard) (syms_of_keyboard): Update for renames. * src/alloc.c (mark_devices): Update declaration. (Fgarbage_collect): Update for renames. * src/coding.c (Fset_terminal_coding_system_internal) (Fterminal_coding_system4) (Fset_keyboard_coding_system_internal) (Fkeyboard_coding_system): Update for renames. * src/data.c (Fterminal_local_value, Fset_terminal_local_value): Update for renames. * src/minibuf.c (read_minibuf): Update for renames. * src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames. * xselect.c (x_handle_selection_clear): Update for renames. * lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'. (save-buffers-kill-terminal, ctl-x-map): Update for renames. * frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update. (frames-on-display-list, framep-on-display, suspend-frame): Update for renames. (selected-display): Rename to `selected-terminal'. * server.el (server-save-buffers-kill-display): Rename to `server-save-buffers-kill-terminal'. (server-delete-client, server-handle-delete-frame) (server-handle-suspend-tty, server-process-filter) (server-switch-buffer): Update for renames. * startup.el (normal-splash-screen, normal-splash-screen): Update for renames. * talk.el (talk): Update for renames. * termdev.el (terminal-id): Update for renames. * xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal) (turn-off-xterm-mouse-tracking-on-terminal) (xterm-mouse-handle-delete-frame): Update for renames. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 29 Dec 2005 18:20:26 +0000
parents 14a4eb789b45
children f67e432d150c
comparison
equal deleted inserted replaced
83430:10f26433fe3f 83431:76396de7f50a
7302 clear_message (1, 1); 7302 clear_message (1, 1);
7303 7303
7304 do_pending_window_change (0); 7304 do_pending_window_change (0);
7305 echo_area_display (1); 7305 echo_area_display (1);
7306 do_pending_window_change (0); 7306 do_pending_window_change (0);
7307 if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) 7307 if (FRAME_TERMINAL (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
7308 (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f); 7308 (*FRAME_TERMINAL (f)->frame_up_to_date_hook) (f);
7309 } 7309 }
7310 } 7310 }
7311 7311
7312 7312
7313 /* Display an echo area message M with a specified length of NBYTES 7313 /* Display an echo area message M with a specified length of NBYTES
7406 clear_message (1, 1); 7406 clear_message (1, 1);
7407 7407
7408 do_pending_window_change (0); 7408 do_pending_window_change (0);
7409 echo_area_display (1); 7409 echo_area_display (1);
7410 do_pending_window_change (0); 7410 do_pending_window_change (0);
7411 if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) 7411 if (FRAME_TERMINAL (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
7412 (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f); 7412 (*FRAME_TERMINAL (f)->frame_up_to_date_hook) (f);
7413 } 7413 }
7414 } 7414 }
7415 7415
7416 7416
7417 /* Display a null-terminated echo area message M. If M is 0, clear 7417 /* Display a null-terminated echo area message M. If M is 0, clear
10938 variables. */ 10938 variables. */
10939 select_frame_for_redisplay (frame); 10939 select_frame_for_redisplay (frame);
10940 10940
10941 /* Mark all the scroll bars to be removed; we'll redeem 10941 /* Mark all the scroll bars to be removed; we'll redeem
10942 the ones we want when we redisplay their windows. */ 10942 the ones we want when we redisplay their windows. */
10943 if (FRAME_DEVICE (f)->condemn_scroll_bars_hook) 10943 if (FRAME_TERMINAL (f)->condemn_scroll_bars_hook)
10944 FRAME_DEVICE (f)->condemn_scroll_bars_hook (f); 10944 FRAME_TERMINAL (f)->condemn_scroll_bars_hook (f);
10945 10945
10946 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) 10946 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
10947 redisplay_windows (FRAME_ROOT_WINDOW (f)); 10947 redisplay_windows (FRAME_ROOT_WINDOW (f));
10948 10948
10949 /* Any scroll bars which redisplay_windows should have 10949 /* Any scroll bars which redisplay_windows should have
10950 nuked should now go away. */ 10950 nuked should now go away. */
10951 if (FRAME_DEVICE (f)->judge_scroll_bars_hook) 10951 if (FRAME_TERMINAL (f)->judge_scroll_bars_hook)
10952 FRAME_DEVICE (f)->judge_scroll_bars_hook (f); 10952 FRAME_TERMINAL (f)->judge_scroll_bars_hook (f);
10953 10953
10954 /* If fonts changed, display again. */ 10954 /* If fonts changed, display again. */
10955 /* ??? rms: I suspect it is a mistake to jump all the way 10955 /* ??? rms: I suspect it is a mistake to jump all the way
10956 back to retry here. It should just retry this frame. */ 10956 back to retry here. It should just retry this frame. */
10957 if (fonts_changed_p) 10957 if (fonts_changed_p)
10997 { 10997 {
10998 struct frame *f = XFRAME (frame); 10998 struct frame *f = XFRAME (frame);
10999 if (f->updated_p) 10999 if (f->updated_p)
11000 { 11000 {
11001 mark_window_display_accurate (f->root_window, 1); 11001 mark_window_display_accurate (f->root_window, 1);
11002 if (FRAME_DEVICE (f)->frame_up_to_date_hook) 11002 if (FRAME_TERMINAL (f)->frame_up_to_date_hook)
11003 FRAME_DEVICE (f)->frame_up_to_date_hook (f); 11003 FRAME_TERMINAL (f)->frame_up_to_date_hook (f);
11004 } 11004 }
11005 } 11005 }
11006 } 11006 }
11007 } 11007 }
11008 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) 11008 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
11084 mark_window_display_accurate_1 (w, 1); 11084 mark_window_display_accurate_1 (w, 1);
11085 11085
11086 /* Say overlay arrows are up to date. */ 11086 /* Say overlay arrows are up to date. */
11087 update_overlay_arrows (1); 11087 update_overlay_arrows (1);
11088 11088
11089 if (FRAME_DEVICE (sf)->frame_up_to_date_hook != 0) 11089 if (FRAME_TERMINAL (sf)->frame_up_to_date_hook != 0)
11090 FRAME_DEVICE (sf)->frame_up_to_date_hook (sf); 11090 FRAME_TERMINAL (sf)->frame_up_to_date_hook (sf);
11091 } 11091 }
11092 11092
11093 update_mode_lines = 0; 11093 update_mode_lines = 0;
11094 windows_or_buffers_changed = 0; 11094 windows_or_buffers_changed = 0;
11095 cursor_type_changed = 0; 11095 cursor_type_changed = 0;
12341 } 12341 }
12342 else 12342 else
12343 start = end = whole = 0; 12343 start = end = whole = 0;
12344 12344
12345 /* Indicate what this scroll bar ought to be displaying now. */ 12345 /* Indicate what this scroll bar ought to be displaying now. */
12346 if (FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook) 12346 if (FRAME_TERMINAL (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
12347 (*FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook) 12347 (*FRAME_TERMINAL (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
12348 (w, end - start, whole, start); 12348 (w, end - start, whole, start);
12349 } 12349 }
12350 12350
12351 12351
12352 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only 12352 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only
13081 /* Set the thumb's position and size. */ 13081 /* Set the thumb's position and size. */
13082 set_vertical_scroll_bar (w); 13082 set_vertical_scroll_bar (w);
13083 13083
13084 /* Note that we actually used the scroll bar attached to this 13084 /* Note that we actually used the scroll bar attached to this
13085 window, so it shouldn't be deleted at the end of redisplay. */ 13085 window, so it shouldn't be deleted at the end of redisplay. */
13086 if (FRAME_DEVICE (f)->redeem_scroll_bar_hook) 13086 if (FRAME_TERMINAL (f)->redeem_scroll_bar_hook)
13087 (*FRAME_DEVICE (f)->redeem_scroll_bar_hook) (w); 13087 (*FRAME_TERMINAL (f)->redeem_scroll_bar_hook) (w);
13088 } 13088 }
13089 13089
13090 /* Restore current_buffer and value of point in it. */ 13090 /* Restore current_buffer and value of point in it. */
13091 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint)); 13091 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
13092 set_buffer_internal_1 (old); 13092 set_buffer_internal_1 (old);