Mercurial > hg > xemacs-beta

comparison src/event-stream.c @ 221:6c0ae1f9357f r20-4b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b9
author cvs
date Mon, 13 Aug 2007 10:10:02 +0200
parents 262b8bb4a523
children 83b3d10dcba9
comparison
equal deleted inserted replaced
220:04f4bca7b601 221:6c0ae1f9357f
3007 return Qnil; 3007 return Qnil;
3008 3008
3009 return event_binding (event0, 1); 3009 return event_binding (event0, 1);
3010 } 3010 }
3011 3011
3012 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID) 3012 #if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
3013 static void 3013 static void
3014 menu_move_up (void) 3014 menu_move_up (void)
3015 { 3015 {
3016 widget_value *current, *prev; 3016 widget_value *current, *prev;
3017 widget_value *entries; 3017 widget_value *entries;
3493 */ 3493 */
3494 ()) 3494 ())
3495 { 3495 {
3496 struct console *con = XCONSOLE (Vselected_console); 3496 struct console *con = XCONSOLE (Vselected_console);
3497 struct frame *f = XFRAME (CONSOLE_SELECTED_FRAME (con)); 3497 struct frame *f = XFRAME (CONSOLE_SELECTED_FRAME (con));
3498 LWLIB_ID id = XPOPUP_DATA (f->menubar_data)->id; 3498 LWLIB_ID id;
3499 widget_value *val = lw_get_all_values (id); 3499 widget_value *val;
3500 3500
3501 if (NILP (f->menubar_data))
3502 error ("Frame has no menubar.");
3503
3504 id = XPOPUP_DATA (f->menubar_data)->id;
3505 val = lw_get_all_values (id);
3501 val = val->contents; 3506 val = val->contents;
3502 lw_set_menu (FRAME_X_MENUBAR_WIDGET (f), val); 3507 lw_set_menu (FRAME_X_MENUBAR_WIDGET (f), val);
3503 lw_map_menu (CurrentTime); 3508 lw_map_menu (CurrentTime);
3504 3509
3505 lw_display_menu (CurrentTime); 3510 lw_display_menu (CurrentTime);
3632 else 3637 else
3633 return Qnil; 3638 return Qnil;
3634 } 3639 }
3635 3640
3636 /* if we're currently in a menu accelerator, check there for further events */ 3641 /* if we're currently in a menu accelerator, check there for further events */
3637 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID) 3642 #if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
3638 if (lw_menu_active) 3643 if (lw_menu_active)
3639 { 3644 {
3640 return command_builder_operate_menu_accelerator (builder); 3645 return command_builder_operate_menu_accelerator (builder);
3641 } 3646 }
3642 else 3647 else
3645 if (EQ (Vmenu_accelerator_enabled, Qmenu_force)) 3650 if (EQ (Vmenu_accelerator_enabled, Qmenu_force))
3646 result = command_builder_find_menu_accelerator (builder); 3651 result = command_builder_find_menu_accelerator (builder);
3647 if (NILP (result)) 3652 if (NILP (result))
3648 #endif 3653 #endif
3649 result = command_builder_find_leaf_1 (builder); 3654 result = command_builder_find_leaf_1 (builder);
3650 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID) 3655 #if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
3651 if (NILP (result) 3656 if (NILP (result)
3652 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback)) 3657 && EQ (Vmenu_accelerator_enabled, Qmenu_fallback))
3653 result = command_builder_find_menu_accelerator (builder); 3658 result = command_builder_find_menu_accelerator (builder);
3654 } 3659 }
3655 #endif 3660 #endif
4851 DEFSUBR (Fdispatch_event); 4856 DEFSUBR (Fdispatch_event);
4852 DEFSUBR (Fread_key_sequence); 4857 DEFSUBR (Fread_key_sequence);
4853 DEFSUBR (Fthis_command_keys); 4858 DEFSUBR (Fthis_command_keys);
4854 DEFSUBR (Freset_this_command_lengths); 4859 DEFSUBR (Freset_this_command_lengths);
4855 DEFSUBR (Fopen_dribble_file); 4860 DEFSUBR (Fopen_dribble_file);
4856 #if defined(HAVE_X_WINDOWS) && defined(HAVE_MENUBARS_LUCID) 4861 #if defined(HAVE_X_WINDOWS) && defined(LWLIB_MENUBARS_LUCID)
4857 DEFSUBR (Faccelerate_menu); 4862 DEFSUBR (Faccelerate_menu);
4858 #endif 4863 #endif
4859 4864
4860 defsymbol (&Qpre_command_hook, "pre-command-hook"); 4865 defsymbol (&Qpre_command_hook, "pre-command-hook");
4861 defsymbol (&Qpost_command_hook, "post-command-hook"); 4866 defsymbol (&Qpost_command_hook, "post-command-hook");