diff src/xdisp.c @ 83342:9216636c02fc

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: [e-mail]--2004/emacs--multi-tty--0--patch-382

--- a/src/xdisp.c	Sun Jul 10 22:25:28 2005 +0000
+++ b/src/xdisp.c	Mon Jul 11 00:05:55 2005 +0000
@@ -6958,8 +6958,8 @@
       do_pending_window_change (0);
       echo_area_display (1);
       do_pending_window_change (0);
-      if (FRAME_DISPLAY (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
-	(*FRAME_DISPLAY (f)->frame_up_to_date_hook) (f);
+      if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
+	(*FRAME_DEVICE (f)->frame_up_to_date_hook) (f);
     }
 }
 
@@ -7051,8 +7051,8 @@
       do_pending_window_change (0);
       echo_area_display (1);
       do_pending_window_change (0);
-      if (FRAME_DISPLAY (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
-	(*FRAME_DISPLAY (f)->frame_up_to_date_hook) (f);
+      if (FRAME_DEVICE (f)->frame_up_to_date_hook != 0 && ! gc_in_progress)
+	(*FRAME_DEVICE (f)->frame_up_to_date_hook) (f);
     }
 }
 
@@ -10549,16 +10549,16 @@
 
 	      /* Mark all the scroll bars to be removed; we'll redeem
 		 the ones we want when we redisplay their windows.  */
-	      if (FRAME_DISPLAY (f)->condemn_scroll_bars_hook)
-		FRAME_DISPLAY (f)->condemn_scroll_bars_hook (f);
+	      if (FRAME_DEVICE (f)->condemn_scroll_bars_hook)
+		FRAME_DEVICE (f)->condemn_scroll_bars_hook (f);
 
 	      if (FRAME_VISIBLE_P (f) && !FRAME_OBSCURED_P (f))
 		redisplay_windows (FRAME_ROOT_WINDOW (f));
 
 	      /* Any scroll bars which redisplay_windows should have
 		 nuked should now go away.  */
-	      if (FRAME_DISPLAY (f)->judge_scroll_bars_hook)
-		FRAME_DISPLAY (f)->judge_scroll_bars_hook (f);
+	      if (FRAME_DEVICE (f)->judge_scroll_bars_hook)
+		FRAME_DEVICE (f)->judge_scroll_bars_hook (f);
 
 	      /* If fonts changed, display again.  */
 	      /* ??? rms: I suspect it is a mistake to jump all the way
@@ -10610,8 +10610,8 @@
 	    {
 	      struct frame *f = updated[i];
 	      mark_window_display_accurate (f->root_window, 1);
-	      if (FRAME_DISPLAY (f)->frame_up_to_date_hook)
-		FRAME_DISPLAY (f)->frame_up_to_date_hook (f);
+	      if (FRAME_DEVICE (f)->frame_up_to_date_hook)
+		FRAME_DEVICE (f)->frame_up_to_date_hook (f);
 	    }
 	}
     }
@@ -10696,8 +10696,8 @@
 	  /* Say overlay arrows are up to date.  */
 	  update_overlay_arrows (1);
 
-	  if (FRAME_DISPLAY (sf)->frame_up_to_date_hook != 0)
-	    FRAME_DISPLAY (sf)->frame_up_to_date_hook (sf);
+	  if (FRAME_DEVICE (sf)->frame_up_to_date_hook != 0)
+	    FRAME_DEVICE (sf)->frame_up_to_date_hook (sf);
 	}
 
       update_mode_lines = 0;
@@ -11949,8 +11949,8 @@
     start = end = whole = 0;
 
   /* Indicate what this scroll bar ought to be displaying now.  */
-  if (FRAME_DISPLAY (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
-    (*FRAME_DISPLAY (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
+  if (FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
+    (*FRAME_DEVICE (XFRAME (w->frame))->set_vertical_scroll_bar_hook)
       (w, end - start, whole, start);
 }
 
@@ -12690,8 +12690,8 @@
 
       /* Note that we actually used the scroll bar attached to this
 	 window, so it shouldn't be deleted at the end of redisplay.  */
-      if (FRAME_DISPLAY (f)->redeem_scroll_bar_hook)
-        (*FRAME_DISPLAY (f)->redeem_scroll_bar_hook) (w);
+      if (FRAME_DEVICE (f)->redeem_scroll_bar_hook)
+        (*FRAME_DEVICE (f)->redeem_scroll_bar_hook) (w);
     }
 
   /* Restore current_buffer and value of point in it.  */