Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 225 insertions, 250 deletions

diff --git a/xorg-server/hw/xwin/winclipboardwrappers.c b/xorg-server/hw/xwin/winclipboardwrappers.c
index 3743b9edb..4005bf176 100644
--- a/xorg-server/hw/xwin/winclipboardwrappers.c
+++ b/xorg-server/hw/xwin/winclipboardwrappers.c
@@ -37,7 +37,6 @@
 #include "dixstruct.h"
 #include <X11/Xatom.h>
 
-
 /*
  * Constants
  */
@@ -46,37 +45,35 @@
 #define CLIP_OWN_PRIMARY		0
 #define CLIP_OWN_CLIPBOARD		1
 
-
 /*
  * Local function prototypes
  */
 
-int winProcEstablishConnection(ClientPtr /* client */);
-int winProcSetSelectionOwner(ClientPtr /* client */);
+int winProcEstablishConnection(ClientPtr /* client */ );
+int winProcSetSelectionOwner(ClientPtr /* client */ );
+
 DISPATCH_PROC(winProcEstablishConnection);
 DISPATCH_PROC(winProcSetSelectionOwner);
 
-
 /*
  * References to external symbols
  */
 
-extern Bool		g_fUnicodeSupport;
-extern int		g_iNumScreens;
-extern unsigned int	g_uiAuthDataLen;
-extern char		*g_pAuthData;
-extern Bool		g_fXdmcpEnabled;
-extern Bool		g_fClipboardLaunched;
-extern Bool		g_fClipboardStarted;
-extern Bool		g_fClipboard;
-extern Window		g_iClipboardWindow;
-extern Atom		g_atomLastOwnedSelection;
-extern HWND		g_hwndClipboard;
+extern Bool g_fUnicodeSupport;
+extern int g_iNumScreens;
+extern unsigned int g_uiAuthDataLen;
+extern char *g_pAuthData;
+extern Bool g_fXdmcpEnabled;
+extern Bool g_fClipboardLaunched;
+extern Bool g_fClipboardStarted;
+extern Bool g_fClipboard;
+extern Window g_iClipboardWindow;
+extern Atom g_atomLastOwnedSelection;
+extern HWND g_hwndClipboard;
 extern Bool		g_fClipboardPrimary;
 
-extern winDispatchProcPtr	winProcEstablishConnectionOrig;
-extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;
-
+extern winDispatchProcPtr winProcEstablishConnectionOrig;
+extern winDispatchProcPtr winProcSetSelectionOwnerOrig;
 
 /*
  * Wrapper for internal EstablishConnection function.
@@ -85,291 +82,269 @@ extern winDispatchProcPtr	winProcSetSelectionOwnerOrig;
  */
 
 int
-winProcEstablishConnection (ClientPtr client)
+winProcEstablishConnection(ClientPtr client)
 {
-  int			iReturn;
-  static int		s_iCallCount = 0;
-  static unsigned long	s_ulServerGeneration = 0;
+    int iReturn;
+    static int s_iCallCount = 0;
+    static unsigned long s_ulServerGeneration = 0;
 
   #ifdef WINDBG
   if (s_iCallCount == 0) winDebug ("winProcEstablishConnection - Hello\n");
   #endif
 
-  /* Do nothing if clipboard is not enabled */
-  if (!g_fClipboard)
-    {
+    /* Do nothing if clipboard is not enabled */
+    if (!g_fClipboard) {
       winDebug ("winProcEstablishConnection - Clipboard is not enabled, "
-	      "returning.\n");
-      
-      /* Unwrap the original function, call it, and return */
-      InitialVector[2] = winProcEstablishConnectionOrig;
-      iReturn = (*winProcEstablishConnectionOrig) (client);
-      winProcEstablishConnectionOrig = NULL;
-      return iReturn;
+               "returning.\n");
+
+        /* Unwrap the original function, call it, and return */
+        InitialVector[2] = winProcEstablishConnectionOrig;
+        iReturn = (*winProcEstablishConnectionOrig) (client);
+        winProcEstablishConnectionOrig = NULL;
+        return iReturn;
     }
 
-  /* Watch for server reset */
-  if (s_ulServerGeneration != serverGeneration)
-    {
-      /* Save new generation number */
-      s_ulServerGeneration = serverGeneration;
+    /* Watch for server reset */
+    if (s_ulServerGeneration != serverGeneration) {
+        /* Save new generation number */
+        s_ulServerGeneration = serverGeneration;
 
-      /* Reset call count */
-      s_iCallCount = 0;
+        /* Reset call count */
+        s_iCallCount = 0;
     }
 
-  /* Increment call count */
-  ++s_iCallCount;
-
-  /*
-   * This procedure is only used for initialization.
-   * We can unwrap the original procedure at this point
-   * so that this function is no longer called until the
-   * server resets and the function is wrapped again.
-   */
-  InitialVector[2] = winProcEstablishConnectionOrig;
-
-  /*
-   * Call original function and bail if it fails.
-   * NOTE: We must do this first, since we need XdmcpOpenDisplay
-   * to be called before we initialize our clipboard client.
-   */
-  iReturn = (*winProcEstablishConnectionOrig) (client);
-  if (iReturn != 0)
-    {
-      ErrorF ("winProcEstablishConnection - ProcEstablishConnection "
-	      "failed, bailing.\n");
-      return iReturn;
+    /* Increment call count */
+    ++s_iCallCount;
+
+    /*
+     * This procedure is only used for initialization.
+     * We can unwrap the original procedure at this point
+     * so that this function is no longer called until the
+     * server resets and the function is wrapped again.
+     */
+    InitialVector[2] = winProcEstablishConnectionOrig;
+
+    /*
+     * Call original function and bail if it fails.
+     * NOTE: We must do this first, since we need XdmcpOpenDisplay
+     * to be called before we initialize our clipboard client.
+     */
+    iReturn = (*winProcEstablishConnectionOrig) (client);
+    if (iReturn != 0) {
+        ErrorF("winProcEstablishConnection - ProcEstablishConnection "
+               "failed, bailing.\n");
+        return iReturn;
     }
 
-  /* Clear original function pointer */
-  winProcEstablishConnectionOrig = NULL;
+    /* Clear original function pointer */
+    winProcEstablishConnectionOrig = NULL;
 
-  /* If the clipboard client has already been started, abort */
-  if (g_fClipboardLaunched)
-    {
-      winDebug ("winProcEstablishConnection - Clipboard client already "
-	      "launched, returning.\n");
-      return iReturn;
+    /* If the clipboard client has already been started, abort */
+    if (g_fClipboardLaunched) {
+        winDebug ("winProcEstablishConnection - Clipboard client already "
+               "launched, returning.\n");
+        return iReturn;
     }
 
-  /* Startup the clipboard client if clipboard mode is being used */
-  if (g_fClipboard)
-    {
-      /*
-       * NOTE: The clipboard client is started here for a reason:
-       * 1) Assume you are using XDMCP (e.g. XWin -query %hostname%)
-       * 2) If the clipboard client attaches during X Server startup,
-       *    then it becomes the "magic client" that causes the X Server
-       *    to reset if it exits.
-       * 3) XDMCP calls KillAllClients when it starts up.
-       * 4) The clipboard client is a client, so it is killed.
-       * 5) The clipboard client is the "magic client", so the X Server
-       *    resets itself.
-       * 6) This repeats ad infinitum.
-       * 7) We avoid this by waiting until at least one client (could
-       *    be XDM, could be another client) connects, which makes it
-       *    almost certain that the clipboard client will not connect
-       *    until after XDM when using XDMCP.
-       */
-      
-      /* Create the clipboard client thread */
-      if (!winInitClipboard ())
-	{
-	  ErrorF ("winProcEstablishConnection - winClipboardInit "
-		  "failed.\n");
-	  return iReturn;
-	}
-      
-      winDebug ("winProcEstablishConnection - winInitClipboard returned.\n");
+    /* Startup the clipboard client if clipboard mode is being used */
+    if (g_fClipboard) {
+        /*
+         * NOTE: The clipboard client is started here for a reason:
+         * 1) Assume you are using XDMCP (e.g. XWin -query %hostname%)
+         * 2) If the clipboard client attaches during X Server startup,
+         *    then it becomes the "magic client" that causes the X Server
+         *    to reset if it exits.
+         * 3) XDMCP calls KillAllClients when it starts up.
+         * 4) The clipboard client is a client, so it is killed.
+         * 5) The clipboard client is the "magic client", so the X Server
+         *    resets itself.
+         * 6) This repeats ad infinitum.
+         * 7) We avoid this by waiting until at least one client (could
+         *    be XDM, could be another client) connects, which makes it
+         *    almost certain that the clipboard client will not connect
+         *    until after XDM when using XDMCP.
+         */
+
+        /* Create the clipboard client thread */
+        if (!winInitClipboard()) {
+            ErrorF("winProcEstablishConnection - winClipboardInit "
+                   "failed.\n");
+            return iReturn;
+        }
+
+        winDebug ("winProcEstablishConnection - winInitClipboard returned.\n");
     }
-  
-  /* Flag that clipboard client has been launched */
-  g_fClipboardLaunched = TRUE;
 
-  return iReturn;
-}
+    /* Flag that clipboard client has been launched */
+    g_fClipboardLaunched = TRUE;
 
+    return iReturn;
+}
 
 /*
  * Wrapper for internal SetSelectionOwner function.
  * Grabs ownership of Windows clipboard when X11 clipboard owner changes.
  */
 int
-winProcSetSelectionOwner (ClientPtr client)
+winProcSetSelectionOwner(ClientPtr client)
 {
-  int			i;
-  DrawablePtr		pDrawable;
-  WindowPtr		pWindow = None;
-  static Window		s_iOwners[CLIP_NUM_SELECTIONS] = {None};
-  static unsigned long	s_ulServerGeneration = 0;
-  REQUEST(xSetSelectionOwnerReq);
-  
-  REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
-
-  winDebug ("winProcSetSelectionOwner - Hello.\n");
-
-  /* Watch for server reset */
-  if (s_ulServerGeneration != serverGeneration)
-    {
-      /* Save new generation number */
-      s_ulServerGeneration = serverGeneration;
+    int i;
+    DrawablePtr pDrawable;
+    WindowPtr pWindow = None;
+    static Window s_iOwners[CLIP_NUM_SELECTIONS] = { None };
+    static unsigned long s_ulServerGeneration = 0;
+
+    REQUEST(xSetSelectionOwnerReq);
+
+    REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
+
+    winDebug("winProcSetSelectionOwner - Hello.\n");
+
+    /* Watch for server reset */
+    if (s_ulServerGeneration != serverGeneration) {
+        /* Save new generation number */
+        s_ulServerGeneration = serverGeneration;
                   
-      /* Initialize static variables */
-      for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
-	s_iOwners[i] = None;
+        /* Initialize static variables */
+        for (i = 0; i < CLIP_NUM_SELECTIONS; ++i)
+            s_iOwners[i] = None;
     }
 
-  /* Abort if clipboard not completely initialized yet */
-  if (!g_fClipboardStarted)
-    {
+    /* Abort if clipboard not completely initialized yet */
+    if (!g_fClipboardStarted) {
         winDebug ("winProcSetSelectionOwner - Clipboard not yet started, "
-	        "aborting.\n");
+                  "aborting.\n");
         goto winProcSetSelectionOwner_Done;
     }
-  
-  /* Grab window if we have one */
-  if (None != stuff->window)
-    {
-      /* Grab the Window from the request */
-      int rc = dixLookupWindow(&pWindow, stuff->window, client, DixReadAccess);
-      if (rc != Success) {
-	  ErrorF ("winProcSetSelectionOwner - Found BadWindow, aborting.\n");
-	  goto winProcSetSelectionOwner_Done;
-      }
+
+    /* Grab window if we have one */
+    if (None != stuff->window) {
+        /* Grab the Window from the request */
+        int rc =
+            dixLookupWindow(&pWindow, stuff->window, client, DixReadAccess);
+        if (rc != Success) {
+            ErrorF("winProcSetSelectionOwner - Found BadWindow, aborting.\n");
+            goto winProcSetSelectionOwner_Done;
+        }
     }
 
-  /* Now we either have a valid window or None */
-
-  /* Save selection owners for monitored selections, ignore other selections */
-  if (XA_PRIMARY == stuff->selection && g_fClipboardPrimary)
-    {
-      /* Look for owned -> not owned transition */
-      if (None == stuff->window
-	  && None != s_iOwners[CLIP_OWN_PRIMARY])
-	{
-	  winDebug ("winProcSetSelectionOwner - PRIMARY - Going from "
-		    "owned to not owned.\n");
-
-                  /* Adjust last owned selection */
-	  if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
-	    g_atomLastOwnedSelection = MakeAtom ("CLIPBOARD", 9, TRUE);
-	  else
-	    g_atomLastOwnedSelection = None;
-	}
-
-      /* Save new selection owner or None */
-      s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
-
-      winDebug ("winProcSetSelectionOwner - PRIMARY - Now owned by: 0x%x (clipboard is 0x%x)\n",
-	        stuff->window,g_iClipboardWindow);
+    /* Now we either have a valid window or None */
+
+    /* Save selection owners for monitored selections, ignore other selections */
+    if (XA_PRIMARY == stuff->selection && g_fClipboardPrimary) {
+        /* Look for owned -> not owned transition */
+        if (None == stuff->window && None != s_iOwners[CLIP_OWN_PRIMARY]) {
+            winDebug("winProcSetSelectionOwner - PRIMARY - Going from "
+                     "owned to not owned.\n");
+
+            /* Adjust last owned selection */
+            if (None != s_iOwners[CLIP_OWN_CLIPBOARD])
+                g_atomLastOwnedSelection = MakeAtom("CLIPBOARD", 9, TRUE);
+            else
+                g_atomLastOwnedSelection = None;
+        }
+
+        /* Save new selection owner or None */
+        s_iOwners[CLIP_OWN_PRIMARY] = stuff->window;
+
+        winDebug ("winProcSetSelectionOwner - PRIMARY - Now owned by: 0x%x (clipboard is 0x%x)\n",
+                  stuff->window,g_iClipboardWindow);
     }
-  else if (MakeAtom ("CLIPBOARD", 9, TRUE) == stuff->selection)
-    {
-      /* Look for owned -> not owned transition */
-      if (None == stuff->window
-	  && None != s_iOwners[CLIP_OWN_CLIPBOARD])
-	{
-	  winDebug ("winProcSetSelectionOwner - CLIPBOARD - Going from "
-		  "owned to not owned.\n");
-
-	  /* Adjust last owned selection */
-	  if ((None != s_iOwners[CLIP_OWN_PRIMARY]) && g_fClipboardPrimary)
-	    g_atomLastOwnedSelection = XA_PRIMARY;
-	  else
-	    g_atomLastOwnedSelection = None;
-	}
-      
-      /* Save new selection owner or None */
-      s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
-
-      winDebug ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: 0x%x, clipboard is 0x%x\n",
-	      stuff->window,g_iClipboardWindow);
+    else if (MakeAtom("CLIPBOARD", 9, TRUE) == stuff->selection) {
+        /* Look for owned -> not owned transition */
+        if (None == stuff->window && None != s_iOwners[CLIP_OWN_CLIPBOARD]) {
+            winDebug("winProcSetSelectionOwner - CLIPBOARD - Going from "
+                     "owned to not owned.\n");
+
+            /* Adjust last owned selection */
+            if ((None != s_iOwners[CLIP_OWN_PRIMARY]) && g_fClipboardPrimary)
+                g_atomLastOwnedSelection = XA_PRIMARY;
+            else
+                g_atomLastOwnedSelection = None;
+        }
+
+        /* Save new selection owner or None */
+        s_iOwners[CLIP_OWN_CLIPBOARD] = stuff->window;
+
+        winDebug ("winProcSetSelectionOwner - CLIPBOARD - Now owned by: 0x%x, clipboard is 0x%x\n",
+                  stuff->window,g_iClipboardWindow);
     }
-  else
-    goto winProcSetSelectionOwner_Done;
-
-  /*
-   * At this point, if one of the selections is still owned by the 
-   * clipboard manager then it should be marked as unowned since
-   * we will be taking ownership of the Win32 clipboard.
-   */
-  if (g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
-    s_iOwners[CLIP_OWN_PRIMARY] = None;
-  if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
-    s_iOwners[CLIP_OWN_CLIPBOARD] = None;
-
-  /* Abort if no window at this point */
-  if (None == stuff->window)
-    {
-      winDebug ("winProcSetSelectionOwner - No window, returning.\n");
-      goto winProcSetSelectionOwner_Done;
+    else
+        goto winProcSetSelectionOwner_Done;
+
+    /*
+     * At this point, if one of the selections is still owned by the 
+     * clipboard manager then it should be marked as unowned since
+     * we will be taking ownership of the Win32 clipboard.
+     */
+    if (g_iClipboardWindow == s_iOwners[CLIP_OWN_PRIMARY])
+        s_iOwners[CLIP_OWN_PRIMARY] = None;
+    if (g_iClipboardWindow == s_iOwners[CLIP_OWN_CLIPBOARD])
+        s_iOwners[CLIP_OWN_CLIPBOARD] = None;
+
+    /* Abort if no window at this point */
+    if (None == stuff->window) {
+        winDebug ("winProcSetSelectionOwner - No window, returning.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Abort if invalid selection */
-  if (!ValidAtom (stuff->selection))
-    {
-      winDebug ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if invalid selection */
+    if (!ValidAtom(stuff->selection)) {
+        winDebug ("winProcSetSelectionOwner - Found BadAtom, aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Cast Window to Drawable */
-  pDrawable = (DrawablePtr) pWindow;
-  
-  /* Abort if clipboard manager is owning the selection */
-  if (pDrawable->id == g_iClipboardWindow)
-    {
-      winDebug ("winProcSetSelectionOwner - We changed ownership, "
-               "aborting.\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Cast Window to Drawable */
+    pDrawable = (DrawablePtr) pWindow;
+
+    /* Abort if clipboard manager is owning the selection */
+    if (pDrawable->id == g_iClipboardWindow) {
+        winDebug ("winProcSetSelectionOwner - We changed ownership, "
+                 "aborting.\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Abort if root window is taking ownership */
-  if (pDrawable->id == 0)
-    {
-      winDebug ("winProcSetSelectionOwner - Root window taking ownership, "
-	      "aborting\n");
-      goto winProcSetSelectionOwner_Done;
+    /* Abort if root window is taking ownership */
+    if (pDrawable->id == 0) {
+        winDebug ("winProcSetSelectionOwner - Root window taking ownership, "
+               "aborting\n");
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Access the Windows clipboard */
-  if (!OpenClipboard (g_hwndClipboard))
-    {
-      ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x, hwnd: %08x\n",
-	      (int) GetLastError (),g_hwndClipboard);
-      goto winProcSetSelectionOwner_Done;
+    /* Access the Windows clipboard */
+    if (!OpenClipboard(g_hwndClipboard)) {
+        ErrorF ("winProcSetSelectionOwner - OpenClipboard () failed: %08x, hwnd: %08x\n",
+                (int) GetLastError (),g_hwndClipboard);
+        goto winProcSetSelectionOwner_Done;
     }
 
-  /* Take ownership of the Windows clipboard */
-  if (!EmptyClipboard ())
-    {
-      ErrorF ("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
-	      (int) GetLastError ());
-      CloseClipboard ();
-      goto winProcSetSelectionOwner_Done;
+    /* Take ownership of the Windows clipboard */
+    if (!EmptyClipboard()) {
+        ErrorF("winProcSetSelectionOwner - EmptyClipboard () failed: %08x\n",
+               (int) GetLastError());
+        CloseClipboard ();
+        goto winProcSetSelectionOwner_Done;
     }
 
-  winDebug("winProcSetSelectionOwner - SetClipboardData NULL\n");
+    winDebug("winProcSetSelectionOwner - SetClipboardData NULL\n");
 
-  /* Advertise Unicode if we support it */
-  if (g_fUnicodeSupport)
-    SetClipboardData (CF_UNICODETEXT, NULL);
+    /* Advertise Unicode if we support it */
+    if (g_fUnicodeSupport)
+        SetClipboardData(CF_UNICODETEXT, NULL);
 
-  /* Always advertise regular text */
-  SetClipboardData (CF_TEXT, NULL);
+    /* Always advertise regular text */
+    SetClipboardData(CF_TEXT, NULL);
 
-  /* Save handle to last owned selection */
-  g_atomLastOwnedSelection = stuff->selection;
+    /* Save handle to last owned selection */
+    g_atomLastOwnedSelection = stuff->selection;
 
-  /* Release the clipboard */
-  if (!CloseClipboard ())
-    {
-      ErrorF ("winProcSetSelectionOwner - CloseClipboard () failed: "
-	      "%08x\n",
-	      (int) GetLastError ());
-      goto winProcSetSelectionOwner_Done;
+    /* Release the clipboard */
+    if (!CloseClipboard()) {
+        ErrorF("winProcSetSelectionOwner - CloseClipboard () failed: "
+               "%08x\n", (int) GetLastError());
+        goto winProcSetSelectionOwner_Done;
     }
 
 winProcSetSelectionOwner_Done:
-  return (*winProcSetSelectionOwnerOrig) (client);
+    return (*winProcSetSelectionOwnerOrig) (client);
 }