We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] First shot at using set_(min|max)_size

SDL-wayland-resizable-windows.diff (text/plain), 7.49 KB, created by Ryan C. Gordon on 2019-11-15 05:34:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan C. Gordon

Created: 2019-11-15 05:34:58 UTC

Size: 7.49 KB

patch

obsolete

># HG changeset patch
># User Ryan C. Gordon <icculus@icculus.org>
># Date 1573795161 18000
>#      Fri Nov 15 00:19:21 2019 -0500
># Node ID eafbe84b29a26a6b895ef23f18829c73125c485b
># Parent  2ec6a247655185b4acd1294fbd443259d0693428
>wayland: First shot at SetWindowResizable and SetWindow(Min|Max)imumSize.
>
>Also marks windows as non-resizable at creation time if the flag is missing.
>
>Fixes Bugzilla #4859.
>
>diff --git a/src/video/wayland/SDL_waylandvideo.c b/src/video/wayland/SDL_waylandvideo.c
>--- a/src/video/wayland/SDL_waylandvideo.c
>+++ b/src/video/wayland/SDL_waylandvideo.c
>@@ -183,10 +183,13 @@
>     device->CreateSDLWindow = Wayland_CreateWindow;
>     device->ShowWindow = Wayland_ShowWindow;
>     device->SetWindowFullscreen = Wayland_SetWindowFullscreen;
>+    device->SetWindowResizable = Wayland_SetWindowResizable;
>     device->MaximizeWindow = Wayland_MaximizeWindow;
>     device->RestoreWindow = Wayland_RestoreWindow;
>     device->SetWindowBordered = Wayland_SetWindowBordered;
>     device->SetWindowSize = Wayland_SetWindowSize;
>+    device->SetWindowMinimumSize = Wayland_SetWindowMinimumSize;
>+    device->SetWindowMaximumSize = Wayland_SetWindowMaximumSize;
>     device->SetWindowTitle = Wayland_SetWindowTitle;
>     device->DestroyWindow = Wayland_DestroyWindow;
>     device->SetWindowHitTest = Wayland_SetWindowHitTest;
>diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
>--- a/src/video/wayland/SDL_waylandwindow.c
>+++ b/src/video/wayland/SDL_waylandwindow.c
>@@ -566,6 +566,39 @@
> }
> 
> void
>+Wayland_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable)
>+{
>+    SDL_WindowData *wind = window->driverdata;
>+    SDL_VideoData *viddata = (SDL_VideoData *) _this->driverdata;
>+    int minw, minh, maxw, maxh;
>+
>+    if (resizable) {
>+        /* if unset, min_* and max_* are set to zero, which xdg_shell takes to mean "no limit". */
>+        minw = window->min_w;
>+        minh = window->min_h;
>+        maxw = window->max_w;
>+        maxh = window->max_h;
>+    } else {
>+        /* if not resizable, set min/max to be the same, which prevents resizing in general, and
>+            the compositor might take this as a hint to eliminate resize cursors, etc */
>+        minw = maxw = window->w;
>+        minh = maxh = window->h;
>+    }
>+
>+    if (viddata->shell.xdg) {
>+        xdg_toplevel_set_min_size(wind->shell_surface.xdg.roleobj.toplevel, window->min_w, window->min_h);
>+        xdg_toplevel_set_max_size(wind->shell_surface.xdg.roleobj.toplevel, window->max_w, window->max_h);
>+    } else if (viddata->shell.zxdg) {
>+        zxdg_toplevel_v6_set_min_size(wind->shell_surface.zxdg.roleobj.toplevel, window->min_w, window->min_h);
>+        zxdg_toplevel_v6_set_max_size(wind->shell_surface.zxdg.roleobj.toplevel, window->max_w, window->max_h);
>+    } else {
>+        /* there is no wl_shell_surface equivalent. */
>+    }
>+
>+    WAYLAND_wl_display_flush(viddata->display);
>+}
>+
>+void
> Wayland_RestoreWindow(_THIS, SDL_Window * window)
> {
>     SDL_WindowData *wind = window->driverdata;
>@@ -669,12 +702,20 @@
>         data->shell_surface.xdg.roleobj.toplevel = xdg_surface_get_toplevel(data->shell_surface.xdg.surface);
>         xdg_toplevel_add_listener(data->shell_surface.xdg.roleobj.toplevel, &toplevel_listener_xdg, data);
>         xdg_toplevel_set_app_id(data->shell_surface.xdg.roleobj.toplevel, c->classname);
>+        if ((window->flags & SDL_WINDOW_RESIZABLE) == 0) {  /* if not resizable, set max/min to the same */
>+            xdg_toplevel_set_min_size(wind->shell_surface.xdg.roleobj.toplevel, window->w, window->h);
>+            xdg_toplevel_set_max_size(wind->shell_surface.xdg.roleobj.toplevel, window->w, window->h);
>+        }
>     } else if (c->shell.zxdg) {
>         data->shell_surface.zxdg.surface = zxdg_shell_v6_get_xdg_surface(c->shell.zxdg, data->surface);
>         /* !!! FIXME: add popup role */
>         data->shell_surface.zxdg.roleobj.toplevel = zxdg_surface_v6_get_toplevel(data->shell_surface.zxdg.surface);
>         zxdg_toplevel_v6_add_listener(data->shell_surface.zxdg.roleobj.toplevel, &toplevel_listener_zxdg, data);
>         zxdg_toplevel_v6_set_app_id(data->shell_surface.zxdg.roleobj.toplevel, c->classname);
>+        if ((window->flags & SDL_WINDOW_RESIZABLE) == 0) {  /* if not resizable, set max/min to the same */
>+            zxdg_toplevel_v6_set_min_size(wind->shell_surface.zxdg.roleobj.toplevel, window->w, window->h);
>+            zxdg_toplevel_v6_set_max_size(wind->shell_surface.zxdg.roleobj.toplevel, window->w, window->h);
>+        }
>     } else {
>         data->shell_surface.wl = wl_shell_get_shell_surface(c->shell.wl, data->surface);
>         wl_shell_surface_set_class(data->shell_surface.wl, c->classname);
>@@ -774,6 +815,46 @@
>     return 0;
> }
> 
>+void
>+Wayland_SetWindowMinimumSize(_THIS, SDL_Window * window)
>+{
>+    /* if not resizable, you _have_ to set the min/max size to be the same, to alert the window manager */
>+    if (window->flags & SDL_WINDOW_RESIZABLE) {
>+        SDL_WindowData *wind = window->driverdata;
>+        SDL_VideoData *viddata = (SDL_VideoData *) _this->driverdata;
>+
>+        if (viddata->shell.xdg) {
>+            xdg_toplevel_set_min_size(wind->shell_surface.xdg.roleobj.toplevel, window->min_w, window->min_h);
>+        } else if (viddata->shell.zxdg) {
>+            zxdg_toplevel_v6_set_min_size(wind->shell_surface.zxdg.roleobj.toplevel, window->min_w, window->min_h);
>+        } else {
>+            /* there is no wl_shell_surface equivalent. */
>+        }
>+
>+        WAYLAND_wl_display_flush( viddata->display );
>+    }
>+}
>+
>+void
>+Wayland_SetWindowMaximumSize(_THIS, SDL_Window * window)
>+{
>+    /* if not resizable, you _have_ to set the min/max size to be the same, to alert the window manager */
>+    if (window->flags & SDL_WINDOW_RESIZABLE) {
>+        SDL_WindowData *wind = window->driverdata;
>+        SDL_VideoData *viddata = (SDL_VideoData *) _this->driverdata;
>+
>+        if (viddata->shell.xdg) {
>+            xdg_toplevel_set_max_size(wind->shell_surface.xdg.roleobj.toplevel, window->max_w, window->max_h);
>+        } else if (viddata->shell.zxdg) {
>+            zxdg_toplevel_v6_set_max_size(wind->shell_surface.zxdg.roleobj.toplevel, window->max_w, window->max_h);
>+        } else {
>+            /* there is no wl_shell_surface equivalent. */
>+        }
>+
>+        WAYLAND_wl_display_flush( viddata->display );
>+    }
>+}
>+
> void Wayland_SetWindowSize(_THIS, SDL_Window * window)
> {
>     SDL_VideoData *data = _this->driverdata;
>diff --git a/src/video/wayland/SDL_waylandwindow.h b/src/video/wayland/SDL_waylandwindow.h
>--- a/src/video/wayland/SDL_waylandwindow.h
>+++ b/src/video/wayland/SDL_waylandwindow.h
>@@ -87,6 +87,7 @@
> extern void Wayland_SetWindowFullscreen(_THIS, SDL_Window * window,
>                                         SDL_VideoDisplay * _display,
>                                         SDL_bool fullscreen);
>+extern void Wayland_SetWindowResizable(_THIS, SDL_Window * window, SDL_bool resizable);
> extern void Wayland_MaximizeWindow(_THIS, SDL_Window * window);
> extern void Wayland_RestoreWindow(_THIS, SDL_Window * window);
> extern void Wayland_SetWindowBordered(_THIS, SDL_Window * window, SDL_bool bordered);
>@@ -94,6 +95,8 @@
> extern void Wayland_SetWindowSize(_THIS, SDL_Window * window);
> extern void Wayland_SetWindowTitle(_THIS, SDL_Window * window);
> extern void Wayland_DestroyWindow(_THIS, SDL_Window *window);
>+extern void Wayland_SetWindowMinimumSize(_THIS, SDL_Window * window);
>+extern void Wayland_SetWindowMaximumSize(_THIS, SDL_Window * window);
> 
> extern SDL_bool
> Wayland_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info);

Actions: View | Diff

Attachments on bug 4859: 4048 | 4049 | 4050 | 4051

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.