diff options
| -rw-r--r-- | src/frame.c | 14 | ||||
| -rw-r--r-- | src/keyboard.h | 11 |
2 files changed, 16 insertions, 9 deletions
diff --git a/src/frame.c b/src/frame.c index a6106c045d7..b887436438a 100644 --- a/src/frame.c +++ b/src/frame.c @@ -87,8 +87,6 @@ Lisp_Object Qx; 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 @@ make_frame (mini_p) 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 @@ Changing the selected frame can change focus redirections. See\n\ (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 @@ and nil for X and Y.") { 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; 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) \ |