| 1 |
Description: Revert change that breaks window corner resizing |
| 2 |
http://bugzilla.libsdl.org/show_bug.cgi?id=1430 |
| 3 |
Author: Andrew Caudwell <acaudwell@gmail.com> |
| 4 |
Last-Update: 2012-04-10 |
| 5 |
Bug-Debian: http://bugs.debian.org/665779 |
| 6 |
|
| 7 |
--- a/src/video/x11/SDL_x11events.c |
| 8 |
+++ b/src/video/x11/SDL_x11events.c |
| 9 |
@@ -57,12 +57,6 @@ |
| 10 |
static SDLKey MISC_keymap[256]; |
| 11 |
SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); |
| 12 |
|
| 13 |
-/* |
| 14 |
- Pending resize target for ConfigureNotify (so outdated events don't |
| 15 |
- cause inappropriate resize events) |
| 16 |
-*/ |
| 17 |
-int X11_PendingConfigureNotifyWidth = -1; |
| 18 |
-int X11_PendingConfigureNotifyHeight = -1; |
| 19 |
|
| 20 |
#ifdef X_HAVE_UTF8_STRING |
| 21 |
Uint32 Utf8ToUcs4(const Uint8 *utf8) |
| 22 |
@@ -825,16 +819,6 @@ |
| 23 |
#ifdef DEBUG_XEVENTS |
| 24 |
printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); |
| 25 |
#endif |
| 26 |
- if ((X11_PendingConfigureNotifyWidth != -1) && |
| 27 |
- (X11_PendingConfigureNotifyHeight != -1)) { |
| 28 |
- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && |
| 29 |
- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { |
| 30 |
- /* Event is from before the resize, so ignore. */ |
| 31 |
- break; |
| 32 |
- } |
| 33 |
- X11_PendingConfigureNotifyWidth = -1; |
| 34 |
- X11_PendingConfigureNotifyHeight = -1; |
| 35 |
- } |
| 36 |
if ( SDL_VideoSurface ) { |
| 37 |
if ((xevent.xconfigure.width != SDL_VideoSurface->w) || |
| 38 |
(xevent.xconfigure.height != SDL_VideoSurface->h)) { |
| 39 |
--- a/src/video/x11/SDL_x11events_c.h |
| 40 |
+++ b/src/video/x11/SDL_x11events_c.h |
| 41 |
@@ -27,8 +27,3 @@ |
| 42 |
extern void X11_InitOSKeymap(_THIS); |
| 43 |
extern void X11_PumpEvents(_THIS); |
| 44 |
extern void X11_SetKeyboardState(Display *display, const char *key_vec); |
| 45 |
- |
| 46 |
-/* Variables to be exported */ |
| 47 |
-extern int X11_PendingConfigureNotifyWidth; |
| 48 |
-extern int X11_PendingConfigureNotifyHeight; |
| 49 |
- |
| 50 |
--- a/src/video/x11/SDL_x11video.c |
| 51 |
+++ b/src/video/x11/SDL_x11video.c |
| 52 |
@@ -1182,8 +1182,6 @@ |
| 53 |
current = NULL; |
| 54 |
goto done; |
| 55 |
} |
| 56 |
- X11_PendingConfigureNotifyWidth = width; |
| 57 |
- X11_PendingConfigureNotifyHeight = height; |
| 58 |
} else { |
| 59 |
if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { |
| 60 |
current = NULL; |
Parent Directory
| 
Revision Log