callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: get rid of server grabs for almost all canvas interaction

Browse Source 
Because it's generally the right thing to do, and server grabs broke
badly with input devices / client side windows.

gimpdisplayshell-grab.c: change logic to only server-grab if an event
is passed to the pointer grab/ungrab functions, but always use
gtk_grab_add/remove() which is sufficient in most cases.

gimpdisplayshell-tool-events.c: have the grab functions grab the
server only for space-bar scrolling and do all tool interaction,
including ruler clicks, with gtk_grab_add/remove(). Refactor things
a bit to also use the grab API for button-2 scrolling.

gimpdeviceinfo-coords.c: transform the event's coords to the canvas'
coordinate system, they might come from a ruler now.

This fixes the following bugs:

Bug 645315 - gimp_display_shell_pointer_grab: gdk_pointer_grab failed...
Bug 644351 - Gimp misses some strokes especially when drawing fast
Bug 645747 - Gimp is now unusable on xfce4
This commit is contained in:
Michael Natterer
2011-12-09 20:20:02 +01:00
parent b06bc63630
commit 01f92a3b48
4 changed files with 100 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/display/gimpdisplayshell-grab.c
View File

@ -23,11 +23,6 @@
#include "display-types.h"
#include "widgets/gimpdeviceinfo.h"
#include "widgets/gimpdevices.h"
#include "widgets/gimpdevicemanager.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
#include "gimpdisplayshell-grab.h"
@ -37,58 +32,52 @@ gimp_display_shell_pointer_grab (GimpDisplayShell *shell,
const GdkEvent *event,
GdkEventMask event_mask)
{
GdkGrabStatus status;
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
g_return_val_if_fail (shell->pointer_grabbed == FALSE, FALSE);
g_return_val_if_fail (shell->pointer_grab_time == 0, FALSE);
if (event)
{
GdkGrabStatus status;
status = gdk_pointer_grab (gtk_widget_get_window (shell->canvas),
FALSE, event_mask, NULL, NULL,
gdk_event_get_time (event));
if (status == GDK_GRAB_SUCCESS)
if (status != GDK_GRAB_SUCCESS)
{
shell->pointer_grabbed = TRUE;
return TRUE;
}
else if (status == GDK_GRAB_ALREADY_GRABBED)
{
GimpDeviceManager *manager;
GdkDisplay *gdk_display;
manager = gimp_devices_get_manager (shell->display->gimp);
gdk_display = gtk_widget_get_display (GTK_WIDGET (shell));
/* EEK: trying to grab an extended device always returns
* ALREADY_GRABBED, so simply assume the grab succeeded anyway
*/
if (gimp_device_manager_get_current_device (manager)->device !=
gdk_display_get_core_pointer (gdk_display))
{
shell->pointer_grabbed = TRUE;
return TRUE;
}
}
g_printerr ("%s: gdk_pointer_grab failed with status %d\n",
G_STRFUNC, status);
return FALSE;
}
shell->pointer_grab_time = gdk_event_get_time (event);
}
gtk_grab_add (shell->canvas);
shell->pointer_grabbed = TRUE;
return TRUE;
}
void
gimp_display_shell_pointer_ungrab (GimpDisplayShell *shell,
const GdkEvent *event)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (event != NULL);
g_return_if_fail (shell->pointer_grabbed == TRUE);
g_return_if_fail (event == NULL || shell->pointer_grab_time != 0);
gtk_grab_remove (shell->canvas);
if (event)
{
gdk_display_pointer_ungrab (gtk_widget_get_display (shell->canvas),
gdk_event_get_time (event));
shell->pointer_grab_time);
shell->pointer_grab_time = 0;
}
shell->pointer_grabbed = FALSE;
}
@ -102,24 +91,25 @@ gimp_display_shell_keyboard_grab (GimpDisplayShell *shell,
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
g_return_val_if_fail (shell->keyboard_grabbed == FALSE, FALSE);
g_return_val_if_fail (shell->keyboard_grab_time == 0, FALSE);
status = gdk_keyboard_grab (gtk_widget_get_window (shell->canvas),
FALSE,
gdk_event_get_time (event));
if (status == GDK_GRAB_SUCCESS)
if (status != GDK_GRAB_SUCCESS)
{
shell->keyboard_grabbed = TRUE;
return TRUE;
}
g_printerr ("%s: gdk_keyboard_grab failed with status %d\n",
G_STRFUNC, status);
return FALSE;
}
shell->keyboard_grabbed = TRUE;
shell->keyboard_grab_time = gdk_event_get_time (event);
return TRUE;
}
void
gimp_display_shell_keyboard_ungrab (GimpDisplayShell *shell,
const GdkEvent *event)
@ -127,9 +117,11 @@ gimp_display_shell_keyboard_ungrab (GimpDisplayShell *shell,
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (event != NULL);
g_return_if_fail (shell->keyboard_grabbed == TRUE);
g_return_if_fail (shell->keyboard_grab_time != 0);
gdk_display_keyboard_ungrab (gtk_widget_get_display (shell->canvas),
gdk_event_get_time (event));
shell->keyboard_grab_time);
shell->keyboard_grabbed = FALSE;
shell->keyboard_grab_time = 0;
}

78
app/display/gimpdisplayshell-tool-events.c
View File

@ -78,9 +78,11 @@ static void gimp_display_shell_proximity_out (GimpDisplayShell
static void gimp_display_shell_check_device_cursor (GimpDisplayShell *shell);
static void gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
const GdkEvent *event,
gint x,
gint y);
static void gimp_display_shell_stop_scrolling (GimpDisplayShell *shell);
static void gimp_display_shell_stop_scrolling (GimpDisplayShell *shell,
const GdkEvent *event);
static void gimp_display_shell_space_pressed (GimpDisplayShell *shell,
const GdkEvent *event);
@ -305,18 +307,12 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (gimp_display_shell_events (canvas, event, shell))
return TRUE;
/* ignore events on overlays, but make sure key events go through
* anyway because they are always originating from the toplevel
/* ignore events on overlays, which are the canvas' children
*/
if (((GdkEventAny *) event)->window != gtk_widget_get_window (canvas))
{
if ((event->type != GDK_KEY_PRESS &&
event->type != GDK_KEY_RELEASE) ||
! gtk_widget_has_focus (canvas))
if (gtk_widget_is_ancestor (gtk_get_event_widget (event), shell->canvas))
{
return FALSE;
}
}
display = shell->display;
gimp = gimp_display_get_gimp (display);
@ -360,6 +356,10 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE;
/* ignore enter notify while we have a grab */
if (shell->pointer_grabbed)
return TRUE;
gimp_display_shell_proximity_in (shell);
update_sw_cursor = TRUE;
@ -377,6 +377,10 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (cevent->mode != GDK_CROSSING_NORMAL)
return TRUE;
/* ignore leave notify while we have a grab */
if (shell->pointer_grabbed)
return TRUE;
gimp_display_shell_proximity_out (shell);
tool_manager_oper_update_active (gimp,
@ -413,7 +417,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (G_UNLIKELY (! gtk_widget_has_focus (canvas)))
g_warning ("%s: FOCUS_IN but canvas has no focus", G_STRFUNC);
/* ignore any focus changes while we have a grab */
/* ignore focus changes while we have a grab */
if (shell->pointer_grabbed)
return TRUE;
@ -426,7 +430,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (G_UNLIKELY (gtk_widget_has_focus (canvas)))
g_warning ("%s: FOCUS_OUT but canvas has focus", G_STRFUNC);
/* ignore any focus changes while we have a grab */
/* ignore focus changes while we have a grab */
if (shell->pointer_grabbed)
return TRUE;
@ -520,13 +524,13 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
}
}
if (! gimp_display_shell_pointer_grab (shell, event, event_mask))
if (! gimp_display_shell_pointer_grab (shell, NULL, 0))
return TRUE;
if (! shell->space_pressed && ! shell->space_release_pending)
if (! gimp_display_shell_keyboard_grab (shell, event))
{
gimp_display_shell_pointer_ungrab (shell, event);
gimp_display_shell_pointer_ungrab (shell, NULL);
return TRUE;
}
@ -561,7 +565,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
}
else if (bevent->button == 2)
{
gimp_display_shell_start_scrolling (shell, bevent->x, bevent->y);
gimp_display_shell_start_scrolling (shell, NULL,
bevent->x, bevent->y);
}
return_val = TRUE;
@ -644,10 +649,6 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
if (! shell->space_pressed && ! shell->space_release_pending)
gimp_display_shell_keyboard_ungrab (shell, event);
gimp_display_shell_pointer_ungrab (shell, event);
gtk_grab_add (canvas);
if (active_tool &&
(! gimp_image_is_empty (image) ||
gimp_tool_control_get_handle_empty_image (active_tool->control)))
@ -673,7 +674,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
gimp_display_shell_update_focus (shell, FALSE,
&image_coords, 0);
gtk_grab_remove (canvas);
gimp_display_shell_pointer_ungrab (shell, NULL);
if (shell->space_release_pending)
gimp_display_shell_space_released (shell, event, &image_coords);
@ -681,7 +682,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget *canvas,
else if (bevent->button == 2)
{
if (shell->scrolling)
gimp_display_shell_stop_scrolling (shell);
gimp_display_shell_stop_scrolling (shell, NULL);
}
else if (bevent->button == 3)
{
@ -1280,11 +1281,7 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget,
gimp_display_shell_update_focus (shell, TRUE,
NULL, event->state);
if (gimp_display_shell_pointer_grab (shell,
(GdkEvent *) event,
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON1_MOTION_MASK |
GDK_BUTTON_RELEASE_MASK))
if (gimp_display_shell_pointer_grab (shell, NULL, 0))
{
if (gimp_display_shell_keyboard_grab (shell,
(GdkEvent *) event))
@ -1300,8 +1297,7 @@ gimp_display_shell_ruler_button_press (GtkWidget *widget,
}
else
{
gimp_display_shell_pointer_ungrab (shell,
(GdkEvent *) event);
gimp_display_shell_pointer_ungrab (shell, NULL);
}
}
}
@ -1405,32 +1401,34 @@ gimp_display_shell_check_device_cursor (GimpDisplayShell *shell)
static void
gimp_display_shell_start_scrolling (GimpDisplayShell *shell,
const GdkEvent *event,
gint x,
gint y)
{
g_return_if_fail (! shell->scrolling);
gimp_display_shell_pointer_grab (shell, event, GDK_POINTER_MOTION_MASK);
shell->scrolling = TRUE;
shell->scroll_start_x = x + shell->offset_x;
shell->scroll_start_y = y + shell->offset_y;
gimp_display_shell_set_override_cursor (shell, GDK_FLEUR);
gtk_grab_add (shell->canvas);
}
static void
gimp_display_shell_stop_scrolling (GimpDisplayShell *shell)
gimp_display_shell_stop_scrolling (GimpDisplayShell *shell,
const GdkEvent *event)
{
g_return_if_fail (shell->scrolling);
gimp_display_shell_unset_override_cursor (shell);
shell->scrolling = FALSE;
shell->scroll_start_x = 0;
shell->scroll_start_y = 0;
gimp_display_shell_unset_override_cursor (shell);
gtk_grab_remove (shell->canvas);
gimp_display_shell_pointer_ungrab (shell, event);
}
static void
@ -1456,14 +1454,6 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell,
GimpDeviceInfo *current_device;
GimpCoords coords;
if (! gimp_display_shell_pointer_grab (shell, event,
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK))
{
gimp_display_shell_keyboard_ungrab (shell, event);
return;
}
manager = gimp_devices_get_manager (gimp);
current_device = gimp_device_manager_get_current_device (manager);
@ -1471,7 +1461,8 @@ gimp_display_shell_space_pressed (GimpDisplayShell *shell,
gtk_widget_get_window (shell->canvas),
&coords);
gimp_display_shell_start_scrolling (shell, coords.x, coords.y);
gimp_display_shell_start_scrolling (shell, event,
coords.x, coords.y);
}
break;
@ -1516,8 +1507,7 @@ gimp_display_shell_space_released (GimpDisplayShell *shell,
break;
case GIMP_SPACE_BAR_ACTION_PAN:
gimp_display_shell_stop_scrolling (shell);
gimp_display_shell_pointer_ungrab (shell, event);
gimp_display_shell_stop_scrolling (shell, event);
break;
case GIMP_SPACE_BAR_ACTION_MOVE:

2
app/display/gimpdisplayshell.h
View File

@ -171,6 +171,8 @@ struct _GimpDisplayShell
/* the state of gimp_display_shell_tool_events() */
gboolean pointer_grabbed;
gboolean keyboard_grabbed;
gboolean pointer_grab_time;
gboolean keyboard_grab_time;
gboolean space_pressed;
gboolean space_release_pending;

25
app/widgets/gimpdeviceinfo-coords.c
View File

@ -45,6 +45,31 @@ gimp_device_info_get_event_coords (GimpDeviceInfo *info,
coords->x = x;
gdk_event_get_axis (event, GDK_AXIS_Y, &coords->y);
/* translate event coordinates to window coordinates, only
* happens if we drag a guide from a ruler
*/
if (event->any.window &&
event->any.window != window)
{
GtkWidget *src_widget;
GtkWidget *dest_widget;
src_widget = gtk_get_event_widget ((GdkEvent *) event);
gdk_window_get_user_data (window, (gpointer) &dest_widget);
if (src_widget && dest_widget)
{
gint offset_x;
gint offset_y;
gtk_widget_translate_coordinates (src_widget, dest_widget,
0, 0, &offset_x, &offset_y);
coords->x += offset_x;
coords->y += offset_y;
}
}
if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &coords->pressure))
{
coords->pressure = gimp_device_info_map_axis (info,