#define GTK_MENU_INTERNALS
-#include <config.h>
+#include "config.h"
#include "gdk/gdkkeysyms.h"
-#include "gtkalias.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 "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,
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:
*
*
* 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
* - 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
{
GtkMnemonicHash *mnemonic_hash;
GtkKeyHash *key_hash;
+
+ guint take_focus : 1;
+ guint activated_submenu : 1;
};
-static void gtk_menu_shell_class_init (GtkMenuShellClass *klass);
-static void gtk_menu_shell_init (GtkMenuShell *menu_shell);
+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,
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,
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 GtkContainerClass *parent_class = NULL;
static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
-
-GType
-gtk_menu_shell_get_type (void)
-{
- static GType menu_shell_type = 0;
-
- if (!menu_shell_type)
- {
- static const GTypeInfo menu_shell_info =
- {
- sizeof (GtkMenuShellClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_menu_shell_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkMenuShell),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_menu_shell_init,
- NULL, /* value_table */
- };
-
- menu_shell_type =
- g_type_register_static (GTK_TYPE_CONTAINER, "GtkMenuShell",
- &menu_shell_info, G_TYPE_FLAG_ABSTRACT);
- }
-
- return menu_shell_type;
-}
+G_DEFINE_ABSTRACT_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
static void
gtk_menu_shell_class_init (GtkMenuShellClass *klass)
widget_class = (GtkWidgetClass*) klass;
container_class = (GtkContainerClass*) klass;
- parent_class = g_type_class_peek_parent (klass);
-
+ 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;
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] =
- g_signal_new ("deactivate",
+ 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] =
- g_signal_new ("selection-done",
+ 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] =
- g_signal_new ("move_current",
+ 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,
+ G_TYPE_NONE, 1,
GTK_TYPE_MENU_DIRECTION_TYPE);
+
menu_shell_signals[ACTIVATE_CURRENT] =
- g_signal_new ("activate_current",
+ 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_NONE, 1,
G_TYPE_BOOLEAN);
+
menu_shell_signals[CANCEL] =
- g_signal_new ("cancel",
+ 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] =
- _gtk_binding_signal_new ("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);
+ 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,
"cancel", 0);
gtk_binding_entry_add_signal (binding_set,
GDK_Return, 0,
- "activate_current", 1,
+ "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,
+ "activate-current", 1,
G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
- "activate_current", 1,
+ "activate-current", 1,
G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
- "activate_current", 1,
+ "activate-current", 1,
G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_F10, 0,
- "cycle_focus", 1,
+ "cycle-focus", 1,
GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
gtk_binding_entry_add_signal (binding_set,
GDK_F10, GDK_SHIFT_MASK,
- "cycle_focus", 1,
+ "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));
}
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
if (priv->key_hash)
_gtk_key_hash_free (priv->key_hash);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_menu_shell_parent_class)->finalize (object);
}
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;
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)
{
_gtk_menu_shell_activate (menu_shell);
-
- menu_shell->button = event->button;
- 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)
- {
- menu_shell->activate_time = event->time;
- }
-
- 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
{
}
}
+ 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;
}
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)
{
+ GtkWidget *menu_item;
+ gboolean deactivate = TRUE;
+
if (menu_shell->button && (event->button != menu_shell->button))
{
menu_shell->button = 0;
menu_shell->button = 0;
menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent*) event);
- deactivate = TRUE;
-
if ((event->time - menu_shell->activate_time) > MENU_SHELL_TIMEOUT)
- {
- 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 (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement != GTK_TOP_BOTTOM)
- {
- gtk_menu_item_select (GTK_MENU_ITEM (menu_item));
- return TRUE;
- }
- }
- 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);
- return TRUE;
- }
-
- /* 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;
- }
- }
+ {
+ 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
+ {
+ /* 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;
- }
-
+ * 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);
- g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0);
- }
+ {
+ gtk_menu_shell_deactivate (menu_shell);
+ g_signal_emit (menu_shell, menu_shell_signals[SELECTION_DONE], 0);
+ }
+
+ priv->activated_submenu = FALSE;
}
return TRUE;
gtk_menu_shell_key_press (GtkWidget *widget,
GdkEventKey *event)
{
- GtkMenuShell *menu_shell;
-
- 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))
return TRUE;
- return gtk_menu_shell_activate_mnemonic (menu_shell, event);
+ 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;
}
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)
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;
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)
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)
{
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;
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
deactivate = GTK_MENU_ITEM_GET_CLASS (menu_item)->hide_on_activate;
g_object_ref (menu_shell);
+ g_object_ref (menu_item);
if (deactivate)
{
g_slist_free (shells);
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
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);
}
/**
{
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_item_popup_submenu (GTK_WIDGET (menu_item));
+ _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;
}
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);
-
- if (gtk_widget_get_direction (GTK_WIDGET (menu_shell)) == GTK_TEXT_DIR_RTL)
- {
- switch (direction)
- {
- case GTK_MENU_DIR_PARENT:
- direction = GTK_MENU_DIR_CHILD;
- break;
- case GTK_MENU_DIR_CHILD:
- direction = GTK_MENU_DIR_PARENT;
- break;
- case GTK_MENU_DIR_PREV:
- if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
- direction = GTK_MENU_DIR_NEXT;
- break;
- case GTK_MENU_DIR_NEXT:
- if (GTK_MENU_SHELL_GET_CLASS (menu_shell)->submenu_placement == GTK_TOP_BOTTOM)
- direction = GTK_MENU_DIR_PREV;
- break;
- default: ;
- }
- }
-
+
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
_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) &&
}
/* Try to find a menu running the opposite direction */
- while (parent_menu_shell &&
+ 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;
-
- if (tmp_widget)
- parent_menu_shell = GTK_MENU_SHELL (tmp_widget);
- else
- parent_menu_shell = NULL;
+ parent_menu_shell = GTK_MENU_SHELL (parent_menu_shell->parent_menu_shell);
}
-
+
if (parent_menu_shell)
{
- gtk_menu_shell_move_selected (parent_menu_shell, 1);
+ 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);
}
break;
-
+
case GTK_MENU_DIR_PREV:
gtk_menu_shell_move_selected (menu_shell, -1);
if (!had_selection &&
menu_shell->children)
_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 &&
gtk_menu_shell_select_first (menu_shell, TRUE);
break;
}
-
}
static void
if (menu_shell->active_menu_item &&
_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);
+ _gtk_menu_item_popup_submenu (menu_shell->active_menu_item, FALSE);
}
}
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"
projects / ~andy / gtk / blobdiff