mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
76fc4757ac
Mon Nov 4 17:08:47 UTC 2013 Slackware 14.1 x86_64 stable is released! It's been another interesting release cycle here at Slackware bringing new features like support for UEFI machines, updated compilers and development tools, the switch from MySQL to MariaDB, and many more improvements throughout the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
Description: Revert change that breaks window corner resizing
|
|
http://bugzilla.libsdl.org/show_bug.cgi?id=1430
|
|
Author: Andrew Caudwell <acaudwell@gmail.com>
|
|
Last-Update: 2012-04-10
|
|
Bug-Debian: http://bugs.debian.org/665779
|
|
|
|
diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
|
|
--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500
|
|
+++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300
|
|
@@ -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)) {
|
|
diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
|
|
--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500
|
|
+++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300
|
|
@@ -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;
|
|
-
|
|
diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
|
|
--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500
|
|
+++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300
|
|
@@ -1182,8 +1182,6 @@
|
|
current = NULL;
|
|
goto done;
|
|
}
|
|
- X11_PendingConfigureNotifyWidth = width;
|
|
- X11_PendingConfigureNotifyHeight = height;
|
|
} else {
|
|
if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
|
|
current = NULL;
|