1 files changed, 22 insertions, 30 deletions

diff --git a/xorg-server/hw/xwin/glx/winpriv.c b/xorg-server/hw/xwin/glx/winpriv.c
index 4badb5320..4f2bc21a8 100644
--- a/xorg-server/hw/xwin/glx/winpriv.c
+++ b/xorg-server/hw/xwin/glx/winpriv.c
@@ -14,26 +14,26 @@
 extern Bool			g_fXdmcpEnabled;
 
 void
-winCreateWindowsWindow (WindowPtr pWin);
+ winCreateWindowsWindow(WindowPtr pWin);
+
 /**
  * Return size and handles of a window.
  * If pWin is NULL, then the information for the root window is requested.
  */
-HWND winGetWindowInfo(WindowPtr pWin)
+HWND
+winGetWindowInfo(WindowPtr pWin)
 {
     HWND hwnd = NULL;
     winDebug("%s:%d pWin %p XID 0x%x\n", __FUNCTION__, __LINE__, pWin, pWin->drawable.id);
 
     /* a real window was requested */
-    if (pWin != NULL)
-    {
+    if (pWin != NULL) {
         /* Get the window and screen privates */
         ScreenPtr pScreen = pWin->drawable.pScreen;
         winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
         winScreenInfoPtr pScreenInfo = NULL;
 
-        if (pWinScreen == NULL)
-        {
+        if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
             return hwnd;
         }
@@ -43,18 +43,15 @@ HWND winGetWindowInfo(WindowPtr pWin)
         pScreenInfo = pWinScreen->pScreenInfo;
 #ifdef XWIN_MULTIWINDOW
         /* check for multiwindow mode */
-        if (pScreenInfo->fMultiWindow)
-        {
+        if (pScreenInfo->fMultiWindow) {
             winWindowPriv(pWin);
 
-            if (pWinPriv == NULL)
-            {
+            if (pWinPriv == NULL) {
                 ErrorF("winGetWindowInfo: window has no privates\n");
                 return hwnd;
             }
 
-            if (pWinPriv->hWnd == NULL)
-            {
+            if (pWinPriv->hWnd == NULL) {
               if (pWin->parent && pWin->parent->parent)
               {
                 int offsetx;
@@ -103,8 +100,7 @@ HWND winGetWindowInfo(WindowPtr pWin)
                 winDebug("winGetWindowInfo: forcing window to exist...\n");
               }
             }
-            if (pWinPriv->hWnd != NULL)
-            {
+            if (pWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pWinPriv->hWnd;
             }
@@ -157,30 +153,26 @@ HWND winGetWindowInfo(WindowPtr pWin)
 #endif
 #ifdef XWIN_MULTIWINDOWEXTWM
         /* check for multiwindow external wm mode */
-        if (pScreenInfo->fMWExtWM)
-        {
+        if (pScreenInfo->fMWExtWM) {
             win32RootlessWindowPtr pRLWinPriv
-                = (win32RootlessWindowPtr) RootlessFrameForWindow (pWin, FALSE);
+                = (win32RootlessWindowPtr) RootlessFrameForWindow(pWin, FALSE);
 
             if (pRLWinPriv == NULL) {
                 ErrorF("winGetWindowInfo: window has no privates\n");
             }
 
-            if (pRLWinPriv->hWnd != NULL)
-            {
+            if (pRLWinPriv->hWnd != NULL) {
                 /* copy window handle */
                 hwnd = pRLWinPriv->hWnd;
             }
         }
 #endif
     }
-    else
-    {
+    else {
         ScreenPtr pScreen = g_ScreenInfo[0].pScreen;
         winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
 
-        if (pWinScreen == NULL)
-        {
+        if (pWinScreen == NULL) {
             ErrorF("winGetWindowInfo: screen has no privates\n");
         }
         else
@@ -197,21 +189,21 @@ HWND winGetWindowInfo(WindowPtr pWin)
 Bool
 winCheckScreenAiglxIsSupported(ScreenPtr pScreen)
 {
-  winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
-  winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo;
+    winPrivScreenPtr pWinScreen = winGetScreenPriv(pScreen);
+    winScreenInfoPtr pScreenInfo = pWinScreen->pScreenInfo;
 
 #ifdef XWIN_MULTIWINDOW
-  if (pScreenInfo->fMultiWindow)
-    return TRUE;
+    if (pScreenInfo->fMultiWindow)
+        return TRUE;
 #endif
 
 #ifdef XWIN_MULTIWINDOWEXTWM
-  if (pScreenInfo->fMWExtWM)
-    return TRUE;
+    if (pScreenInfo->fMWExtWM)
+        return TRUE;
 #endif
 
   if (g_fXdmcpEnabled)
     return TRUE;
 
-  return FALSE;
+    return FALSE;
 }