rpms/xorg-x11-server/FC-6 xorg-x11-server-1.1.1-xkb-vidmode-switch.patch, NONE, 1.1

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv27406

Added Files:
	xorg-x11-server-1.1.1-xkb-vidmode-switch.patch 
Log Message:
Added


xorg-x11-server-1.1.1-xkb-vidmode-switch.patch:
 hw/xfree86/dixmods/xkbPrivate.c |    8 ++++----
 include/dix.h                   |    6 ++++++
 xkb/maprules.c                  |   16 +++++-----------
 xkb/xkbfmisc.c                  |   16 ----------------
 4 files changed, 15 insertions(+), 31 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-xkb-vidmode-switch.patch ---
--- xorg-server-1.1.1/hw/xfree86/dixmods/xkbPrivate.c.xkb-vidmode-switch	2006-07-05 14:31:40.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/dixmods/xkbPrivate.c	2006-12-01 13:25:31.000000000 -0500
@@ -26,13 +26,13 @@
     if (xf86act->type == XkbSA_XFree86Private) {
         memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize);
         msgbuf[XkbAnyActionDataSize]= '\0';
-        if (strcmp(msgbuf, "-vmode")==0)
+        if (strcasecmp(msgbuf, "-vmode")==0)
             xf86ProcessActionEvent(ACTION_PREV_MODE, NULL);
-        else if (strcmp(msgbuf, "+vmode")==0)
+        else if (strcasecmp(msgbuf, "+vmode")==0)
             xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL);
-        else if (strcmp(msgbuf, "ungrab")==0)
+        else if (strcasecmp(msgbuf, "ungrab")==0)
             xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL);
-        else if (strcmp(msgbuf, "clsgrb")==0)
+        else if (strcasecmp(msgbuf, "clsgrb")==0)
             xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL);
         else
             xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf);
--- xorg-server-1.1.1/include/dix.h.xkb-vidmode-switch	2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/include/dix.h	2006-12-01 13:25:31.000000000 -0500
@@ -814,4 +814,10 @@
     SelectionCallbackKind   kind;
 } SelectionInfoRec;
 
+/* strcasecmp.c */
+#if NEED_STRCASECMP
+#define strcasecmp xstrcasecmp
+extern int xstrcasecmp(char *s1, char *s2);
+#endif
+
 #endif /* DIX_H */
--- xorg-server-1.1.1/xkb/xkbfmisc.c.xkb-vidmode-switch	2006-07-05 14:31:44.000000000 -0400
+++ xorg-server-1.1.1/xkb/xkbfmisc.c	2006-12-01 13:25:31.000000000 -0500
@@ -247,19 +247,3 @@
     /* if we get here, the pattern is exhausted (-:just like me:-) */
     return (name[0]=='\0');
 }
-
-#ifdef NEED_STRCASECMP
-_X_HIDDEN int
-_XkbStrCaseCmp(char *str1,char *str2)
-{
-    const u_char *us1 = (const u_char *)str1, *us2 = (const u_char *)str2;
-
-    while (tolower(*us1) == tolower(*us2)) {
-        if (*us1++ == '\0')
-            return (0);
-        us2++;
-    }
-
-    return (tolower(*us1) - tolower(*us2));
-}
-#endif
--- xorg-server-1.1.1/xkb/maprules.c.xkb-vidmode-switch	2006-07-05 14:38:48.000000000 -0400
+++ xorg-server-1.1.1/xkb/maprules.c	2006-12-01 13:26:40.000000000 -0500
@@ -62,12 +62,6 @@
 #define PR_DEBUG2(s,a,b)
 #endif
 
-#ifdef NEED_STRCASECMP
-extern int _XkbStrCaseCmp(char *s1, char *s2);
-#else
-#define _XkbStrCaseCmp strcasecmp
-#endif
-
 /***====================================================================***/
 
 #define DFLT_LINE_SIZE	128
@@ -1092,20 +1086,20 @@
     for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
 	if (line.line[0]=='!') {
 	    tok = strtok(&(line.line[1]), " \t");
-	    if (_XkbStrCaseCmp(tolower(tok),"model") == 0)
+	    if (strcasecmp(tolower(tok),"model") == 0)
 		headingtype = HEAD_MODEL;
-	    else if (_XkbStrCaseCmp(tok,"layout") == 0)
+	    else if (strcasecmp(tok,"layout") == 0)
 		headingtype = HEAD_LAYOUT;
-	    else if (_XkbStrCaseCmp(tok,"variant") == 0)
+	    else if (strcasecmp(tok,"variant") == 0)
 		headingtype = HEAD_VARIANT;
-	    else if (_XkbStrCaseCmp(tok,"option") == 0)
+	    else if (strcasecmp(tok,"option") == 0)
 		headingtype = HEAD_OPTION;
 	    else {
 		int i;
 		headingtype = HEAD_EXTRA;
 		extra_ndx= -1;
 		for (i=0;(i<rules->num_extra)&&(extra_ndx<0);i++) {
-		    if (!_XkbStrCaseCmp(tok,rules->extra_names[i]))
+		    if (!strcasecmp(tok,rules->extra_names[i]))
 			extra_ndx= i;
 		}
 		if (extra_ndx<0) {