Merge pull request #201 from Ferdi265/fix-xdg-geometry

xdg-popup-surface: avoid setting window_geometry with no buffer attached

Author: wmww

src/xdg-popup-surface.c

@@ -162,6 +162,7 @@ xdg_popup_surface_map (CustomShellSurface *super, struct wl_surface *wl_surface)
     g_return_if_fail (xdg_wm_base_global);
     struct xdg_positioner *positioner = xdg_wm_base_create_positioner (xdg_wm_base_global);
     self->geom = gtk_window_get_priv_logical_geom (gtk_window);
+    self->cached_allocation = (GdkRectangle){0};
     enum xdg_positioner_anchor anchor = gdk_gravity_get_xdg_positioner_anchor(self->position.rect_anchor);
     enum xdg_positioner_gravity gravity = gdk_gravity_get_xdg_positioner_gravity(self->position.window_anchor);
     enum xdg_positioner_constraint_adjustment constraint_adjustment =
@@ -188,11 +189,6 @@ xdg_popup_surface_map (CustomShellSurface *super, struct wl_surface *wl_surface)
     xdg_positioner_destroy (positioner);
 
     xdg_popup_surface_maybe_grab (self, gdk_window);
-    xdg_surface_set_window_geometry (self->xdg_surface,
-                                     self->geom.x,
-                                     self->geom.y,
-                                     self->geom.width,
-                                     self->geom.height);
 }
 
 static void
@@ -277,12 +273,7 @@ xdg_popup_surface_new (GtkWindow *gtk_window, XdgPopupPosition const* position)
     custom_shell_surface_init ((CustomShellSurface *)self, gtk_window);
 
     self->position = *position;
-    self->cached_allocation = (GdkRectangle) {
-        .x = 0,
-        .y = 0,
-        .width = 0,
-        .height = 0,
-    };
+    self->cached_allocation = (GdkRectangle){0};
     self->xdg_surface = NULL;
     self->xdg_popup = NULL;
 

test/mock-server/mock-server.h

@@ -34,6 +34,7 @@ void* alloc_zeroed(size_t size);
 #define NEW_ID_ARG(name, index) ASSERT(type_code_at_index(message, index) == 'n'); uint32_t name = args[index].n;
 #define RESOURCE_ARG(type, name, index) ASSERT(type_code_at_index(message, index) == 'o'); ASSERT(message->types[index] == &type##_interface); struct wl_resource* name = (struct wl_resource*)args[index].o;
 #define UINT_ARG(name, index) ASSERT(type_code_at_index(message, index) == 'u'); uint32_t name = args[index].u;
+#define INT_ARG(name, index) ASSERT(type_code_at_index(message, index) == 'i'); int32_t name = args[index].i;
 
 typedef void (*RequestOverrideFunction)(struct wl_resource* resource, const struct wl_message* message, union wl_argument* args);
 void install_request_override(const struct wl_interface* interface, const char* name, RequestOverrideFunction function);

test/mock-server/overrides.c

@@ -29,6 +29,7 @@ struct SurfaceData
     struct wl_resource* pending_frame;
     struct wl_resource* pending_buffer; // The attached but not committed buffer
     char buffer_cleared; // If the buffer has been explicitly cleared since the last commit
+    char pending_window_geom; // If the window geom has been set since last commit
     struct wl_resource* xdg_toplevel;
     struct wl_resource* xdg_popup;
     struct wl_resource* xdg_surface;
@@ -123,6 +124,11 @@ static void wl_surface_commit(struct wl_resource *resource, const struct wl_mess
         data->pending_buffer = NULL;
     }
 
+    if (data->pending_window_geom) {
+        ASSERT(data->has_committed_buffer);
+        data->pending_window_geom = 0;
+    }
+
     if (data->pending_frame)
     {
         wl_callback_send_done(data->pending_frame, 0);
@@ -255,6 +261,18 @@ static void xdg_surface_destroy(struct wl_resource *resource, const struct wl_me
     data->xdg_surface = NULL;
 }
 
+static void xdg_surface_set_window_geometry(struct wl_resource *resource, const struct wl_message* message, union wl_argument* args)
+{
+    //INT_ARG(x, 0);
+    //INT_ARG(y, 1);
+    INT_ARG(width, 2);
+    INT_ARG(height, 3);
+    SurfaceData* data = wl_resource_get_user_data(resource);
+    ASSERT(width > 0);
+    ASSERT(height > 0);
+    data->pending_window_geom = 1;
+}
+
 static void xdg_surface_get_toplevel(struct wl_resource *resource, const struct wl_message* message, union wl_argument* args)
 {
     NEW_ID_ARG(id, 0);
@@ -385,6 +403,7 @@ void init()
     OVERRIDE_REQUEST(wl_seat, get_pointer);
     OVERRIDE_REQUEST(xdg_wm_base, get_xdg_surface);
     OVERRIDE_REQUEST(xdg_surface, destroy);
+    OVERRIDE_REQUEST(xdg_surface, set_window_geometry);
     OVERRIDE_REQUEST(xdg_surface, get_toplevel);
     OVERRIDE_REQUEST(xdg_toplevel, destroy);
     OVERRIDE_REQUEST(xdg_surface, get_popup);