#define GTK_MENU_INTERNALS
+#include <config.h>
#include "gdk/gdkkeysyms.h"
#include "gtkbindings.h"
+#include "gtkkeyhash.h"
#include "gtkmain.h"
#include "gtkmarshalers.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,
LAST_SIGNAL
};
+enum {
+ PROP_0,
+ PROP_TAKE_FOCUS
+};
+
typedef void (*GtkMenuShellSignal1) (GtkObject *object,
GtkMenuDirectionType arg1,
gpointer data);
* - 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
* 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;
+
+ gboolean take_focus;
+};
+
+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,
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,
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);
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;
+static void gtk_menu_shell_reset_key_hash (GtkMenuShell *menu_shell);
+static gboolean gtk_menu_shell_activate_mnemonic (GtkMenuShell *menu_shell,
+ GdkEventKey *event);
- 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 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_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;
klass->insert = gtk_menu_shell_real_insert;
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);
+ 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] =
- 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);
+ _gtk_binding_signal_new (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);
binding_set = gtk_binding_set_by_class (klass);
gtk_binding_entry_add_signal (binding_set,
GDK_Return, 0,
"activate_current", 1,
- GTK_TYPE_BOOL,
+ G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Enter, 0,
"activate_current", 1,
- GTK_TYPE_BOOL,
+ G_TYPE_BOOLEAN,
TRUE);
gtk_binding_entry_add_signal (binding_set,
GDK_space, 0,
"activate_current", 1,
- GTK_TYPE_BOOL,
+ G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
GDK_KP_Space, 0,
"activate_current", 1,
- GTK_TYPE_BOOL,
+ G_TYPE_BOOLEAN,
FALSE);
gtk_binding_entry_add_signal (binding_set,
- GDK_Tab, GDK_CONTROL_MASK,
+ 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,
+ 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;
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;
+}
+
+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)
{
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
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)
}
else 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;
- }
+ _gtk_menu_shell_activate (menu_shell);
+
menu_shell->button = event->button;
menu_item = gtk_menu_shell_get_item (menu_shell, (GdkEvent *)event);
(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));
+ {
+ menu_shell->activate_time = event->time;
+ }
+
gtk_menu_shell_select_item (menu_shell, menu_item);
}
}
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);
}
}
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;
+}
+
static gint
gtk_menu_shell_button_release (GtkWidget *widget,
GdkEventButton *event)
menu_shell = GTK_MENU_SHELL (widget);
if (menu_shell->active)
{
- gboolean deactivate_immediately = FALSE;
-
if (menu_shell->button && (event->button != menu_shell->button))
{
menu_shell->button = 0;
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))
{
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_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;
}
+
+ /* 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
+ 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
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;
-
if (deactivate)
{
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 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);
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;
-
- toplevel = gtk_widget_get_toplevel (widget);
- if (GTK_IS_WINDOW (toplevel) &&
- _gtk_window_activate_key (GTK_WINDOW (toplevel), event))
+ if (gtk_bindings_activate_event (GTK_OBJECT (widget), event))
return TRUE;
- return FALSE;
+ return gtk_menu_shell_activate_mnemonic (menu_shell, event);
}
static gint
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;
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)
{
menu_shell->button = 0;
menu_shell->active = FALSE;
+ menu_shell->activate_time = 0;
if (menu_shell->active_menu_item)
{
}
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);
}
}
}
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);
}
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
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)
{
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;
}
/* 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 */
}
/**
- * _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;
{
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))
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;
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));
+ 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
if (menu_shell->parent_menu_shell)
parent_menu_shell = GTK_MENU_SHELL (menu_shell->parent_menu_shell);
-
+
switch (direction)
{
case GTK_MENU_DIR_PARENT:
gtk_menu_shell_deselect (menu_shell);
else
{
- 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);
}
}
+ /* 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:
_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;
-
- if (tmp_widget)
- parent_menu_shell = GTK_MENU_SHELL (tmp_widget);
- else
- parent_menu_shell = NULL;
- }
-
- if (parent_menu_shell)
- {
- gtk_menu_shell_move_selected (parent_menu_shell, 1);
- gtk_menu_shell_select_submenu_first (parent_menu_shell);
- }
+ 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;
+ }
+
+ 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);
+
+ gtk_menu_shell_select_submenu_first (parent_menu_shell);
}
break;
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
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);
+ }
}
static void
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
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"
projects / ~andy / gtk / blobdiff