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] Fix for X11.

patch (text/plain), 3.64 KB, created by Rainer Deyke on 2013-08-09 11:59:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Deyke

Created: 2013-08-09 11:59:43 UTC

Size: 3.64 KB

patch

obsolete

>diff -r 90ff13467550 src/video/x11/SDL_x11video.c
>--- a/src/video/x11/SDL_x11video.c	Thu Aug 08 22:10:00 2013 -0700
>+++ b/src/video/x11/SDL_x11video.c	Fri Aug 09 17:58:33 2013 +0200
>@@ -362,6 +362,8 @@
>     device->SetWindowIcon = X11_SetWindowIcon;
>     device->SetWindowPosition = X11_SetWindowPosition;
>     device->SetWindowSize = X11_SetWindowSize;
>+    device->SetWindowMinimumSize = X11_SetWindowMinimumSize;
>+    device->SetWindowMaximumSize = X11_SetWindowMaximumSize;
>     device->ShowWindow = X11_ShowWindow;
>     device->HideWindow = X11_HideWindow;
>     device->RaiseWindow = X11_RaiseWindow;
>diff -r 90ff13467550 src/video/x11/SDL_x11window.c
>--- a/src/video/x11/SDL_x11window.c	Thu Aug 08 22:10:00 2013 -0700
>+++ b/src/video/x11/SDL_x11window.c	Fri Aug 09 17:58:33 2013 +0200
>@@ -742,6 +742,64 @@
> }
> 
> void
>+X11_SetWindowMinimumSize(_THIS, SDL_Window * window)
>+{
>+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>+    Display *display = data->videodata->display;
>+
>+    if (window->flags & SDL_WINDOW_RESIZABLE) {
>+         XSizeHints *sizehints = XAllocSizeHints();
>+         long userhints;
>+
>+         XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
>+
>+         sizehints->min_width = window->min_w;
>+         sizehints->min_height = window->min_h;
>+         sizehints->flags |= PMinSize;
>+
>+         XSetWMNormalHints(display, data->xwindow, sizehints);
>+
>+         XFree(sizehints);
>+
>+        /* See comment in X11_SetWindowSize. */
>+        XResizeWindow(display, data->xwindow, window->w, window->h);
>+        XMoveWindow(display, data->xwindow, window->x, window->y);
>+        XRaiseWindow(display, data->xwindow);
>+    }
>+
>+    XFlush(display);
>+}
>+
>+void
>+X11_SetWindowMaximumSize(_THIS, SDL_Window * window)
>+{
>+    SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>+    Display *display = data->videodata->display;
>+
>+    if (window->flags & SDL_WINDOW_RESIZABLE) {
>+         XSizeHints *sizehints = XAllocSizeHints();
>+         long userhints;
>+
>+         XGetWMNormalHints(display, data->xwindow, sizehints, &userhints);
>+
>+         sizehints->max_width = window->max_w;
>+         sizehints->max_height = window->max_h;
>+         sizehints->flags |= PMaxSize;
>+
>+         XSetWMNormalHints(display, data->xwindow, sizehints);
>+
>+         XFree(sizehints);
>+
>+        /* See comment in X11_SetWindowSize. */
>+        XResizeWindow(display, data->xwindow, window->w, window->h);
>+        XMoveWindow(display, data->xwindow, window->x, window->y);
>+        XRaiseWindow(display, data->xwindow);
>+    }
>+
>+    XFlush(display);
>+}
>+
>+void
> X11_SetWindowSize(_THIS, SDL_Window * window)
> {
>     SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
>@@ -760,6 +818,7 @@
> 
>          sizehints->min_width = sizehints->max_width = window->w;
>          sizehints->min_height = sizehints->max_height = window->h;
>+         sizehints->flags |= PMinSize | PMaxSize;
> 
>          XSetWMNormalHints(display, data->xwindow, sizehints);
> 
>diff -r 90ff13467550 src/video/x11/SDL_x11window.h
>--- a/src/video/x11/SDL_x11window.h	Thu Aug 08 22:10:00 2013 -0700
>+++ b/src/video/x11/SDL_x11window.h	Fri Aug 09 17:58:33 2013 +0200
>@@ -70,6 +70,8 @@
> extern void X11_SetWindowTitle(_THIS, SDL_Window * window);
> extern void X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon);
> extern void X11_SetWindowPosition(_THIS, SDL_Window * window);
>+extern void X11_SetWindowMinimumSize(_THIS, SDL_Window * window);
>+extern void X11_SetWindowMaximumSize(_THIS, SDL_Window * window);
> extern void X11_SetWindowSize(_THIS, SDL_Window * window);
> extern void X11_ShowWindow(_THIS, SDL_Window * window);
> extern void X11_HideWindow(_THIS, SDL_Window * window);

Actions: View | Diff

Attachments on bug 2007: 1280

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.