changeset 1989:b1c1ab20f810

Use the term `scroll bar', instead of `scrollbar'. * alloc.c, frame.c, frame.h, indent.c, keyboard.c, keyboard.h, lisp.h, term.c, termhooks.h, window.c, window.h, xdisp.c, xfns.c, xterm.c, xterm.h: Terminology changed. Don't generate switch-frame events by checking Vlast_event_frame; use a separate variable for that bookkeeping. In order to generate them properly, we may need to fiddle with it. * keyboard.c (internal_last_event_frame): New variable. (command_loop_1): Check internal_last_event_frame, not Vlast_event_frame. (read_char, kbd_buffer_store_event): Set both Vlast_event_frame and internal_last_event_frame. (kbd_buffer_get_event): Check internal_last_event_frame to decide whether to generate a switch-frame event. Set Vlast_event_frame after each event. (init_keyboard): Initialize both Vlast_event_frame and internal_last_event_frame. * keyboard.h (internal_last_event_frame): Add extern declaration for this. * frame.c (Vlast_event_frame): Remove external declaration for this. (Fselect_frame): Set internal_last_event_frame to Qnil to force a switch-frame event, not Vlast_event_frame; the latter is supposed to convey information to the user.

--- a/src/frame.c	Tue Mar 02 08:14:15 1993 +0000
+++ b/src/frame.c	Tue Mar 02 08:14:57 1993 +0000
@@ -87,8 +87,6 @@
 
 extern Lisp_Object Vminibuffer_list;
 extern Lisp_Object get_minibuffer ();
-
-extern Lisp_Object Vlast_event_frame;
 
 DEFUN ("framep", Fframep, Sframep, 1, 1, 0,
   "Return non-nil if OBJECT is a frame.\n\
@@ -159,11 +157,11 @@
   f->has_minibuffer = mini_p;
   f->focus_frame = Qnil;
   f->explicit_name = 0;
-  f->can_have_scrollbars = 0;
-  f->has_vertical_scrollbars = 0;
+  f->can_have_scroll_bars = 0;
+  f->has_vertical_scroll_bars = 0;
   f->param_alist = Qnil;
-  f->scrollbars = Qnil;
-  f->condemned_scrollbars = Qnil;
+  f->scroll_bars = Qnil;
+  f->condemned_scroll_bars = Qnil;
 
   root_window = make_window ();
   if (mini_p)
@@ -398,7 +396,7 @@
      (select-window (frame-root-window (new-frame))) doesn't end up
      with your typing being interpreted in the new frame instead of
      the one you're actually typing in.  */
-  Vlast_event_frame = Qnil;
+  internal_last_event_frame = Qnil;
 
   return frame;
 }
@@ -749,7 +747,7 @@
 {
   FRAME_PTR f;
   Lisp_Object lispy_dummy;
-  enum scrollbar_part party_dummy;
+  enum scroll_bar_part party_dummy;
   Lisp_Object x, y;
   unsigned long long_dummy;
 

--- a/src/keyboard.h	Tue Mar 02 08:14:15 1993 +0000
+++ b/src/keyboard.h	Tue Mar 02 08:14:57 1993 +0000
@@ -37,6 +37,15 @@
 extern Lisp_Object this_command_keys;
 extern int this_command_key_count;
 
+#ifdef MULTI_FRAME
+/* The frame in which the last input event occurred, or Qmacro if the
+   last event came from a macro.  We use this to determine when to
+   generate switch-frame events.  This may be cleared by functions
+   like Fselect_frame, to make sure that a switch-frame event is
+   generated by the next character.  */
+Lisp_Object internal_last_event_frame;
+#endif
+
 
 /* Macros for dealing with lispy events.  */
 
@@ -72,7 +81,7 @@
 
 /* The values of Qevent_kind properties.  */
 extern Lisp_Object Qfunction_key, Qmouse_click, Qmouse_movement;
-extern Lisp_Object Qscrollbar_movement;
+extern Lisp_Object Qscroll_bar_movement;
 
 /* Getting the kind of an event head.  */
 #define EVENT_HEAD_KIND(event_head) \