Commit 2470a66f authored by Karl Heuer's avatar Karl Heuer
Browse files

(kbd_buffer_get_event): Check for frame buried in a cons.

Delete menu_bar_event handling code.
(make_lispy_event): Move it here, so it gets a switch-frame if needed.
parent ab2f96f8
...@@ -2439,14 +2439,6 @@ kbd_buffer_get_event (KBOARD **kbp) ...@@ -2439,14 +2439,6 @@ kbd_buffer_get_event (KBOARD **kbp)
kbd_fetch_ptr = event + 1; kbd_fetch_ptr = event + 1;
} }
#endif #endif
else if (event->kind == menu_bar_event)
{
/* The event value is in the cdr of the frame_or_window slot. */
if (!CONSP (event->frame_or_window))
abort ();
obj = XCONS (event->frame_or_window)->cdr;
kbd_fetch_ptr = event + 1;
}
else if (event->kind == buffer_switch_event) else if (event->kind == buffer_switch_event)
{ {
/* The value doesn't matter here; only the type is tested. */ /* The value doesn't matter here; only the type is tested. */
...@@ -2471,7 +2463,9 @@ kbd_buffer_get_event (KBOARD **kbp) ...@@ -2471,7 +2463,9 @@ kbd_buffer_get_event (KBOARD **kbp)
Lisp_Object focus; Lisp_Object focus;
frame = event->frame_or_window; frame = event->frame_or_window;
if (WINDOWP (frame)) if (CONSP (frame))
frame = XCONS (frame)->car;
else if (WINDOWP (frame))
frame = WINDOW_FRAME (XWINDOW (frame)); frame = WINDOW_FRAME (XWINDOW (frame));
focus = FRAME_FOCUS_FRAME (XFRAME (frame)); focus = FRAME_FOCUS_FRAME (XFRAME (frame));
...@@ -3165,6 +3159,14 @@ make_lispy_event (event) ...@@ -3165,6 +3159,14 @@ make_lispy_event (event)
} }
#endif /* HAVE_MOUSE */ #endif /* HAVE_MOUSE */
#ifdef USE_X_TOOLKIT
case menu_bar_event:
/* The event value is in the cdr of the frame_or_window slot. */
if (!CONSP (event->frame_or_window))
abort ();
return XCONS (event->frame_or_window)->cdr;
#endif
/* The 'kind' field of the event is something we don't recognize. */ /* The 'kind' field of the event is something we don't recognize. */
default: default:
abort (); abort ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment