From 96b4fdae776275766a999eb6fcf94827b1073bba Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 23 Nov 2009 19:43:23 +0000
Subject: winGetWindowInfo: avoid creating unnecessary regions

---
 xorg-server/hw/xwin/glx/winpriv.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'xorg-server')

diff --git a/xorg-server/hw/xwin/glx/winpriv.c b/xorg-server/hw/xwin/glx/winpriv.c
index 5c1aa529a..65477afb2 100644
--- a/xorg-server/hw/xwin/glx/winpriv.c
+++ b/xorg-server/hw/xwin/glx/winpriv.c
@@ -79,11 +79,21 @@ void winGetWindowInfo(WindowPtr pWin, winWindowInfoPtr pWinInfo)
                 pWinInfo->hwnd = pWinPriv->hWnd;
 
                 /* Copy window region */
-                if (pWinInfo->hrgn)
-                    DeleteObject(pWinInfo->hrgn);
-                pWinInfo->hrgn = CreateRectRgn(0,0,0,0);
-                CombineRgn(pWinInfo->hrgn, pWinPriv->hRgn, pWinPriv->hRgn, 
-                        RGN_COPY);
+                if (pWinPriv->hRgn)
+                {
+                  if (!pWinInfo->hrgn)
+                  {
+                    pWinInfo->hrgn = CreateRectRgn(0,0,0,0);
+                  }
+                  CombineRgn(pWinInfo->hrgn, pWinPriv->hRgn, pWinPriv->hRgn, 
+                          RGN_COPY);
+                }
+                else if (pWinInfo->hrgn)
+                {
+                  DeleteObject(pWinInfo->hrgn);
+                  pWinInfo->hrgn=NULL;
+                }
+
             }
             
             return;
-- 
cgit v1.2.3