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, 177 insertions, 173 deletions

diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c
index db34c8df5..9b69b2b82 100644
--- a/xorg-server/xkb/ddxList.c
+++ b/xorg-server/xkb/ddxList.c
@@ -44,8 +44,9 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #ifdef WIN32
 /* from ddxLoad.c */
-extern const char* Win32TempDir(void);
+extern const char *Win32TempDir(void);
 extern int Win32System(const char *cmdline);
+
 #undef System
 #define System Win32System
 
@@ -54,63 +55,62 @@ extern int Win32System(const char *cmdline);
 #define W32_tmplen strlen(tmpname)+3
 #else
 #define W32_tmparg
-#define W32_tmpfile 
+#define W32_tmpfile
 #define W32_tmplen 0
-#endif 
+#endif
 
 /***====================================================================***/
 
 static const char *componentDirs[_XkbListNumComponents] = {
-	"keycodes", "types", "compat", "symbols", "geometry"
+    "keycodes", "types", "compat", "symbols", "geometry"
 };
 
 /***====================================================================***/
 
 static Status
-_AddListComponent(	XkbSrvListInfoPtr	list,
-			int			what,
-			unsigned		flags,
-			char *			str,
-			ClientPtr		client)
+_AddListComponent(XkbSrvListInfoPtr list,
+                  int what, unsigned flags, char *str, ClientPtr client)
 {
-int		slen,wlen;
-unsigned char *	wire8;
-unsigned short *wire16;
-char *		tmp;
+    int slen, wlen;
+    unsigned char *wire8;
+    unsigned short *wire16;
+    char *tmp;
 
-    if (list->nTotal>=list->maxRtrn) {
-	list->nTotal++;
-	return Success;
+    if (list->nTotal >= list->maxRtrn) {
+        list->nTotal++;
+        return Success;
     }
-    tmp= strchr(str,')');
-    if ((tmp==NULL)&&((tmp=strchr(str,'('))==NULL)) {
-	slen= strlen(str);
-	while ((slen>0) && isspace(str[slen-1])) {
-	    slen--;
-	}
+    tmp = strchr(str, ')');
+    if ((tmp == NULL) && ((tmp = strchr(str, '(')) == NULL)) {
+        slen = strlen(str);
+        while ((slen > 0) && isspace(str[slen - 1])) {
+            slen--;
+        }
     }
     else {
-	slen= (tmp-str+1);
+        slen = (tmp - str + 1);
     }
-    wlen= (((slen+1)/2)*2)+4;	/* four bytes for flags and length, pad to */
-				/* 2-byte boundary */
-    if ((list->szPool-list->nPool)<wlen) {
-	if (wlen>1024)	list->szPool+= XkbPaddedSize(wlen*2);
-	else		list->szPool+= 1024;
-	list->pool= realloc(list->pool, list->szPool * sizeof(char));
-	if (!list->pool)
-	    return BadAlloc;
+    wlen = (((slen + 1) / 2) * 2) + 4;  /* four bytes for flags and length, pad to */
+    /* 2-byte boundary */
+    if ((list->szPool - list->nPool) < wlen) {
+        if (wlen > 1024)
+            list->szPool += XkbPaddedSize(wlen * 2);
+        else
+            list->szPool += 1024;
+        list->pool = realloc(list->pool, list->szPool * sizeof(char));
+        if (!list->pool)
+            return BadAlloc;
     }
-    wire16= (unsigned short *)&list->pool[list->nPool];
-    wire8= (unsigned char *)&wire16[2];
-    wire16[0]= flags;
-    wire16[1]= slen;
-    memcpy(wire8,str,slen);
+    wire16 = (unsigned short *) &list->pool[list->nPool];
+    wire8 = (unsigned char *) &wire16[2];
+    wire16[0] = flags;
+    wire16[1] = slen;
+    memcpy(wire8, str, slen);
     if (client->swapped) {
-	swaps(&wire16[0]);
-	swaps(&wire16[1]);
+        swaps(&wire16[0]);
+        swaps(&wire16[1]);
     }
-    list->nPool+= wlen;
+    list->nPool += wlen;
     list->nFound[what]++;
     list->nTotal++;
     return Success;
@@ -118,108 +118,104 @@ char *		tmp;
 
 /***====================================================================***/
 static Status
-XkbDDXListComponent(	DeviceIntPtr 		dev,
-			int			what,
-			XkbSrvListInfoPtr	list,
-			ClientPtr		client)
+XkbDDXListComponent(DeviceIntPtr dev,
+                    int what, XkbSrvListInfoPtr list, ClientPtr client)
 {
-char 	*file,*map,*tmp,*buf=NULL;
-FILE 	*in;
-Status	status;
-Bool	haveDir;
+    char *file, *map, *tmp, *buf = NULL;
+    FILE *in;
+    Status status;
+    Bool haveDir;
+
 #ifdef WIN32
-char	tmpname[PATH_MAX];
+    char tmpname[PATH_MAX];
 #else
-int	rval;
+    int rval;
 #endif
 
-    if ((list->pattern[what]==NULL)||(list->pattern[what][0]=='\0'))
-	return Success;
-    file= list->pattern[what];
-    map= strrchr(file,'(');
-    if (map!=NULL) {
-	char *tmp;
-	map++;
-	tmp= strrchr(map,')');
-	if ((tmp==NULL)||(tmp[1]!='\0')) {
-	    /* illegal pattern.  No error, but no match */
-	    return Success;
-	}
+    if ((list->pattern[what] == NULL) || (list->pattern[what][0] == '\0'))
+        return Success;
+    file = list->pattern[what];
+    map = strrchr(file, '(');
+    if (map != NULL) {
+        char *tmp;
+
+        map++;
+        tmp = strrchr(map, ')');
+        if ((tmp == NULL) || (tmp[1] != '\0')) {
+            /* illegal pattern.  No error, but no match */
+            return Success;
+        }
     }
 
-    in= NULL;
-    haveDir= TRUE;
+    in = NULL;
+    haveDir = TRUE;
 #ifdef WIN32
     strcpy(tmpname, Win32TempDir());
     strcat(tmpname, "\\xkb_XXXXXX");
     (void) mktemp(tmpname);
 #endif
-    if (XkbBaseDirectory!=NULL) {
-	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
-	    if (asprintf(&buf, "%s/%s.dir", XkbBaseDirectory,
-			 componentDirs[what]) == -1)
-		buf = NULL;
-	    else
-		in = fopen(buf,"r");
-	}
-	if (!in) {
-	    haveDir= FALSE;
-	    free(buf);
-	    if (asprintf
-		(&buf,
-		 "'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
-		 XkbBinDirectory, XkbBaseDirectory, componentDirs[what],
-		 (long) ((xkbDebugFlags < 2) ? 1 :
-			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
-		 file W32_tmpfile
-		    ) == -1)
-		buf = NULL;
-	}
+    if (XkbBaseDirectory != NULL) {
+        if ((list->pattern[what][0] == '*') && (list->pattern[what][1] == '\0')) {
+            if (asprintf(&buf, "%s/%s.dir", XkbBaseDirectory,
+                         componentDirs[what]) == -1)
+                buf = NULL;
+            else
+                in = fopen(buf, "r");
+        }
+        if (!in) {
+            haveDir = FALSE;
+            free(buf);
+            if (asprintf
+                (&buf,
+                 "'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
+                 XkbBinDirectory, XkbBaseDirectory, componentDirs[what],
+                 (long) ((xkbDebugFlags < 2) ? 1 :
+                         ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
+                 file W32_tmpfile) == -1)
+                buf = NULL;
+        }
     }
     else {
-	if ((list->pattern[what][0]=='*')&&(list->pattern[what][1]=='\0')) {
-	    if (asprintf(&buf, "%s.dir", componentDirs[what]) == -1)
-		buf = NULL;
-	    else
-		in = fopen(buf,"r");
-	}
-	if (!in) {
-	    haveDir= FALSE;
-	    free(buf);
-	    if (asprintf
-		(&buf,
-		 "xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
-		 componentDirs[what],
-		 (long)	((xkbDebugFlags < 2) ? 1 :
-			 ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
-		 file W32_tmpfile
-		    ) == -1)
-		buf = NULL;
-	}
+        if ((list->pattern[what][0] == '*') && (list->pattern[what][1] == '\0')) {
+            if (asprintf(&buf, "%s.dir", componentDirs[what]) == -1)
+                buf = NULL;
+            else
+                in = fopen(buf, "r");
+        }
+        if (!in) {
+            haveDir = FALSE;
+            free(buf);
+            if (asprintf
+                (&buf,
+                 "xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
+                 componentDirs[what],
+                 (long) ((xkbDebugFlags < 2) ? 1 :
+                         ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)),
+                 file W32_tmpfile) == -1)
+                buf = NULL;
+        }
     }
-    status= Success;
-    if (!haveDir)
-    {  
+    status = Success;
+    if (!haveDir) {
 #ifndef WIN32
-	in= Popen(buf,"r");
+        in = Popen(buf, "r");
 #else
         if (xkbDebugFlags)
-            DebugF("[xkb] xkbList executes: %s\n",buf);
-	if (System(buf) < 0)
-	    ErrorF("[xkb] Could not invoke keymap compiler\n");
-	else
-	    in= fopen(tmpname, "r");
+            DebugF("[xkb] xkbList executes: %s\n", buf);
+        if (System(buf) < 0)
+            ErrorF("[xkb] Could not invoke keymap compiler\n");
+        else
+            in = fopen(tmpname, "r");
 #endif
     }
-    if (!in)
-    {
-	free(buf);
+    if (!in) {
+        free(buf);
 #ifdef WIN32
-	unlink(tmpname);
+        unlink(tmpname);
 #endif
-	return BadImplementation;
+        return BadImplementation;
     }
-    list->nFound[what]= 0;
+    list->nFound[what] = 0;
     free(buf);
     buf = malloc(PATH_MAX * sizeof(char));
     if (!buf) {
@@ -229,53 +225,61 @@ int	rval;
 #endif
         return BadAlloc;
     }
-    while ((status==Success)&&((tmp=fgets(buf,PATH_MAX,in))!=NULL)) {
-	unsigned flags;
-	register unsigned int i;
-	if (*tmp=='#') /* comment, skip it */
-	    continue;
-	if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, "        ", 8))
-	    /* skip warnings too */
-	    continue;
-	flags= 0;
-	/* each line in the listing is supposed to start with two */
-	/* groups of eight characters, which specify the general  */
-	/* flags and the flags that are specific to the component */
-	/* if they're missing, fail with BadImplementation	  */
-	for (i=0;(i<8)&&(status==Success);i++) { /* read the general flags */
-	   if (isalpha(*tmp))	flags|= (1L<<i);
-	   else if (*tmp!='-')	status= BadImplementation;
-	   tmp++;
-	}
-	if (status != Success)  break;
-	if (!isspace(*tmp)) {
-	     status= BadImplementation;
-	     break;
-	}
-	else tmp++;
-	for (i=0;(i<8)&&(status==Success);i++) { /* read the component flags */
-	   if (isalpha(*tmp))	flags|= (1L<<(i+8));
-	   else if (*tmp!='-')	status= BadImplementation;
-	   tmp++;
-	}
-	if (status != Success)  break;
-	if (isspace(*tmp)) {
-	    while (isspace(*tmp)) {
-		tmp++;
-	    }
-	}
-	else {
-	    status= BadImplementation;
-	    break;
-	}
-	status= _AddListComponent(list,what,flags,tmp,client);
+    while ((status == Success) && ((tmp = fgets(buf, PATH_MAX, in)) != NULL)) {
+        unsigned flags;
+        register unsigned int i;
+
+        if (*tmp == '#')        /* comment, skip it */
+            continue;
+        if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, "        ", 8))
+            /* skip warnings too */
+            continue;
+        flags = 0;
+        /* each line in the listing is supposed to start with two */
+        /* groups of eight characters, which specify the general  */
+        /* flags and the flags that are specific to the component */
+        /* if they're missing, fail with BadImplementation        */
+        for (i = 0; (i < 8) && (status == Success); i++) {      /* read the general flags */
+            if (isalpha(*tmp))
+                flags |= (1L << i);
+            else if (*tmp != '-')
+                status = BadImplementation;
+            tmp++;
+        }
+        if (status != Success)
+            break;
+        if (!isspace(*tmp)) {
+            status = BadImplementation;
+            break;
+        }
+        else
+            tmp++;
+        for (i = 0; (i < 8) && (status == Success); i++) {      /* read the component flags */
+            if (isalpha(*tmp))
+                flags |= (1L << (i + 8));
+            else if (*tmp != '-')
+                status = BadImplementation;
+            tmp++;
+        }
+        if (status != Success)
+            break;
+        if (isspace(*tmp)) {
+            while (isspace(*tmp)) {
+                tmp++;
+            }
+        }
+        else {
+            status = BadImplementation;
+            break;
+        }
+        status = _AddListComponent(list, what, flags, tmp, client);
     }
 #ifndef WIN32
     if (haveDir)
-	fclose(in);
-    else if ((rval=Pclose(in))!=0) {
-	if (xkbDebugFlags)
-	    ErrorF("[xkb] xkbcomp returned exit code %d\n",rval);
+        fclose(in);
+    else if ((rval = Pclose(in)) != 0) {
+        if (xkbDebugFlags)
+            ErrorF("[xkb] xkbcomp returned exit code %d\n", rval);
     }
 #else
     fclose(in);
@@ -289,18 +293,18 @@ int	rval;
 
 /* ARGSUSED */
 Status
-XkbDDXList(DeviceIntPtr	dev,XkbSrvListInfoPtr list,ClientPtr client)
+XkbDDXList(DeviceIntPtr dev, XkbSrvListInfoPtr list, ClientPtr client)
 {
-Status	status;
+    Status status;
 
-    status= XkbDDXListComponent(dev,_XkbListKeycodes,list,client);
-    if (status==Success)
-	status= XkbDDXListComponent(dev,_XkbListTypes,list,client);
-    if (status==Success)
-	status= XkbDDXListComponent(dev,_XkbListCompat,list,client);
-    if (status==Success)
-	status= XkbDDXListComponent(dev,_XkbListSymbols,list,client);
-    if (status==Success)
-	status= XkbDDXListComponent(dev,_XkbListGeometry,list,client);
+    status = XkbDDXListComponent(dev, _XkbListKeycodes, list, client);
+    if (status == Success)
+        status = XkbDDXListComponent(dev, _XkbListTypes, list, client);
+    if (status == Success)
+        status = XkbDDXListComponent(dev, _XkbListCompat, list, client);
+    if (status == Success)
+        status = XkbDDXListComponent(dev, _XkbListSymbols, list, client);
+    if (status == Success)
+        status = XkbDDXListComponent(dev, _XkbListGeometry, list, client);
     return status;
 }