1 files changed, 71 insertions, 71 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 5da3f422f80..b784b560fc4 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -338,15 +338,15 @@ void x_raise_frame P_ ((struct frame *));
 void x_set_window_size P_ ((struct frame *, int, int, int));
 void x_wm_set_window_state P_ ((struct frame *, int));
 void x_wm_set_icon_pixmap P_ ((struct frame *, int));
-struct device *x_create_device P_ ((struct x_display_info *));
-void x_delete_device P_ ((struct device *));
+static struct terminal *x_create_terminal P_ ((struct x_display_info *));
+void x_delete_terminal P_ ((struct terminal *));
 void x_initialize P_ ((void));
 static void x_font_min_bounds P_ ((XFontStruct *, int *, int *));
 static int x_compute_min_glyph_bounds P_ ((struct frame *));
 static void x_update_end P_ ((struct frame *));
 static void XTframe_up_to_date P_ ((struct frame *));
-static void XTset_terminal_modes P_ ((struct device *));
-static void XTreset_terminal_modes P_ ((struct device *));
+static void XTset_terminal_modes P_ ((struct terminal *));
+static void XTreset_terminal_modes P_ ((struct terminal *));
 static void x_clear_frame P_ ((struct frame *));
 static void frame_highlight P_ ((struct frame *));
 static void frame_unhighlight P_ ((struct frame *));
@@ -806,7 +806,7 @@ x_draw_fringe_bitmap (w, row, p)
    rarely happens).  */
 
 static void
-XTset_terminal_modes (struct device *device)
+XTset_terminal_modes (struct terminal *terminal)
 {
 }
 
@@ -814,7 +814,7 @@ XTset_terminal_modes (struct device *device)
    the X-windows go away, and suspending requires no action.  */
 
 static void
-XTreset_terminal_modes (struct device *device)
+XTreset_terminal_modes (struct terminal *terminal)
 {
 }
 
@@ -5673,7 +5673,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit)
   int count = 0;
   int do_help = 0;
   int nbytes = 0;
-  struct frame *f;
+  struct frame *f = NULL;
   struct coding_system coding;
   XEvent event = *eventp;
 
@@ -6923,8 +6923,8 @@ x_dispatch_event (event, display)
    EXPECTED is nonzero if the caller knows input is available.  */
 
 static int
-XTread_socket (device, expected, hold_quit)
-     struct device *device;
+XTread_socket (terminal, expected, hold_quit)
+     struct terminal *terminal;
      int expected;
      struct input_event *hold_quit;
 {
@@ -6987,7 +6987,7 @@ XTread_socket (device, expected, hold_quit)
 
 #ifdef HAVE_X_SM
       /* Only check session manager input for the primary display. */
-      if (device->id == 1 && x_session_have_connection ())
+      if (terminal->id == 1 && x_session_have_connection ())
         {
           struct input_event inev;
           BLOCK_INPUT;
@@ -7656,7 +7656,7 @@ x_connection_closed (dpy, error_message)
       /* Protect display from being closed when we delete the last
          frame on it. */
       dpyinfo->reference_count++;
-      dpyinfo->device->reference_count++;
+      dpyinfo->terminal->reference_count++;
     }
   
   /* First delete frames whose mini-buffers are on frames
@@ -7724,7 +7724,7 @@ x_connection_closed (dpy, error_message)
       dpyinfo->display = 0;
 
       dpyinfo->reference_count--;
-      dpyinfo->device->reference_count--;
+      dpyinfo->terminal->reference_count--;
       if (dpyinfo->reference_count != 0)
         /* We have just closed all frames on this display. */
         abort ();
@@ -7734,7 +7734,7 @@ x_connection_closed (dpy, error_message)
 
   x_uncatch_errors (dpy, count);
 
-  if (device_list == 0)
+  if (terminal_list == 0)
     {
       fprintf (stderr, "%s\n", error_msg);
       shut_down_emacs (0, 0, Qnil);
@@ -10121,7 +10121,7 @@ x_term_init (display_name, xrm_option, resource_name)
 {
   int connection;
   Display *dpy;
-  struct device *device;
+  struct terminal *terminal;
   struct x_display_info *dpyinfo;
   XrmDatabase xrdb;
 
@@ -10268,7 +10268,7 @@ x_term_init (display_name, xrm_option, resource_name)
   dpyinfo = (struct x_display_info *) xmalloc (sizeof (struct x_display_info));
   bzero (dpyinfo, sizeof *dpyinfo);
 
-  device = x_create_device (dpyinfo);
+  terminal = x_create_terminal (dpyinfo);
 
 #ifdef MULTI_KBOARD
   {
@@ -10281,30 +10281,30 @@ x_term_init (display_name, xrm_option, resource_name)
                          SDATA (display_name)))
         break;
     if (share)
-      device->kboard = share->device->kboard;
+      terminal->kboard = share->terminal->kboard;
     else
       {
-        device->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
-        init_kboard (device->kboard);
+        terminal->kboard = (KBOARD *) xmalloc (sizeof (KBOARD));
+        init_kboard (terminal->kboard);
         if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound))
           {
             char *vendor = ServerVendor (dpy);
             UNBLOCK_INPUT;
-            device->kboard->Vsystem_key_alist
+            terminal->kboard->Vsystem_key_alist
               = call1 (Qvendor_specific_keysyms,
                        build_string (vendor ? vendor : ""));
             BLOCK_INPUT;
           }
 
-        device->kboard->next_kboard = all_kboards;
-        all_kboards = device->kboard;
+        terminal->kboard->next_kboard = all_kboards;
+        all_kboards = terminal->kboard;
         /* Don't let the initial kboard remain current longer than necessary.
            That would cause problems if a file loaded on startup tries to
            prompt in the mini-buffer.  */
         if (current_kboard == initial_kboard)
-          current_kboard = device->kboard;
+          current_kboard = terminal->kboard;
       }
-    device->kboard->reference_count++;
+    terminal->kboard->reference_count++;
   }
 #endif
 
@@ -10319,10 +10319,10 @@ x_term_init (display_name, xrm_option, resource_name)
 
   dpyinfo->display = dpy;
 
-  /* Set the name of the device. */
-  device->name = (char *) xmalloc (SBYTES (display_name) + 1);
-  strncpy (device->name, SDATA (display_name), SBYTES (display_name));
-  device->name[SBYTES (display_name)] = 0;
+  /* Set the name of the terminal. */
+  terminal->name = (char *) xmalloc (SBYTES (display_name) + 1);
+  strncpy (terminal->name, SDATA (display_name), SBYTES (display_name));
+  terminal->name[SBYTES (display_name)] = 0;
   
 #if 0
   XSetAfterFunction (x_current_display, x_trace_wire);
@@ -10614,7 +10614,7 @@ x_term_init (display_name, xrm_option, resource_name)
   /* Only do this for the very first display in the Emacs session.
      Ignore X session management when Emacs was first started on a
      tty.  */
-  if (device->id == 1)
+  if (terminal->id == 1)
     x_session_initialize (dpyinfo);
 #endif
 
@@ -10631,17 +10631,17 @@ x_delete_display (dpyinfo)
      struct x_display_info *dpyinfo;
 {
   int i;
-  struct device *d;
+  struct terminal *t;
 
-  /* Delete the generic struct device for this X display. */
-  for (d = device_list; d; d = d->next_device)
-    if (d->type == output_x_window && d->display_info.x == dpyinfo)
+  /* Delete the generic struct terminal for this X display. */
+  for (t = terminal_list; t; t = t->next_terminal)
+    if (t->type == output_x_window && t->display_info.x == dpyinfo)
       {
         /* Close X session management when we close its display. */
-        if (d->id == 1 && x_session_have_connection ())
+        if (t->id == 1 && x_session_have_connection ())
           x_session_close();
 
-        delete_device (d);
+        delete_terminal (t);
         break;
       }
 
@@ -10776,9 +10776,9 @@ static struct redisplay_interface x_redisplay_interface =
 
 /* This function is called when the last frame on a display is deleted. */
 void
-x_delete_device (struct device *device)
+x_delete_terminal (struct terminal *terminal)
 {
-  struct x_display_info *dpyinfo = device->display_info.x;
+  struct x_display_info *dpyinfo = terminal->display_info.x;
   int i;
 
   BLOCK_INPUT;
@@ -10807,50 +10807,50 @@ x_delete_device (struct device *device)
 }
 
 
-struct device *
-x_create_device (struct x_display_info *dpyinfo)
+static struct terminal *
+x_create_terminal (struct x_display_info *dpyinfo)
 {
-  struct device *device;
+  struct terminal *terminal;
   
-  device = create_device ();
+  terminal = create_terminal ();
 
-  device->type = output_x_window;
-  device->display_info.x = dpyinfo;
-  dpyinfo->device = device;
+  terminal->type = output_x_window;
+  terminal->display_info.x = dpyinfo;
+  dpyinfo->terminal = terminal;
 
   /* kboard is initialized in x_term_init. */
   
-  device->clear_frame_hook = x_clear_frame;
-  device->ins_del_lines_hook = x_ins_del_lines;
-  device->delete_glyphs_hook = x_delete_glyphs;
-  device->ring_bell_hook = XTring_bell;
-  device->reset_terminal_modes_hook = XTreset_terminal_modes;
-  device->set_terminal_modes_hook = XTset_terminal_modes;
-  device->update_begin_hook = x_update_begin;
-  device->update_end_hook = x_update_end;
-  device->set_terminal_window_hook = XTset_terminal_window;
-  device->read_socket_hook = XTread_socket;
-  device->frame_up_to_date_hook = XTframe_up_to_date;
-  device->mouse_position_hook = XTmouse_position;
-  device->frame_rehighlight_hook = XTframe_rehighlight;
-  device->frame_raise_lower_hook = XTframe_raise_lower;
-  device->set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar;
-  device->condemn_scroll_bars_hook = XTcondemn_scroll_bars;
-  device->redeem_scroll_bar_hook = XTredeem_scroll_bar;
-  device->judge_scroll_bars_hook = XTjudge_scroll_bars;
-
-  device->delete_frame_hook = x_destroy_window;
-  device->delete_device_hook = x_delete_device;
+  terminal->clear_frame_hook = x_clear_frame;
+  terminal->ins_del_lines_hook = x_ins_del_lines;
+  terminal->delete_glyphs_hook = x_delete_glyphs;
+  terminal->ring_bell_hook = XTring_bell;
+  terminal->reset_terminal_modes_hook = XTreset_terminal_modes;
+  terminal->set_terminal_modes_hook = XTset_terminal_modes;
+  terminal->update_begin_hook = x_update_begin;
+  terminal->update_end_hook = x_update_end;
+  terminal->set_terminal_window_hook = XTset_terminal_window;
+  terminal->read_socket_hook = XTread_socket;
+  terminal->frame_up_to_date_hook = XTframe_up_to_date;
+  terminal->mouse_position_hook = XTmouse_position;
+  terminal->frame_rehighlight_hook = XTframe_rehighlight;
+  terminal->frame_raise_lower_hook = XTframe_raise_lower;
+  terminal->set_vertical_scroll_bar_hook = XTset_vertical_scroll_bar;
+  terminal->condemn_scroll_bars_hook = XTcondemn_scroll_bars;
+  terminal->redeem_scroll_bar_hook = XTredeem_scroll_bar;
+  terminal->judge_scroll_bars_hook = XTjudge_scroll_bars;
+
+  terminal->delete_frame_hook = x_destroy_window;
+  terminal->delete_terminal_hook = x_delete_terminal;
   
-  device->rif = &x_redisplay_interface;
-  device->scroll_region_ok = 1;    /* We'll scroll partial frames. */
-  device->char_ins_del_ok = 1;
-  device->line_ins_del_ok = 1;         /* We'll just blt 'em. */
-  device->fast_clear_end_of_line = 1;  /* X does this well. */
-  device->memory_below_frame = 0;   /* We don't remember what scrolls
+  terminal->rif = &x_redisplay_interface;
+  terminal->scroll_region_ok = 1;    /* We'll scroll partial frames. */
+  terminal->char_ins_del_ok = 1;
+  terminal->line_ins_del_ok = 1;         /* We'll just blt 'em. */
+  terminal->fast_clear_end_of_line = 1;  /* X does this well. */
+  terminal->memory_below_frame = 0;   /* We don't remember what scrolls
                                         off the bottom. */
 
-  return device;
+  return terminal;
 }
 
 void