debrix/xkb Makefile.am, 1.2, 1.3 XKBAlloc.c, 1.1, 1.2 XKBGAlloc.c,
1.1, 1.2 XKBMAlloc.c, 1.1, 1.2 XKBMisc.c, 1.1, 1.2 ddxLoad.c,
1.3, 1.4 maprules.c, 1.1, 1.2 xkb.c, 1.3, 1.4 xkbconfig.c, 1.1,
1.2 xkbfmisc.c, 1.1, 1.2 xkbout.c, 1.1, 1.2 xkbtext.c, 1.1,
1.2 xkmread.c, 1.1, 1.2
Daniel Stone
xserver-commit at pdx.freedesktop.org
Tue Jul 6 16:54:00 PDT 2004
Committed by: daniel
Update of /cvs/xserver/debrix/xkb
In directory pdx:/tmp/cvs-serv18452/xkb
Modified Files:
Makefile.am XKBAlloc.c XKBGAlloc.c XKBMAlloc.c XKBMisc.c
ddxLoad.c maprules.c xkb.c xkbconfig.c xkbfmisc.c xkbout.c
xkbtext.c xkmread.c
Log Message:
* configure.ac:
Minor cleanups; add some XKB defines.
* hw/xorg/common/debrixInit.c:
Add space in printed string (cosmetic).
* hw/xorg/loader/xf86sym.c:
Add in a bunch of symbols, so atimisc loads on my Mach64.
* xkb/Makefile.am:
Remove defines as per configure.ac.
* xkb/XKB*.c:
Add in a heap of missing #include <config.h>'s for xkbfile-derived
code.
Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix/xkb/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am 1 Jul 2004 17:49:52 -0000 1.2
+++ Makefile.am 6 Jul 2004 23:53:57 -0000 1.3
@@ -48,6 +48,3 @@
xf86%.c:
echo "#define XF86DDXACTIONS" > $@
echo "#include \"$(srcdir)/ddx$*.c\"" >> $@
-
-AM_CFLAGS = -DXKB_DFLT_DISABLED=0 -DXKB_IN_SERVER \
- -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\"
Index: XKBAlloc.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/XKBAlloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XKBAlloc.c 12 Jun 2004 15:18:20 -0000 1.1
+++ XKBAlloc.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -26,6 +26,10 @@
********************************************************/
/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.4 1998/08/20 08:55:49 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef XKB_IN_SERVER
#include <stdio.h>
Index: XKBGAlloc.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/XKBGAlloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XKBGAlloc.c 12 Jun 2004 15:19:39 -0000 1.1
+++ XKBGAlloc.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -29,6 +29,10 @@
#define NEED_EVENTS
#define NEED_REPLIES
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef XKB_IN_SERVER
#include <stdio.h>
Index: XKBMAlloc.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/XKBMAlloc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XKBMAlloc.c 12 Jun 2004 15:21:23 -0000 1.1
+++ XKBMAlloc.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -26,6 +26,10 @@
********************************************************/
/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.10 1998/10/03 08:41:27 dawes Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef XKB_IN_SERVER
#include <stdio.h>
Index: XKBMisc.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/XKBMisc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XKBMisc.c 12 Jun 2004 15:19:39 -0000 1.1
+++ XKBMisc.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -26,12 +26,16 @@
********************************************************/
/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.4 2001/08/01 00:44:38 tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#ifndef XKB_IN_SERVER
#include <stdio.h>
#define NEED_REPLIES
#define NEED_EVENTS
-#include "Xlibint.h"
+#include <X11/Xlibint.h>
#include <X11/extensions/XKBproto.h>
#include <X11/keysym.h>
#include <X11/extensions/XKBlibint.h>
Index: ddxLoad.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/ddxLoad.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ddxLoad.c 10 Jun 2004 19:42:11 -0000 1.3
+++ ddxLoad.c 6 Jul 2004 23:53:57 -0000 1.4
@@ -432,6 +432,7 @@
nameRtrn[0]= '\0';
return finfoRtrn->defined;
}
+ ErrorF("names->keymap == NULL\n");
return 0;
}
else if (!XkbDDXCompileNamedKeymap(xkb,names,nameRtrn,nameRtrnLen)) {
Index: maprules.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/maprules.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- maprules.c 12 Jun 2004 15:19:39 -0000 1.1
+++ maprules.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -30,6 +30,10 @@
#include <ctype.h>
#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#define X_INCLUDE_STRING_H
#define XOS_USE_NO_LOCKING
#include <X11/Xos_r.h>
Index: xkb.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xkb.c 10 Jun 2004 19:42:11 -0000 1.3
+++ xkb.c 6 Jul 2004 23:53:57 -0000 1.4
@@ -2307,6 +2307,9 @@
if ((xkb->min_key_code!=stuff->minKeyCode)||
(xkb->max_key_code!=stuff->maxKeyCode)) {
if (client->vMajor!=1) { /* pre 1.0 versions of Xlib have a bug */
+ /* look at the libX11 version number; not
+ * referring to fd.o xlibs versioning
+ * -daniel */
stuff->minKeyCode= xkb->min_key_code;
stuff->maxKeyCode= xkb->max_key_code;
}
Index: xkbconfig.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbconfig.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkbconfig.c 12 Jun 2004 15:19:39 -0000 1.1
+++ xkbconfig.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -32,7 +32,9 @@
#include <X11/Xfuncs.h>
-#include <X11/Xfuncs.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#ifndef XKB_IN_SERVER
@@ -40,7 +42,7 @@
#include <X11/Xlib.h>
#include <X11/keysym.h>
#include <X11/XKBlib.h>
-#include <X11/XKBfileInt.h>
+#include <X11/extensions/XKBfileInt.h>
#else
Index: xkbfmisc.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbfmisc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkbfmisc.c 12 Jun 2004 15:19:39 -0000 1.1
+++ xkbfmisc.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -30,6 +30,10 @@
#include <ctype.h>
#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/Xos.h>
#include <X11/Xfuncs.h>
Index: xkbout.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbout.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkbout.c 12 Jun 2004 15:19:39 -0000 1.1
+++ xkbout.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -29,6 +29,11 @@
#include <stdio.h>
#include <ctype.h>
#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/Xfuncs.h>
#ifndef XKB_IN_SERVER
Index: xkbtext.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkbtext.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkbtext.c 12 Jun 2004 15:19:39 -0000 1.1
+++ xkbtext.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -30,6 +30,10 @@
#include <ctype.h>
#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/Xos.h>
#ifndef XKB_IN_SERVER
Index: xkmread.c
===================================================================
RCS file: /cvs/xserver/debrix/xkb/xkmread.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkmread.c 12 Jun 2004 15:19:39 -0000 1.1
+++ xkmread.c 6 Jul 2004 23:53:57 -0000 1.2
@@ -28,6 +28,10 @@
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <X11/Xos.h>
#include <X11/Xfuncs.h>
More information about the xserver-commit
mailing list