From 96b7c5f575e6b5512386efdf9e5328024fd53324 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 24 Feb 2020 17:59:12 -0500 Subject: [PATCH 1/3] Add gdk_surface_get_mapped Returns the value of the ::mapped property. This is a direct replacement for gtk_surface_is_visible. --- docs/reference/gdk/gdk4-sections.txt | 1 + gdk/gdksurface.c | 17 +++++++++++++++++ gdk/gdksurface.h | 3 +++ 3 files changed, 21 insertions(+) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index cb090b4f66..b93bdb24c3 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -187,6 +187,7 @@ gdk_surface_hide gdk_surface_is_destroyed gdk_surface_is_visible gdk_surface_is_viewable +gdk_surface_get_mapped gdk_surface_get_state gdk_surface_get_autohide gdk_surface_minimize diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 480a2ff9c3..4fe3da8001 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1023,6 +1023,23 @@ gdk_surface_get_position (GdkSurface *surface, } } +/** + * gdk_surface_get_mapped: + * @surface: a #GdkSurface + * + * Checks whether the surface has been mapped (with gdk_surface_show() or + * gdk_surface_show_unraised()). + * + * Returns: %TRUE if the surface is mapped + **/ +gboolean +gdk_surface_get_mapped (GdkSurface *surface) +{ + g_return_val_if_fail (GDK_IS_SURFACE (surface), FALSE); + + return GDK_SURFACE_IS_MAPPED (surface); +} + /** * gdk_surface_is_visible: * @surface: a #GdkSurface diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h index 623be33c0d..7afb05777f 100644 --- a/gdk/gdksurface.h +++ b/gdk/gdksurface.h @@ -408,6 +408,9 @@ gboolean gdk_surface_is_visible (GdkSurface *surface); GDK_AVAILABLE_IN_ALL gboolean gdk_surface_is_viewable (GdkSurface *surface); +GDK_AVAILABLE_IN_ALL +gboolean gdk_surface_get_mapped (GdkSurface *surface); + GDK_AVAILABLE_IN_ALL gboolean gdk_surface_get_autohide (GdkSurface *surface); From 7a39f2d49d67f29ec0a067a1e535c6323d081414 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 24 Feb 2020 19:02:34 -0500 Subject: [PATCH 2/3] Replace gdk_surface_is_visible by _get_mapped The property is called ::mapped, and we want to get to standard getter naming. --- gdk/gdkseatdefault.c | 6 +++--- gdk/wayland/gdkdevice-wayland.c | 4 ++-- gdk/wayland/gdksurface-wayland.c | 2 +- gdk/x11/gdkdrag-x11.c | 2 +- gtk/gtkpopover.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c index 5b1a8425e8..26bf5ae967 100644 --- a/gdk/gdkseatdefault.c +++ b/gdk/gdkseatdefault.c @@ -119,14 +119,14 @@ gdk_seat_default_grab (GdkSeat *seat, gboolean was_visible; priv = gdk_seat_default_get_instance_private (GDK_SEAT_DEFAULT (seat)); - was_visible = gdk_surface_is_visible (surface); + was_visible = gdk_surface_get_mapped (surface); if (prepare_func) (prepare_func) (seat, surface, prepare_func_data); - if (!gdk_surface_is_visible (surface)) + if (!gdk_surface_get_mapped (surface)) { - g_critical ("Surface %p has not been made visible in GdkSeatGrabPrepareFunc", + g_critical ("Surface %p has not been mapped in GdkSeatGrabPrepareFunc", surface); return GDK_GRAB_NOT_VIEWABLE; } diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index c18b0e1eaf..09fa321d16 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -750,7 +750,7 @@ gdk_wayland_device_grab (GdkDevice *device, GdkWaylandPointerData *pointer = GDK_WAYLAND_DEVICE (device)->pointer; if (gdk_surface_get_surface_type (surface) == GDK_SURFACE_TEMP && - gdk_surface_is_visible (surface)) + gdk_surface_get_mapped (surface)) { g_warning ("Surface %p is already mapped at the time of grabbing. " "gdk_seat_grab() should be used to simultanously grab input " @@ -4502,7 +4502,7 @@ gdk_wayland_seat_grab (GdkSeat *seat, if (prepare_func) (prepare_func) (seat, surface, prepare_func_data); - if (!gdk_surface_is_visible (surface)) + if (!gdk_surface_get_mapped (surface)) { gdk_wayland_seat_set_grab_surface (wayland_seat, NULL); return GDK_GRAB_NOT_VIEWABLE; diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c index 6b59f43c9e..e50c39991a 100644 --- a/gdk/wayland/gdksurface-wayland.c +++ b/gdk/wayland/gdksurface-wayland.c @@ -864,7 +864,7 @@ gdk_wayland_surface_maybe_resize (GdkSurface *surface, */ is_xdg_popup = is_realized_popup (surface); - is_visible = gdk_surface_is_visible (surface); + is_visible = gdk_surface_get_mapped (surface); if (is_xdg_popup && is_visible && !impl->initial_configure_received) gdk_wayland_surface_hide (surface); diff --git a/gdk/x11/gdkdrag-x11.c b/gdk/x11/gdkdrag-x11.c index b946cb255f..c4fed39c84 100644 --- a/gdk/x11/gdkdrag-x11.c +++ b/gdk/x11/gdkdrag-x11.c @@ -543,7 +543,7 @@ gdk_surface_cache_new (GdkDisplay *display) x * impl->surface_scale, y * impl->surface_scale, width * impl->surface_scale, height * impl->surface_scale, - gdk_surface_is_visible (surface)); + gdk_surface_get_mapped (surface)); } return result; } diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 286388bb2d..d36159cde1 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -826,7 +826,7 @@ surface_transform_changed_cb (GtkWidget *widget, GtkPopover *popover = user_data; GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover); - if (priv->surface && gdk_surface_is_visible (priv->surface)) + if (priv->surface && gdk_surface_get_mapped (priv->surface)) present_popup (popover); return G_SOURCE_CONTINUE; @@ -1567,7 +1567,7 @@ relative_to_size_changed (GtkWidget *widget, { GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover); - if (priv->surface && gdk_surface_is_visible (priv->surface)) + if (priv->surface && gdk_surface_get_mapped (priv->surface)) present_popup (popover); } From 6fb50ccd0deedf4a4abb6deb337936704586e12c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 24 Feb 2020 19:03:49 -0500 Subject: [PATCH 3/3] Drop gdk_surface_is_visible It has been replaced by gdk_surface_get_mapped. --- docs/reference/gdk/gdk4-sections.txt | 1 - gdk/gdksurface.c | 17 ----------------- gdk/gdksurface.h | 2 -- 3 files changed, 20 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index b93bdb24c3..9f67fbc889 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -185,7 +185,6 @@ gdk_surface_show gdk_surface_show_unraised gdk_surface_hide gdk_surface_is_destroyed -gdk_surface_is_visible gdk_surface_is_viewable gdk_surface_get_mapped gdk_surface_get_state diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c index 4fe3da8001..8c9a23db10 100644 --- a/gdk/gdksurface.c +++ b/gdk/gdksurface.c @@ -1040,23 +1040,6 @@ gdk_surface_get_mapped (GdkSurface *surface) return GDK_SURFACE_IS_MAPPED (surface); } -/** - * gdk_surface_is_visible: - * @surface: a #GdkSurface - * - * Checks whether the surface has been mapped (with gdk_surface_show() or - * gdk_surface_show_unraised()). - * - * Returns: %TRUE if the surface is mapped - **/ -gboolean -gdk_surface_is_visible (GdkSurface *surface) -{ - g_return_val_if_fail (GDK_IS_SURFACE (surface), FALSE); - - return GDK_SURFACE_IS_MAPPED (surface); -} - /** * gdk_surface_is_viewable: * @surface: a #GdkSurface diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h index 7afb05777f..67ba05b4ae 100644 --- a/gdk/gdksurface.h +++ b/gdk/gdksurface.h @@ -403,8 +403,6 @@ void gdk_surface_input_shape_combine_region (GdkSurface *surface, gint offset_x, gint offset_y); -GDK_AVAILABLE_IN_ALL -gboolean gdk_surface_is_visible (GdkSurface *surface); GDK_AVAILABLE_IN_ALL gboolean gdk_surface_is_viewable (GdkSurface *surface);