* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
-#include <ctype.h>
+#define GTK_MENU_INTERNALS
+
+#include <string.h> /* memset */
#include "gdk/gdkkeysyms.h"
+#include "gtkaccelmap.h"
#include "gtkbindings.h"
#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"
-#include "gtksignal.h"
#include "gtkwindow.h"
#include "gtkhbox.h"
#include "gtkvscrollbar.h"
+#include "gtksettings.h"
+#include "gtkintl.h"
#define MENU_ITEM_CLASS(w) GTK_MENU_ITEM_GET_CLASS (w)
#define MENU_NEEDS_RESIZE(m) GTK_MENU_SHELL (m)->menu_flag
-#define SUBMENU_NAV_REGION_PADDING 2
-#define SUBMENU_NAV_HYSTERESIS_TIMEOUT 333
+#define DEFAULT_POPUP_DELAY 225
+#define DEFAULT_POPDOWN_DELAY 1000
+
+#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
+ * extends below the submenu
+ */
#define MENU_SCROLL_STEP 10
#define MENU_SCROLL_ARROW_HEIGHT 16
#define MENU_SCROLL_TIMEOUT2 50
typedef struct _GtkMenuAttachData GtkMenuAttachData;
+typedef struct _GtkMenuPrivate GtkMenuPrivate;
struct _GtkMenuAttachData
{
GtkMenuDetachFunc detacher;
};
+struct _GtkMenuPrivate
+{
+ gboolean have_position;
+ gint x;
+ gint y;
+};
+
+enum {
+ PROP_0,
+ PROP_TEAROFF_TITLE
+};
static void gtk_menu_class_init (GtkMenuClass *klass);
static void gtk_menu_init (GtkMenu *menu);
+static void gtk_menu_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_menu_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_menu_destroy (GtkObject *object);
+static void gtk_menu_finalize (GObject *object);
static void gtk_menu_realize (GtkWidget *widget);
static void gtk_menu_unrealize (GtkWidget *widget);
static void gtk_menu_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_menu_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static void gtk_menu_paint (GtkWidget *widget);
+static void gtk_menu_paint (GtkWidget *widget,
+ GdkEventExpose *expose);
+static void gtk_menu_show (GtkWidget *widget);
static gboolean gtk_menu_expose (GtkWidget *widget,
GdkEventExpose *event);
static gboolean gtk_menu_key_press (GtkWidget *widget,
gint offset);
static void gtk_menu_stop_scrolling (GtkMenu *menu);
static gboolean gtk_menu_scroll_timeout (gpointer data);
+static void gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item);
static void gtk_menu_select_item (GtkMenuShell *menu_shell,
GtkWidget *menu_item);
-static void gtk_menu_insert (GtkMenuShell *menu_shell,
+static void gtk_menu_real_insert (GtkMenuShell *menu_shell,
GtkWidget *child,
gint position);
static void gtk_menu_scrollbar_changed (GtkAdjustment *adjustment,
gboolean enter);
static void gtk_menu_set_tearoff_hints (GtkMenu *menu,
gint width);
+static void gtk_menu_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
+static gboolean gtk_menu_focus (GtkWidget *widget,
+ GtkDirectionType direction);
+static gint gtk_menu_get_popup_delay (GtkMenuShell *menu_shell);
+
static void gtk_menu_stop_navigating_submenu (GtkMenu *menu);
static gboolean gtk_menu_stop_navigating_submenu_cb (gpointer user_data);
static void gtk_menu_remove (GtkContainer *menu,
GtkWidget *widget);
+static void gtk_menu_update_title (GtkMenu *menu);
+
+static void menu_grab_transfer_window_destroy (GtkMenu *menu);
+static GdkWindow *menu_grab_transfer_window_get (GtkMenu *menu);
+
+static void _gtk_menu_refresh_accel_paths (GtkMenu *menu,
+ gboolean group_changed);
+
static GtkMenuShellClass *parent_class = NULL;
static const gchar *attach_data_key = "gtk-menu-attach-data";
-static GQuark quark_uline_accel_group = 0;
-GtkType
+GtkMenuPrivate *
+gtk_menu_get_private (GtkMenu *menu)
+{
+ GtkMenuPrivate *private;
+ static GQuark private_quark = 0;
+
+ if (!private_quark)
+ private_quark = g_quark_from_static_string ("gtk-menu-private");
+
+ private = g_object_get_qdata (G_OBJECT (menu), private_quark);
+
+ if (!private)
+ {
+ private = g_new0 (GtkMenuPrivate, 1);
+ private->have_position = FALSE;
+
+ g_object_set_qdata_full (G_OBJECT (menu), private_quark,
+ private, g_free);
+ }
+
+ return private;
+}
+
+GType
gtk_menu_get_type (void)
{
- static GtkType menu_type = 0;
+ static GType menu_type = 0;
if (!menu_type)
{
- static const GtkTypeInfo menu_info =
+ static const GTypeInfo menu_info =
{
- "GtkMenu",
- sizeof (GtkMenu),
sizeof (GtkMenuClass),
- (GtkClassInitFunc) gtk_menu_class_init,
- (GtkObjectInitFunc) gtk_menu_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL,
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_menu_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkMenu),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_menu_init,
};
- menu_type = gtk_type_unique (gtk_menu_shell_get_type (), &menu_info);
+ menu_type = g_type_register_static (GTK_TYPE_MENU_SHELL, "GtkMenu",
+ &menu_info, 0);
}
return menu_type;
static void
gtk_menu_class_init (GtkMenuClass *class)
{
- GtkObjectClass *object_class;
- GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
- GtkMenuShellClass *menu_shell_class;
-
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+ GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
+ GtkMenuShellClass *menu_shell_class = GTK_MENU_SHELL_CLASS (class);
GtkBindingSet *binding_set;
- object_class = (GtkObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
- container_class = (GtkContainerClass*) class;
- menu_shell_class = (GtkMenuShellClass*) class;
- parent_class = gtk_type_class (gtk_menu_shell_get_type ());
+ parent_class = g_type_class_peek_parent (class);
+ gobject_class->finalize = gtk_menu_finalize;
+ gobject_class->set_property = gtk_menu_set_property;
+ gobject_class->get_property = gtk_menu_get_property;
+
+ g_object_class_install_property (gobject_class,
+ PROP_TEAROFF_TITLE,
+ g_param_spec_string ("tearoff-title",
+ _("Tearoff Title"),
+ _("A title that may be displayed by the window manager when this menu is torn-off"),
+ "",
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
+
object_class->destroy = gtk_menu_destroy;
widget_class->realize = gtk_menu_realize;
widget_class->unrealize = gtk_menu_unrealize;
widget_class->size_request = gtk_menu_size_request;
widget_class->size_allocate = gtk_menu_size_allocate;
+ widget_class->show = gtk_menu_show;
widget_class->expose_event = gtk_menu_expose;
widget_class->key_press_event = gtk_menu_key_press;
widget_class->motion_notify_event = gtk_menu_motion_notify;
widget_class->hide_all = gtk_menu_hide_all;
widget_class->enter_notify_event = gtk_menu_enter_notify;
widget_class->leave_notify_event = gtk_menu_leave_notify;
+ widget_class->style_set = gtk_menu_style_set;
+ widget_class->focus = gtk_menu_focus;
container_class->remove = gtk_menu_remove;
menu_shell_class->submenu_placement = GTK_LEFT_RIGHT;
menu_shell_class->deactivate = gtk_menu_deactivate;
menu_shell_class->select_item = gtk_menu_select_item;
- menu_shell_class->insert = gtk_menu_insert;
+ menu_shell_class->insert = gtk_menu_real_insert;
+ menu_shell_class->get_popup_delay = gtk_menu_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_PREV);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KP_Up, 0,
+ "move_current", 1,
+ GTK_TYPE_MENU_DIRECTION_TYPE,
+ GTK_MENU_DIR_PREV);
gtk_binding_entry_add_signal (binding_set,
GDK_Down, 0,
"move_current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_NEXT);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KP_Down, 0,
+ "move_current", 1,
+ GTK_TYPE_MENU_DIRECTION_TYPE,
+ GTK_MENU_DIR_NEXT);
gtk_binding_entry_add_signal (binding_set,
GDK_Left, 0,
"move_current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_PARENT);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KP_Left, 0,
+ "move_current", 1,
+ GTK_TYPE_MENU_DIRECTION_TYPE,
+ GTK_MENU_DIR_PARENT);
gtk_binding_entry_add_signal (binding_set,
GDK_Right, 0,
"move_current", 1,
GTK_TYPE_MENU_DIRECTION_TYPE,
GTK_MENU_DIR_CHILD);
+ gtk_binding_entry_add_signal (binding_set,
+ GDK_KP_Right, 0,
+ "move_current", 1,
+ GTK_TYPE_MENU_DIRECTION_TYPE,
+ GTK_MENU_DIR_CHILD);
+
+ gtk_settings_install_property (g_param_spec_boolean ("gtk-can-change-accels",
+ _("Can change accelerators"),
+ _("Whether menu accelerators can be changed by pressing a key over the menu item"),
+ FALSE,
+ G_PARAM_READWRITE));
+
+ gtk_settings_install_property (g_param_spec_int ("gtk-menu-popup-delay",
+ _("Delay before submenus appear"),
+ _("Minimum time the pointer must stay over a menu item before the submenu appear"),
+ 0,
+ G_MAXINT,
+ DEFAULT_POPUP_DELAY,
+ G_PARAM_READWRITE));
+
+ gtk_settings_install_property (g_param_spec_int ("gtk-menu-popdown-delay",
+ _("Delay before hiding a submenu"),
+ _("The time before hiding a submenu when the pointer is moving towards the submenu"),
+ 0,
+ G_MAXINT,
+ DEFAULT_POPDOWN_DELAY,
+ G_PARAM_READWRITE));
+
+}
+
+
+static void
+gtk_menu_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkMenu *menu;
+
+ menu = GTK_MENU (object);
+
+ switch (prop_id)
+ {
+ case PROP_TEAROFF_TITLE:
+ gtk_menu_set_title (menu, g_value_get_string (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gtk_menu_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkMenu *menu;
+
+ menu = GTK_MENU (object);
+
+ switch (prop_id)
+ {
+ case PROP_TEAROFF_TITLE:
+ g_value_set_string (value, gtk_menu_get_title (menu));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
static gboolean
{
gboolean handled = FALSE;
- gtk_widget_ref (window);
- gtk_widget_ref (menu);
+ g_object_ref (window);
+ g_object_ref (menu);
switch (event->type)
{
break;
}
- gtk_widget_unref (window);
- gtk_widget_unref (menu);
+ g_object_unref (window);
+ g_object_unref (menu);
return handled;
}
+static void
+gtk_menu_window_size_request (GtkWidget *window,
+ GtkRequisition *requisition,
+ GtkMenu *menu)
+{
+ GtkMenuPrivate *private = gtk_menu_get_private (menu);
+
+ if (private->have_position)
+ {
+ gint screen_height = gdk_screen_height ();
+
+ if (private->y + requisition->height > screen_height)
+ requisition->height = screen_height - private->y;
+ }
+}
+
static void
gtk_menu_init (GtkMenu *menu)
{
menu->position_func_data = NULL;
menu->toggle_size = 0;
- menu->toplevel = gtk_widget_new (GTK_TYPE_WINDOW,
- "type", GTK_WINDOW_POPUP,
- "signal::event", gtk_menu_window_event, menu,
- "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
- "child", menu,
- NULL);
- gtk_window_set_policy (GTK_WINDOW (menu->toplevel),
- FALSE, FALSE, TRUE);
+ menu->toplevel = g_object_connect (g_object_new (GTK_TYPE_WINDOW,
+ "type", GTK_WINDOW_POPUP,
+ "child", menu,
+ NULL),
+ "signal::event", gtk_menu_window_event, menu,
+ "signal::size_request", gtk_menu_window_size_request, menu,
+ "signal::destroy", gtk_widget_destroyed, &menu->toplevel,
+ NULL);
+ gtk_window_set_resizable (GTK_WINDOW (menu->toplevel), FALSE);
+ gtk_window_set_mnemonic_modifier (GTK_WINDOW (menu->toplevel), 0);
/* Refloat the menu, so that reference counting for the menu isn't
* affected by it being a child of the toplevel
gtk_menu_stop_scrolling (menu);
- data = gtk_object_get_data (object, attach_data_key);
+ data = g_object_get_data (G_OBJECT (object), attach_data_key);
if (data)
gtk_menu_detach (menu);
gtk_menu_stop_navigating_submenu (menu);
- gtk_menu_set_accel_group (menu, NULL);
-
if (menu->old_active_menu_item)
{
- gtk_widget_unref (menu->old_active_menu_item);
+ g_object_unref (menu->old_active_menu_item);
menu->old_active_menu_item = NULL;
}
if (menu->needs_destruction_ref_count)
{
menu->needs_destruction_ref_count = FALSE;
- gtk_object_ref (object);
+ g_object_ref (object);
}
+ if (menu->accel_group)
+ {
+ g_object_unref (menu->accel_group);
+ menu->accel_group = NULL;
+ }
+
if (menu->toplevel)
gtk_widget_destroy (menu->toplevel);
if (menu->tearoff_window)
GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
+static void
+gtk_menu_finalize (GObject *object)
+{
+ GtkMenu *menu = GTK_MENU (object);
+
+ g_free (menu->accel_path);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
+}
void
gtk_menu_attach_to_widget (GtkMenu *menu,
{
GtkMenuAttachData *data;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
- g_return_if_fail (attach_widget != NULL);
g_return_if_fail (GTK_IS_WIDGET (attach_widget));
g_return_if_fail (detacher != NULL);
/* keep this function in sync with gtk_widget_set_parent()
*/
- data = gtk_object_get_data (GTK_OBJECT (menu), attach_data_key);
+ data = g_object_get_data (G_OBJECT (menu), attach_data_key);
if (data)
{
g_warning ("gtk_menu_attach_to_widget(): menu already attached to %s",
- gtk_type_name (GTK_OBJECT_TYPE (data->attach_widget)));
+ g_type_name (G_TYPE_FROM_INSTANCE (data->attach_widget)));
return;
}
- gtk_object_ref (GTK_OBJECT (menu));
+ g_object_ref (menu);
gtk_object_sink (GTK_OBJECT (menu));
data = g_new (GtkMenuAttachData, 1);
data->attach_widget = attach_widget;
data->detacher = detacher;
- gtk_object_set_data (GTK_OBJECT (menu), attach_data_key, data);
+ g_object_set_data (G_OBJECT (menu), attach_data_key, data);
if (GTK_WIDGET_STATE (menu) != GTK_STATE_NORMAL)
gtk_widget_set_state (GTK_WIDGET (menu), GTK_STATE_NORMAL);
/* we don't need to set the style here, since
* we are a toplevel widget.
*/
+
+ /* Fallback title for menu comes from attach widget */
+ gtk_menu_update_title (menu);
}
GtkWidget*
{
GtkMenuAttachData *data;
- g_return_val_if_fail (menu != NULL, NULL);
g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
- data = gtk_object_get_data (GTK_OBJECT (menu), attach_data_key);
+ data = g_object_get_data (G_OBJECT (menu), attach_data_key);
if (data)
return data->attach_widget;
return NULL;
{
GtkMenuAttachData *data;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
/* keep this function in sync with gtk_widget_unparent()
*/
- data = gtk_object_get_data (GTK_OBJECT (menu), attach_data_key);
+ data = g_object_get_data (G_OBJECT (menu), attach_data_key);
if (!data)
{
g_warning ("gtk_menu_detach(): menu is not attached");
return;
}
- gtk_object_remove_data (GTK_OBJECT (menu), attach_data_key);
+ g_object_set_data (G_OBJECT (menu), attach_data_key, NULL);
data->detacher (data->attach_widget, menu);
g_free (data);
- gtk_widget_unref (GTK_WIDGET (menu));
+ /* Fallback title for menu comes from attach widget */
+ gtk_menu_update_title (menu);
+
+ g_object_unref (menu);
}
-void
-gtk_menu_remove(GtkContainer *container,
- GtkWidget *widget)
+static void
+gtk_menu_remove (GtkContainer *container,
+ GtkWidget *widget)
{
GtkMenu *menu;
g_return_if_fail (GTK_IS_MENU (container));
*/
if (menu->old_active_menu_item == widget)
{
- gtk_widget_unref (menu->old_active_menu_item);
+ g_object_unref (menu->old_active_menu_item);
menu->old_active_menu_item = NULL;
}
GtkWidget*
gtk_menu_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_menu_get_type ()));
+ return g_object_new (GTK_TYPE_MENU, NULL);
}
static void
-gtk_menu_insert (GtkMenuShell *menu_shell,
- GtkWidget *child,
- gint position)
+gtk_menu_real_insert (GtkMenuShell *menu_shell,
+ GtkWidget *child,
+ gint position)
{
+ if (GTK_WIDGET_REALIZED (menu_shell))
+ gtk_widget_set_parent_window (child, GTK_MENU (menu_shell)->bin_window);
+
GTK_MENU_SHELL_CLASS (parent_class)->insert (menu_shell, child, position);
-
- gtk_widget_set_parent_window (child, GTK_MENU (menu_shell)->bin_window);
}
static void
gc = gdk_gc_new_with_values (widget->window,
&gc_values, GDK_GC_SUBWINDOW);
- gdk_window_get_size (menu->tearoff_window->window, &width, &height);
+ gdk_drawable_get_size (menu->tearoff_window->window, &width, &height);
pixmap = gdk_pixmap_new (menu->tearoff_window->window,
width,
height,
-1);
- gdk_draw_pixmap (pixmap, gc,
- menu->tearoff_window->window,
- 0, 0, 0, 0, -1, -1);
- gdk_gc_unref (gc);
+ gdk_draw_drawable (pixmap, gc,
+ menu->tearoff_window->window,
+ 0, 0, 0, 0, -1, -1);
+ g_object_unref (gc);
- gtk_widget_set_usize (menu->tearoff_window,
- width,
- height);
+ gtk_widget_set_size_request (menu->tearoff_window,
+ width,
+ height);
gdk_window_set_back_pixmap (menu->tearoff_window->window, pixmap, FALSE);
- gdk_pixmap_unref (pixmap);
+ g_object_unref (pixmap);
}
}
+static gboolean
+popup_grab_on_window (GdkWindow *window,
+ guint32 activate_time)
+{
+ if ((gdk_pointer_grab (window, TRUE,
+ GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+ GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+ GDK_POINTER_MOTION_MASK,
+ NULL, NULL, activate_time) == 0))
+ {
+ if (gdk_keyboard_grab (window, TRUE,
+ activate_time) == 0)
+ return TRUE;
+ else
+ {
+ gdk_display_pointer_ungrab (gdk_drawable_get_display (window),
+ activate_time);
+ return FALSE;
+ }
+ }
+
+ return FALSE;
+}
+
+/**
+ * gtk_menu_popup:
+ * @menu: a #GtkMenu.
+ * @parent_menu_shell: the menu shell containing the triggering menu item, or %NULL
+ * @parent_menu_item: the menu item whose activation triggered the popup, or %NULL
+ * @func: a user supplied function used to position the menu, or %NULL
+ * @data: user supplied data to be passed to @func.
+ * @button: the mouse button which was pressed to initiate the event.
+ * @activate_time: the time at which the activation event occurred.
+ *
+ * Displays a menu and makes it available for selection. Applications can use
+ * this function to display context-sensitive menus, and will typically supply
+ * %NULL for the @parent_menu_shell, @parent_menu_item, @func and @data
+ * parameters. The default menu positioning function will position the menu
+ * at the current mouse cursor position.
+ *
+ * The @button parameter should be the mouse button pressed to initiate
+ * the menu popup. If the menu popup was initiated by something other than
+ * a mouse button press, such as a mouse button release or a keypress,
+ * @button should be 0.
+ *
+ * The @activate_time parameter should be the time stamp of the event that
+ * initiated the popup. If such an event is not available, use
+ * gtk_get_current_event_time() instead.
+ *
+ */
void
gtk_menu_popup (GtkMenu *menu,
GtkWidget *parent_menu_shell,
GtkWidget *parent;
GdkEvent *current_event;
GtkMenuShell *menu_shell;
+ GtkMenuAttachData *attach_data;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
widget = GTK_WIDGET (menu);
menu_shell = GTK_MENU_SHELL (menu);
menu_shell->parent_menu_shell = parent_menu_shell;
+
+ if (!g_object_get_data (G_OBJECT (menu), "gtk-menu-explicit-screen"))
+ {
+ /* The screen was not set explicitly, if the menu is
+ * attached to a widget, try to get screen from its
+ * toplevel window else go with the default
+ */
+ attach_data = g_object_get_data (G_OBJECT (menu), attach_data_key);
+ if (attach_data)
+ {
+ if (!GTK_WIDGET_REALIZED (menu))
+ gtk_window_set_screen (GTK_WINDOW (menu->toplevel),
+ gtk_widget_get_screen (attach_data->attach_widget));
+ }
+ }
+
+ /* Find the last viewable ancestor, and make an X grab on it
+ */
+ parent = GTK_WIDGET (menu);
+ xgrab_shell = NULL;
+ while (parent)
+ {
+ gboolean viewable = TRUE;
+ GtkWidget *tmp = parent;
+
+ while (tmp)
+ {
+ if (!GTK_WIDGET_MAPPED (tmp))
+ {
+ viewable = FALSE;
+ break;
+ }
+ tmp = tmp->parent;
+ }
+
+ if (viewable)
+ xgrab_shell = parent;
+
+ parent = GTK_MENU_SHELL (parent)->parent_menu_shell;
+ }
+
+ /* We want to receive events generated when we map the menu; unfortunately,
+ * since there is probably already an implicit grab in place from the
+ * button that the user used to pop up the menu, we won't receive then --
+ * in particular, the EnterNotify when the menu pops up under the pointer.
+ *
+ * If we are grabbing on a parent menu shell, no problem; just grab on
+ * that menu shell first before popping up the window with owner_events = TRUE.
+ *
+ * When grabbing on the menu itself, things get more convuluted - we
+ * we do an explicit grab on a specially created window with
+ * owner_events = TRUE, which we override further down with a grab
+ * on the menu. (We can't grab on the menu until it is mapped; we
+ * probably could just leave the grab on the other window, with a
+ * little reorganization of the code in gtkmenu*).
+ */
+ if (xgrab_shell && xgrab_shell != widget)
+ {
+ if (popup_grab_on_window (xgrab_shell->window, activate_time))
+ GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
+ }
+ else
+ {
+ GdkWindow *transfer_window;
+
+ xgrab_shell = widget;
+ transfer_window = menu_grab_transfer_window_get (menu);
+ if (popup_grab_on_window (transfer_window, activate_time))
+ GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
+ }
+
+ if (!GTK_MENU_SHELL (xgrab_shell)->have_xgrab)
+ {
+ /* We failed to make our pointer/keyboard grab. Rather than leaving the user
+ * with a stuck up window, we just abort here. Presumably the user will
+ * try again.
+ */
+ menu_shell->parent_menu_shell = NULL;
+ menu_grab_transfer_window_destroy (menu);
+ return;
+ }
+
menu_shell->active = TRUE;
menu_shell->button = button;
* until we get a MOTION_NOTIFY.
*/
- current_event = gtk_get_current_event();
+ current_event = gtk_get_current_event ();
if (current_event)
{
if ((current_event->type != GDK_BUTTON_PRESS) &&
(current_event->type != GDK_ENTER_NOTIFY))
menu_shell->ignore_enter = TRUE;
+
gdk_event_free (current_event);
}
menu->position_func_data = data;
menu_shell->activate_time = activate_time;
- gtk_menu_position (menu);
-
- /* We need to show the menu _here_ because code expects to be
- * able to tell if the menu is onscreen by looking at the
- * GTK_WIDGET_VISIBLE (menu)
+ /* We need to show the menu here rather in the init function because
+ * code expects to be able to tell if the menu is onscreen by
+ * looking at the GTK_WIDGET_VISIBLE (menu)
*/
gtk_widget_show (GTK_WIDGET (menu));
- gtk_widget_show (menu->toplevel);
- /* Find the last viewable ancestor, and make an X grab on it
+ /* Position the menu, possibly changing the size request
*/
- parent = GTK_WIDGET (menu);
- xgrab_shell = NULL;
- while (parent)
- {
- gboolean viewable = TRUE;
- GtkWidget *tmp = parent;
-
- while (tmp)
- {
- if (!GTK_WIDGET_MAPPED (tmp))
- {
- viewable = FALSE;
- break;
- }
- tmp = tmp->parent;
- }
-
- if (viewable)
- xgrab_shell = parent;
-
- parent = GTK_MENU_SHELL (parent)->parent_menu_shell;
- }
-
- if (xgrab_shell && (!GTK_MENU_SHELL (xgrab_shell)->have_xgrab))
- {
- GdkCursor *cursor = gdk_cursor_new (GDK_ARROW);
+ gtk_menu_position (menu);
- if ((gdk_pointer_grab (xgrab_shell->window, TRUE,
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
- GDK_POINTER_MOTION_MASK,
- NULL, cursor, activate_time) == 0))
- {
- if (gdk_keyboard_grab (xgrab_shell->window, TRUE,
- activate_time) == 0)
- GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
- else
- {
- gdk_pointer_ungrab (activate_time);
- }
- }
+ /* Compute the size of the toplevel and realize it so we
+ * can scroll correctly.
+ */
+ {
+ GtkRequisition tmp_request;
+ GtkAllocation tmp_allocation = { 0, };
- gdk_cursor_destroy (cursor);
- }
+ gtk_widget_size_request (menu->toplevel, &tmp_request);
+
+ tmp_allocation.width = tmp_request.width;
+ tmp_allocation.height = tmp_request.height;
+
+ gtk_widget_size_allocate (menu->toplevel, &tmp_allocation);
+
+ gtk_widget_realize (GTK_WIDGET (menu));
+ }
gtk_menu_scroll_to (menu, menu->scroll_offset);
+ /* Once everything is set up correctly, map the toplevel window on
+ the screen.
+ */
+ gtk_widget_show (menu->toplevel);
+
+ if (xgrab_shell == widget)
+ popup_grab_on_window (widget->window, activate_time); /* Should always succeed */
+
gtk_grab_add (GTK_WIDGET (menu));
}
void
gtk_menu_popdown (GtkMenu *menu)
{
+ GtkMenuPrivate *private;
GtkMenuShell *menu_shell;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
menu_shell = GTK_MENU_SHELL (menu);
+ private = gtk_menu_get_private (menu);
menu_shell->parent_menu_shell = NULL;
menu_shell->active = FALSE;
menu_shell->ignore_enter = FALSE;
+ private->have_position = FALSE;
+
gtk_menu_stop_scrolling (menu);
gtk_menu_stop_navigating_submenu (menu);
if (menu_shell->active_menu_item)
{
if (menu->old_active_menu_item)
- gtk_widget_unref (menu->old_active_menu_item);
+ g_object_unref (menu->old_active_menu_item);
menu->old_active_menu_item = menu_shell->active_menu_item;
- gtk_widget_ref (menu->old_active_menu_item);
+ g_object_ref (menu->old_active_menu_item);
}
gtk_menu_shell_deselect (menu_shell);
if (menu->torn_off)
{
- gint width, height;
- gdk_window_get_size (menu->tearoff_window->window, &width, &height);
- gtk_widget_set_usize (menu->tearoff_window,
- -1,
- height);
+ gtk_widget_set_size_request (menu->tearoff_window, -1, -1);
if (GTK_BIN (menu->toplevel)->child)
{
*/
if (menu_shell->have_xgrab)
{
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
- gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (menu));
+
+ gdk_display_pointer_ungrab (display, GDK_CURRENT_TIME);
+ gdk_display_keyboard_ungrab (display, GDK_CURRENT_TIME);
}
}
menu_shell->have_xgrab = FALSE;
gtk_grab_remove (GTK_WIDGET (menu));
+
+ menu_grab_transfer_window_destroy (menu);
}
GtkWidget*
GtkWidget *child;
GList *children;
- g_return_val_if_fail (menu != NULL, NULL);
g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
if (!menu->old_active_menu_item)
menu->old_active_menu_item = child;
if (menu->old_active_menu_item)
- gtk_widget_ref (menu->old_active_menu_item);
+ g_object_ref (menu->old_active_menu_item);
}
return menu->old_active_menu_item;
GtkWidget *child;
GList *tmp_list;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
tmp_list = g_list_nth (GTK_MENU_SHELL (menu)->children, index);
if (GTK_BIN (child)->child)
{
if (menu->old_active_menu_item)
- gtk_widget_unref (menu->old_active_menu_item);
+ g_object_unref (menu->old_active_menu_item);
menu->old_active_menu_item = child;
- gtk_widget_ref (menu->old_active_menu_item);
+ g_object_ref (menu->old_active_menu_item);
}
}
}
if (menu->accel_group != accel_group)
{
if (menu->accel_group)
- gtk_accel_group_unref (menu->accel_group);
+ g_object_unref (menu->accel_group);
menu->accel_group = accel_group;
if (menu->accel_group)
- gtk_accel_group_ref (menu->accel_group);
+ g_object_ref (menu->accel_group);
+ _gtk_menu_refresh_accel_paths (menu, TRUE);
}
}
return menu->accel_group;
}
-GtkAccelGroup*
-gtk_menu_ensure_uline_accel_group (GtkMenu *menu)
+/**
+ * gtk_menu_set_accel_path
+ * @menu: a valid #GtkMenu
+ * @accel_path: a valid accelerator path
+ *
+ * Sets an accelerator path for this menu from which accelerator paths
+ * for its immediate children, its menu items, can be constructed.
+ * The main purpose of this function is to spare the programmer the
+ * inconvenience of having to call gtk_menu_item_set_accel_path() on
+ * each menu item that should support runtime user changable accelerators.
+ * Instead, by just calling gtk_menu_set_accel_path() on their parent,
+ * each menu item of this menu, that contains a label describing its purpose,
+ * automatically gets an accel path assigned. For example, a menu containing
+ * menu items "New" and "Exit", will, after
+ * <literal>gtk_menu_set_accel_path (menu, "<Gnumeric-Sheet>/File");</literal>
+ * has been called, assign its items the accel paths:
+ * <literal>"<Gnumeric-Sheet>/File/New"</literal> and <literal>"<Gnumeric-Sheet>/File/Exit"</literal>.
+ * Assigning accel paths to menu items then enables the user to change
+ * their accelerators at runtime. More details about accelerator paths
+ * and their default setups can be found at gtk_accel_map_add_entry().
+ */
+void
+gtk_menu_set_accel_path (GtkMenu *menu,
+ const gchar *accel_path)
{
- GtkAccelGroup *accel_group;
+ g_return_if_fail (GTK_IS_MENU (menu));
+ if (accel_path)
+ g_return_if_fail (accel_path[0] == '<' && strchr (accel_path, '/')); /* simplistic check */
- g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
+ g_free (menu->accel_path);
+ menu->accel_path = g_strdup (accel_path);
+ if (menu->accel_path)
+ _gtk_menu_refresh_accel_paths (menu, FALSE);
+}
- if (!quark_uline_accel_group)
- quark_uline_accel_group = g_quark_from_static_string ("GtkMenu-uline-accel-group");
+typedef struct {
+ GtkMenu *menu;
+ gboolean group_changed;
+} AccelPropagation;
- accel_group = gtk_object_get_data_by_id (GTK_OBJECT (menu), quark_uline_accel_group);
- if (!accel_group)
- {
- accel_group = gtk_accel_group_new ();
- gtk_accel_group_attach (accel_group, GTK_OBJECT (menu));
- gtk_object_set_data_by_id_full (GTK_OBJECT (menu),
- quark_uline_accel_group,
- accel_group,
- (GtkDestroyNotify) gtk_accel_group_unref);
- }
+static void
+refresh_accel_paths_foreach (GtkWidget *widget,
+ gpointer data)
+{
+ AccelPropagation *prop = data;
- return accel_group;
+ if (GTK_IS_MENU_ITEM (widget)) /* should always be true */
+ _gtk_menu_item_refresh_accel_path (GTK_MENU_ITEM (widget),
+ prop->menu->accel_path,
+ prop->menu->accel_group,
+ prop->group_changed);
}
-GtkAccelGroup*
-gtk_menu_get_uline_accel_group (GtkMenu *menu)
+static void
+_gtk_menu_refresh_accel_paths (GtkMenu *menu,
+ gboolean group_changed)
{
- g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
+ g_return_if_fail (GTK_IS_MENU (menu));
+
+ if (menu->accel_path && menu->accel_group)
+ {
+ AccelPropagation prop;
- return gtk_object_get_data_by_id (GTK_OBJECT (menu), quark_uline_accel_group);
+ prop.menu = menu;
+ prop.group_changed = group_changed;
+ gtk_container_foreach (GTK_CONTAINER (menu),
+ refresh_accel_paths_foreach,
+ &prop);
+ }
}
void
gtk_menu_reposition (GtkMenu *menu)
{
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (GTK_WIDGET_DRAWABLE (menu) && !menu->torn_off)
gtk_menu_scrollbar_changed (GtkAdjustment *adjustment,
GtkMenu *menu)
{
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (adjustment->value != menu->scroll_offset)
}
static void
-gtk_menu_set_tearoff_hints(GtkMenu *menu,
- gint width)
+gtk_menu_set_tearoff_hints (GtkMenu *menu,
+ gint width)
{
GdkGeometry geometry_hints;
if (!menu->tearoff_window)
return;
+ if (GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
+ {
+ gtk_widget_size_request (menu->tearoff_scrollbar, NULL);
+ width += menu->tearoff_scrollbar->requisition.width;
+ }
+
geometry_hints.min_width = width;
geometry_hints.max_width = width;
geometry_hints.min_height = 0;
geometry_hints.max_height = GTK_WIDGET (menu)->requisition.height;
+
gtk_window_set_geometry_hints (GTK_WINDOW (menu->tearoff_window),
NULL,
&geometry_hints,
GDK_HINT_MAX_SIZE|GDK_HINT_MIN_SIZE);
}
+static void
+gtk_menu_update_title (GtkMenu *menu)
+{
+ if (menu->tearoff_window)
+ {
+ const gchar *title;
+ GtkWidget *attach_widget;
+
+ title = gtk_menu_get_title (menu);
+ if (!title)
+ {
+ attach_widget = gtk_menu_get_attach_widget (menu);
+ if (GTK_IS_MENU_ITEM (attach_widget))
+ {
+ GtkWidget *child = GTK_BIN (attach_widget)->child;
+ if (GTK_IS_LABEL (child))
+ title = gtk_label_get_text (GTK_LABEL (child));
+ }
+ }
+
+ if (title)
+ gtk_window_set_title (GTK_WINDOW (menu->tearoff_window), title);
+ }
+}
void
gtk_menu_set_tearoff_state (GtkMenu *menu,
{
gint width, height;
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
if (menu->torn_off != torn_off)
if (!menu->tearoff_window)
{
- GtkWidget *attach_widget;
- gchar *title;
-
menu->tearoff_window = gtk_widget_new (GTK_TYPE_WINDOW,
"type", GTK_WINDOW_TOPLEVEL,
- "signal::destroy", gtk_widget_destroyed, &menu->tearoff_window,
+ "screen", gtk_widget_get_screen (menu->toplevel),
+ "app_paintable", TRUE,
NULL);
- gtk_widget_set_app_paintable (menu->tearoff_window, TRUE);
- gtk_signal_connect (GTK_OBJECT (menu->tearoff_window),
- "event",
- GTK_SIGNAL_FUNC (gtk_menu_window_event),
- GTK_OBJECT (menu));
- gtk_widget_realize (menu->tearoff_window);
-
- title = gtk_object_get_data (GTK_OBJECT (menu), "gtk-menu-title");
- if (!title)
- {
- attach_widget = gtk_menu_get_attach_widget (menu);
- if (GTK_IS_MENU_ITEM (attach_widget))
- {
- GtkWidget *child = GTK_BIN (attach_widget)->child;
- if (GTK_IS_LABEL (child))
- gtk_label_get (GTK_LABEL (child), &title);
- }
- }
- if (title)
- gdk_window_set_title (menu->tearoff_window->window, title);
+ gtk_window_set_type_hint (GTK_WINDOW (menu->tearoff_window),
+ GDK_WINDOW_TYPE_HINT_MENU);
+ gtk_window_set_mnemonic_modifier (GTK_WINDOW (menu->tearoff_window), 0);
+ g_signal_connect (menu->tearoff_window, "destroy",
+ G_CALLBACK (gtk_widget_destroyed), &menu->tearoff_window);
+ g_signal_connect (menu->tearoff_window, "event",
+ G_CALLBACK (gtk_menu_window_event), menu);
- gdk_window_set_decorations (menu->tearoff_window->window,
- GDK_DECOR_ALL |
- GDK_DECOR_RESIZEH |
- GDK_DECOR_MINIMIZE |
- GDK_DECOR_MAXIMIZE);
- gtk_window_set_policy (GTK_WINDOW (menu->tearoff_window),
- FALSE, FALSE, TRUE);
+ gtk_menu_update_title (menu);
+ gtk_widget_realize (menu->tearoff_window);
+
menu->tearoff_hbox = gtk_hbox_new (FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (menu->tearoff_window), menu->tearoff_hbox);
- gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+ gdk_drawable_get_size (GTK_WIDGET (menu)->window, &width, &height);
menu->tearoff_adjustment =
GTK_ADJUSTMENT (gtk_adjustment_new (0,
0,
MENU_SCROLL_STEP,
height/2,
height));
- gtk_signal_connect (GTK_OBJECT (menu->tearoff_adjustment), "value_changed",
- gtk_menu_scrollbar_changed,
- menu);
+ g_object_connect (menu->tearoff_adjustment,
+ "signal::value_changed", gtk_menu_scrollbar_changed, menu,
+ NULL);
menu->tearoff_scrollbar = gtk_vscrollbar_new (menu->tearoff_adjustment);
gtk_box_pack_end (GTK_BOX (menu->tearoff_hbox),
}
gtk_menu_reparent (menu, menu->tearoff_hbox, FALSE);
-
- gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
- if (GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
- width += menu->tearoff_scrollbar->requisition.width;
-
+
+ gdk_drawable_get_size (GTK_WIDGET (menu)->window, &width, NULL);
+
+ /* Update menu->requisition
+ */
+ gtk_widget_size_request (GTK_WIDGET (menu), NULL);
+
gtk_menu_set_tearoff_hints (menu, width);
gtk_widget_realize (menu->tearoff_window);
}
}
+/**
+ * gtk_menu_get_tearoff_state:
+ * @menu: a #GtkMenu
+ *
+ * Returns whether the menu is torn off. See
+ * gtk_menu_set_tearoff_state ().
+ *
+ * Return value: %TRUE if the menu is currently torn off.
+ **/
+gboolean
+gtk_menu_get_tearoff_state (GtkMenu *menu)
+{
+ g_return_val_if_fail (GTK_IS_MENU (menu), FALSE);
+
+ return menu->torn_off;
+}
+
+/**
+ * gtk_menu_set_title:
+ * @menu: a #GtkMenu
+ * @title: a string containing the title for the menu.
+ *
+ * Sets the title string for the menu. The title is displayed when the menu
+ * is shown as a tearoff menu.
+ **/
void
gtk_menu_set_title (GtkMenu *menu,
const gchar *title)
{
- g_return_if_fail (menu != NULL);
g_return_if_fail (GTK_IS_MENU (menu));
- gtk_object_set_data_full (GTK_OBJECT (menu), "gtk-menu-title",
+ if (title)
+ g_object_set_data_full (G_OBJECT (menu), "gtk-menu-title",
g_strdup (title), (GtkDestroyNotify) g_free);
+ else
+ g_object_set_data (G_OBJECT (menu), "gtk-menu-title", NULL);
+
+ gtk_menu_update_title (menu);
+ g_object_notify (G_OBJECT (menu), "tearoff_title");
+}
+
+/**
+ * gtk_menu_get_title:
+ * @menu: a #GtkMenu
+ *
+ * Returns the title of the menu. See gtk_menu_set_title().
+ *
+ * Return value: the title of the menu, or %NULL if the menu has no
+ * title set on it. This string is owned by the widget and should
+ * not be modified or freed.
+ **/
+G_CONST_RETURN gchar *
+gtk_menu_get_title (GtkMenu *menu)
+{
+ g_return_val_if_fail (GTK_IS_MENU (menu), NULL);
+
+ return g_object_get_data (G_OBJECT (menu), "gtk-menu-title");
}
void
}
}
+static void
+gtk_menu_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
+{
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ GtkMenu *menu = GTK_MENU (widget);
+
+ gtk_style_set_background (widget->style, menu->bin_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, menu->view_window, GTK_STATE_NORMAL);
+ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
+ }
+}
+
static void
gtk_menu_realize (GtkWidget *widget)
{
GtkWidget *child;
GList *children;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
gtk_style_set_background (widget->style, menu->view_window, GTK_STATE_NORMAL);
gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- gtk_menu_paint (widget);
-
+ if (GTK_MENU_SHELL (widget)->active_menu_item)
+ gtk_menu_scroll_item_visible (GTK_MENU_SHELL (widget),
+ GTK_MENU_SHELL (widget)->active_menu_item);
+
gdk_window_show (menu->bin_window);
gdk_window_show (menu->view_window);
}
+static gboolean
+gtk_menu_focus (GtkWidget *widget,
+ GtkDirectionType direction)
+{
+ /*
+ * A menu or its menu items cannot have focus
+ */
+ return FALSE;
+}
+
+/* See notes in gtk_menu_popup() for information about the "grab transfer window"
+ */
+static GdkWindow *
+menu_grab_transfer_window_get (GtkMenu *menu)
+{
+ GdkWindow *window = g_object_get_data (G_OBJECT (menu), "gtk-menu-transfer-window");
+ if (!window)
+ {
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ attributes.x = -100;
+ attributes.y = -100;
+ attributes.width = 10;
+ attributes.height = 10;
+ attributes.window_type = GDK_WINDOW_TEMP;
+ attributes.wclass = GDK_INPUT_ONLY;
+ attributes.override_redirect = TRUE;
+ attributes.event_mask = 0;
+
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_NOREDIR;
+
+ window = gdk_window_new (gtk_widget_get_root_window (GTK_WIDGET (menu)),
+ &attributes, attributes_mask);
+ gdk_window_set_user_data (window, menu);
+
+ gdk_window_show (window);
+
+ g_object_set_data (G_OBJECT (menu), "gtk-menu-transfer-window", window);
+ }
+
+ return window;
+}
+
+static void
+menu_grab_transfer_window_destroy (GtkMenu *menu)
+{
+ GdkWindow *window = g_object_get_data (G_OBJECT (menu), "gtk-menu-transfer-window");
+ if (window)
+ {
+ gdk_window_set_user_data (window, NULL);
+ gdk_window_destroy (window);
+ g_object_set_data (G_OBJECT (menu), "gtk-menu-transfer-window", NULL);
+ }
+}
+
static void
gtk_menu_unrealize (GtkWidget *widget)
{
GtkMenu *menu;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
+ menu_grab_transfer_window_destroy (menu);
+
gdk_window_set_user_data (menu->view_window, NULL);
gdk_window_destroy (menu->view_window);
menu->view_window = NULL;
guint max_toggle_size;
guint max_accel_width;
GtkRequisition child_requisition;
- gint width;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
g_return_if_fail (requisition != NULL);
menu->toggle_size = max_toggle_size;
- /* If the requested width was different than the allocated width, we need to change
- * the geometry hints for the tear off window so that the window can actually be resized.
- * Don't resize the tearoff if it is not active, beacuse it won't redraw (it is only a background pixmap).
+ /* Don't resize the tearoff if it is not active, because it won't redraw (it is only a background pixmap).
*/
- if ((requisition->width != GTK_WIDGET (menu)->allocation.width) && menu->tearoff_active)
- {
- width = requisition->width;
- if (menu->tearoff_scrollbar && GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
- width += menu->tearoff_scrollbar->requisition.width;
- gtk_menu_set_tearoff_hints (menu, width);
- }
+ if (menu->tearoff_active)
+ gtk_menu_set_tearoff_hints (menu, requisition->width);
}
static void
gint x, y;
gint width, height;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
g_return_if_fail (allocation != NULL);
width = MAX (1, allocation->width - x * 2);
height = MAX (1, allocation->height - y * 2);
+
+ if (menu_shell->active)
+ gtk_menu_scroll_to (menu, menu->scroll_offset);
if (menu->upper_arrow_visible && !menu->tearoff_active)
{
{
gtk_widget_hide (menu->tearoff_scrollbar);
gtk_menu_set_tearoff_hints (menu, allocation->width);
- gtk_widget_set_usize (menu->tearoff_window, -1, allocation->height);
gtk_menu_scroll_to (menu, 0);
}
if (!GTK_WIDGET_VISIBLE (menu->tearoff_scrollbar))
{
- gtk_menu_set_tearoff_hints (menu,
- allocation->width + menu->tearoff_scrollbar->requisition.width);
gtk_widget_show (menu->tearoff_scrollbar);
- gtk_widget_set_usize (menu->tearoff_window, -1, allocation->height);
+ gtk_menu_set_tearoff_hints (menu, allocation->width);
}
}
}
}
static void
-gtk_menu_paint (GtkWidget *widget)
+gtk_menu_paint (GtkWidget *widget,
+ GdkEventExpose *event)
{
- gint border_x;
- gint border_y;
- gint width, height;
- gint menu_height;
- gint top_pos;
GtkMenu *menu;
+ gint width, height;
+ gint border_x, border_y;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
menu = GTK_MENU (widget);
- if (GTK_WIDGET_DRAWABLE (widget))
+ border_x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
+ border_y = GTK_CONTAINER (widget)->border_width + widget->style->ythickness;
+ gdk_drawable_get_size (widget->window, &width, &height);
+
+ if (event->window == widget->window)
{
gtk_paint_box (widget->style,
widget->window,
GTK_SHADOW_OUT,
NULL, widget, "menu",
0, 0, -1, -1);
-
- border_x = GTK_CONTAINER (widget)->border_width + widget->style->xthickness;
- border_y = GTK_CONTAINER (widget)->border_width + widget->style->ythickness;
- gdk_window_get_size (widget->window, &width, &height);
-
if (menu->upper_arrow_visible && !menu->tearoff_active)
{
gtk_paint_box (widget->style,
MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2,
MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
}
-
- if (menu->scroll_offset < 0)
- gtk_paint_box (widget->style,
- menu->view_window,
- GTK_STATE_ACTIVE,
- GTK_SHADOW_IN,
- NULL, widget, "menu",
- 0, 0,
- -1,
- -menu->scroll_offset);
-
- menu_height = widget->requisition.height - 2*border_y;
- top_pos = height - 2*border_y - (menu->upper_arrow_visible ? MENU_SCROLL_ARROW_HEIGHT : 0);
-
- if (menu_height - menu->scroll_offset < top_pos)
- gtk_paint_box (widget->style,
- menu->view_window,
- GTK_STATE_ACTIVE,
- GTK_SHADOW_IN,
- NULL, widget, "menu",
- 0,
- menu_height - menu->scroll_offset,
- -1,
- top_pos - (menu_height - menu->scroll_offset));
}
}
gtk_menu_expose (GtkWidget *widget,
GdkEventExpose *event)
{
- GtkMenuShell *menu_shell;
- GtkWidget *child;
- GList *children;
- GtkMenu *menu;
-
- g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
- menu_shell = GTK_MENU_SHELL (widget);
- menu = GTK_MENU (widget);
-
if (GTK_WIDGET_DRAWABLE (widget))
{
- GdkEventExpose child_event = *event;
-
- gtk_menu_paint (widget);
+ gtk_menu_paint (widget, event);
- children = menu_shell->children;
- while (children)
- {
- child = children->data;
- children = children->next;
-
- if (GTK_WIDGET_NO_WINDOW (child) &&
- gtk_widget_intersect (child, &event->area, &child_event.area))
- gtk_widget_event (child, (GdkEvent*) &child_event);
- }
+ (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
}
return FALSE;
}
+static void
+gtk_menu_show (GtkWidget *widget)
+{
+ GtkMenu *menu = GTK_MENU (widget);
+
+ _gtk_menu_refresh_accel_paths (menu, FALSE);
+
+ GTK_WIDGET_CLASS (parent_class)->show (widget);
+}
+
static gboolean
gtk_menu_key_press (GtkWidget *widget,
GdkEventKey *event)
{
GtkMenuShell *menu_shell;
+ GtkMenu *menu;
gboolean delete = FALSE;
-
- g_return_val_if_fail (widget != NULL, FALSE);
+ gboolean can_change_accels;
+ gchar *accel = NULL;
+ guint accel_key, accel_mods;
+ GdkModifierType consumed_modifiers;
+ GdkDisplay *display;
+
g_return_val_if_fail (GTK_IS_MENU (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
menu_shell = GTK_MENU_SHELL (widget);
-
- gtk_menu_stop_navigating_submenu (GTK_MENU (widget));
+ menu = GTK_MENU (widget);
+
+ gtk_menu_stop_navigating_submenu (menu);
if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
return TRUE;
+ display = gtk_widget_get_display (widget);
+
+ g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
+ "gtk-menu-bar-accel", &accel,
+ "gtk-can-change-accels", &can_change_accels,
+ NULL);
+
+ if (accel)
+ {
+ guint keyval = 0;
+ GdkModifierType mods = 0;
+ gboolean handled = FALSE;
+
+ gtk_accelerator_parse (accel, &keyval, &mods);
+
+ if (keyval == 0)
+ g_warning ("Failed to parse menu bar accelerator '%s'\n", accel);
+
+ /* FIXME this is wrong, needs to be in the global accel resolution
+ * thing, to properly consider i18n etc., but that probably requires
+ * AccelGroup changes etc.
+ */
+ if (event->keyval == keyval &&
+ (mods & event->state) == mods)
+ {
+ g_signal_emit_by_name (menu, "cancel", 0);
+ }
+
+ g_free (accel);
+
+ if (handled)
+ return TRUE;
+ }
+
switch (event->keyval)
{
case GDK_Delete:
break;
}
+ /* Figure out what modifiers went into determining the key symbol */
+ gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (display),
+ event->hardware_keycode, event->state, event->group,
+ NULL, NULL, NULL, &consumed_modifiers);
+
+ accel_key = gdk_keyval_to_lower (event->keyval);
+ accel_mods = event->state & gtk_accelerator_get_default_mod_mask () & ~consumed_modifiers;
+
+ /* If lowercasing affects the keysym, then we need to include SHIFT in the modifiers,
+ * We re-upper case when we match against the keyval, but display and save in caseless form.
+ */
+ if (accel_key != event->keyval)
+ accel_mods |= GDK_SHIFT_MASK;
+
/* Modify the accelerators */
- if (menu_shell->active_menu_item &&
- GTK_BIN (menu_shell->active_menu_item)->child &&
- GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL &&
- !gtk_widget_accelerators_locked (menu_shell->active_menu_item) &&
- (delete ||
- (gtk_accelerator_valid (event->keyval, event->state) &&
- (event->state ||
- !gtk_menu_get_uline_accel_group (GTK_MENU (menu_shell)) ||
- (event->keyval >= GDK_F1 && event->keyval <= GDK_F35)))))
- {
- GtkMenuItem *menu_item;
- GtkAccelGroup *accel_group;
-
- menu_item = GTK_MENU_ITEM (menu_shell->active_menu_item);
-
- if (!GTK_MENU (widget)->accel_group)
- accel_group = gtk_accel_group_get_default ();
+ if (can_change_accels &&
+ menu_shell->active_menu_item &&
+ GTK_BIN (menu_shell->active_menu_item)->child && /* no seperators */
+ GTK_MENU_ITEM (menu_shell->active_menu_item)->submenu == NULL && /* no submenus */
+ (delete || gtk_accelerator_valid (accel_key, accel_mods)))
+ {
+ GtkWidget *menu_item = menu_shell->active_menu_item;
+ gboolean locked, replace_accels = TRUE;
+ const gchar *path;
+
+ path = _gtk_widget_get_accel_path (menu_item, &locked);
+ if (!path || locked)
+ {
+ /* can't change accelerators on menu_items without paths
+ * (basically, those items are accelerator-locked).
+ */
+ /* g_print("item has no path or is locked, menu prefix: %s\n", menu->accel_path); */
+ gdk_display_beep (display);
+ }
else
- accel_group = GTK_MENU (widget)->accel_group;
-
- gtk_widget_remove_accelerators (GTK_WIDGET (menu_item),
- gtk_signal_name (menu_item->accelerator_signal),
- TRUE);
-
- if (!delete &&
- 0 == gtk_widget_accelerator_signal (GTK_WIDGET (menu_item),
- accel_group,
- event->keyval,
- event->state))
{
- GSList *slist;
-
- slist = gtk_accel_group_entries_from_object (GTK_OBJECT (menu_item));
- while (slist)
+ gboolean changed;
+
+ /* For the keys that act to delete the current setting, we delete
+ * the current setting if there is one, otherwise, we set the
+ * key as the accelerator.
+ */
+ if (delete)
{
- GtkAccelEntry *ac_entry;
-
- ac_entry = slist->data;
-
- if (ac_entry->signal_id == menu_item->accelerator_signal)
- break;
+ GtkAccelKey key;
- slist = slist->next;
+ if (gtk_accel_map_lookup_entry (path, &key) &&
+ (key.accel_key || key.accel_mods))
+ {
+ accel_key = 0;
+ accel_mods = 0;
+ }
+ }
+ changed = gtk_accel_map_change_entry (path, accel_key, accel_mods, replace_accels);
+
+ if (!changed)
+ {
+ /* we failed, probably because this key is in use and
+ * locked already
+ */
+ /* g_print("failed to change\n"); */
+ gdk_display_beep (display);
}
-
- if (!slist)
- gtk_widget_add_accelerator (GTK_WIDGET (menu_item),
- gtk_signal_name (menu_item->accelerator_signal),
- accel_group,
- event->keyval,
- event->state,
- GTK_ACCEL_VISIBLE);
}
}
gboolean need_enter;
-
if (GTK_IS_MENU (widget))
gtk_menu_handle_scrolling (GTK_MENU (widget), TRUE);
-
+
/* We received the event for one of two reasons:
*
* a) We are the active menu, and did gtk_grab_add()
* which may be different from 'widget'.
*/
menu_item = gtk_get_event_widget ((GdkEvent*) event);
- if (!menu_item || !GTK_IS_MENU_ITEM (menu_item) || !GTK_WIDGET_IS_SENSITIVE (menu_item) ||
+ if (!menu_item || !GTK_IS_MENU_ITEM (menu_item) ||
+ !_gtk_menu_item_is_selectable (menu_item) ||
!GTK_IS_MENU (menu_item->parent))
return FALSE;
menu_shell->ignore_enter = FALSE;
- gdk_window_get_size (event->window, &width, &height);
+ gdk_drawable_get_size (event->window, &width, &height);
if (event->x >= 0 && event->x < width &&
event->y >= 0 && event->y < height)
{
- GdkEvent send_event;
-
- memset (&send_event, 0, sizeof (send_event));
- send_event.crossing.type = GDK_ENTER_NOTIFY;
- send_event.crossing.window = event->window;
- send_event.crossing.time = event->time;
- send_event.crossing.send_event = TRUE;
- send_event.crossing.x_root = event->x_root;
- send_event.crossing.y_root = event->y_root;
- send_event.crossing.x = event->x;
- send_event.crossing.y = event->y;
+ GdkEvent *send_event = gdk_event_new (GDK_ENTER_NOTIFY);
+ gboolean result;
+
+ send_event->crossing.window = g_object_ref (event->window);
+ send_event->crossing.time = event->time;
+ send_event->crossing.send_event = TRUE;
+ send_event->crossing.x_root = event->x_root;
+ send_event->crossing.y_root = event->y_root;
+ send_event->crossing.x = event->x;
+ send_event->crossing.y = event->y;
/* We send the event to 'widget', the currently active menu,
* instead of 'menu', the menu that the pointer is in. This
* menuitem is a child of the active menu or some parent
* menu of the active menu.
*/
- return gtk_widget_event (widget, &send_event);
+ result = gtk_widget_event (widget, send_event);
+ gdk_event_free (send_event);
+
+ return result;
}
}
gint offset;
gint view_width, view_height;
+ GDK_THREADS_ENTER ();
+
menu = GTK_MENU (data);
widget = GTK_WIDGET (menu);
if ((menu->scroll_offset >= 0) && (offset < 0))
offset = 0;
- gdk_window_get_size (widget->window, &view_width, &view_height);
+ gdk_drawable_get_size (widget->window, &view_width, &view_height);
/* Don't scroll past the bottom if we weren't before: */
if (menu->scroll_offset > 0)
gtk_menu_scroll_to (menu, offset);
+ GDK_THREADS_LEAVE ();
+
return TRUE;
}
menu_shell = GTK_MENU_SHELL (menu);
gdk_window_get_pointer (GTK_WIDGET (menu)->window, &x, &y, NULL);
- gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+ gdk_drawable_get_size (GTK_WIDGET (menu)->window, &width, &height);
border = GTK_CONTAINER (menu)->border_width + GTK_WIDGET (menu)->style->ythickness;
&& menu_item->submenu != NULL
&& menu_item->submenu_placement == GTK_LEFT_RIGHT)
{
- if (menu_item->submenu->window != NULL)
+ if (GTK_MENU_SHELL (menu_item->submenu)->active)
{
gtk_menu_set_submenu_navigation_region (menu, menu_item, event);
return TRUE;
GtkMenu *menu = user_data;
GdkWindow *child_window;
+ GDK_THREADS_ENTER ();
+
gtk_menu_stop_navigating_submenu (menu);
if (GTK_WIDGET_REALIZED (menu))
{
- child_window = gdk_window_get_pointer (GTK_WIDGET (menu)->window, NULL, NULL, NULL);
+ child_window = gdk_window_get_pointer (menu->bin_window, NULL, NULL, NULL);
if (child_window)
{
- GdkEventCrossing send_event;
+ GdkEvent *send_event = gdk_event_new (GDK_ENTER_NOTIFY);
- memset (&send_event, 0, sizeof (send_event));
- send_event.window = child_window;
- send_event.type = GDK_ENTER_NOTIFY;
- send_event.time = GDK_CURRENT_TIME; /* Bogus */
- send_event.send_event = TRUE;
+ send_event->crossing.window = g_object_ref (child_window);
+ send_event->crossing.time = GDK_CURRENT_TIME; /* Bogus */
+ send_event->crossing.send_event = TRUE;
- GTK_WIDGET_CLASS (parent_class)->enter_notify_event (GTK_WIDGET (menu), &send_event);
+ GTK_WIDGET_CLASS (parent_class)->enter_notify_event (GTK_WIDGET (menu), (GdkEventCrossing *)send_event);
+
+ gdk_event_free (send_event);
}
}
+ GDK_THREADS_LEAVE ();
+
return FALSE;
}
return FALSE;
}
+#undef DRAW_STAY_UP_TRIANGLE
+
+#ifdef DRAW_STAY_UP_TRIANGLE
+
+static void
+draw_stay_up_triangle (GdkWindow *window,
+ GdkRegion *region)
+{
+ /* Draw ugly color all over the stay-up triangle */
+ GdkColor ugly_color = { 0, 50000, 10000, 10000 };
+ GdkGCValues gc_values;
+ GdkGC *ugly_gc;
+ GdkRectangle clipbox;
+
+ gc_values.subwindow_mode = GDK_INCLUDE_INFERIORS;
+ ugly_gc = gdk_gc_new_with_values (window, &gc_values, 0 | GDK_GC_SUBWINDOW);
+ gdk_gc_set_rgb_fg_color (ugly_gc, &ugly_color);
+ gdk_gc_set_clip_region (ugly_gc, region);
+
+ gdk_region_get_clipbox (region, &clipbox);
+
+ gdk_draw_rectangle (window,
+ ugly_gc,
+ TRUE,
+ clipbox.x, clipbox.y,
+ clipbox.width, clipbox.height);
+
+ g_object_unref (G_OBJECT (ugly_gc));
+}
+#endif
+
+static GdkRegion *
+flip_region (GdkRegion *region,
+ gboolean flip_x,
+ gboolean flip_y)
+{
+ gint n_rectangles;
+ GdkRectangle *rectangles;
+ GdkRectangle clipbox;
+ GdkRegion *new_region;
+ gint i;
+
+ new_region = gdk_region_new ();
+
+ gdk_region_get_rectangles (region, &rectangles, &n_rectangles);
+ gdk_region_get_clipbox (region, &clipbox);
+
+ for (i = 0; i < n_rectangles; ++i)
+ {
+ GdkRectangle rect = rectangles[i];
+
+ if (flip_y)
+ rect.y -= 2 * (rect.y - clipbox.y) + rect.height;
+
+ if (flip_x)
+ rect.x -= 2 * (rect.x - clipbox.x) + rect.width;
+
+ gdk_region_union_with_rect (new_region, &rect);
+ }
+
+ g_free (rectangles);
+
+ return new_region;
+}
+
static void
gtk_menu_set_submenu_navigation_region (GtkMenu *menu,
GtkMenuItem *menu_item,
event_widget = gtk_get_event_widget ((GdkEvent*) event);
gdk_window_get_origin (menu_item->submenu->window, &submenu_left, &submenu_top);
- gdk_window_get_size (menu_item->submenu->window, &width, &height);
+ gdk_drawable_get_size (menu_item->submenu->window, &width, &height);
+
submenu_right = submenu_left + width;
submenu_bottom = submenu_top + height;
- gdk_window_get_size (event_widget->window, &width, &height);
+ gdk_drawable_get_size (event_widget->window, &width, &height);
if (event->x >= 0 && event->x < width)
{
- /* Set navigation region */
- /* We fudge/give a little padding in case the user
- * ``misses the vertex'' of the triangle/is off by a pixel or two.
- */
- if (menu_item->submenu_direction == GTK_DIRECTION_RIGHT)
- point[0].x = event->x_root - SUBMENU_NAV_REGION_PADDING;
- else
- point[0].x = event->x_root + SUBMENU_NAV_REGION_PADDING;
+ gint popdown_delay;
+ gboolean flip_y = FALSE;
+ gboolean flip_x = FALSE;
- /* Exiting the top or bottom? */
+ gtk_menu_stop_navigating_submenu (menu);
+
+ if (menu_item->submenu_direction == GTK_DIRECTION_RIGHT)
+ {
+ /* right */
+ point[0].x = event->x_root;
+ point[1].x = submenu_left;
+ }
+ else
+ {
+ /* left */
+ point[0].x = event->x_root + 1;
+ point[1].x = 2 * (event->x_root + 1) - submenu_right;
+
+ flip_x = TRUE;
+ }
+
if (event->y < 0)
- { /* top */
- point[0].y = event->y_root + SUBMENU_NAV_REGION_PADDING;
- point[1].y = submenu_top;
+ {
+ /* top */
+ point[0].y = event->y_root + 1;
+ point[1].y = 2 * (event->y_root + 1) - submenu_top + NAVIGATION_REGION_OVERSHOOT;
- if (point[0].y <= point[1].y)
+ if (point[0].y >= point[1].y - NAVIGATION_REGION_OVERSHOOT)
return;
+
+ flip_y = TRUE;
}
else
- { /* bottom */
- point[0].y = event->y_root - SUBMENU_NAV_REGION_PADDING;
- point[1].y = submenu_bottom;
+ {
+ /* bottom */
+ point[0].y = event->y_root;
+ point[1].y = submenu_bottom + NAVIGATION_REGION_OVERSHOOT;
- if (point[0].y >= point[1].y)
+ if (point[0].y >= submenu_bottom)
return;
}
-
- /* Submenu is to the left or right? */
- if (menu_item->submenu_direction == GTK_DIRECTION_RIGHT)
- point[1].x = submenu_left; /* right */
- else
- point[1].x = submenu_right; /* left */
-
+
point[2].x = point[1].x;
point[2].y = point[0].y;
- gtk_menu_stop_navigating_submenu (menu);
-
menu->navigation_region = gdk_region_polygon (point, 3, GDK_WINDING_RULE);
- menu->navigation_timeout = gtk_timeout_add (SUBMENU_NAV_HYSTERESIS_TIMEOUT,
+ if (flip_x || flip_y)
+ {
+ GdkRegion *new_region = flip_region (menu->navigation_region, flip_x, flip_y);
+ gdk_region_destroy (menu->navigation_region);
+ menu->navigation_region = new_region;
+ }
+
+ g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu))),
+ "gtk-menu-popdown-delay", &popdown_delay,
+ NULL);
+
+ menu->navigation_timeout = gtk_timeout_add (popdown_delay,
gtk_menu_stop_navigating_submenu_cb, menu);
+
+#ifdef DRAW_STAY_UP_TRIANGLE
+ draw_stay_up_triangle (gdk_get_default_root_window(),
+ menu->navigation_region);
+#endif
}
}
{
GtkWidget *parent;
- g_return_if_fail (menu_shell != NULL);
g_return_if_fail (GTK_IS_MENU (menu_shell));
parent = menu_shell->parent_menu_shell;
{
GtkWidget *widget;
GtkRequisition requisition;
+ GtkMenuPrivate *private;
gint x, y;
- gint screen_width;
- gint screen_height;
gint scroll_offset;
gint menu_height;
gboolean push_in;
-
- g_return_if_fail (menu != NULL);
+ GdkScreen *screen;
+ GdkRectangle monitor;
+ gint monitor_num;
+
g_return_if_fail (GTK_IS_MENU (menu));
widget = GTK_WIDGET (menu);
- screen_width = gdk_screen_width ();
- screen_height = gdk_screen_height ();
+ gdk_window_get_pointer (gtk_widget_get_root_window (widget),
+ &x, &y, NULL);
- gdk_window_get_pointer (NULL, &x, &y, NULL);
+ screen = gtk_widget_get_screen (widget);
+ monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
+ if (monitor_num < 0)
+ monitor_num = 0;
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
/* We need the requisition to figure out the right place to
* popup the menu. In fact, we always need to ask here, since
(* menu->position_func) (menu, &x, &y, &push_in, menu->position_func_data);
else
{
- x = CLAMP (x - 2, 0, MAX (0, screen_width - requisition.width));
- y = CLAMP (y - 2, 0, MAX (0, screen_height - requisition.height));
+ x = CLAMP (x - 2, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
+ y = CLAMP (y - 2, monitor.y, MAX (monitor.y, monitor.y + monitor.height - requisition.height));
}
scroll_offset = 0;
{
menu_height = GTK_WIDGET (menu)->requisition.height;
- if (y + menu_height > screen_height)
+ if (y + menu_height > monitor.y + monitor.height)
{
- scroll_offset -= y + menu_height - screen_height;
- y = screen_height - menu_height;
+ scroll_offset -= y + menu_height - (monitor.y + monitor.height);
+ y = (monitor.y + monitor.height) - menu_height;
}
- if (y < 0)
+ if (y < monitor.y)
{
scroll_offset -= y;
- y = 0;
+ y = monitor.y;
}
}
- if (y + requisition.height > screen_height)
- requisition.height = screen_height - y;
+ /* FIXME: should this be done in the various position_funcs ? */
+ x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
+
+ if (y + requisition.height > monitor.y + monitor.height)
+ requisition.height = (monitor.y + monitor.height) - y;
- if (y < 0)
+ if (y < monitor.y)
{
scroll_offset -= y;
requisition.height -= -y;
- y = 0;
+ y = monitor.y;
}
if (scroll_offset > 0)
scroll_offset += MENU_SCROLL_ARROW_HEIGHT;
- /* FIXME: The MAX() here is because gtk_widget_set_uposition
- * is broken. Once we provide an alternate interface that
- * allows negative values, then we can remove them.
- */
- x = MAX (x, 0);
- gtk_widget_set_uposition (GTK_MENU_SHELL (menu)->active ?
- menu->toplevel : menu->tearoff_window,
- x, y);
- gtk_widget_set_usize (GTK_MENU_SHELL (menu)->active ?
- menu->toplevel : menu->tearoff_hbox,
- -1, requisition.height);
+ gtk_window_move (GTK_WINDOW (GTK_MENU_SHELL (menu)->active ? menu->toplevel : menu->tearoff_window),
+ x, y);
+
+ if (GTK_MENU_SHELL (menu)->active)
+ {
+ private = gtk_menu_get_private (menu);
+ private->have_position = TRUE;
+ private->x = x;
+ private->y = y;
+
+ gtk_widget_queue_resize (menu->toplevel);
+ }
+ else
+ {
+ gtk_window_resize (GTK_WINDOW (menu->tearoff_window),
+ requisition.width, requisition.height);
+ }
+
menu->scroll_offset = scroll_offset;
}
gtk_adjustment_value_changed (menu->tearoff_adjustment);
}
- /* Scroll the menu: */
- gdk_window_move (menu->bin_window, 0, -offset);
-
/* Move/resize the viewport according to arrows: */
- gdk_window_get_size (widget->window, &view_width, &view_height);
+ view_width = widget->allocation.width;
+ view_height = widget->allocation.height;
border_width = GTK_CONTAINER (menu)->border_width;
view_width -= (border_width + widget->style->xthickness) * 2;
{
last_visible = menu->upper_arrow_visible;
menu->upper_arrow_visible = (offset > 0);
-
+
if (menu->upper_arrow_visible)
view_height -= MENU_SCROLL_ARROW_HEIGHT;
if (menu->upper_arrow_visible)
y += MENU_SCROLL_ARROW_HEIGHT;
}
-
-
- gdk_window_move_resize (menu->view_window,
- x,
- y,
- view_width,
- view_height);
+
+ offset = CLAMP (offset, 0, menu_height - view_height);
+
+ /* Scroll the menu: */
+ if (GTK_WIDGET_REALIZED (menu))
+ gdk_window_move (menu->bin_window, 0, -offset);
+
+ if (GTK_WIDGET_REALIZED (menu))
+ gdk_window_move_resize (menu->view_window,
+ x,
+ y,
+ view_width,
+ view_height);
menu->scroll_offset = offset;
}
static void
-gtk_menu_select_item (GtkMenuShell *menu_shell,
- GtkWidget *menu_item)
+gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item)
{
GtkMenu *menu;
GtkWidget *child;
gint arrow_height;
gboolean last_child = 0;
- g_return_if_fail (menu_shell != NULL);
- g_return_if_fail (GTK_IS_MENU (menu_shell));
-
menu = GTK_MENU (menu_shell);
/* We need to check if the selected item fully visible.
if (child == menu_item)
{
y = menu->scroll_offset;
- gdk_window_get_size (GTK_WIDGET (menu)->window, &width, &height);
+ gdk_drawable_get_size (GTK_WIDGET (menu)->window, &width, &height);
height -= 2*GTK_CONTAINER (menu)->border_width + 2*GTK_WIDGET (menu)->style->ythickness;
}
}
+}
+
+static void
+gtk_menu_select_item (GtkMenuShell *menu_shell,
+ GtkWidget *menu_item)
+{
+ GtkMenu *menu = GTK_MENU (menu_shell);
+
+ if (GTK_WIDGET_REALIZED (GTK_WIDGET (menu)))
+ gtk_menu_scroll_item_visible (menu_shell, menu_item);
GTK_MENU_SHELL_CLASS (parent_class)->select_item (menu_shell, menu_item);
}
GtkWidget *widget = GTK_WIDGET (menu);
gboolean was_floating = GTK_OBJECT_FLOATING (object);
- gtk_object_ref (object);
+ g_object_ref (object);
gtk_object_sink (object);
if (unrealize)
{
- gtk_object_ref (object);
+ g_object_ref (object);
gtk_container_remove (GTK_CONTAINER (widget->parent), widget);
gtk_container_add (GTK_CONTAINER (new_parent), widget);
- gtk_object_unref (object);
+ g_object_unref (object);
}
else
gtk_widget_reparent (GTK_WIDGET (menu), new_parent);
if (was_floating)
GTK_OBJECT_SET_FLAGS (object, GTK_FLOATING);
else
- gtk_object_unref (object);
+ g_object_unref (object);
}
static void
gtk_menu_show_all (GtkWidget *widget)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
/* Show children, but not self. */
static void
gtk_menu_hide_all (GtkWidget *widget)
{
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
/* Hide children, but not self. */
gtk_container_foreach (GTK_CONTAINER (widget), (GtkCallback) gtk_widget_hide_all, NULL);
}
+/**
+ * gtk_menu_set_screen:
+ * @menu: a #GtkMenu.
+ * @screen: a #GtkScreen.
+ *
+ * Sets the #GtkScreen on which the GtkMenu will be displayed.
+ * This function can only be called before @menu is realized.
+ **/
+void
+gtk_menu_set_screen (GtkMenu *menu,
+ GdkScreen *screen)
+{
+ g_return_if_fail (GTK_IS_MENU (menu));
+ gtk_window_set_screen (GTK_WINDOW (menu->toplevel),
+ screen);
+ g_object_set_data (G_OBJECT (menu), "gtk-menu-explicit-screen", screen);
+}
+
+static gint
+gtk_menu_get_popup_delay (GtkMenuShell *menu_shell)
+{
+ gint popup_delay;
+
+ g_object_get (G_OBJECT (gtk_widget_get_settings (GTK_WIDGET (menu_shell))),
+ "gtk-menu-popup-delay", &popup_delay,
+ NULL);
+
+ return popup_delay;
+}