diff options
author | Jim Blandy <jimb@redhat.com> | 1993-03-02 08:14:57 +0000 |
---|---|---|
committer | Jim Blandy <jimb@redhat.com> | 1993-03-02 08:14:57 +0000 |
commit | 625fb3bf58f67eedd6a83dcd5e29f0cfa4944d7f (patch) | |
tree | 84294d4375017cf9c6074110a2cf0b7ed78f431a /src/keyboard.h | |
parent | ca980289e579ee3afe580942232bb7ee5db370b1 (diff) | |
download | emacs-625fb3bf58f67eedd6a83dcd5e29f0cfa4944d7f.tar.gz |
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.
Diffstat (limited to 'src/keyboard.h')
-rw-r--r-- | src/keyboard.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 1d4a82256d0..e44f6a800eb 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -37,6 +37,15 @@ extern Lisp_Object Vfunction_key_map; 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 @@ extern Lisp_Object Qevent_kind, Qevent_symbol_elements; /* 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) \ |