Commit d54f208d authored by Carlos Garnacho's avatar Carlos Garnacho
parent 5cbbb90e
...@@ -1500,33 +1500,17 @@ gtk_menu_tearoff_bg_copy (GtkMenu *menu) ...@@ -1500,33 +1500,17 @@ gtk_menu_tearoff_bg_copy (GtkMenu *menu)
static gboolean static gboolean
popup_grab_on_window (GdkWindow *window, popup_grab_on_window (GdkWindow *window,
GdkDevice *keyboard, GdkDevice *pointer)
GdkDevice *pointer,
guint32 activate_time)
{ {
if (keyboard && GdkGrabStatus status;
gdk_device_grab (keyboard, window, GdkSeat *seat;
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, activate_time) != GDK_GRAB_SUCCESS)
return FALSE;
if (pointer &&
gdk_device_grab (pointer, window,
GDK_OWNERSHIP_WINDOW, TRUE,
GDK_SMOOTH_SCROLL_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_POINTER_MOTION_MASK,
NULL, activate_time) != GDK_GRAB_SUCCESS)
{
if (keyboard)
gdk_device_ungrab (keyboard, activate_time);
return FALSE; seat = gdk_device_get_seat (pointer);
} status = gdk_seat_grab (seat, window,
GDK_SEAT_CAPABILITY_ALL, TRUE,
NULL, NULL, NULL, NULL);
return TRUE; return status == GDK_GRAB_SUCCESS;
} }
static void static void
...@@ -1601,7 +1585,7 @@ gtk_menu_popup_for_device (GtkMenu *menu, ...@@ -1601,7 +1585,7 @@ gtk_menu_popup_for_device (GtkMenu *menu,
GtkMenuShell *menu_shell; GtkMenuShell *menu_shell;
gboolean grab_keyboard; gboolean grab_keyboard;
GtkWidget *parent_toplevel; GtkWidget *parent_toplevel;
GdkDevice *keyboard, *pointer, *source_device = NULL; GdkDevice *pointer, *source_device = NULL;
GdkDisplay *display; GdkDisplay *display;
g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_MENU (menu));
...@@ -1632,15 +1616,9 @@ gtk_menu_popup_for_device (GtkMenu *menu, ...@@ -1632,15 +1616,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
menu_shell = GTK_MENU_SHELL (menu); menu_shell = GTK_MENU_SHELL (menu);
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD) if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
{ pointer = gdk_device_get_associated_device (device);
keyboard = device;
pointer = gdk_device_get_associated_device (device);
}
else else
{ pointer = device;
pointer = device;
keyboard = gdk_device_get_associated_device (device);
}
menu_shell->priv->parent_menu_shell = parent_menu_shell; menu_shell->priv->parent_menu_shell = parent_menu_shell;
...@@ -1691,12 +1669,9 @@ gtk_menu_popup_for_device (GtkMenu *menu, ...@@ -1691,12 +1669,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
grab_keyboard = gtk_menu_shell_get_take_focus (menu_shell); grab_keyboard = gtk_menu_shell_get_take_focus (menu_shell);
gtk_window_set_accept_focus (GTK_WINDOW (priv->toplevel), grab_keyboard); gtk_window_set_accept_focus (GTK_WINDOW (priv->toplevel), grab_keyboard);
if (!grab_keyboard)
keyboard = NULL;
if (xgrab_shell && xgrab_shell != widget) if (xgrab_shell && xgrab_shell != widget)
{ {
if (popup_grab_on_window (gtk_widget_get_window (xgrab_shell), keyboard, pointer, activate_time)) if (popup_grab_on_window (gtk_widget_get_window (xgrab_shell), pointer))
{ {
_gtk_menu_shell_set_grab_device (GTK_MENU_SHELL (xgrab_shell), pointer); _gtk_menu_shell_set_grab_device (GTK_MENU_SHELL (xgrab_shell), pointer);
GTK_MENU_SHELL (xgrab_shell)->priv->have_xgrab = TRUE; GTK_MENU_SHELL (xgrab_shell)->priv->have_xgrab = TRUE;
...@@ -1708,7 +1683,7 @@ gtk_menu_popup_for_device (GtkMenu *menu, ...@@ -1708,7 +1683,7 @@ gtk_menu_popup_for_device (GtkMenu *menu,
xgrab_shell = widget; xgrab_shell = widget;
transfer_window = menu_grab_transfer_window_get (menu); transfer_window = menu_grab_transfer_window_get (menu);
if (popup_grab_on_window (transfer_window, keyboard, pointer, activate_time)) if (popup_grab_on_window (transfer_window, pointer))
{ {
_gtk_menu_shell_set_grab_device (GTK_MENU_SHELL (xgrab_shell), pointer); _gtk_menu_shell_set_grab_device (GTK_MENU_SHELL (xgrab_shell), pointer);
GTK_MENU_SHELL (xgrab_shell)->priv->have_xgrab = TRUE; GTK_MENU_SHELL (xgrab_shell)->priv->have_xgrab = TRUE;
...@@ -1799,9 +1774,9 @@ gtk_menu_popup_for_device (GtkMenu *menu, ...@@ -1799,9 +1774,9 @@ gtk_menu_popup_for_device (GtkMenu *menu,
gtk_widget_show (priv->toplevel); gtk_widget_show (priv->toplevel);
if (xgrab_shell == widget) if (xgrab_shell == widget)
popup_grab_on_window (gtk_widget_get_window (widget), keyboard, pointer, activate_time); /* Should always succeed */ popup_grab_on_window (gtk_widget_get_window (widget), pointer); /* Should always succeed */
gtk_device_grab_add (GTK_WIDGET (menu), pointer, TRUE); gtk_grab_add (GTK_WIDGET (menu));
if (parent_menu_shell) if (parent_menu_shell)
{ {
...@@ -1930,15 +1905,7 @@ gtk_menu_popdown (GtkMenu *menu) ...@@ -1930,15 +1905,7 @@ gtk_menu_popdown (GtkMenu *menu)
* release the grab - we aren't actually hiding the menu. * release the grab - we aren't actually hiding the menu.
*/ */
if (menu_shell->priv->have_xgrab && pointer) if (menu_shell->priv->have_xgrab && pointer)
{ gdk_seat_ungrab (gdk_device_get_seat (pointer));
GdkDevice *keyboard;
gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
keyboard = gdk_device_get_associated_device (pointer);
if (keyboard)
gdk_device_ungrab (keyboard, GDK_CURRENT_TIME);
}
} }
/* gtk_menu_popdown is called each time a menu item is selected from /* gtk_menu_popdown is called each time a menu item is selected from
...@@ -1954,8 +1921,7 @@ gtk_menu_popdown (GtkMenu *menu) ...@@ -1954,8 +1921,7 @@ gtk_menu_popdown (GtkMenu *menu)
menu_shell->priv->have_xgrab = FALSE; menu_shell->priv->have_xgrab = FALSE;
if (pointer) gtk_grab_remove (GTK_WIDGET (menu));
gtk_device_grab_remove (GTK_WIDGET (menu), pointer);
_gtk_menu_shell_set_grab_device (menu_shell, NULL); _gtk_menu_shell_set_grab_device (menu_shell, NULL);
...@@ -5657,7 +5623,7 @@ gtk_menu_grab_notify (GtkWidget *widget, ...@@ -5657,7 +5623,7 @@ gtk_menu_grab_notify (GtkWidget *widget,
return; return;
group = gtk_window_get_group (GTK_WINDOW (toplevel)); group = gtk_window_get_group (GTK_WINDOW (toplevel));
grab = gtk_window_group_get_current_device_grab (group, pointer); grab = gtk_window_group_get_current_grab (group);
if (GTK_MENU_SHELL (widget)->priv->active && !GTK_IS_MENU_SHELL (grab)) if (GTK_MENU_SHELL (widget)->priv->active && !GTK_IS_MENU_SHELL (grab))
gtk_menu_shell_cancel (GTK_MENU_SHELL (widget)); gtk_menu_shell_cancel (GTK_MENU_SHELL (widget));
......
...@@ -626,7 +626,7 @@ gtk_menu_shell_activate (GtkMenuShell *menu_shell) ...@@ -626,7 +626,7 @@ gtk_menu_shell_activate (GtkMenuShell *menu_shell)
device = gtk_get_current_event_device (); device = gtk_get_current_event_device ();
_gtk_menu_shell_set_grab_device (menu_shell, device); _gtk_menu_shell_set_grab_device (menu_shell, device);
gtk_device_grab_add (GTK_WIDGET (menu_shell), device, TRUE); gtk_grab_add (GTK_WIDGET (menu_shell));
priv->have_grab = TRUE; priv->have_grab = TRUE;
priv->active = TRUE; priv->active = TRUE;
...@@ -1173,18 +1173,11 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell) ...@@ -1173,18 +1173,11 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell)
if (priv->have_grab) if (priv->have_grab)
{ {
priv->have_grab = FALSE; priv->have_grab = FALSE;
gtk_device_grab_remove (GTK_WIDGET (menu_shell), priv->grab_pointer); gtk_grab_remove (GTK_WIDGET (menu_shell));
} }
if (priv->have_xgrab) if (priv->have_xgrab)
{ {
GdkDevice *keyboard; gdk_seat_ungrab (gdk_device_get_seat (priv->grab_pointer));
gdk_device_ungrab (priv->grab_pointer, GDK_CURRENT_TIME);
keyboard = gdk_device_get_associated_device (priv->grab_pointer);
if (keyboard)
gdk_device_ungrab (keyboard, GDK_CURRENT_TIME);
priv->have_xgrab = FALSE; priv->have_xgrab = FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment