encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression causing crashes when running without a window manager.

This commit is contained in:
Pierre-Loup A. Griffais 2013-10-23 13:43:17 -07:00
parent 965a0da901
commit e0771482f6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/video/x11/SDL_x11events.c
View File

@ -525,19 +525,22 @@ X11_DispatchEvent(_THIS)
long border_bottom = 0; long border_bottom = 0;
if (data->xwindow) { if (data->xwindow) {
Atom _net_frame_extents = X11_XInternAtom(display, "_NET_FRAME_EXTENTS", 0); Atom _net_frame_extents = X11_XInternAtom(display, "_NET_FRAME_EXTENTS", 0);
Atom type; Atom type = None;
int format; int format;
unsigned long nitems, bytes_after; unsigned long nitems = 0, bytes_after;
unsigned char *property; unsigned char *property;
X11_XGetWindowProperty(display, data->xwindow, X11_XGetWindowProperty(display, data->xwindow,
_net_frame_extents, 0, 16, 0, _net_frame_extents, 0, 16, 0,
XA_CARDINAL, &type, &format, XA_CARDINAL, &type, &format,
&nitems, &bytes_after, &property); &nitems, &bytes_after, &property);
border_left = ((long*)property)[0]; if (type != None && nitems == 4)
border_right = ((long*)property)[1]; {
border_top = ((long*)property)[2]; border_left = ((long*)property)[0];
border_bottom = ((long*)property)[3]; border_right = ((long*)property)[1];
border_top = ((long*)property)[2];
border_bottom = ((long*)property)[3];
}
} }
if (xevent.xconfigure.x != data->last_xconfigure.x || if (xevent.xconfigure.x != data->last_xconfigure.x ||