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, 127 insertions, 96 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86PM.c b/xorg-server/hw/xfree86/common/xf86PM.c
index 47e0297d6..f69fffa0e 100644
--- a/xorg-server/hw/xfree86/common/xf86PM.c
+++ b/xorg-server/hw/xfree86/common/xf86PM.c
@@ -35,60 +35,90 @@
 #include "xf86Xinput.h"
 #include "xf86_OSproc.h"
 
-int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL;
-pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL;
+int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;
+pmWait (*xf86PMConfirmEventToOs) (int fd, pmEvent event) = NULL;
 
 static Bool suspended = FALSE;
 
 static int
 eventName(pmEvent event, const char **str)
 {
-    switch(event) {
-    case XF86_APM_SYS_STANDBY: *str="System Standby Request"; return 0;
-    case XF86_APM_SYS_SUSPEND: *str="System Suspend Request"; return 0;
-    case XF86_APM_CRITICAL_SUSPEND: *str="Critical Suspend"; return 0;
-    case XF86_APM_USER_STANDBY: *str="User System Standby Request"; return 0;
-    case XF86_APM_USER_SUSPEND: *str="User System Suspend Request"; return 0;
-    case XF86_APM_STANDBY_RESUME: *str="System Standby Resume"; return 0;
-    case XF86_APM_NORMAL_RESUME: *str="Normal Resume System"; return 0;
-    case XF86_APM_CRITICAL_RESUME: *str="Critical Resume System"; return 0;
-    case XF86_APM_LOW_BATTERY: *str="Battery Low"; return 3;
-    case XF86_APM_POWER_STATUS_CHANGE: *str="Power Status Change";return 3;
-    case XF86_APM_UPDATE_TIME: *str="Update Time";return 3;
-    case XF86_APM_CAPABILITY_CHANGED: *str="Capability Changed"; return 3;
-    case XF86_APM_STANDBY_FAILED: *str="Standby Request Failed"; return 0;
-    case XF86_APM_SUSPEND_FAILED: *str="Suspend Request Failed"; return 0;
-    default: *str="Unknown Event"; return 0;
+    switch (event) {
+    case XF86_APM_SYS_STANDBY:
+        *str = "System Standby Request";
+        return 0;
+    case XF86_APM_SYS_SUSPEND:
+        *str = "System Suspend Request";
+        return 0;
+    case XF86_APM_CRITICAL_SUSPEND:
+        *str = "Critical Suspend";
+        return 0;
+    case XF86_APM_USER_STANDBY:
+        *str = "User System Standby Request";
+        return 0;
+    case XF86_APM_USER_SUSPEND:
+        *str = "User System Suspend Request";
+        return 0;
+    case XF86_APM_STANDBY_RESUME:
+        *str = "System Standby Resume";
+        return 0;
+    case XF86_APM_NORMAL_RESUME:
+        *str = "Normal Resume System";
+        return 0;
+    case XF86_APM_CRITICAL_RESUME:
+        *str = "Critical Resume System";
+        return 0;
+    case XF86_APM_LOW_BATTERY:
+        *str = "Battery Low";
+        return 3;
+    case XF86_APM_POWER_STATUS_CHANGE:
+        *str = "Power Status Change";
+        return 3;
+    case XF86_APM_UPDATE_TIME:
+        *str = "Update Time";
+        return 3;
+    case XF86_APM_CAPABILITY_CHANGED:
+        *str = "Capability Changed";
+        return 3;
+    case XF86_APM_STANDBY_FAILED:
+        *str = "Standby Request Failed";
+        return 0;
+    case XF86_APM_SUSPEND_FAILED:
+        *str = "Suspend Request Failed";
+        return 0;
+    default:
+        *str = "Unknown Event";
+        return 0;
     }
 }
 
 static int sigio_blocked_for_suspend;
 
 static void
-suspend (pmEvent event, Bool undo)
+suspend(pmEvent event, Bool undo)
 {
     int i;
     InputInfoPtr pInfo;
 
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->EnableDisableFBAccess)
-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
+        if (xf86Screens[i]->EnableDisableFBAccess)
+            (*xf86Screens[i]->EnableDisableFBAccess) (i, FALSE);
     }
     pInfo = xf86InputDevs;
     while (pInfo) {
-	DisableDevice(pInfo->dev, TRUE);
-	pInfo = pInfo->next;
+        DisableDevice(pInfo->dev, TRUE);
+        pInfo = pInfo->next;
     }
     sigio_blocked_for_suspend = xf86BlockSIGIO();
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->PMEvent)
-	    xf86Screens[i]->PMEvent(i,event,undo);
-	else {
-	    xf86Screens[i]->LeaveVT(i, 0);
-	    xf86Screens[i]->vtSema = FALSE;
-	}
+        if (xf86Screens[i]->PMEvent)
+            xf86Screens[i]->PMEvent(i, event, undo);
+        else {
+            xf86Screens[i]->LeaveVT(i, 0);
+            xf86Screens[i]->vtSema = FALSE;
+        }
     }
-    xf86AccessLeave();      
+    xf86AccessLeave();
 
 }
 
@@ -100,23 +130,23 @@ resume(pmEvent event, Bool undo)
 
     xf86AccessEnter();
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->PMEvent)
-	    xf86Screens[i]->PMEvent(i,event,undo);
-	else {
-	    xf86Screens[i]->vtSema = TRUE;
-	    xf86Screens[i]->EnterVT(i, 0);
-	}
+        if (xf86Screens[i]->PMEvent)
+            xf86Screens[i]->PMEvent(i, event, undo);
+        else {
+            xf86Screens[i]->vtSema = TRUE;
+            xf86Screens[i]->EnterVT(i, 0);
+        }
     }
     xf86UnblockSIGIO(sigio_blocked_for_suspend);
     for (i = 0; i < xf86NumScreens; i++) {
-	if (xf86Screens[i]->EnableDisableFBAccess)
-	    (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
+        if (xf86Screens[i]->EnableDisableFBAccess)
+            (*xf86Screens[i]->EnableDisableFBAccess) (i, TRUE);
     }
     dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
     pInfo = xf86InputDevs;
     while (pInfo) {
-	EnableDevice(pInfo->dev, TRUE);
-	pInfo = pInfo->next;
+        EnableDevice(pInfo->dev, TRUE);
+        pInfo = pInfo->next;
     }
 }
 
@@ -124,43 +154,44 @@ static void
 DoApmEvent(pmEvent event, Bool undo)
 {
     int i, was_blocked;
-    
-    switch(event) {
+
+    switch (event) {
 #if 0
     case XF86_APM_SYS_STANDBY:
     case XF86_APM_USER_STANDBY:
 #endif
     case XF86_APM_SYS_SUSPEND:
-    case XF86_APM_CRITICAL_SUSPEND: /*do we want to delay a critical suspend?*/
+    case XF86_APM_CRITICAL_SUSPEND:    /*do we want to delay a critical suspend? */
     case XF86_APM_USER_SUSPEND:
-	/* should we do this ? */
-	if (!undo && !suspended) {
-	    suspend(event,undo);
-	    suspended = TRUE;
-	} else if (undo && suspended) {
-	    resume(event,undo);
-	    suspended = FALSE;
-	}
-	break;
+        /* should we do this ? */
+        if (!undo && !suspended) {
+            suspend(event, undo);
+            suspended = TRUE;
+        }
+        else if (undo && suspended) {
+            resume(event, undo);
+            suspended = FALSE;
+        }
+        break;
 #if 0
     case XF86_APM_STANDBY_RESUME:
 #endif
     case XF86_APM_NORMAL_RESUME:
     case XF86_APM_CRITICAL_RESUME:
-	if (suspended) {
-	    resume(event,undo);
-	    suspended = FALSE;
-	}
-	break;
+        if (suspended) {
+            resume(event, undo);
+            suspended = FALSE;
+        }
+        break;
     default:
-	was_blocked = xf86BlockSIGIO();
-	for (i = 0; i < xf86NumScreens; i++) {
-	    if (xf86Screens[i]->PMEvent) {
-		xf86Screens[i]->PMEvent(i,event,undo);
-	    }
-	}
-	xf86UnblockSIGIO(was_blocked);
-	break;
+        was_blocked = xf86BlockSIGIO();
+        for (i = 0; i < xf86NumScreens; i++) {
+            if (xf86Screens[i]->PMEvent) {
+                xf86Screens[i]->PMEvent(i, event, undo);
+            }
+        }
+        xf86UnblockSIGIO(was_blocked);
+        break;
     }
 }
 
@@ -170,39 +201,39 @@ void
 xf86HandlePMEvents(int fd, pointer data)
 {
     pmEvent events[MAX_NO_EVENTS];
-    int i,n;
+    int i, n;
     Bool wait = FALSE;
 
     if (!xf86PMGetEventFromOs)
-	return;
-
-    if ((n = xf86PMGetEventFromOs(fd,events,MAX_NO_EVENTS))) {
-	do {
-	    for (i = 0; i < n; i++) {
-		const char *str = NULL;
-		int verb = eventName(events[i],&str);
-
-		xf86MsgVerb(X_INFO,verb,"PM Event received: %s\n",str);
-		DoApmEvent(events[i],FALSE);
-		switch (xf86PMConfirmEventToOs(fd,events[i])) {
-		case PM_WAIT:
-		    wait = TRUE;
-		    break;
-		case PM_CONTINUE:
-		    wait = FALSE;
-		    break;
-		case PM_FAILED:
-		    DoApmEvent(events[i],TRUE);
-		    wait = FALSE;
-		    break;
-		default:
-		    break;
-		}
-	    }
-	    if (wait)
-		n = xf86PMGetEventFromOs(fd,events,MAX_NO_EVENTS);
-	    else
-		break;
-	} while (1);
+        return;
+
+    if ((n = xf86PMGetEventFromOs(fd, events, MAX_NO_EVENTS))) {
+        do {
+            for (i = 0; i < n; i++) {
+                const char *str = NULL;
+                int verb = eventName(events[i], &str);
+
+                xf86MsgVerb(X_INFO, verb, "PM Event received: %s\n", str);
+                DoApmEvent(events[i], FALSE);
+                switch (xf86PMConfirmEventToOs(fd, events[i])) {
+                case PM_WAIT:
+                    wait = TRUE;
+                    break;
+                case PM_CONTINUE:
+                    wait = FALSE;
+                    break;
+                case PM_FAILED:
+                    DoApmEvent(events[i], TRUE);
+                    wait = FALSE;
+                    break;
+                default:
+                    break;
+                }
+            }
+            if (wait)
+                n = xf86PMGetEventFromOs(fd, events, MAX_NO_EVENTS);
+            else
+                break;
+        } while (1);
     }
 }