Keep track of the configure events we've received from the X server.

When programmatically resizing a window on Unity 3D, we'll get a move event with the old size before we get a size event with the new size, and we don't want to clobber our internal state with the old size.
libsdl-org · Oct 3, 2012 · 8f6ef3a · 8f6ef3a
1 parent 6a5d465
commit 8f6ef3a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
@@ -365,14 +365,22 @@ X11_DispatchEvent(_THIS)
         /* Have we been resized or moved? */
     case ConfigureNotify:{
 #ifdef DEBUG_XEVENTS
-            printf("window %p: ConfigureNotify! (resize: %dx%d)\n", data,
+            printf("window %p: ConfigureNotify! (position: %d,%d, size: %dx%d)\n", data,
+                   xevent.xconfigure.x, xevent.xconfigure.y,
                    xevent.xconfigure.width, xevent.xconfigure.height);
 #endif
-            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
-                                xevent.xconfigure.x, xevent.xconfigure.y);
-            SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED,
-                                xevent.xconfigure.width,
-                                xevent.xconfigure.height);
+            if (xevent.xconfigure.x != data->last_xconfigure.x ||
+                xevent.xconfigure.y != data->last_xconfigure.y) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
+                                    xevent.xconfigure.x, xevent.xconfigure.y);
+            }
+            if (xevent.xconfigure.width != data->last_xconfigure.width ||
+                xevent.xconfigure.height != data->last_xconfigure.height) {
+                SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED,
+                                    xevent.xconfigure.width,
+                                    xevent.xconfigure.height);
+            }
+            data->last_xconfigure = xevent.xconfigure;
         }
         break;
 

diff --git a/src/video/x11/SDL_x11window.h b/src/video/x11/SDL_x11window.h
@@ -55,6 +55,7 @@ typedef struct
     SDL_bool created;
     PendingFocusEnum pending_focus;
     Uint32 pending_focus_time;
+    XConfigureEvent last_xconfigure;
     struct SDL_VideoData *videodata;
 } SDL_WindowData;