From bd14449b8bf6687cd921c723c91d13605afef81c Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Sat, 8 Feb 2014 21:03:20 +0700
Subject: [PATCH] ecere/gui/drivers/XInterface: Moved frame extents request to
 RequestFrameExtents()

---
 ecere/src/gui/drivers/XInterface.ec | 50 ++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/ecere/src/gui/drivers/XInterface.ec b/ecere/src/gui/drivers/XInterface.ec
index 33a1b7b..754b3c2 100644
--- a/ecere/src/gui/drivers/XInterface.ec
+++ b/ecere/src/gui/drivers/XInterface.ec
@@ -956,6 +956,32 @@ static void WaitForViewableWindow(Window window)
    }
 }
 
+static bool RequestFrameExtents(Window window)
+{
+   if(window.nativeDecorations && frameExtentSupported != broken)
+   {
+      // Request decoration frame extents
+      XClientMessageEvent event = { 0 };
+      event.type = ClientMessage;
+      event.message_type = atoms[_net_request_frame_extents];
+      event.display = xGlobalDisplay;
+      event.serial = 0;
+      event.window = (X11Window)window.windowHandle;
+      event.send_event = 1;
+      window.windowHandle = (void *)window.windowHandle;
+      event.format = 32;
+
+      if(frameExtentSupported == unknown && !frameExtentRequest)
+      {
+         frameExtentRequest = GetTime();
+         frameExtentWindow = (X11Window)window.windowHandle;
+      }
+
+      XSendEvent(xGlobalDisplay, DefaultRootWindow(xGlobalDisplay), bool::false,
+         SubstructureRedirectMask | SubstructureNotifyMask, (union _XEvent *)&event);
+   }
+}
+
 static bool GetFrameExtents(Window window, bool update)
 {
    XWindowData windowData = window.windowData;
@@ -2423,29 +2449,7 @@ class XInterface : Interface
          XUngrabPointer(xGlobalDisplay, CurrentTime);
       }
 
-      if(window.nativeDecorations && frameExtentSupported != broken)
-      {
-         // Request decoration frame extents
-         XClientMessageEvent event = { 0 };
-         event.type = ClientMessage;
-         event.message_type = atoms[_net_request_frame_extents];
-         event.display = xGlobalDisplay;
-         event.serial = 0;
-         event.window = (X11Window)windowHandle;
-         event.send_event = 1;
-         window.windowHandle = (void *)windowHandle;
-         event.format = 32;
-
-         if(frameExtentSupported == unknown && !frameExtentRequest)
-         {
-            frameExtentRequest = GetTime();
-            frameExtentWindow = windowHandle;
-         }
-
-         XSendEvent(xGlobalDisplay, DefaultRootWindow(xGlobalDisplay), bool::false,
-            SubstructureRedirectMask | SubstructureNotifyMask, (union _XEvent *)&event);
-      }
-      else
+      if(!window.nativeDecorations || !RequestFrameExtents(window))
          ((XWindowData)window.windowData).gotFrameExtents = true;
       return (void *)windowHandle;
    }
-- 
1.8.3.1