X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmenushell.c;h=910c760d56aa727b4bfa02ddb4d82311d1458a1c;hb=e2bce0d630c6f424664e81ee95352c4cbc41fc27;hp=3c88397894f89461054c5bcc041e2c84d598ccfe;hpb=8627dbda08ea95403356442fbb75ac21a7223dc0;p=~andy%2Fgtk diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 3c8839789..910c760d5 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -26,19 +26,30 @@ #define GTK_MENU_INTERNALS +#include "config.h" #include "gdk/gdkkeysyms.h" #include "gtkbindings.h" +#include "gtkkeyhash.h" #include "gtkmain.h" #include "gtkmarshalers.h" +#include "gtkmenu.h" #include "gtkmenubar.h" #include "gtkmenuitem.h" #include "gtkmenushell.h" -#include "gtksignal.h" +#include "gtkmnemonichash.h" #include "gtktearoffmenuitem.h" #include "gtkwindow.h" +#include "gtkprivate.h" +#include "gtkintl.h" +#include "gtkalias.h" #define MENU_SHELL_TIMEOUT 500 +#define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ + ? gtk_menu_bar_get_pack_direction (GTK_MENU_BAR (m)) \ + : GTK_PACK_DIRECTION_LTR) + enum { DEACTIVATE, SELECTION_DONE, @@ -46,15 +57,14 @@ enum { ACTIVATE_CURRENT, CANCEL, CYCLE_FOCUS, + MOVE_SELECTED, LAST_SIGNAL }; -typedef void (*GtkMenuShellSignal1) (GtkObject *object, - GtkMenuDirectionType arg1, - gpointer data); -typedef void (*GtkMenuShellSignal2) (GtkObject *object, - gboolean arg1, - gpointer data); +enum { + PROP_0, + PROP_TAKE_FOCUS +}; /* Terminology: * @@ -73,7 +83,7 @@ typedef void (*GtkMenuShellSignal2) (GtkObject *object, * * There is also is a concept of the current menu and a current * menu item. The current menu item is the selected menu item - * that is furthest down in the heirarchy. (Every active menu_shell + * that is furthest down in the hierarchy. (Every active menu_shell * does not necessarily contain a selected menu item, but if * it does, then menu_shell->parent_menu_shell must also contain * a selected menu item. The current menu is the menu that @@ -101,6 +111,10 @@ typedef void (*GtkMenuShellSignal2) (GtkObject *object, * - For 'child', if there is no child, then current is * moved to the next item in the parent. * + * Note that the above explanation of ::move_current was written + * before menus and menubars had support for RTL flipping and + * different packing directions, and therefore only applies for + * when text direction and packing direction are both left-to-right. * * ::activate_current (GBoolean *force_hide) * Activate the current item. If 'force_hide' is true, hide @@ -111,9 +125,29 @@ typedef void (*GtkMenuShellSignal2) (GtkObject *object, * Cancels the current selection */ -static void gtk_menu_shell_class_init (GtkMenuShellClass *klass); -static void gtk_menu_shell_init (GtkMenuShell *menu_shell); +#define GTK_MENU_SHELL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_MENU_SHELL, GtkMenuShellPrivate)) + +typedef struct _GtkMenuShellPrivate GtkMenuShellPrivate; + +struct _GtkMenuShellPrivate +{ + GtkMnemonicHash *mnemonic_hash; + GtkKeyHash *key_hash; + + guint take_focus : 1; + guint activated_submenu : 1; +}; + +static void gtk_menu_shell_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); +static void gtk_menu_shell_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); static void gtk_menu_shell_realize (GtkWidget *widget); +static void gtk_menu_shell_finalize (GObject *object); static gint gtk_menu_shell_button_press (GtkWidget *widget, GdkEventButton *event); static gint gtk_menu_shell_button_release (GtkWidget *widget, @@ -124,6 +158,10 @@ static gint gtk_menu_shell_enter_notify (GtkWidget *widget, GdkEventCrossing *event); static gint gtk_menu_shell_leave_notify (GtkWidget *widget, GdkEventCrossing *event); +static void gtk_menu_shell_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen); +static gboolean gtk_menu_shell_grab_broken (GtkWidget *widget, + GdkEventGrabBroken *event); static void gtk_menu_shell_add (GtkContainer *container, GtkWidget *widget); static void gtk_menu_shell_remove (GtkContainer *container, @@ -140,10 +178,10 @@ static gint gtk_menu_shell_is_item (GtkMenuShell *menu_shell, GtkWidget *child); static GtkWidget *gtk_menu_shell_get_item (GtkMenuShell *menu_shell, GdkEvent *event); -static GtkType gtk_menu_shell_child_type (GtkContainer *container); +static GType gtk_menu_shell_child_type (GtkContainer *container); static void gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell, GtkWidget *menu_item); -static void gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell); +static gboolean gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell); static void gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, GtkMenuDirectionType direction); @@ -153,85 +191,41 @@ static void gtk_real_menu_shell_cancel (GtkMenuShell *menu_shell) static void gtk_real_menu_shell_cycle_focus (GtkMenuShell *menu_shell, GtkDirectionType dir); -static GtkContainerClass *parent_class = NULL; -static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; - - -GtkType -gtk_menu_shell_get_type (void) -{ - static GtkType menu_shell_type = 0; - - if (!menu_shell_type) - { - static const GtkTypeInfo menu_shell_info = - { - "GtkMenuShell", - sizeof (GtkMenuShell), - sizeof (GtkMenuShellClass), - (GtkClassInitFunc) gtk_menu_shell_class_init, - (GtkObjectInitFunc) gtk_menu_shell_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - menu_shell_type = gtk_type_unique (gtk_container_get_type (), &menu_shell_info); - } - - return menu_shell_type; -} +static void gtk_menu_shell_reset_key_hash (GtkMenuShell *menu_shell); +static gboolean gtk_menu_shell_activate_mnemonic (GtkMenuShell *menu_shell, + GdkEventKey *event); +static gboolean gtk_menu_shell_real_move_selected (GtkMenuShell *menu_shell, + gint distance); -static guint -binding_signal_new (const gchar *signal_name, - GType itype, - GSignalFlags signal_flags, - GCallback handler, - GSignalAccumulator accumulator, - gpointer accu_data, - GSignalCMarshaller c_marshaller, - GType return_type, - guint n_params, - ...) -{ - va_list args; - guint signal_id; - - g_return_val_if_fail (signal_name != NULL, 0); - - va_start (args, n_params); - - signal_id = g_signal_new_valist (signal_name, itype, signal_flags, - g_cclosure_new (handler, NULL, NULL), - accumulator, accu_data, c_marshaller, - return_type, n_params, args); +static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; - va_end (args); - - return signal_id; -} +G_DEFINE_ABSTRACT_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) static void gtk_menu_shell_class_init (GtkMenuShellClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; GtkBindingSet *binding_set; - object_class = (GtkObjectClass*) klass; + object_class = (GObjectClass*) klass; widget_class = (GtkWidgetClass*) klass; container_class = (GtkContainerClass*) klass; - parent_class = gtk_type_class (gtk_container_get_type ()); + object_class->set_property = gtk_menu_shell_set_property; + object_class->get_property = gtk_menu_shell_get_property; + object_class->finalize = gtk_menu_shell_finalize; widget_class->realize = gtk_menu_shell_realize; widget_class->button_press_event = gtk_menu_shell_button_press; widget_class->button_release_event = gtk_menu_shell_button_release; + widget_class->grab_broken_event = gtk_menu_shell_grab_broken; widget_class->key_press_event = gtk_menu_shell_key_press; widget_class->enter_notify_event = gtk_menu_shell_enter_notify; widget_class->leave_notify_event = gtk_menu_shell_leave_notify; + widget_class->screen_changed = gtk_menu_shell_screen_changed; container_class->add = gtk_menu_shell_add; container_class->remove = gtk_menu_shell_remove; @@ -246,54 +240,86 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) klass->cancel = gtk_real_menu_shell_cancel; klass->select_item = gtk_menu_shell_real_select_item; klass->insert = gtk_menu_shell_real_insert; + klass->move_selected = gtk_menu_shell_real_move_selected; menu_shell_signals[DEACTIVATE] = - gtk_signal_new ("deactivate", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkMenuShellClass, deactivate), - _gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); + g_signal_new (I_("deactivate"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkMenuShellClass, deactivate), + NULL, NULL, + _gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); + menu_shell_signals[SELECTION_DONE] = - gtk_signal_new ("selection-done", - GTK_RUN_FIRST, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkMenuShellClass, selection_done), - _gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); + g_signal_new (I_("selection-done"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GtkMenuShellClass, selection_done), + NULL, NULL, + _gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); + menu_shell_signals[MOVE_CURRENT] = - gtk_signal_new ("move_current", - GTK_RUN_LAST | GTK_RUN_ACTION, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkMenuShellClass, move_current), - _gtk_marshal_VOID__ENUM, - GTK_TYPE_NONE, 1, - GTK_TYPE_MENU_DIRECTION_TYPE); + g_signal_new (I_("move-current"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkMenuShellClass, move_current), + NULL, NULL, + _gtk_marshal_VOID__ENUM, + G_TYPE_NONE, 1, + GTK_TYPE_MENU_DIRECTION_TYPE); + menu_shell_signals[ACTIVATE_CURRENT] = - gtk_signal_new ("activate_current", - GTK_RUN_LAST | GTK_RUN_ACTION, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkMenuShellClass, activate_current), - _gtk_marshal_VOID__BOOLEAN, - GTK_TYPE_NONE, 1, - GTK_TYPE_BOOL); + g_signal_new (I_("activate-current"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkMenuShellClass, activate_current), + NULL, NULL, + _gtk_marshal_VOID__BOOLEAN, + G_TYPE_NONE, 1, + G_TYPE_BOOLEAN); + menu_shell_signals[CANCEL] = - gtk_signal_new ("cancel", - GTK_RUN_LAST | GTK_RUN_ACTION, - GTK_CLASS_TYPE (object_class), - GTK_SIGNAL_OFFSET (GtkMenuShellClass, cancel), - _gtk_marshal_VOID__VOID, - GTK_TYPE_NONE, 0); - menu_shell_signals[CYCLE_FOCUS] = - binding_signal_new ("cycle_focus", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST | GTK_RUN_ACTION, - G_CALLBACK (gtk_real_menu_shell_cycle_focus), - NULL, NULL, - _gtk_marshal_VOID__ENUM, - GTK_TYPE_NONE, 1, - GTK_TYPE_DIRECTION_TYPE); + g_signal_new (I_("cancel"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GtkMenuShellClass, cancel), + NULL, NULL, + _gtk_marshal_VOID__VOID, + G_TYPE_NONE, 0); + menu_shell_signals[CYCLE_FOCUS] = + g_signal_new_class_handler (I_("cycle-focus"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_CALLBACK (gtk_real_menu_shell_cycle_focus), + NULL, NULL, + _gtk_marshal_VOID__ENUM, + G_TYPE_NONE, 1, + GTK_TYPE_DIRECTION_TYPE); + + /** + * GtkMenuShell::move-selected: + * @menu_shell: the object on which the signal is emitted + * @distance: +1 to move to the next item, -1 to move to the previous + * + * The ::move-selected signal is emitted to move the selection to + * another item. + * + * Returns: %TRUE to stop the signal emission, %FALSE to continue + * + * Since: 2.12 + */ + menu_shell_signals[MOVE_SELECTED] = + g_signal_new (I_("move-selected"), + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GtkMenuShellClass, move_selected), + _gtk_boolean_handled_accumulator, NULL, + _gtk_marshal_BOOLEAN__INT, + G_TYPE_BOOLEAN, 1, + G_TYPE_INT); binding_set = gtk_binding_set_by_class (klass); gtk_binding_entry_add_signal (binding_set, @@ -301,43 +327,59 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass) "cancel", 0); gtk_binding_entry_add_signal (binding_set, GDK_Return, 0, - "activate_current", 1, - GTK_TYPE_BOOL, + "activate-current", 1, + G_TYPE_BOOLEAN, + TRUE); + gtk_binding_entry_add_signal (binding_set, + GDK_ISO_Enter, 0, + "activate-current", 1, + G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0, - "activate_current", 1, - GTK_TYPE_BOOL, + "activate-current", 1, + G_TYPE_BOOLEAN, TRUE); gtk_binding_entry_add_signal (binding_set, GDK_space, 0, - "activate_current", 1, - GTK_TYPE_BOOL, + "activate-current", 1, + G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, GDK_KP_Space, 0, - "activate_current", 1, - GTK_TYPE_BOOL, + "activate-current", 1, + G_TYPE_BOOLEAN, FALSE); gtk_binding_entry_add_signal (binding_set, - GDK_Tab, GDK_CONTROL_MASK, - "cycle_focus", 1, + GDK_F10, 0, + "cycle-focus", 1, GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD); gtk_binding_entry_add_signal (binding_set, - GDK_KP_Tab, GDK_CONTROL_MASK, - "cycle_focus", 1, - GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD); - gtk_binding_entry_add_signal (binding_set, - GDK_Tab, GDK_CONTROL_MASK | GDK_SHIFT_MASK, - "cycle_focus", 1, - GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD); - gtk_binding_entry_add_signal (binding_set, - GDK_KP_Tab, GDK_CONTROL_MASK | GDK_SHIFT_MASK, - "cycle_focus", 1, + GDK_F10, GDK_SHIFT_MASK, + "cycle-focus", 1, GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD); + + /** + * GtkMenuShell:take-focus: + * + * A boolean that determines whether the menu and its submenus grab the + * keyboard focus. See gtk_menu_shell_set_take_focus() and + * gtk_menu_shell_get_take_focus(). + * + * Since: 2.8 + **/ + g_object_class_install_property (object_class, + PROP_TAKE_FOCUS, + g_param_spec_boolean ("take-focus", + P_("Take Focus"), + P_("A boolean that determines whether the menu grabs the keyboard focus"), + TRUE, + GTK_PARAM_READWRITE)); + + g_type_class_add_private (object_class, sizeof (GtkMenuShellPrivate)); } -static GtkType +static GType gtk_menu_shell_child_type (GtkContainer *container) { return GTK_TYPE_MENU_ITEM; @@ -346,18 +388,76 @@ gtk_menu_shell_child_type (GtkContainer *container) static void gtk_menu_shell_init (GtkMenuShell *menu_shell) { + GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + menu_shell->children = NULL; menu_shell->active_menu_item = NULL; menu_shell->parent_menu_shell = NULL; menu_shell->active = FALSE; menu_shell->have_grab = FALSE; menu_shell->have_xgrab = FALSE; - menu_shell->ignore_leave = FALSE; menu_shell->button = 0; - menu_shell->menu_flag = 0; menu_shell->activate_time = 0; + + priv->mnemonic_hash = NULL; + priv->key_hash = NULL; + priv->take_focus = TRUE; + priv->activated_submenu = FALSE; +} + +static void +gtk_menu_shell_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); + + switch (prop_id) + { + case PROP_TAKE_FOCUS: + gtk_menu_shell_set_take_focus (menu_shell, g_value_get_boolean (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gtk_menu_shell_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); + + switch (prop_id) + { + case PROP_TAKE_FOCUS: + g_value_set_boolean (value, gtk_menu_shell_get_take_focus (menu_shell)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gtk_menu_shell_finalize (GObject *object) +{ + GtkMenuShell *menu_shell = GTK_MENU_SHELL (object); + GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + + if (priv->mnemonic_hash) + _gtk_mnemonic_hash_free (priv->mnemonic_hash); + if (priv->key_hash) + _gtk_key_hash_free (priv->key_hash); + + G_OBJECT_CLASS (gtk_menu_shell_parent_class)->finalize (object); } + void gtk_menu_shell_append (GtkMenuShell *menu_shell, GtkWidget *child) @@ -403,7 +503,7 @@ gtk_menu_shell_deactivate (GtkMenuShell *menu_shell) { g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); - gtk_signal_emit (GTK_OBJECT (menu_shell), menu_shell_signals[DEACTIVATE]); + g_signal_emit (menu_shell, menu_shell_signals[DEACTIVATE], 0); } static void @@ -412,8 +512,6 @@ gtk_menu_shell_realize (GtkWidget *widget) GdkWindowAttr attributes; gint attributes_mask; - g_return_if_fail (GTK_IS_MENU_SHELL (widget)); - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); attributes.x = widget->allocation.x; @@ -440,6 +538,17 @@ gtk_menu_shell_realize (GtkWidget *widget) gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); } +void +_gtk_menu_shell_activate (GtkMenuShell *menu_shell) +{ + if (!menu_shell->active) + { + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; + } +} + static gint gtk_menu_shell_button_press (GtkWidget *widget, GdkEventButton *event) @@ -447,42 +556,48 @@ gtk_menu_shell_button_press (GtkWidget *widget, GtkMenuShell *menu_shell; GtkWidget *menu_item; - g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - if (event->type != GDK_BUTTON_PRESS) return FALSE; menu_shell = GTK_MENU_SHELL (widget); if (menu_shell->parent_menu_shell) + return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event); + + menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent *)event); + + if (menu_item && _gtk_menu_item_is_selectable (menu_item) && + menu_item != GTK_MENU_SHELL (menu_item->parent)->active_menu_item) { - return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event); + /* select the menu item *before* activating the shell, so submenus + * which might be open are closed the friendly way. If we activate + * (and thus grab) this menu shell first, we might get grab_broken + * events which will close the entire menu hierarchy. Selecting the + * menu item also fixes up the state as if enter_notify() would + * have run before (which normally selects the item). + */ + if (GTK_MENU_SHELL_GET_CLASS (menu_item->parent)->submenu_placement != GTK_TOP_BOTTOM) + { + gtk_menu_shell_select_item (GTK_MENU_SHELL (menu_item->parent), menu_item); + } } - else if (!menu_shell->active || !menu_shell->button) + + if (!menu_shell->active || !menu_shell->button) { - if (!menu_shell->active) - { - gtk_grab_add (GTK_WIDGET (widget)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; - } - menu_shell->button = event->button; + _gtk_menu_shell_activate (menu_shell); - menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent *)event); + menu_shell->button = event->button; - if (menu_item && _gtk_menu_item_is_selectable (menu_item)) - { - if ((menu_item->parent == widget) && - (menu_item != menu_shell->active_menu_item)) - { - if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) - g_object_set_data (G_OBJECT (menu_shell), - "gtk-menushell-just-activated", - GUINT_TO_POINTER (1)); - gtk_menu_shell_select_item (menu_shell, menu_item); - } - } + if (menu_item && _gtk_menu_item_is_selectable (menu_item) && + menu_item->parent == widget && + menu_item != menu_shell->active_menu_item) + { + if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) + { + menu_shell->activate_time = event->time; + gtk_menu_shell_select_item (menu_shell, menu_item); + } + } } else { @@ -490,10 +605,42 @@ gtk_menu_shell_button_press (GtkWidget *widget, if (widget == GTK_WIDGET (menu_shell)) { gtk_menu_shell_deactivate (menu_shell); - gtk_signal_emit (GTK_OBJECT (menu_shell), menu_shell_signals[SELECTION_DONE]); + g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0); } } + if (menu_item && _gtk_menu_item_is_selectable (menu_item) && + GTK_MENU_ITEM (menu_item)->submenu != NULL && + !GTK_WIDGET_VISIBLE (GTK_MENU_ITEM (menu_item)->submenu)) + { + GtkMenuShellPrivate *priv; + + _gtk_menu_item_popup_submenu (menu_item, FALSE); + + priv = GTK_MENU_SHELL_GET_PRIVATE (menu_item->parent); + priv->activated_submenu = TRUE; + } + + return TRUE; +} + +static gboolean +gtk_menu_shell_grab_broken (GtkWidget *widget, + GdkEventGrabBroken *event) +{ + GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); + + if (menu_shell->have_xgrab && event->grab_window == NULL) + { + /* Unset the active menu item so gtk_menu_popdown() doesn't see it. + */ + + gtk_menu_shell_deselect (menu_shell); + + gtk_menu_shell_deactivate (menu_shell); + g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0); + } + return TRUE; } @@ -501,17 +648,13 @@ static gint gtk_menu_shell_button_release (GtkWidget *widget, GdkEventButton *event) { - GtkMenuShell *menu_shell; - GtkWidget *menu_item; - gint deactivate; - - g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); + GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); + GtkMenuShellPrivate *priv = GTK_MENU_SHELL_GET_PRIVATE (widget); - menu_shell = GTK_MENU_SHELL (widget); if (menu_shell->active) { - gboolean deactivate_immediately = FALSE; + GtkWidget *menu_item; + gboolean deactivate = TRUE; if (menu_shell->button && (event->button != menu_shell->button)) { @@ -523,100 +666,132 @@ gtk_menu_shell_button_release (GtkWidget *widget, menu_shell->button = 0; menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent*) event); - deactivate = TRUE; - - if (menu_item - && GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM) - { - if (g_object_get_data (G_OBJECT (menu_shell), "gtk-menushell-just-activated")) - g_object_set_data (G_OBJECT (menu_shell), "gtk-menushell-just-activated", NULL); - else - deactivate_immediately = TRUE; - } - if ((event->time - menu_shell->activate_time) > MENU_SHELL_TIMEOUT) - { - if (deactivate_immediately) - { - gtk_menu_shell_deactivate (menu_shell); - return TRUE; - } - - if (menu_item && (menu_shell->active_menu_item == menu_item) && - _gtk_menu_item_is_selectable (menu_item)) - { - if (GTK_MENU_ITEM (menu_item)->submenu == NULL) - { - gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE); - return TRUE; - } - } - else if (menu_item && !_gtk_menu_item_is_selectable (menu_item)) - deactivate = FALSE; - else if (menu_shell->parent_menu_shell) - { - menu_shell->active = TRUE; - gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event); - return TRUE; - } - } - else - { - /* We only ever want to prevent deactivation on the first + { + if (menu_item && (menu_shell->active_menu_item == menu_item) && + _gtk_menu_item_is_selectable (menu_item)) + { + GtkWidget *submenu = GTK_MENU_ITEM (menu_item)->submenu; + + if (submenu == NULL) + { + gtk_menu_shell_activate_item (menu_shell, menu_item, TRUE); + + deactivate = FALSE; + } + else if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM || + priv->activated_submenu) + { + gint popdown_delay; + GTimeVal *popup_time; + gint64 usec_since_popup = 0; + + g_object_get (gtk_widget_get_settings (widget), + "gtk-menu-popdown-delay", &popdown_delay, + NULL); + + popup_time = g_object_get_data (G_OBJECT (submenu), + "gtk-menu-exact-popup-time"); + + if (popup_time) + { + GTimeVal current_time; + + g_get_current_time (¤t_time); + + usec_since_popup = ((gint64) current_time.tv_sec * 1000 * 1000 + + (gint64) current_time.tv_usec - + (gint64) popup_time->tv_sec * 1000 * 1000 - + (gint64) popup_time->tv_usec); + + g_object_set_data (G_OBJECT (submenu), + "gtk-menu-exact-popup-time", NULL); + } + + /* only close the submenu on click if we opened the + * menu explicitely (usec_since_popup == 0) or + * enough time has passed since it was opened by + * GtkMenuItem's timeout (usec_since_popup > delay). + */ + if (!priv->activated_submenu && + (usec_since_popup == 0 || + usec_since_popup > popdown_delay * 1000)) + { + _gtk_menu_item_popdown_submenu (menu_item); + } + else + { + gtk_menu_item_select (GTK_MENU_ITEM (menu_item)); + } + + deactivate = FALSE; + } + } + else if (menu_item && + !_gtk_menu_item_is_selectable (menu_item) && + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM) + { + deactivate = FALSE; + } + else if (menu_shell->parent_menu_shell) + { + menu_shell->active = TRUE; + gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent*) event); + deactivate = FALSE; + } + + /* If we ended up on an item with a submenu, leave the menu up. + */ + if (menu_item && (menu_shell->active_menu_item == menu_item) && + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM) + { + deactivate = FALSE; + } + } + else /* a very fast press-release */ + { + /* We only ever want to prevent deactivation on the first * press/release. Setting the time to zero is a bit of a - * hack, since we could be being triggered in the first - * few fractions of a second after a server time wraparound. - * the chances of that happening are ~1/10^6, without - * serious harm if we lose. - */ - menu_shell->activate_time = 0; - deactivate = FALSE; - } - - /* If the button click was very fast, or we ended up on a submenu, - * leave the menu up - */ - if (!deactivate || - (menu_item && (menu_shell->active_menu_item == menu_item))) - { - deactivate = FALSE; - menu_shell->ignore_leave = TRUE; - } - else - deactivate = TRUE; + * hack, since we could be being triggered in the first + * few fractions of a second after a server time wraparound. + * the chances of that happening are ~1/10^6, without + * serious harm if we lose. + */ + menu_shell->activate_time = 0; + deactivate = FALSE; + } if (deactivate) - { - gtk_menu_shell_deactivate (menu_shell); - gtk_signal_emit (GTK_OBJECT (menu_shell), menu_shell_signals[SELECTION_DONE]); - } + { + gtk_menu_shell_deactivate (menu_shell); + g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0); + } + + priv->activated_submenu = FALSE; } return TRUE; } static gint -gtk_menu_shell_key_press (GtkWidget *widget, +gtk_menu_shell_key_press (GtkWidget *widget, GdkEventKey *event) { - GtkMenuShell *menu_shell; - GtkWidget *toplevel; - - g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - menu_shell = GTK_MENU_SHELL (widget); + GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); + gboolean enable_mnemonics; if (!menu_shell->active_menu_item && menu_shell->parent_menu_shell) return gtk_widget_event (menu_shell->parent_menu_shell, (GdkEvent *)event); - if (_gtk_bindings_activate_event (GTK_OBJECT (widget), event)) + if (gtk_bindings_activate_event (GTK_OBJECT (widget), event)) return TRUE; - toplevel = gtk_widget_get_toplevel (widget); - if (GTK_IS_WINDOW (toplevel) && - _gtk_window_activate_key (GTK_WINDOW (toplevel), event)) - return TRUE; + g_object_get (gtk_widget_get_settings (widget), + "gtk-enable-mnemonics", &enable_mnemonics, + NULL); + + if (enable_mnemonics) + return gtk_menu_shell_activate_mnemonic (menu_shell, event); return FALSE; } @@ -625,34 +800,63 @@ static gint gtk_menu_shell_enter_notify (GtkWidget *widget, GdkEventCrossing *event) { - GtkMenuShell *menu_shell; - GtkWidget *menu_item; + GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); - g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - menu_shell = GTK_MENU_SHELL (widget); + if (event->mode == GDK_CROSSING_GTK_GRAB || + event->mode == GDK_CROSSING_GTK_UNGRAB || + event->mode == GDK_CROSSING_STATE_CHANGED) + return TRUE; if (menu_shell->active) { + GtkWidget *menu_item; + menu_item = gtk_get_event_widget ((GdkEvent*) event); if (!menu_item || (GTK_IS_MENU_ITEM (menu_item) && !_gtk_menu_item_is_selectable (menu_item))) return TRUE; - - if ((menu_item->parent == widget) && - (menu_shell->active_menu_item != menu_item) && + + if (menu_item->parent == widget && GTK_IS_MENU_ITEM (menu_item)) { if (menu_shell->ignore_enter) return TRUE; - - if ((event->detail != GDK_NOTIFY_INFERIOR) && - (GTK_WIDGET_STATE (menu_item) != GTK_STATE_PRELIGHT)) - { - gtk_menu_shell_select_item (menu_shell, menu_item); + + if (event->detail != GDK_NOTIFY_INFERIOR) + { + if (GTK_WIDGET_STATE (menu_item) != GTK_STATE_PRELIGHT) + gtk_menu_shell_select_item (menu_shell, menu_item); + + /* If any mouse button is down, and there is a submenu + * that is not yet visible, activate it. It's sufficient + * to check for any button's mask (not only the one + * matching menu_shell->button), because there is no + * situation a mouse button could be pressed while + * entering a menu item where we wouldn't want to show + * its submenu. + */ + if ((event->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) && + GTK_MENU_ITEM (menu_item)->submenu != NULL) + { + GtkMenuShellPrivate *priv; + + priv = GTK_MENU_SHELL_GET_PRIVATE (menu_item->parent); + priv->activated_submenu = TRUE; + + if (!GTK_WIDGET_VISIBLE (GTK_MENU_ITEM (menu_item)->submenu)) + { + gboolean touchscreen_mode; + + g_object_get (gtk_widget_get_settings (widget), + "gtk-touchscreen-mode", &touchscreen_mode, + NULL); + + if (touchscreen_mode) + _gtk_menu_item_popup_submenu (menu_item, TRUE); + } + } } } else if (menu_shell->parent_menu_shell) @@ -668,29 +872,22 @@ static gint gtk_menu_shell_leave_notify (GtkWidget *widget, GdkEventCrossing *event) { - GtkMenuShell *menu_shell; - GtkMenuItem *menu_item; - GtkWidget *event_widget; - - g_return_val_if_fail (GTK_IS_MENU_SHELL (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); + if (event->mode == GDK_CROSSING_GTK_GRAB || + event->mode == GDK_CROSSING_GTK_GRAB || + event->mode == GDK_CROSSING_STATE_CHANGED) + return TRUE; if (GTK_WIDGET_VISIBLE (widget)) { - menu_shell = GTK_MENU_SHELL (widget); - event_widget = gtk_get_event_widget ((GdkEvent*) event); + GtkMenuShell *menu_shell = GTK_MENU_SHELL (widget); + GtkWidget *event_widget = gtk_get_event_widget ((GdkEvent*) event); + GtkMenuItem *menu_item; if (!event_widget || !GTK_IS_MENU_ITEM (event_widget)) return TRUE; menu_item = GTK_MENU_ITEM (event_widget); - if (menu_shell->ignore_leave) - { - menu_shell->ignore_leave = FALSE; - return TRUE; - } - if (!_gtk_menu_item_is_selectable (event_widget)) return TRUE; @@ -712,6 +909,13 @@ gtk_menu_shell_leave_notify (GtkWidget *widget, return TRUE; } +static void +gtk_menu_shell_screen_changed (GtkWidget *widget, + GdkScreen *previous_screen) +{ + gtk_menu_shell_reset_key_hash (GTK_MENU_SHELL (widget)); +} + static void gtk_menu_shell_add (GtkContainer *container, GtkWidget *widget) @@ -723,14 +927,10 @@ static void gtk_menu_shell_remove (GtkContainer *container, GtkWidget *widget) { - GtkMenuShell *menu_shell; + GtkMenuShell *menu_shell = GTK_MENU_SHELL (container); gint was_visible; - - g_return_if_fail (GTK_IS_MENU_SHELL (container)); - g_return_if_fail (GTK_IS_MENU_ITEM (widget)); - + was_visible = GTK_WIDGET_VISIBLE (widget); - menu_shell = GTK_MENU_SHELL (container); menu_shell->children = g_list_remove (menu_shell->children, widget); if (widget == menu_shell->active_menu_item) @@ -754,15 +954,10 @@ gtk_menu_shell_forall (GtkContainer *container, GtkCallback callback, gpointer callback_data) { - GtkMenuShell *menu_shell; + GtkMenuShell *menu_shell = GTK_MENU_SHELL (container); GtkWidget *child; GList *children; - g_return_if_fail (GTK_IS_MENU_SHELL (container)); - g_return_if_fail (callback != NULL); - - menu_shell = GTK_MENU_SHELL (container); - children = menu_shell->children; while (children) { @@ -781,6 +976,7 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell) { menu_shell->button = 0; menu_shell->active = FALSE; + menu_shell->activate_time = 0; if (menu_shell->active_menu_item) { @@ -795,9 +991,11 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell) } if (menu_shell->have_xgrab) { + GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (menu_shell)); + menu_shell->have_xgrab = FALSE; - gdk_pointer_ungrab (GDK_CURRENT_TIME); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); + gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME); + gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME); } } } @@ -812,7 +1010,7 @@ gtk_menu_shell_is_item (GtkMenuShell *menu_shell, g_return_val_if_fail (child != NULL, FALSE); parent = child->parent; - while (parent && GTK_IS_MENU_SHELL (parent)) + while (GTK_IS_MENU_SHELL (parent)) { if (parent == (GtkWidget*) menu_shell) return TRUE; @@ -852,7 +1050,9 @@ gtk_menu_shell_select_item (GtkMenuShell *menu_shell, class = GTK_MENU_SHELL_GET_CLASS (menu_shell); - if (class->select_item) + if (class->select_item && + !(menu_shell->active && + menu_shell->active_menu_item == menu_item)) class->select_item (menu_shell, menu_item); } @@ -863,11 +1063,20 @@ static void gtk_menu_shell_real_select_item (GtkMenuShell *menu_shell, GtkWidget *menu_item) { + GtkPackDirection pack_dir = PACK_DIRECTION (menu_shell); + gtk_menu_shell_deselect (menu_shell); + if (!_gtk_menu_item_is_selectable (menu_item)) + return; + menu_shell->active_menu_item = menu_item; - _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), - GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement); + if (pack_dir == GTK_PACK_DIRECTION_TTB || pack_dir == GTK_PACK_DIRECTION_BTT) + _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), + GTK_LEFT_RIGHT); + else + _gtk_menu_item_set_placement (GTK_MENU_ITEM (menu_shell->active_menu_item), + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement); gtk_menu_item_select (GTK_MENU_ITEM (menu_shell->active_menu_item)); /* This allows the bizarre radio buttons-with-submenus-display-history @@ -903,7 +1112,8 @@ gtk_menu_shell_activate_item (GtkMenuShell *menu_shell, if (!deactivate) deactivate = GTK_MENU_ITEM_GET_CLASS (menu_item)->hide_on_activate; - gtk_widget_ref (GTK_WIDGET (menu_shell)); + g_object_ref (menu_shell); + g_object_ref (menu_item); if (deactivate) { @@ -911,7 +1121,7 @@ gtk_menu_shell_activate_item (GtkMenuShell *menu_shell, do { - gtk_widget_ref (GTK_WIDGET (parent_menu_shell)); + g_object_ref (parent_menu_shell); shells = g_slist_prepend (shells, parent_menu_shell); parent_menu_shell = (GtkMenuShell*) parent_menu_shell->parent_menu_shell; } @@ -923,42 +1133,53 @@ gtk_menu_shell_activate_item (GtkMenuShell *menu_shell, /* flush the x-queue, so any grabs are removed and * the menu is actually taken down */ - gdk_flush (); + gdk_display_sync (gtk_widget_get_display (menu_item)); } gtk_widget_activate (menu_item); for (slist = shells; slist; slist = slist->next) { - gtk_signal_emit (slist->data, menu_shell_signals[SELECTION_DONE]); - gtk_widget_unref (slist->data); + g_signal_emit (slist->data, menu_shell_signals[SELECTION_DONE], 0); + g_object_unref (slist->data); } g_slist_free (shells); - gtk_widget_unref (GTK_WIDGET (menu_shell)); + g_object_unref (menu_shell); + g_object_unref (menu_item); } /* Distance should be +/- 1 */ -static void -gtk_menu_shell_move_selected (GtkMenuShell *menu_shell, - gint distance) +static gboolean +gtk_menu_shell_real_move_selected (GtkMenuShell *menu_shell, + gint distance) { if (menu_shell->active_menu_item) { GList *node = g_list_find (menu_shell->children, menu_shell->active_menu_item); GList *start_node = node; - + gboolean wrap_around; + + g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)), + "gtk-keynav-wrap-around", &wrap_around, + NULL); + if (distance > 0) { node = node->next; while (node != start_node && (!node || !_gtk_menu_item_is_selectable (node->data))) { - if (!node) - node = menu_shell->children; - else + if (node) node = node->next; + else if (wrap_around) + node = menu_shell->children; + else + { + gtk_widget_error_bell (GTK_WIDGET (menu_shell)); + break; + } } } else @@ -967,27 +1188,54 @@ gtk_menu_shell_move_selected (GtkMenuShell *menu_shell, while (node != start_node && (!node || !_gtk_menu_item_is_selectable (node->data))) { - if (!node) - node = g_list_last (menu_shell->children); - else + if (node) node = node->prev; + else if (wrap_around) + node = g_list_last (menu_shell->children); + else + { + gtk_widget_error_bell (GTK_WIDGET (menu_shell)); + break; + } } } if (node) gtk_menu_shell_select_item (menu_shell, node->data); } + + return TRUE; +} + +/* Distance should be +/- 1 */ +static void +gtk_menu_shell_move_selected (GtkMenuShell *menu_shell, + gint distance) +{ + gboolean handled = FALSE; + + g_signal_emit (menu_shell, menu_shell_signals[MOVE_SELECTED], 0, + distance, &handled); } /** - * _gtk_menu_shell_select_first: + * gtk_menu_shell_select_first: * @menu_shell: a #GtkMenuShell + * @search_sensitive: if %TRUE, search for the first selectable + * menu item, otherwise select nothing if + * the first item isn't sensitive. This + * should be %FALSE if the menu is being + * popped up initially. * - * Select the first visible child of the menu shell, unless - * it's a tearoff item. + * Select the first visible or selectable child of the menu shell; + * don't select tearoff items unless the only item is a tearoff + * item. + * + * Since: 2.2 **/ void -_gtk_menu_shell_select_first (GtkMenuShell *menu_shell) +gtk_menu_shell_select_first (GtkMenuShell *menu_shell, + gboolean search_sensitive) { GtkWidget *to_select = NULL; GList *tmp_list; @@ -997,7 +1245,8 @@ _gtk_menu_shell_select_first (GtkMenuShell *menu_shell) { GtkWidget *child = tmp_list->data; - if (GTK_WIDGET_VISIBLE (child)) + if ((!search_sensitive && GTK_WIDGET_VISIBLE (child)) || + _gtk_menu_item_is_selectable (child)) { to_select = child; if (!GTK_IS_TEAROFF_MENU_ITEM (child)) @@ -1011,91 +1260,168 @@ _gtk_menu_shell_select_first (GtkMenuShell *menu_shell) gtk_menu_shell_select_item (menu_shell, to_select); } -static void +void +_gtk_menu_shell_select_last (GtkMenuShell *menu_shell, + gboolean search_sensitive) +{ + GtkWidget *to_select = NULL; + GList *tmp_list; + + tmp_list = g_list_last (menu_shell->children); + while (tmp_list) + { + GtkWidget *child = tmp_list->data; + + if ((!search_sensitive && GTK_WIDGET_VISIBLE (child)) || + _gtk_menu_item_is_selectable (child)) + { + to_select = child; + if (!GTK_IS_TEAROFF_MENU_ITEM (child)) + break; + } + + tmp_list = tmp_list->prev; + } + + if (to_select) + gtk_menu_shell_select_item (menu_shell, to_select); +} + +static gboolean gtk_menu_shell_select_submenu_first (GtkMenuShell *menu_shell) { GtkMenuItem *menu_item; + if (menu_shell->active_menu_item == NULL) + return FALSE; + menu_item = GTK_MENU_ITEM (menu_shell->active_menu_item); if (menu_item->submenu) - _gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_item->submenu)); + { + _gtk_menu_item_popup_submenu (GTK_WIDGET (menu_item), FALSE); + gtk_menu_shell_select_first (GTK_MENU_SHELL (menu_item->submenu), TRUE); + if (GTK_MENU_SHELL (menu_item->submenu)->active_menu_item) + return TRUE; + } + + return FALSE; } static void -gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, - GtkMenuDirectionType direction) +gtk_real_menu_shell_move_current (GtkMenuShell *menu_shell, + GtkMenuDirectionType direction) { GtkMenuShell *parent_menu_shell = NULL; gboolean had_selection; + gboolean touchscreen_mode; had_selection = menu_shell->active_menu_item != NULL; + g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)), + "gtk-touchscreen-mode", &touchscreen_mode, + NULL); + if (menu_shell->parent_menu_shell) parent_menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell); - + switch (direction) { case GTK_MENU_DIR_PARENT: - if (parent_menu_shell) + if (touchscreen_mode && + menu_shell->active_menu_item && + GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu && + GTK_WIDGET_VISIBLE (GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu)) + { + /* if we are on a menu item that has an open submenu but the + * focus is not in that submenu (e.g. because it's empty or + * has only insensitive items), close that submenu instead + * of running into the code below which would close *this* + * menu. + */ + _gtk_menu_item_popdown_submenu (menu_shell->active_menu_item); + } + else if (parent_menu_shell) { - if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == - GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement) + if (touchscreen_mode) + { + /* close menu when returning from submenu. */ + _gtk_menu_item_popdown_submenu (GTK_MENU (menu_shell)->parent_menu_item); + break; + } + + if (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement) gtk_menu_shell_deselect (menu_shell); - else + else { - gtk_menu_shell_move_selected (parent_menu_shell, -1); - gtk_menu_shell_select_submenu_first (parent_menu_shell); + if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR) + gtk_menu_shell_move_selected (parent_menu_shell, -1); + else + gtk_menu_shell_move_selected (parent_menu_shell, 1); + gtk_menu_shell_select_submenu_first (parent_menu_shell); } } + /* If there is no parent and the submenu is in the opposite direction + * to the menu, then make the PARENT direction wrap around to + * the bottom of the submenu. + */ + else if (menu_shell->active_menu_item && + _gtk_menu_item_is_selectable (menu_shell->active_menu_item) && + GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu) + { + GtkMenuShell *submenu = GTK_MENU_SHELL (GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu); + + if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != + GTK_MENU_SHELL_GET_CLASS (submenu)->submenu_placement) + _gtk_menu_shell_select_last (submenu, TRUE); + } break; - + case GTK_MENU_DIR_CHILD: if (menu_shell->active_menu_item && _gtk_menu_item_is_selectable (menu_shell->active_menu_item) && GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu) { - gtk_menu_shell_select_submenu_first (menu_shell); + if (gtk_menu_shell_select_submenu_first (menu_shell)) + break; } - else + + /* Try to find a menu running the opposite direction */ + while (parent_menu_shell && + (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == + GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)) { - /* Try to find a menu running the opposite direction */ - while (parent_menu_shell && - (GTK_MENU_SHELL_GET_CLASS (parent_menu_shell)->submenu_placement == - GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement)) - { - GtkWidget *tmp_widget = parent_menu_shell->parent_menu_shell; + parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell); + } - if (tmp_widget) - parent_menu_shell = GTK_MENU_SHELL (tmp_widget); - else - parent_menu_shell = NULL; - } + if (parent_menu_shell) + { + if (PACK_DIRECTION (parent_menu_shell) == GTK_PACK_DIRECTION_LTR) + gtk_menu_shell_move_selected (parent_menu_shell, 1); + else + gtk_menu_shell_move_selected (parent_menu_shell, -1); - if (parent_menu_shell) - { - gtk_menu_shell_move_selected (parent_menu_shell, 1); - gtk_menu_shell_select_submenu_first (parent_menu_shell); - } + gtk_menu_shell_select_submenu_first (parent_menu_shell); } break; - + case GTK_MENU_DIR_PREV: gtk_menu_shell_move_selected (menu_shell, -1); if (!had_selection && !menu_shell->active_menu_item && menu_shell->children) - gtk_menu_shell_select_item (menu_shell, g_list_last (menu_shell->children)->data); + _gtk_menu_shell_select_last (menu_shell, TRUE); break; + case GTK_MENU_DIR_NEXT: gtk_menu_shell_move_selected (menu_shell, 1); if (!had_selection && !menu_shell->active_menu_item && menu_shell->children) - gtk_menu_shell_select_item (menu_shell, menu_shell->children->data); + gtk_menu_shell_select_first (menu_shell, TRUE); break; } - } static void @@ -1103,13 +1429,15 @@ gtk_real_menu_shell_activate_current (GtkMenuShell *menu_shell, gboolean force_hide) { if (menu_shell->active_menu_item && - _gtk_menu_item_is_selectable (menu_shell->active_menu_item) && - GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL) - { + _gtk_menu_item_is_selectable (menu_shell->active_menu_item)) + { + if (GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL) gtk_menu_shell_activate_item (menu_shell, menu_shell->active_menu_item, force_hide); - } + else + _gtk_menu_item_popup_submenu (menu_shell->active_menu_item, FALSE); + } } static void @@ -1120,7 +1448,7 @@ gtk_real_menu_shell_cancel (GtkMenuShell *menu_shell) gtk_menu_shell_deselect (menu_shell); gtk_menu_shell_deactivate (menu_shell); - gtk_signal_emit (GTK_OBJECT (menu_shell), menu_shell_signals[SELECTION_DONE]); + g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0); } static void @@ -1128,8 +1456,242 @@ gtk_real_menu_shell_cycle_focus (GtkMenuShell *menu_shell, GtkDirectionType dir) { while (menu_shell && !GTK_IS_MENU_BAR (menu_shell)) - menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell); + { + if (menu_shell->parent_menu_shell) + menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell); + else + menu_shell = NULL; + } if (menu_shell) _gtk_menu_bar_cycle_focus (GTK_MENU_BAR (menu_shell), dir); } + +gint +_gtk_menu_shell_get_popup_delay (GtkMenuShell *menu_shell) +{ + GtkMenuShellClass *klass = GTK_MENU_SHELL_GET_CLASS (menu_shell); + + if (klass->get_popup_delay) + { + return klass->get_popup_delay (menu_shell); + } + else + { + gint popup_delay; + GtkWidget *widget = GTK_WIDGET (menu_shell); + + g_object_get (gtk_widget_get_settings (widget), + "gtk-menu-popup-delay", &popup_delay, + NULL); + + return popup_delay; + } +} + +/** + * gtk_menu_shell_cancel: + * @menu_shell: a #GtkMenuShell + * + * Cancels the selection within the menu shell. + * + * Since: 2.4 + */ +void +gtk_menu_shell_cancel (GtkMenuShell *menu_shell) +{ + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + + g_signal_emit (menu_shell, menu_shell_signals[CANCEL], 0); +} + +static GtkMnemonicHash * +gtk_menu_shell_get_mnemonic_hash (GtkMenuShell *menu_shell, + gboolean create) +{ + GtkMenuShellPrivate *private = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + + if (!private->mnemonic_hash && create) + private->mnemonic_hash = _gtk_mnemonic_hash_new (); + + return private->mnemonic_hash; +} + +static void +menu_shell_add_mnemonic_foreach (guint keyval, + GSList *targets, + gpointer data) +{ + GtkKeyHash *key_hash = data; + + _gtk_key_hash_add_entry (key_hash, keyval, 0, GUINT_TO_POINTER (keyval)); +} + +static GtkKeyHash * +gtk_menu_shell_get_key_hash (GtkMenuShell *menu_shell, + gboolean create) +{ + GtkMenuShellPrivate *private = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + GtkWidget *widget = GTK_WIDGET (menu_shell); + + if (!private->key_hash && create && gtk_widget_has_screen (widget)) + { + GtkMnemonicHash *mnemonic_hash = gtk_menu_shell_get_mnemonic_hash (menu_shell, FALSE); + GdkScreen *screen = gtk_widget_get_screen (widget); + GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_screen_get_display (screen)); + + if (!mnemonic_hash) + return NULL; + + private->key_hash = _gtk_key_hash_new (keymap, NULL); + + _gtk_mnemonic_hash_foreach (mnemonic_hash, + menu_shell_add_mnemonic_foreach, + private->key_hash); + } + + return private->key_hash; +} + +static void +gtk_menu_shell_reset_key_hash (GtkMenuShell *menu_shell) +{ + GtkMenuShellPrivate *private = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + + if (private->key_hash) + { + _gtk_key_hash_free (private->key_hash); + private->key_hash = NULL; + } +} + +static gboolean +gtk_menu_shell_activate_mnemonic (GtkMenuShell *menu_shell, + GdkEventKey *event) +{ + GtkMnemonicHash *mnemonic_hash; + GtkKeyHash *key_hash; + GSList *entries; + gboolean result = FALSE; + + mnemonic_hash = gtk_menu_shell_get_mnemonic_hash (menu_shell, FALSE); + if (!mnemonic_hash) + return FALSE; + + key_hash = gtk_menu_shell_get_key_hash (menu_shell, TRUE); + if (!key_hash) + return FALSE; + + entries = _gtk_key_hash_lookup (key_hash, + event->hardware_keycode, + event->state, + gtk_accelerator_get_default_mod_mask (), + event->group); + + if (entries) + result = _gtk_mnemonic_hash_activate (mnemonic_hash, + GPOINTER_TO_UINT (entries->data)); + + return result; +} + +void +_gtk_menu_shell_add_mnemonic (GtkMenuShell *menu_shell, + guint keyval, + GtkWidget *target) +{ + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + g_return_if_fail (GTK_IS_WIDGET (target)); + + _gtk_mnemonic_hash_add (gtk_menu_shell_get_mnemonic_hash (menu_shell, TRUE), + keyval, target); + gtk_menu_shell_reset_key_hash (menu_shell); +} + +void +_gtk_menu_shell_remove_mnemonic (GtkMenuShell *menu_shell, + guint keyval, + GtkWidget *target) +{ + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + g_return_if_fail (GTK_IS_WIDGET (target)); + + _gtk_mnemonic_hash_remove (gtk_menu_shell_get_mnemonic_hash (menu_shell, TRUE), + keyval, target); + gtk_menu_shell_reset_key_hash (menu_shell); +} + +/** + * gtk_menu_shell_get_take_focus: + * @menu_shell: a #GtkMenuShell + * + * Returns %TRUE if the menu shell will take the keyboard focus on popup. + * + * Returns: %TRUE if the menu shell will take the keyboard focus on popup. + * + * Since: 2.8 + **/ +gboolean +gtk_menu_shell_get_take_focus (GtkMenuShell *menu_shell) +{ + GtkMenuShellPrivate *priv; + + g_return_val_if_fail (GTK_IS_MENU_SHELL (menu_shell), FALSE); + + priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + + return priv->take_focus; +} + +/** + * gtk_menu_shell_set_take_focus: + * @menu_shell: a #GtkMenuShell + * @take_focus: %TRUE if the menu shell should take the keyboard focus on popup. + * + * If @take_focus is %TRUE (the default) the menu shell will take the keyboard + * focus so that it will receive all keyboard events which is needed to enable + * keyboard navigation in menus. + * + * Setting @take_focus to %FALSE is useful only for special applications + * like virtual keyboard implementations which should not take keyboard + * focus. + * + * The @take_focus state of a menu or menu bar is automatically propagated + * to submenus whenever a submenu is popped up, so you don't have to worry + * about recursively setting it for your entire menu hierarchy. Only when + * programmatically picking a submenu and popping it up manually, the + * @take_focus property of the submenu needs to be set explicitely. + * + * Note that setting it to %FALSE has side-effects: + * + * If the focus is in some other app, it keeps the focus and keynav in + * the menu doesn't work. Consequently, keynav on the menu will only + * work if the focus is on some toplevel owned by the onscreen keyboard. + * + * To avoid confusing the user, menus with @take_focus set to %FALSE + * should not display mnemonics or accelerators, since it cannot be + * guaranteed that they will work. + * + * See also gdk_keyboard_grab() + * + * Since: 2.8 + **/ +void +gtk_menu_shell_set_take_focus (GtkMenuShell *menu_shell, + gboolean take_focus) +{ + GtkMenuShellPrivate *priv; + + g_return_if_fail (GTK_IS_MENU_SHELL (menu_shell)); + + priv = GTK_MENU_SHELL_GET_PRIVATE (menu_shell); + + if (priv->take_focus != take_focus) + { + priv->take_focus = take_focus; + g_object_notify (G_OBJECT (menu_shell), "take-focus"); + } +} + +#define __GTK_MENU_SHELL_C__ +#include "gtkaliasdef.c"