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

broadway: Call device vfunc to get device state

Browse Source 
We want only one place where we get device state.
This commit is contained in:
Alexander Larsson 2011-03-11 08:26:37 +01:00
parent 0fa32e98a4
commit 71aa55d291
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/broadway/gdkdevice-broadway.c
View File

@ -152,6 +152,16 @@ gdk_broadway_device_query_state (GdkDevice *device,
gint *win_y, gint *win_y,
GdkModifierType *mask) GdkModifierType *mask)
{ {
if (root_x)
*root_x = 0;
if (root_y)
*root_y = 0;
if (win_x)
*win_x = 0;
if (win_y)
*win_y = 0;
if (mask)
*mask = 0;
return FALSE; return FALSE;
} }

14
gdk/broadway/gdkwindow-broadway.c
View File

@ -873,10 +873,18 @@ gdk_window_broadway_get_device_state (GdkWindow *window,
gint *y, gint *y,
GdkModifierType *mask) GdkModifierType *mask)
{ {
*x = 0; GdkWindow *child;
*y = 0;
*mask = 0; g_return_val_if_fail (window == NULL || GDK_IS_WINDOW (window), FALSE);
if (GDK_WINDOW_DESTROYED (window))
return FALSE; return FALSE;
GDK_DEVICE_GET_CLASS (device)->query_state (device, window,
NULL, &child,
NULL, NULL,
x, y, mask);
return child != NULL;
} }
static GdkEventMask static GdkEventMask