#include "gtksettings.h"
#include "gtkintl.h"
#include "gtkwindow.h"
-#include "gtksignal.h"
#define BORDER_SPACING 0
#define CHILD_SPACING 3
#define DEFAULT_IPADDING 1
-static void gtk_menu_bar_class_init (GtkMenuBarClass *klass);
-static void gtk_menu_bar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_menu_bar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_menu_bar_paint (GtkWidget *widget,
- GdkRectangle *area);
-static gint gtk_menu_bar_expose (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
- GtkWidget *old_toplevel);
-static void gtk_menu_bar_cycle_focus (GtkMenuBar *menubar,
- GtkDirectionType dir);
-static GtkShadowType get_shadow_type (GtkMenuBar *menubar);
-
-enum {
- CYCLE_FOCUS,
- LAST_SIGNAL
-};
+static void gtk_menu_bar_class_init (GtkMenuBarClass *klass);
+static void gtk_menu_bar_size_request (GtkWidget *widget,
+ GtkRequisition *requisition);
+static void gtk_menu_bar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_menu_bar_paint (GtkWidget *widget,
+ GdkRectangle *area);
+static gint gtk_menu_bar_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+static void gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *old_toplevel);
+static gint gtk_menu_bar_get_popup_delay (GtkMenuShell *menu_shell);
+
-static guint signals[LAST_SIGNAL] = { 0 };
+static GtkShadowType get_shadow_type (GtkMenuBar *menubar);
static GtkMenuShellClass *parent_class = NULL;
-GtkType
+GType
gtk_menu_bar_get_type (void)
{
- static GtkType menu_bar_type = 0;
+ static GType menu_bar_type = 0;
if (!menu_bar_type)
{
- static const GtkTypeInfo menu_bar_info =
+ static const GTypeInfo menu_bar_info =
{
- "GtkMenuBar",
- sizeof (GtkMenuBar),
sizeof (GtkMenuBarClass),
- (GtkClassInitFunc) gtk_menu_bar_class_init,
- (GtkObjectInitFunc) NULL,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_menu_bar_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkMenuBar),
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
};
- menu_bar_type = gtk_type_unique (gtk_menu_shell_get_type (), &menu_bar_info);
+ menu_bar_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenuBar",
+ &menu_bar_info, 0);
}
return menu_bar_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);
-
- va_end (args);
-
- return signal_id;
-}
-
static void
gtk_menu_bar_class_init (GtkMenuBarClass *class)
{
widget_class->hierarchy_changed = gtk_menu_bar_hierarchy_changed;
menu_shell_class->submenu_placement = GTK_TOP_BOTTOM;
-
- signals[CYCLE_FOCUS] =
- binding_signal_new ("cycle_focus",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_LAST | GTK_RUN_ACTION,
- G_CALLBACK (gtk_menu_bar_cycle_focus),
- NULL, NULL,
- _gtk_marshal_VOID__ENUM,
- GTK_TYPE_NONE, 1,
- GTK_TYPE_DIRECTION_TYPE);
+ menu_shell_class->get_popup_delay = gtk_menu_bar_get_popup_delay;
binding_set = gtk_binding_set_by_class (class);
gtk_binding_entry_add_signal (binding_set,
"move_current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
- gtk_binding_entry_add_signal (binding_set,
- GDK_Tab, GDK_CONTROL_MASK,
- "move_focus", 1,
- GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
- gtk_binding_entry_add_signal (binding_set,
- GDK_KP_Tab, GDK_CONTROL_MASK,
- "move_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,
- "move_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,
- "move_focus", 1,
- GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
gtk_widget_class_install_style_property (widget_class,
g_param_spec_enum ("shadow_type",
DEFAULT_IPADDING,
G_PARAM_READABLE));
+ gtk_settings_install_property (g_param_spec_int ("gtk-menu-bar-popup-delay",
+ _("Delay before drop down menus appear"),
+ _("Delay before the submenus of a menu bar appear"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
}
GtkWidget*
gtk_menu_bar_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_menu_bar_get_type ()));
+ return g_object_new (GTK_TYPE_MENU_BAR, NULL);
}
static void
GtkRequisition child_requisition;
guint offset;
gint ipadding;
-
+ GtkTextDirection direction;
+ gint ltr_x;
+
g_return_if_fail (GTK_IS_MENU_BAR (widget));
g_return_if_fail (allocation != NULL);
menu_bar = GTK_MENU_BAR (widget);
menu_shell = GTK_MENU_SHELL (widget);
+ direction = gtk_widget_get_direction (widget);
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
gdk_window_move_resize (widget->window,
child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2);
offset = child_allocation.x; /* Window edge to menubar start */
+ ltr_x = child_allocation.x;
children = menu_shell->children;
while (children)
if ((children == NULL) && (GTK_IS_MENU_ITEM(child))
&& (GTK_MENU_ITEM(child)->right_justify))
{
- child_allocation.x = allocation->width -
- child_requisition.width - offset;
+ ltr_x = allocation->width -
+ child_requisition.width - offset;
}
if (GTK_WIDGET_VISIBLE (child))
{
+ if (direction == GTK_TEXT_DIR_LTR)
+ child_allocation.x = ltr_x;
+ else
+ child_allocation.x = allocation->width -
+ child_requisition.width - ltr_x;
+
child_allocation.width = child_requisition.width;
gtk_menu_item_toggle_size_allocate (GTK_MENU_ITEM (child),
toggle_size);
gtk_widget_size_allocate (child, &child_allocation);
- child_allocation.x += child_allocation.width + CHILD_SPACING * 2;
+ ltr_x += child_allocation.width + CHILD_SPACING * 2;
}
}
}
return g_object_get_data (G_OBJECT (window), "gtk-menu-bar-list");
}
+static GList *
+get_viewable_menu_bars (GtkWindow *window)
+{
+ GList *menu_bars;
+ GList *viewable_menu_bars = NULL;
+
+ for (menu_bars = get_menu_bars (window);
+ menu_bars;
+ menu_bars = menu_bars->next)
+ {
+ GtkWidget *widget = menu_bars->data;
+ gboolean viewable = TRUE;
+
+ while (widget)
+ {
+ if (!GTK_WIDGET_MAPPED (widget))
+ viewable = FALSE;
+
+ widget = widget->parent;
+ }
+
+ if (viewable)
+ viewable_menu_bars = g_list_prepend (viewable_menu_bars, menu_bars->data);
+ }
+
+ return g_list_reverse (viewable_menu_bars);
+}
+
static void
set_menu_bars (GtkWindow *window,
GList *menubars)
gchar *accel = NULL;
gboolean retval = FALSE;
- g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ g_object_get (gtk_widget_get_settings (widget),
"gtk-menu-bar-accel",
&accel,
NULL);
((event->state & gtk_accelerator_get_default_mod_mask ()) ==
(mods & gtk_accelerator_get_default_mod_mask ())))
{
- GList *menubars = get_menu_bars (GTK_WINDOW (widget));
+ GList *tmp_menubars = get_viewable_menu_bars (GTK_WINDOW (widget));
+ GList *menubars;
- menubars = _gtk_container_focus_sort (GTK_CONTAINER (widget), menubars,
+ menubars = _gtk_container_focus_sort (GTK_CONTAINER (widget), tmp_menubars,
GTK_DIR_TAB_FORWARD, NULL);
+ g_list_free (tmp_menubars);
+
if (menubars)
{
- GtkMenuShell *menushell = GTK_MENU_SHELL (menubars->data);
+ GtkMenuShell *menu_shell = GTK_MENU_SHELL (menubars->data);
- if (menushell->children)
- {
- gtk_signal_emit_by_name (GTK_OBJECT (menushell->children->data),
- "activate_item");
- retval = TRUE;
- }
+ _gtk_menu_shell_activate (menu_shell);
+ gtk_menu_shell_select_first (menu_shell, FALSE);
g_list_free (menubars);
+
+ retval = TRUE;
}
}
if (!menubars)
{
- g_signal_connect (G_OBJECT (window),
+ g_signal_connect (window,
"key_press_event",
G_CALLBACK (window_key_press_handler),
NULL);
if (!menubars)
{
- g_signal_handlers_disconnect_by_func (G_OBJECT (window),
- G_CALLBACK (window_key_press_handler),
+ g_signal_handlers_disconnect_by_func (window,
+ window_key_press_handler,
NULL);
}
add_to_window (GTK_WINDOW (toplevel), menubar);
}
-static void
-gtk_menu_bar_cycle_focus (GtkMenuBar *menubar,
- GtkDirectionType dir)
+/**
+ * _gtk_menu_bar_cycle_focus:
+ * @menubar: a #GtkMenuBar
+ * @dir: direction in which to cycle the focus
+ *
+ * Move the focus between menubars in the toplevel.
+ **/
+void
+_gtk_menu_bar_cycle_focus (GtkMenuBar *menubar,
+ GtkDirectionType dir)
{
GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menubar));
+ GtkMenuItem *to_activate = NULL;
if (GTK_WIDGET_TOPLEVEL (toplevel))
{
- GList *menubars = get_menu_bars (GTK_WINDOW (toplevel));
+ GList *tmp_menubars = get_viewable_menu_bars (GTK_WINDOW (toplevel));
+ GList *menubars;
GList *current;
- GtkMenuBar *new;
- menubars = _gtk_container_focus_sort (GTK_CONTAINER (toplevel), menubars,
+ menubars = _gtk_container_focus_sort (GTK_CONTAINER (toplevel), tmp_menubars,
dir, GTK_WIDGET (menubar));
+ g_list_free (tmp_menubars);
if (menubars)
{
current = g_list_find (menubars, menubar);
+
if (current && current->next)
- new = current->next->data;
- else
- new = menubars->data;
-
- if (new != menubar)
{
- GtkMenuShell *new_menushell = GTK_MENU_SHELL (new);
-
+ GtkMenuShell *new_menushell = GTK_MENU_SHELL (current->next->data);
if (new_menushell->children)
- {
- g_signal_emit_by_name (menubar, "cancel", 0);
- gtk_signal_emit_by_name (GTK_OBJECT (new_menushell->children->data),
- "activate_item");
- }
+ to_activate = new_menushell->children->data;
}
}
g_list_free (menubars);
}
+
+ g_signal_emit_by_name (menubar, "cancel", 0);
+
+ if (to_activate)
+ g_signal_emit_by_name (to_activate, "activate_item");
}
static GtkShadowType
"shadow_type", &shadow_type,
NULL);
-
return shadow_type;
}
+
+static gint
+gtk_menu_bar_get_popup_delay (GtkMenuShell *menu_shell)
+{
+ gint popup_delay;
+
+ g_object_get (gtk_widget_get_settings (GTK_WIDGET (menu_shell)),
+ "gtk-menu-bar-popup-delay", &popup_delay,
+ NULL);
+
+ return popup_delay;
+}
projects / ~andy / gtk / blobdiff