[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-2-5-g4785c5e

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 9e81e94c3af03798e208d2705383d46018b542dc
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue Apr 10 21:52:24 2012 +0100

    Fix for bug "Window corner re-size events ignored by SDL" (Closes: #665779)
    
    Thanks Andrew Caudwell <acaudwell at gmail.com> for the report and the suggested fix.

diff --git a/debian/patches/fix_window_resizing.diff b/debian/patches/fix_window_resizing.diff
new file mode 100644
index 0000000..fad51a9
--- /dev/null
+++ b/debian/patches/fix_window_resizing.diff
@@ -0,0 +1,61 @@
+Description: Revert change that breaks window corner resizing
+ http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+Author: Andrew Caudwell <acaudwell at gmail.com>
+Last-Update: 2012-04-10
+Bug-Debian: http://bugs.debian.org/665779
+Forwarded: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+
+--- a/src/video/x11/SDL_x11events.c
++++ b/src/video/x11/SDL_x11events.c
+@@ -57,12 +57,6 @@
+ static SDLKey MISC_keymap[256];
+ SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
+ 
+-/*
+- Pending resize target for ConfigureNotify (so outdated events don't
+- cause inappropriate resize events)
+-*/
+-int X11_PendingConfigureNotifyWidth = -1;
+-int X11_PendingConfigureNotifyHeight = -1;
+ 
+ #ifdef X_HAVE_UTF8_STRING
+ Uint32 Utf8ToUcs4(const Uint8 *utf8)
+@@ -825,16 +819,6 @@
+ #ifdef DEBUG_XEVENTS
+ printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
+ #endif
+-		if ((X11_PendingConfigureNotifyWidth != -1) &&
+-		    (X11_PendingConfigureNotifyHeight != -1)) {
+-		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
+-			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
+-			    /* Event is from before the resize, so ignore. */
+-			    break;
+-		    }
+-		    X11_PendingConfigureNotifyWidth = -1;
+-		    X11_PendingConfigureNotifyHeight = -1;
+-		}
+ 		if ( SDL_VideoSurface ) {
+ 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
+ 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
+--- a/src/video/x11/SDL_x11events_c.h
++++ b/src/video/x11/SDL_x11events_c.h
+@@ -27,8 +27,3 @@
+ extern void X11_InitOSKeymap(_THIS);
+ extern void X11_PumpEvents(_THIS);
+ extern void X11_SetKeyboardState(Display *display, const char *key_vec);
+-
+-/* Variables to be exported */
+-extern int X11_PendingConfigureNotifyWidth;
+-extern int X11_PendingConfigureNotifyHeight;
+-
+--- a/src/video/x11/SDL_x11video.c
++++ b/src/video/x11/SDL_x11video.c
+@@ -1177,8 +1177,6 @@
+ 			current = NULL;
+ 			goto done;
+ 		}
+-		X11_PendingConfigureNotifyWidth = width;
+-		X11_PendingConfigureNotifyHeight = height;
+ 	} else {
+ 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
+ 			current = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index ac5fcf3..0f0f6b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ x11_keytounicode.diff
 dont_propagate_lpthread.diff
 #check_SDL_NOKBD_environment_variable.diff
 fix_build_joystick_freebsd.diff
+fix_window_resizing.diff

-- 
Debian packaging of SDL 1.2