[gtk+/wip/attachment-parameters: 1/16] gtkmenu: add gtk_menu_popup_with_parameters ()
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/attachment-parameters: 1/16] gtkmenu: add gtk_menu_popup_with_parameters ()
- Date: Mon, 28 Sep 2015 14:20:38 +0000 (UTC)
commit e01f1a5ea3af20959d9c115b0c86f8ca402c5e66
Author: William Hua <william hua canonical com>
Date: Fri Sep 18 16:46:44 2015 -0400
gtkmenu: add gtk_menu_popup_with_parameters ()
gtk/gtkmenu.c | 408 +++++++++++++++++++++++++++++++++++++++-----------
gtk/gtkmenu.h | 21 +++
gtk/gtkmenuprivate.h | 2 +
3 files changed, 343 insertions(+), 88 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 61f8541..fe7a89a 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1496,53 +1496,17 @@ associate_menu_grab_transfer_window (GtkMenu *menu)
g_object_set_data (G_OBJECT (toplevel_window), I_("gdk-attached-grab-window"), transfer_window);
}
-/**
- * gtk_menu_popup_for_device:
- * @menu: a #GtkMenu
- * @device: (allow-none): a #GdkDevice
- * @parent_menu_shell: (allow-none): the menu shell containing the triggering
- * menu item, or %NULL
- * @parent_menu_item: (allow-none): the menu item whose activation triggered
- * the popup, or %NULL
- * @func: (allow-none): a user supplied function used to position the menu,
- * or %NULL
- * @data: (allow-none): user supplied data to be passed to @func
- * @destroy: (allow-none): destroy notify for @data
- * @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, @data and @destroy parameters. The default
- * menu positioning function will position the menu at the current position
- * of @device (or its corresponding pointer).
- *
- * 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 is used to conflict-resolve initiation of
- * concurrent requests for mouse/keyboard grab requests. To function
- * properly, this needs to be the time stamp of the user event (such as
- * a mouse click or key press) that caused the initiation of the popup.
- * Only if no such event is available, gtk_get_current_event_time() can
- * be used instead.
- *
- * Since: 3.0
- */
-void
-gtk_menu_popup_for_device (GtkMenu *menu,
- GdkDevice *device,
- GtkWidget *parent_menu_shell,
- GtkWidget *parent_menu_item,
- GtkMenuPositionFunc func,
- gpointer data,
- GDestroyNotify destroy,
- guint button,
- guint32 activate_time)
+static void
+gtk_menu_popup_internal (GtkMenu *menu,
+ GdkDevice *device,
+ GtkWidget *parent_menu_shell,
+ GtkWidget *parent_menu_item,
+ GtkMenuPositionFunc func,
+ gpointer data,
+ GDestroyNotify destroy,
+ guint button,
+ guint32 activate_time,
+ GdkAttachmentParameters *parameters)
{
GtkMenuPrivate *priv = menu->priv;
GtkWidget *widget;
@@ -1555,6 +1519,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
GdkDevice *keyboard, *pointer, *source_device = NULL;
GdkDisplay *display;
+ if (!GTK_IS_MENU (menu) || (device && !GDK_IS_DEVICE (device)))
+ gdk_attachment_parameters_free (parameters);
+
g_return_if_fail (GTK_IS_MENU (menu));
g_return_if_fail (device == NULL || GDK_IS_DEVICE (device));
@@ -1674,6 +1641,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
*/
menu_shell->priv->parent_menu_shell = NULL;
menu_grab_transfer_window_destroy (menu);
+
+ gdk_attachment_parameters_free (parameters);
+
return;
}
@@ -1727,6 +1697,14 @@ gtk_menu_popup_for_device (GtkMenu *menu,
priv->position_func_data_destroy = destroy;
menu_shell->priv->activate_time = activate_time;
+ if (parameters != priv->attachment_parameters)
+ {
+ gdk_attachment_parameters_free (priv->attachment_parameters);
+ priv->attachment_parameters = parameters;
+ }
+ else if (parameters)
+ g_warning ("%s (): menu already owns parameters", G_STRFUNC);
+
/* 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 gtk_widget_get_visible (menu)
@@ -1767,6 +1745,285 @@ gtk_menu_popup_for_device (GtkMenu *menu,
_gtk_menu_shell_update_mnemonics (menu_shell);
}
+void
+gtk_menu_update_parameters (GtkMenu *menu,
+ GdkAttachmentParameters *parameters)
+{
+ GtkBorder shadow;
+ GdkAttachmentBorder margin;
+ GtkTextDirection direction;
+
+ g_return_if_fail (GTK_IS_MENU (menu));
+ g_return_if_fail (parameters);
+
+ _gtk_window_get_shadow_width (GTK_WINDOW (menu->priv->toplevel), &shadow);
+ margin.top = shadow.top;
+ margin.left = shadow.left;
+ margin.right = shadow.right;
+ margin.bottom = shadow.bottom;
+ gdk_attachment_parameters_set_window_margin (parameters, &margin);
+
+ direction = gtk_widget_get_direction (GTK_WIDGET (menu));
+ gdk_attachment_parameters_set_right_to_left (parameters, direction == GTK_TEXT_DIR_RTL);
+
+ gdk_attachment_parameters_set_window_type_hint (parameters, GDK_WINDOW_TYPE_HINT_MENU);
+}
+
+static void
+get_arrows_border (GtkMenu *menu,
+ GtkBorder *border)
+{
+ GtkMenuPrivate *priv = menu->priv;
+ guint scroll_arrow_height;
+ GtkArrowPlacement arrow_placement;
+
+ gtk_widget_style_get (GTK_WIDGET (menu),
+ "scroll-arrow-vlength", &scroll_arrow_height,
+ "arrow_placement", &arrow_placement,
+ NULL);
+
+ switch (arrow_placement)
+ {
+ case GTK_ARROWS_BOTH:
+ border->top = priv->upper_arrow_visible ? scroll_arrow_height : 0;
+ border->bottom = priv->lower_arrow_visible ? scroll_arrow_height : 0;
+ break;
+
+ case GTK_ARROWS_START:
+ border->top = (priv->upper_arrow_visible ||
+ priv->lower_arrow_visible) ? scroll_arrow_height : 0;
+ border->bottom = 0;
+ break;
+
+ case GTK_ARROWS_END:
+ border->top = 0;
+ border->bottom = (priv->upper_arrow_visible ||
+ priv->lower_arrow_visible) ? scroll_arrow_height : 0;
+ break;
+ }
+
+ border->left = border->right = 0;
+}
+
+void
+gtk_menu_update_scroll_offset (GdkWindow *window,
+ GdkAttachmentOption primary_option,
+ GdkAttachmentOption secondary_option,
+ const GdkPoint *position,
+ const GdkPoint *offset,
+ gpointer user_data)
+{
+ GtkMenu *menu;
+ GtkBorder border;
+
+ g_return_if_fail (GTK_IS_MENU (user_data));
+
+ if (!offset->y)
+ return;
+
+ menu = user_data;
+
+ get_arrows_border (menu, &border);
+
+ menu->priv->scroll_offset = offset->y + border.top;
+ gtk_menu_scroll_to (menu, menu->priv->scroll_offset);
+}
+
+static void
+set_attachment_widget (GdkAttachmentParameters *parameters,
+ GtkWidget *widget)
+{
+ GdkWindow *window;
+ GdkPoint origin = { 0 };
+ GtkAllocation allocation;
+
+ g_return_if_fail (parameters);
+
+ if (!widget)
+ return;
+
+ window = gtk_widget_get_window (widget);
+
+ if (window)
+ gdk_window_get_root_origin (window, &origin.x, &origin.y);
+
+ gtk_widget_get_allocation (widget, &allocation);
+ gdk_window_get_root_coords (window, allocation.x, allocation.y, &allocation.x, &allocation.y);
+ allocation.x -= origin.x;
+ allocation.y -= origin.y;
+
+ gdk_attachment_parameters_set_attachment_origin (parameters, &origin);
+ gdk_attachment_parameters_set_attachment_rectangle (parameters, &allocation);
+}
+
+void
+gtk_menu_popup_with_parameters (GtkMenu *menu,
+ GdkDevice *device,
+ GtkWidget *parent_menu_shell,
+ GtkWidget *attachment_widget,
+ guint button,
+ guint32 activate_time,
+ GdkAttachmentParameters *parameters)
+{
+ GdkDisplay *display;
+ GdkDeviceManager *manager;
+ GList *devices;
+ GdkDevice *pointer;
+ GdkRectangle rectangle;
+
+ if (!GTK_IS_MENU (menu))
+ gdk_attachment_parameters_free (parameters);
+
+ g_return_if_fail (GTK_IS_MENU (menu));
+
+ if (!parameters)
+ {
+ parameters = gdk_attachment_parameters_new ();
+
+ gtk_menu_update_parameters (menu, parameters);
+
+ if (attachment_widget)
+ {
+ gdk_attachment_parameters_add_primary_options (parameters,
+ GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE,
+ GDK_ATTACHMENT_ATTACH_TOP_EDGE,
+ GDK_ATTACHMENT_ATTACH_FORWARD_EDGE,
+ GDK_ATTACHMENT_ATTACH_BACKWARD_EDGE,
+ GDK_ATTACHMENT_FORCE_FIRST_OPTION,
+ NULL);
+
+ gdk_attachment_parameters_add_secondary_options (parameters,
+ GDK_ATTACHMENT_ALIGN_BACKWARD_EDGES,
+ GDK_ATTACHMENT_ALIGN_FORWARD_EDGES,
+ GDK_ATTACHMENT_ALIGN_TOP_EDGES,
+ GDK_ATTACHMENT_ALIGN_BOTTOM_EDGES,
+ GDK_ATTACHMENT_FORCE_FIRST_OPTION,
+ NULL);
+ }
+ else
+ {
+ display = gtk_widget_get_display (GTK_WIDGET (menu));
+
+ if (device == NULL)
+ device = gtk_get_current_event_device ();
+
+ if (device && gdk_device_get_display (device) != display)
+ device = NULL;
+
+ if (device == NULL)
+ {
+ manager = gdk_display_get_device_manager (display);
+ devices = gdk_device_manager_list_devices (manager, GDK_DEVICE_TYPE_MASTER);
+ device = devices->data;
+ g_list_free (devices);
+ }
+
+ if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
+ pointer = gdk_device_get_associated_device (device);
+ else
+ pointer = device;
+
+ gdk_device_get_position (pointer, NULL, &rectangle.x, &rectangle.y);
+ rectangle.width = 1;
+ rectangle.height = 1;
+
+ gdk_attachment_parameters_set_attachment_rectangle (parameters, &rectangle);
+
+ gdk_attachment_parameters_add_primary_options (parameters,
+ GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE,
+ GDK_ATTACHMENT_ATTACH_TOP_EDGE,
+ GDK_ATTACHMENT_ATTACH_FORWARD_EDGE,
+ GDK_ATTACHMENT_ATTACH_BACKWARD_EDGE,
+ GDK_ATTACHMENT_FORCE_FIRST_OPTION,
+ NULL);
+
+ gdk_attachment_parameters_add_secondary_options (parameters,
+ GDK_ATTACHMENT_ATTACH_FORWARD_EDGE,
+ GDK_ATTACHMENT_ATTACH_BACKWARD_EDGE,
+ GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE,
+ GDK_ATTACHMENT_ATTACH_TOP_EDGE,
+ GDK_ATTACHMENT_FORCE_FIRST_OPTION,
+ NULL);
+ }
+ }
+
+ if (attachment_widget)
+ set_attachment_widget (parameters, attachment_widget);
+
+ gtk_menu_popup_internal (menu,
+ device,
+ parent_menu_shell,
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ button,
+ activate_time,
+ parameters);
+}
+
+/**
+ * gtk_menu_popup_for_device:
+ * @menu: a #GtkMenu
+ * @device: (allow-none): a #GdkDevice
+ * @parent_menu_shell: (allow-none): the menu shell containing the triggering
+ * menu item, or %NULL
+ * @parent_menu_item: (allow-none): the menu item whose activation triggered
+ * the popup, or %NULL
+ * @func: (allow-none): a user supplied function used to position the menu,
+ * or %NULL
+ * @data: (allow-none): user supplied data to be passed to @func
+ * @destroy: (allow-none): destroy notify for @data
+ * @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, @data and @destroy parameters. The default
+ * menu positioning function will position the menu at the current position
+ * of @device (or its corresponding pointer).
+ *
+ * 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 is used to conflict-resolve initiation of
+ * concurrent requests for mouse/keyboard grab requests. To function
+ * properly, this needs to be the time stamp of the user event (such as
+ * a mouse click or key press) that caused the initiation of the popup.
+ * Only if no such event is available, gtk_get_current_event_time() can
+ * be used instead.
+ *
+ * Since: 3.0
+ */
+void
+gtk_menu_popup_for_device (GtkMenu *menu,
+ GdkDevice *device,
+ GtkWidget *parent_menu_shell,
+ GtkWidget *parent_menu_item,
+ GtkMenuPositionFunc func,
+ gpointer data,
+ GDestroyNotify destroy,
+ guint button,
+ guint32 activate_time)
+{
+ g_return_if_fail (GTK_IS_MENU (menu));
+
+ gtk_menu_popup_internal (menu,
+ device,
+ parent_menu_shell,
+ parent_menu_item,
+ func,
+ data,
+ destroy,
+ button,
+ activate_time,
+ NULL);
+}
+
/**
* gtk_menu_popup:
* @menu: a #GtkMenu
@@ -2493,42 +2750,6 @@ gtk_menu_reorder_child (GtkMenu *menu,
}
static void
-get_arrows_border (GtkMenu *menu,
- GtkBorder *border)
-{
- GtkMenuPrivate *priv = menu->priv;
- guint scroll_arrow_height;
- GtkArrowPlacement arrow_placement;
-
- gtk_widget_style_get (GTK_WIDGET (menu),
- "scroll-arrow-vlength", &scroll_arrow_height,
- "arrow_placement", &arrow_placement,
- NULL);
-
- switch (arrow_placement)
- {
- case GTK_ARROWS_BOTH:
- border->top = priv->upper_arrow_visible ? scroll_arrow_height : 0;
- border->bottom = priv->lower_arrow_visible ? scroll_arrow_height : 0;
- break;
-
- case GTK_ARROWS_START:
- border->top = (priv->upper_arrow_visible ||
- priv->lower_arrow_visible) ? scroll_arrow_height : 0;
- border->bottom = 0;
- break;
-
- case GTK_ARROWS_END:
- border->top = 0;
- border->bottom = (priv->upper_arrow_visible ||
- priv->lower_arrow_visible) ? scroll_arrow_height : 0;
- break;
- }
-
- border->left = border->right = 0;
-}
-
-static void
get_menu_padding (GtkWidget *widget,
GtkBorder *padding)
{
@@ -4461,6 +4682,7 @@ gtk_menu_position (GtkMenu *menu,
gboolean set_scroll_offset)
{
GtkMenuPrivate *priv = menu->priv;
+ GdkWindowTypeHint hint;
GtkWidget *widget;
GtkRequisition requisition;
gint x, y;
@@ -4471,17 +4693,27 @@ gtk_menu_position (GtkMenu *menu,
GdkDevice *pointer;
GtkBorder border;
+ /* Realize so we have the proper width and height to figure out
+ * the right place to popup the menu. */
+ gtk_widget_realize (priv->toplevel);
+
+ if (!gtk_widget_get_mapped (priv->toplevel) && priv->attachment_parameters)
+ {
+ hint = gdk_attachment_parameters_get_window_type_hint (priv->attachment_parameters);
+ gtk_window_set_type_hint (GTK_WINDOW (priv->toplevel), hint);
+ }
+
+ gdk_window_set_attachment_parameters (gtk_widget_get_window (priv->toplevel), priv->attachment_parameters);
+
+ if (priv->attachment_parameters)
+ return;
+
widget = GTK_WIDGET (menu);
screen = gtk_widget_get_screen (widget);
pointer = _gtk_menu_shell_get_grab_device (GTK_MENU_SHELL (menu));
gdk_device_get_position (pointer, &pointer_screen, &x, &y);
- /* Realize so we have the proper width and height to figure out
- * the right place to popup the menu.
- */
- gtk_widget_realize (priv->toplevel);
-
_gtk_window_get_shadow_width (GTK_WINDOW (priv->toplevel), &border);
requisition.width = gtk_widget_get_allocated_width (widget);
diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h
index bf81a89..aa9ff0f 100644
--- a/gtk/gtkmenu.h
+++ b/gtk/gtkmenu.h
@@ -155,6 +155,27 @@ void gtk_menu_popup_for_device (GtkMenu *menu,
guint button,
guint32 activate_time);
+GDK_AVAILABLE_IN_3_18
+void gtk_menu_update_parameters (GtkMenu *menu,
+ GdkAttachmentParameters *parameters);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_menu_update_scroll_offset (GdkWindow *window,
+ GdkAttachmentOption primary_option,
+ GdkAttachmentOption secondary_option,
+ const GdkPoint *position,
+ const GdkPoint *offset,
+ gpointer user_data);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_menu_popup_with_parameters (GtkMenu *menu,
+ GdkDevice *device,
+ GtkWidget *parent_menu_shell,
+ GtkWidget *attachment_widget,
+ guint button,
+ guint32 activate_time,
+ GdkAttachmentParameters *parameters);
+
/* Position the menu according to its position function. Called
* from gtkmenuitem.c when a menu-item changes its allocation
*/
diff --git a/gtk/gtkmenuprivate.h b/gtk/gtkmenuprivate.h
index f1a40d8..5e0295d 100644
--- a/gtk/gtkmenuprivate.h
+++ b/gtk/gtkmenuprivate.h
@@ -51,6 +51,8 @@ struct _GtkMenuPrivate
gint position_x;
gint position_y;
+ GdkAttachmentParameters *attachment_parameters;
+
guint toggle_size;
guint accel_size;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
