summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-08-26 16:28:09 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-08-26 17:56:41 -0400
commit338d6adb10fd24b6425d85ea5a3c7df348355d08 (patch)
treeff59b19d6696e8128dd648db2b7dac7f526b9d7c
parentc4c155d698c822816279554bf505feaa7339d9cf (diff)
downloadgtk+-338d6adb10fd24b6425d85ea5a3c7df348355d08.tar.gz
broadway: Drop unused argument from query_state
Now that this is backend-only api, we can just drop unused arguments.
-rw-r--r--gdk/broadway/gdkdevice-broadway.c15
-rw-r--r--gdk/broadway/gdkdevice-broadway.h1
-rw-r--r--gdk/broadway/gdksurface-broadway.c2
3 files changed, 2 insertions, 16 deletions
diff --git a/gdk/broadway/gdkdevice-broadway.c b/gdk/broadway/gdkdevice-broadway.c
index cbcf5d6e79..1a815c278c 100644
--- a/gdk/broadway/gdkdevice-broadway.c
+++ b/gdk/broadway/gdkdevice-broadway.c
@@ -75,7 +75,6 @@ gdk_broadway_device_set_surface_cursor (GdkDevice *device,
void
gdk_broadway_device_query_state (GdkDevice *device,
GdkSurface *surface,
- GdkSurface **child_surface,
double *win_x,
double *win_y,
GdkModifierType *mask)
@@ -104,18 +103,6 @@ gdk_broadway_device_query_state (GdkDevice *device,
*win_y = device_root_y;
if (mask)
*mask = mask32;
- if (child_surface)
- {
- GdkSurface *mouse_toplevel;
-
- mouse_toplevel = g_hash_table_lookup (broadway_display->id_ht, GUINT_TO_POINTER (mouse_toplevel_id));
- if (surface == NULL)
- *child_surface = mouse_toplevel;
- else
- *child_surface = NULL;
- }
-
- return;
}
void
@@ -248,7 +235,7 @@ gdk_broadway_device_surface_at_position (GdkDevice *device,
{
GdkSurface *surface = NULL;
- gdk_broadway_device_query_state (device, NULL, &surface, win_x, win_y, mask);
+ gdk_broadway_device_query_state (device, NULL, win_x, win_y, mask);
return surface;
}
diff --git a/gdk/broadway/gdkdevice-broadway.h b/gdk/broadway/gdkdevice-broadway.h
index 33b715924f..cde76b4c6e 100644
--- a/gdk/broadway/gdkdevice-broadway.h
+++ b/gdk/broadway/gdkdevice-broadway.h
@@ -47,7 +47,6 @@ GType gdk_broadway_device_get_type (void) G_GNUC_CONST;
void gdk_broadway_device_query_state (GdkDevice *device,
GdkSurface *surface,
- GdkSurface **child_surface,
double *win_x,
double *win_y,
GdkModifierType *mask);
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index bb932ee17f..f0f152203f 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -755,7 +755,7 @@ gdk_broadway_surface_get_device_state (GdkSurface *surface,
if (GDK_SURFACE_DESTROYED (surface))
return FALSE;
- gdk_broadway_device_query_state (device, surface, NULL, x, y, mask);
+ gdk_broadway_device_query_state (device, surface, x, y, mask);
return *x >= 0 && *y >= 0 && *x < surface->width && *y < surface->height;
}