Mercurial > emacs

comparison src/xdisp.c @ 83342:9216636c02fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename `struct display' to `struct device'. Update function, parameter and variable names accordingly. * src/termhooks.h (struct device): Rename to `struct device'. Rename member `next_display' to `next_device'. Rename member `delete_display_hook' to `delete_device_hook'. (FRAME_DISPLAY): Rename to FRAME_DEVICE. (DISPLAY_ACTIVE_P): Rename to DEVICE_ACTIVE_P. (DISPLAY_TERMINAL_CODING): Rename to DEVICE_TERMINAL_CODING. (DISPLAY_KEYBOARD_CODING): Rename to DEVICE_KEYBOARD_CODING. * src/frame.h (stuct frame): Rename `display' member to `device'. * src/xterm.h (x_display_info): Rename member `frame_display' to `device'. * src/termchar.h (struct tty_display_info): Rename `display' member to `device'. * src/keyboard.c (push_display_kboard): Rename to push_device_kboard. * lisp/frame.el (make-frame): Rename frame parameter `display-id' to `device'. * src/frame.c (Fmake_terminal_frame): Ditto. * src/xfns.c (Fx_create_frame): Ditto. * src/term.c (display_list): Rename to device_list. * src/term.c (initial_display): Rename to initial_device. * src/term.c (next_display_id): Rename to next_device_id. * src/term.c (get_display): Rename to get_device. * src/term.c (get_tty_display): Rename to get_tty_device. * src/term.c (get_named_tty_display): Rename to get_named_tty. * src/term.c (init_initial_display): Rename to init_initial_device. * src/term.c (delete_initial_display): Rename to delete_initial_device. * src/term.c (create_display): Rename to create_device. * src/term.c (delete_display): Rename to delete_device. * src/xfns.c (check_x_display_info): Document that the function allows display ids as well. * src/xterm.c (x_delete_frame_display): Rename to x_delete_device. * src/xterm.c (x_create_frame_display): Rename to x_create_device. * src/coding.c: Update. * src/dispextern.h: Update. * src/data.c: Update. * src/dispnew.c: Update. * src/frame.c: Update. * src/frame.h: Update. * src/keyboard.c: Update. * src/keyboard.h: Update. * src/lisp.h: Update. * src/sysdep.c: Update. * src/term.c: Update. * src/xdisp.c: Update. * src/xselect.c: Update. * src/xterm.c: Update. * src/prefix-args.c: Include stdlib.h for exit. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-382
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 11 Jul 2005 00:05:55 +0000
parents 026d9ba414d9
children 266b015edc83
comparison
equal deleted inserted replaced
83341:76e51706154e 83342:9216636c02fc
6956 clear_message (1, 1); 6956 clear_message (1, 1);
6957 6957
6958 do_pending_window_change (0); 6958 do_pending_window_change (0);
6959 echo_area_display (1); 6959 echo_area_display (1);
6960 do_pending_window_change (0); 6960 do_pending_window_change (0);
6961 if (FRAME_DISPLAY (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) 6961 if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
6962 (*FRAME_DISPLAY (f)->frame_up_to_date_hook) (f); 6962 (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f);
6963 } 6963 }
6964 } 6964 }
6965 6965
6966 6966
6967 /* Display an echo area message M with a specified length of NBYTES 6967 /* Display an echo area message M with a specified length of NBYTES
7049 clear_message (1, 1); 7049 clear_message (1, 1);
7050 7050
7051 do_pending_window_change (0); 7051 do_pending_window_change (0);
7052 echo_area_display (1); 7052 echo_area_display (1);
7053 do_pending_window_change (0); 7053 do_pending_window_change (0);
7054 if (FRAME_DISPLAY (f)->frame_up_to_date_hook != 0 && ! gc_in_progress) 7054 if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
7055 (*FRAME_DISPLAY (f)->frame_up_to_date_hook) (f); 7055 (*FRAME_DEVICE (f)->frame_up_to_date_hook) (f);
7056 } 7056 }
7057 } 7057 }
7058 7058
7059 7059
7060 /* Display a null-terminated echo area message M. If M is 0, clear 7060 /* Display a null-terminated echo area message M. If M is 0, clear
10547 variables. */ 10547 variables. */
10548 select_frame_for_redisplay (frame); 10548 select_frame_for_redisplay (frame);
10549 10549
10550 /* Mark all the scroll bars to be removed; we'll redeem 10550 /* Mark all the scroll bars to be removed; we'll redeem
10551 the ones we want when we redisplay their windows. */ 10551 the ones we want when we redisplay their windows. */
10552 if (FRAME_DISPLAY (f)->condemn_scroll_bars_hook) 10552 if (FRAME_DEVICE (f)->condemn_scroll_bars_hook)
10553 FRAME_DISPLAY (f)->condemn_scroll_bars_hook (f); 10553 FRAME_DEVICE (f)->condemn_scroll_bars_hook (f);
10554 10554
10555 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f)) 10555 if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
10556 redisplay_windows (FRAME_ROOT_WINDOW (f)); 10556 redisplay_windows (FRAME_ROOT_WINDOW (f));
10557 10557
10558 /* Any scroll bars which redisplay_windows should have 10558 /* Any scroll bars which redisplay_windows should have
10559 nuked should now go away. */ 10559 nuked should now go away. */
10560 if (FRAME_DISPLAY (f)->judge_scroll_bars_hook) 10560 if (FRAME_DEVICE (f)->judge_scroll_bars_hook)
10561 FRAME_DISPLAY (f)->judge_scroll_bars_hook (f); 10561 FRAME_DEVICE (f)->judge_scroll_bars_hook (f);
10562 10562
10563 /* If fonts changed, display again. */ 10563 /* If fonts changed, display again. */
10564 /* ??? rms: I suspect it is a mistake to jump all the way 10564 /* ??? rms: I suspect it is a mistake to jump all the way
10565 back to retry here. It should just retry this frame. */ 10565 back to retry here. It should just retry this frame. */
10566 if (fonts_changed_p) 10566 if (fonts_changed_p)
10608 which are needed for proper redisplay. */ 10608 which are needed for proper redisplay. */
10609 for (i = 0; i < n; ++i) 10609 for (i = 0; i < n; ++i)
10610 { 10610 {
10611 struct frame *f = updated[i]; 10611 struct frame *f = updated[i];
10612 mark_window_display_accurate (f->root_window, 1); 10612 mark_window_display_accurate (f->root_window, 1);
10613 if (FRAME_DISPLAY (f)->frame_up_to_date_hook) 10613 if (FRAME_DEVICE (f)->frame_up_to_date_hook)
10614 FRAME_DISPLAY (f)->frame_up_to_date_hook (f); 10614 FRAME_DEVICE (f)->frame_up_to_date_hook (f);
10615 } 10615 }
10616 } 10616 }
10617 } 10617 }
10618 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf)) 10618 else if (FRAME_VISIBLE_P (sf) && !FRAME_OBSCURED_P (sf))
10619 { 10619 {
10694 mark_window_display_accurate_1 (w, 1); 10694 mark_window_display_accurate_1 (w, 1);
10695 10695
10696 /* Say overlay arrows are up to date. */ 10696 /* Say overlay arrows are up to date. */
10697 update_overlay_arrows (1); 10697 update_overlay_arrows (1);
10698 10698
10699 if (FRAME_DISPLAY (sf)->frame_up_to_date_hook != 0) 10699 if (FRAME_DEVICE (sf)->frame_up_to_date_hook != 0)
10700 FRAME_DISPLAY (sf)->frame_up_to_date_hook (sf); 10700 FRAME_DEVICE (sf)->frame_up_to_date_hook (sf);
10701 } 10701 }
10702 10702
10703 update_mode_lines = 0; 10703 update_mode_lines = 0;
10704 windows_or_buffers_changed = 0; 10704 windows_or_buffers_changed = 0;
10705 cursor_type_changed = 0; 10705 cursor_type_changed = 0;
11947 } 11947 }
11948 else 11948 else
11949 start = end = whole = 0; 11949 start = end = whole = 0;
11950 11950
11951 /* Indicate what this scroll bar ought to be displaying now. */ 11951 /* Indicate what this scroll bar ought to be displaying now. */
11952 if (FRAME_DISPLAY (XFRAME (w->frame))->set_vertical_scroll_bar_hook) 11952 if (FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
11953 (*FRAME_DISPLAY (XFRAME (w->frame))->set_vertical_scroll_bar_hook) 11953 (*FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
11954 (w, end - start, whole, start); 11954 (w, end - start, whole, start);
11955 } 11955 }
11956 11956
11957 11957
11958 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only 11958 /* Redisplay leaf window WINDOW. JUST_THIS_ONE_P non-zero means only
12688 /* Set the thumb's position and size. */ 12688 /* Set the thumb's position and size. */
12689 set_vertical_scroll_bar (w); 12689 set_vertical_scroll_bar (w);
12690 12690
12691 /* Note that we actually used the scroll bar attached to this 12691 /* Note that we actually used the scroll bar attached to this
12692 window, so it shouldn't be deleted at the end of redisplay. */ 12692 window, so it shouldn't be deleted at the end of redisplay. */
12693 if (FRAME_DISPLAY (f)->redeem_scroll_bar_hook) 12693 if (FRAME_DEVICE (f)->redeem_scroll_bar_hook)
12694 (*FRAME_DISPLAY (f)->redeem_scroll_bar_hook) (w); 12694 (*FRAME_DEVICE (f)->redeem_scroll_bar_hook) (w);
12695 } 12695 }
12696 12696
12697 /* Restore current_buffer and value of point in it. */ 12697 /* Restore current_buffer and value of point in it. */
12698 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint)); 12698 TEMP_SET_PT_BOTH (CHARPOS (opoint), BYTEPOS (opoint));
12699 set_buffer_internal_1 (old); 12699 set_buffer_internal_1 (old);