xserver: Branch 'master' - 7 commits
Daniel Stone
daniels at kemper.freedesktop.org
Fri Jul 21 12:19:39 PDT 2006
Xext/xevie.c | 24 ++++++++++++++++++------
configure.ac | 2 +-
exa/exa.c | 2 ++
hw/kdrive/src/kxv.c | 2 +-
include/dix-config.h.in | 3 +++
include/kdrive-config.h.in | 3 +++
os/utils.c | 6 ------
7 files changed, 28 insertions(+), 14 deletions(-)
New commits:
diff-tree 93cd53860c3aca182a0a02543c41b5d71d65926b (from cd0874dda1c30ef91a7d2b3cd455676422599ccf)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Thu Jul 20 16:52:31 2006 -0400
kdrive: allow debugging
diff --git a/include/kdrive-config.h.in b/include/kdrive-config.h.in
index 9e611c5..2f454d7 100644
--- a/include/kdrive-config.h.in
+++ b/include/kdrive-config.h.in
@@ -22,4 +22,7 @@
/* Support tslib touchscreen abstraction library */
#undef TSLIB
+/* Verbose debugging output hilarity */
+#undef DEBUG
+
#endif /* _KDRIVE_CONFIG_H_ */
diff-tree cd0874dda1c30ef91a7d2b3cd455676422599ccf (from 093943d4d02f1dbc8935b8cf835866a6e3885193)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Wed Jul 19 20:13:02 2006 -0400
never define MEMBUG
Definining MEMBUG causes allocations to randomly fail.
diff --git a/os/utils.c b/os/utils.c
index 3900bff..ffa4958 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -264,12 +264,6 @@ int SyncOn = 0;
extern int SelectWaitTime;
#endif
-#ifdef DEBUG
-#ifndef SPECIAL_MALLOC
-#define MEMBUG
-#endif
-#endif
-
#if defined(SVR4) || defined(__linux__) || defined(CSRG_BASED)
#define HAS_SAVED_IDS_AND_SETEUID
#endif
diff-tree 093943d4d02f1dbc8935b8cf835866a6e3885193 (from 68b0678254240a984db9adefefb0cf68e9bfd4e4)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Wed Jul 19 20:09:55 2006 -0400
define DEBUG in DIX
Which makes #ifdef DEBUG actually useful. Incredible.
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 4c3a4b7..2b9f273 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -231,6 +231,9 @@
/* Disable some debugging code */
#undef NDEBUG
+/* Enable some debugging code */
+#undef DEBUG
+
/* Name of package */
#undef PACKAGE
diff-tree 68b0678254240a984db9adefefb0cf68e9bfd4e4 (from 27df2eda795681c9f05e2907d74e2c102d3441e4)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Wed Jul 19 20:08:32 2006 -0400
exa: only disable cw when COMPOSITE is built
diff --git a/exa/exa.c b/exa/exa.c
index 1022b2e..b490653 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -606,7 +606,9 @@ exaDriverInit (ScreenPtr pScreen,
}
#endif
+#ifdef COMPOSITE
miDisableCompositeWrapper(pScreen);
+#endif
/*
* Hookup offscreen pixmaps
diff-tree 27df2eda795681c9f05e2907d74e2c102d3441e4 (from 00b24f119f03da86fa98ffea545c5b041810ce53)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Wed Jul 19 16:18:28 2006 -0400
fix KdXvCopyPackedData to actually work
Remove extraneous bit shift in KdXvCopyPackedData, so it's actually
useful.
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 8580dc2..4e672f1 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -1814,7 +1814,7 @@ KdXVCopyPackedData(KdScreenInfo *screen,
src = src + top * srcDown + left * srcRight;
w >>= 1;
- srcRight >>= 1;
+ /* srcRight >>= 1; */
srcNext = srcRight >> 1;
while (h--) {
CARD16 *s = (CARD16 *)src;
diff-tree 00b24f119f03da86fa98ffea545c5b041810ce53 (from f8a7a1e40c14a85ebde11c5854c07a8d529d38b9)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Wed Jul 19 17:01:20 2006 -0400
fix minor typo
diff --git a/configure.ac b/configure.ac
index 51b634e..a2af599 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,7 +469,7 @@ AC_MSG_RESULT([$SETUID])
AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
-dnl was not expanded, since libX11 with no transport types is rather useless.
+dnl was not expanded, since xorg-server with no transport types is rather useless.
dnl
dnl If you're seeing an error here, be sure you installed the lib/xtrans module
dnl first and if it's not in the default location, that you set the ACLOCAL
diff-tree f8a7a1e40c14a85ebde11c5854c07a8d529d38b9 (from 985c34bf06af70a7296db8307899a17347a25558)
Author: Daniel Stone <daniel.stone at nokia.com>
Date: Wed Jul 19 17:06:00 2006 -0400
fix XEvIE build without XKB
Don't unconditionally play with XKB stuff in XEvIE.
diff --git a/Xext/xevie.c b/Xext/xevie.c
index ccc1237..41fdd1d 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -59,7 +59,9 @@ of the copyright holder.
#define NoSuchEvent 0x80000000
+#ifdef XKB
extern Bool noXkbExtension;
+#endif
extern int xeviegrabState;
static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
@@ -201,12 +203,14 @@ int ProcStart (register ClientPtr client
return BadAlloc;
} else
return BadAccess;
+#ifdef XKB
if (!noXkbExtension) {
if (!XevieStart()) {
DeleteCallback(&ClientStateCallback,XevieClientStateCallback,NULL);
return BadAlloc;
}
}
+#endif
xevieModifiersOn = FALSE;
@@ -255,19 +259,23 @@ int ProcSend (register ClientPtr client)
case KeyPress:
case KeyRelease:
xevieKBEventSent = 1;
- if(noXkbExtension)
- CoreProcessKeyboardEvent (xE, xeviekb, 1);
- else
+#ifdef XKB
+ if(!noXkbExtension)
doSendEvent(xE, inputInfo.keyboard);
+ else
+#endif
+ CoreProcessKeyboardEvent (xE, xeviekb, 1);
break;
case ButtonPress:
case ButtonRelease:
case MotionNotify:
xevieEventSent = 1;
- if(noXkbExtension)
- CoreProcessPointerEvent(xE, xeviemouse, 1);
- else
+#ifdef XKB
+ if(!noXkbExtension)
doSendEvent(xE, inputInfo.pointer);
+ else
+#endif
+ CoreProcessPointerEvent(xE, xeviemouse, 1);
break;
default:
break;
@@ -464,6 +472,7 @@ XevieKbdProcessInputProc(xEvent *xE, Dev
xE->u.keyButtonPointer.state = keyc->state | inputInfo.pointer->button->state;
/* fix bug: sequence lost in Xlib */
xE->u.u.sequenceNumber = clients[xevieClientIndex]->sequence;
+#ifdef XKB
/* fix for bug5092586 */
if(!noXkbExtension) {
switch(xE->u.u.type) {
@@ -471,6 +480,7 @@ XevieKbdProcessInputProc(xEvent *xE, Dev
case KeyRelease: *kptr &= ~bit; break;
}
}
+#endif
keycq[keycqHead].time = xE->u.keyButtonPointer.time;
memcpy(keycq[keycqHead].keyc, keyc, sizeof(KeyClassRec) - sizeof(KeyClassPtr));
memcpy(keycq[keycqHead].keyc->xkbInfo, keyc->xkbInfo, sizeof(XkbSrvInfoRec));
@@ -525,6 +535,7 @@ XevieEnd(int clientIndex)
{
if (!clientIndex || clientIndex == xevieClientIndex) {
+#ifdef XKB
if(!noXkbExtension) {
XevieRemove(inputInfo.keyboard,NULL);
@@ -540,6 +551,7 @@ XevieEnd(int clientIndex)
inputInfo.pointer->public.realInputProc = CoreProcessPointerEvent;
XkbSetExtension(inputInfo.pointer,ProcessPointerEvent);
}
+#endif
xevieFlag = 0;
xevieClientIndex = 0;
More information about the xorg-commit
mailing list