comparison src/keyboard.c @ 44300:21286349d285

(Qselect_window): New symbol. (head_table): Use it. (keys_of_keyboard): Bound select-window event to handle-select-window. (kbd_buffer_get_event): Make a Lisp event from SELECT_WINDOW_EVENT.
author Pavel Janík <Pavel@Janik.cz>
date Mon, 01 Apr 2002 13:42:32 +0000
parents 8f0053476105
children b6b565886e78
comparison
equal deleted inserted replaced
44299:b7f9e859425a 44300:21286349d285
542 Lisp_Object Qscroll_bar_movement; 542 Lisp_Object Qscroll_bar_movement;
543 Lisp_Object Qswitch_frame; 543 Lisp_Object Qswitch_frame;
544 Lisp_Object Qdelete_frame; 544 Lisp_Object Qdelete_frame;
545 Lisp_Object Qiconify_frame; 545 Lisp_Object Qiconify_frame;
546 Lisp_Object Qmake_frame_visible; 546 Lisp_Object Qmake_frame_visible;
547 Lisp_Object Qselect_window;
547 Lisp_Object Qhelp_echo; 548 Lisp_Object Qhelp_echo;
548 549
549 /* Symbols to denote kinds of events. */ 550 /* Symbols to denote kinds of events. */
550 Lisp_Object Qfunction_key; 551 Lisp_Object Qfunction_key;
551 Lisp_Object Qmouse_click; 552 Lisp_Object Qmouse_click;
3787 3788
3788 if (!EQ (frame, internal_last_event_frame) 3789 if (!EQ (frame, internal_last_event_frame)
3789 && !EQ (frame, selected_frame)) 3790 && !EQ (frame, selected_frame))
3790 obj = make_lispy_switch_frame (frame); 3791 obj = make_lispy_switch_frame (frame);
3791 internal_last_event_frame = frame; 3792 internal_last_event_frame = frame;
3793 kbd_fetch_ptr = event + 1;
3794 }
3795 else if (event->kind == SELECT_WINDOW_EVENT)
3796 {
3797 /* Make an event (select-window (WINDOW)). */
3798 obj = Fcons (event->frame_or_window, Qnil);
3799 obj = Fcons (Qselect_window, Fcons (obj, Qnil));
3800
3792 kbd_fetch_ptr = event + 1; 3801 kbd_fetch_ptr = event + 1;
3793 } 3802 }
3794 else 3803 else
3795 { 3804 {
3796 /* If this event is on a different frame, return a switch-frame this 3805 /* If this event is on a different frame, return a switch-frame this
10300 {&Qmouse_movement, "mouse-movement", &Qmouse_movement}, 10309 {&Qmouse_movement, "mouse-movement", &Qmouse_movement},
10301 {&Qscroll_bar_movement, "scroll-bar-movement", &Qmouse_movement}, 10310 {&Qscroll_bar_movement, "scroll-bar-movement", &Qmouse_movement},
10302 {&Qswitch_frame, "switch-frame", &Qswitch_frame}, 10311 {&Qswitch_frame, "switch-frame", &Qswitch_frame},
10303 {&Qdelete_frame, "delete-frame", &Qdelete_frame}, 10312 {&Qdelete_frame, "delete-frame", &Qdelete_frame},
10304 {&Qiconify_frame, "iconify-frame", &Qiconify_frame}, 10313 {&Qiconify_frame, "iconify-frame", &Qiconify_frame},
10305 {&Qmake_frame_visible, "make-frame-visible", &Qmake_frame_visible} 10314 {&Qmake_frame_visible, "make-frame-visible", &Qmake_frame_visible},
10315 {&Qselect_window, "select-window", &Qselect_window}
10306 }; 10316 };
10307 10317
10308 void 10318 void
10309 syms_of_keyboard () 10319 syms_of_keyboard ()
10310 { 10320 {
10966 "handle-delete-frame"); 10976 "handle-delete-frame");
10967 initial_define_lispy_key (Vspecial_event_map, "iconify-frame", 10977 initial_define_lispy_key (Vspecial_event_map, "iconify-frame",
10968 "ignore-event"); 10978 "ignore-event");
10969 initial_define_lispy_key (Vspecial_event_map, "make-frame-visible", 10979 initial_define_lispy_key (Vspecial_event_map, "make-frame-visible",
10970 "ignore-event"); 10980 "ignore-event");
10981 initial_define_lispy_key (Vspecial_event_map, "select-window",
10982 "handle-select-window");
10971 initial_define_lispy_key (Vspecial_event_map, "save-session", 10983 initial_define_lispy_key (Vspecial_event_map, "save-session",
10972 "handle-save-session"); 10984 "handle-save-session");
10973 } 10985 }