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, 94 insertions, 82 deletions

diff --git a/xorg-server/hw/xquartz/pbproxy/x-input.m b/xorg-server/hw/xquartz/pbproxy/x-input.m
index ebb89980f..134bf59d8 100644
--- a/xorg-server/hw/xquartz/pbproxy/x-input.m
+++ b/xorg-server/hw/xquartz/pbproxy/x-input.m
@@ -48,126 +48,138 @@ BOOL xpbproxy_prefs_reload = NO;
 /* Timestamp when the X server last told us it's active */
 static Time last_activation_time;
 
-static void x_event_apple_wm_notify(XAppleWMNotifyEvent *e) {
+static void
+x_event_apple_wm_notify(XAppleWMNotifyEvent * e)
+{
     int type = e->type - xpbproxy_apple_wm_event_base;
     int kind = e->kind;
 
     /* We want to reload prefs even if we're not active */
-    if(type == AppleWMActivationNotify &&
-       kind == AppleWMReloadPreferences)
-        [xpbproxy_selection_object() reload_preferences];
+    if (type == AppleWMActivationNotify && kind == AppleWMReloadPreferences)
+        [xpbproxy_selection_object()reload_preferences];
 
-    if(![xpbproxy_selection_object() is_active])
+    if (![xpbproxy_selection_object()is_active])
         return;
 
-    switch (type) {              
-        case AppleWMActivationNotify:
-            switch (kind) {
-                case AppleWMIsActive:
-                    last_activation_time = e->time;
-                    [xpbproxy_selection_object() x_active:e->time];
-                    break;
-                    
-                case AppleWMIsInactive:
-                    [xpbproxy_selection_object() x_inactive:e->time];
-                    break;
-            }
+    switch (type) {
+    case AppleWMActivationNotify:
+        switch (kind) {
+        case AppleWMIsActive:
+            last_activation_time = e->time;
+ [xpbproxy_selection_object()x_active:e->time];
             break;
-            
-        case AppleWMPasteboardNotify:
-            switch (kind) {
-                case AppleWMCopyToPasteboard:
-                    [xpbproxy_selection_object() x_copy:e->time];
-            }
+
+        case AppleWMIsInactive:
+ [xpbproxy_selection_object()x_inactive:e->time];
             break;
+        }
+        break;
+
+    case AppleWMPasteboardNotify:
+        switch (kind) {
+        case AppleWMCopyToPasteboard:
+ [xpbproxy_selection_object()x_copy:e->time];
+        }
+        break;
     }
 }
 
-static void xpbproxy_process_xevents(void) {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    
-    if(pool == nil) {
+static void
+xpbproxy_process_xevents(void)
+{
+    NSAutoreleasePool *pool =[[NSAutoreleasePool alloc] init];
+
+    if (pool == nil) {
         ErrorF("unable to allocate/init auto release pool!\n");
         return;
     }
-    
+
     while (XPending(xpbproxy_dpy) != 0) {
         XEvent e;
-        
-        XNextEvent (xpbproxy_dpy, &e);
-        
-        switch (e.type) {                
-            case SelectionClear:
-                if([xpbproxy_selection_object() is_active])
-                    [xpbproxy_selection_object () clear_event:&e.xselectionclear];
-                break;
-                
-            case SelectionRequest:
-                [xpbproxy_selection_object () request_event:&e.xselectionrequest];
-                break;
-                
-            case SelectionNotify:
-                [xpbproxy_selection_object () notify_event:&e.xselection];
-                break;
-                
-            case PropertyNotify:
-                [xpbproxy_selection_object () property_event:&e.xproperty];
-                break;
-                
-            default:
-                if(e.type >= xpbproxy_apple_wm_event_base &&
-                   e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
-                    x_event_apple_wm_notify((XAppleWMNotifyEvent *) &e);
-                } else if(e.type == xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
-                    [xpbproxy_selection_object() xfixes_selection_notify:(XFixesSelectionNotifyEvent *)&e];
-                }
-                break;
+
+        XNextEvent(xpbproxy_dpy, &e);
+
+        switch (e.type) {
+        case SelectionClear:
+            if ([xpbproxy_selection_object()is_active])
+ [xpbproxy_selection_object()clear_event:&e.xselectionclear];
+            break;
+
+        case SelectionRequest:
+ [xpbproxy_selection_object()request_event:&e.xselectionrequest];
+            break;
+
+        case SelectionNotify:
+ [xpbproxy_selection_object()notify_event:&e.xselection];
+            break;
+
+        case PropertyNotify:
+ [xpbproxy_selection_object()property_event:&e.xproperty];
+            break;
+
+        default:
+            if (e.type >= xpbproxy_apple_wm_event_base &&
+                e.type < xpbproxy_apple_wm_event_base + AppleWMNumberEvents) {
+                x_event_apple_wm_notify((XAppleWMNotifyEvent *) & e);
+            }
+            else if (e.type ==
+                     xpbproxy_xfixes_event_base + XFixesSelectionNotify) {
+ [xpbproxy_selection_object()xfixes_selection_notify:(XFixesSelectionNotifyEvent *) &
+                 e];
+            }
+            break;
         }
-        
+
         XFlush(xpbproxy_dpy);
     }
-    
+
     [pool release];
 }
 
-static BOOL add_input_socket (int sock, CFOptionFlags callback_types,
-                             CFSocketCallBack callback, const CFSocketContext *ctx,
-                             CFRunLoopSourceRef *cf_source) {
+static BOOL
+add_input_socket(int sock, CFOptionFlags callback_types,
+                 CFSocketCallBack callback, const CFSocketContext * ctx,
+                 CFRunLoopSourceRef * cf_source)
+{
     CFSocketRef cf_sock;
-    
-    cf_sock = CFSocketCreateWithNative (kCFAllocatorDefault, sock,
-                                        callback_types, callback, ctx);
+
+    cf_sock = CFSocketCreateWithNative(kCFAllocatorDefault, sock,
+                                       callback_types, callback, ctx);
     if (cf_sock == NULL) {
-        close (sock);
+        close(sock);
         return FALSE;
     }
-    
-    *cf_source = CFSocketCreateRunLoopSource (kCFAllocatorDefault,
-                                              cf_sock, 0);
-    CFRelease (cf_sock);
-    
+
+    *cf_source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, cf_sock, 0);
+    CFRelease(cf_sock);
+
     if (*cf_source == NULL)
         return FALSE;
-    
-    CFRunLoopAddSource (CFRunLoopGetCurrent (),
-                        *cf_source, kCFRunLoopDefaultMode);
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(),
+                       *cf_source, kCFRunLoopDefaultMode);
     return TRUE;
 }
 
-static void x_input_callback (CFSocketRef sock, CFSocketCallBackType type,
-                              CFDataRef address, const void *data, void *info) {
+static void
+x_input_callback(CFSocketRef sock, CFSocketCallBackType type,
+                 CFDataRef address, const void *data, void *info)
+{
 
 #ifdef STANDALONE_XPBPROXY
-    if(xpbproxy_prefs_reload) {
-        [xpbproxy_selection_object() reload_preferences];
+    if (xpbproxy_prefs_reload) {
+        [xpbproxy_selection_object()reload_preferences];
         xpbproxy_prefs_reload = NO;
     }
 #endif
-    
+
     xpbproxy_process_xevents();
 }
 
-BOOL xpbproxy_input_register(void) {
-    return add_input_socket(ConnectionNumber(xpbproxy_dpy), kCFSocketReadCallBack,
-                            x_input_callback, NULL, &xpbproxy_dpy_source);
+BOOL
+xpbproxy_input_register(void)
+{
+    return add_input_socket(ConnectionNumber(xpbproxy_dpy),
+                            kCFSocketReadCallBack, x_input_callback, NULL,
+                            &xpbproxy_dpy_source);
 }