xserver: Branch 'server-1.4-branch' - 4 commits
Peter Hutterer
whot at kemper.freedesktop.org
Mon Jul 28 20:51:09 PDT 2008
dix/devices.c | 3 ---
hw/kdrive/src/kinput.c | 16 ++++++----------
hw/xfree86/common/xf86Config.c | 10 ++++++----
hw/xfree86/doc/man/xorg.conf.man.pre | 15 ---------------
include/xkbsrv.h | 4 ----
xkb/xkbInit.c | 18 ------------------
6 files changed, 12 insertions(+), 54 deletions(-)
New commits:
commit 969f1db96b03afa51dacce466320d311e5c9ce72
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Jul 29 13:17:27 2008 +0930
Revert "kdrive: don't post motion event if there was no motion. #16179"
This reverts commit 5903b4c749c1136d0f3e91d5e6321b08c31da4bf.
And this one wasn't supposed to be pushed too.
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index d53a0d9..6c247c1 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2066,7 +2066,7 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
int (*matrix)[3] = kdPointerMatrix.matrix;
unsigned long button;
int n;
- int dixflags = 0;
+ int dixflags;
if (!pi)
return;
@@ -2097,15 +2097,11 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
z = rz;
if (flags & KD_MOUSE_DELTA)
- {
- if (x || y || z)
- dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
- } else if ((pi->dixdev->valuator) && (x != pi->dixdev->valuator->lastx ||
- y != pi->dixdev->valuator->lasty))
- dixflags = POINTER_ABSOLUTE;
-
- if (dixflags)
- _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
+ dixflags = POINTER_RELATIVE & POINTER_ACCELERATE;
+ else
+ dixflags = POINTER_ABSOLUTE;
+
+ _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
buttons = flags;
commit a49d811065701c5f3abb25b9e4945ce7547d0b53
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Jul 29 13:15:50 2008 +0930
Revert "xkb: delete default rules when devices are closed."
This reverts commit 7cdef0d6fc3ec6705a61014b741a4c24dc60973b.
Nor was this one.
diff --git a/dix/devices.c b/dix/devices.c
index c02b7ae..f6f3c8e 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -634,9 +634,6 @@ CloseDownDevices(void)
inputInfo.off_devices = NULL;
inputInfo.keyboard = NULL;
inputInfo.pointer = NULL;
-#ifdef XKB
- XkbDeleteRulesDflts();
-#endif
}
/**
diff --git a/include/xkbsrv.h b/include/xkbsrv.h
index b52eb65..acf3bb0 100644
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -895,10 +895,6 @@ extern void XkbSetRulesDflts(
char * /* options */
);
-extern void XkbDeleteRulesDflts(
- void
-);
-
extern void XkbInitDevice(
DeviceIntPtr /* pXDev */
);
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 87ee072..c0867ad 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -278,21 +278,6 @@ XkbSetRulesDflts(char *rulesFile,char *model,char *layout,
return;
}
-void
-XkbDeleteRulesDflts()
-{
- _XkbFree(XkbRulesFile);
- XkbRulesFile = NULL;
- _XkbFree(XkbModelDflt);
- XkbModelDflt = NULL;
- _XkbFree(XkbLayoutDflt);
- XkbLayoutDflt = NULL;
- _XkbFree(XkbVariantDflt);
- XkbVariantDflt = NULL;
- _XkbFree(XkbOptionsDflt);
- XkbOptionsDflt = NULL;
-}
-
/***====================================================================***/
#if defined(luna)
commit f0f3a11acd48dd233e8808101dcc8a22591fd00c
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Jul 29 13:15:34 2008 +0930
Revert "xkb: reset xkb_cached_map on CloseDownDevices."
This reverts commit 9b62355847ce7df1ca144b4ebc9ff5c7286b573d.
This wasn't supposed to be pushed either.
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 7723c74..87ee072 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -291,9 +291,6 @@ XkbDeleteRulesDflts()
XkbVariantDflt = NULL;
_XkbFree(XkbOptionsDflt);
XkbOptionsDflt = NULL;
-
- XkbFreeKeyboard(xkb_cached_map, XkbAllComponentsMask, True);
- xkb_cached_map = NULL;
}
/***====================================================================***/
commit b50932d998f9fe81d01a8cd22d9613aaf9136985
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Tue Jul 29 13:14:02 2008 +0930
Revert "xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled."
This reverts commit 153c6d48c655b3eca9a33b7487b238b42a4a3f8e.
How did this one end up on the branch? Sure as hell wasn't supposed to be
pushed.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 2916402..3c29497 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1081,9 +1081,9 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86Info.aiglxFrom = X_CONFIG;
}
- /* AllowEmptyInput is automatically true if we're hotplugging */
- xf86Info.allowEmptyInput = (xf86Info.autoAddDevices && xf86Info.autoEnableDevices);
- xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &xf86Info.allowEmptyInput);
+ xf86Info.allowEmptyInput = FALSE;
+ if (xf86GetOptValBool(FlagOptions, FLAG_ALLOW_EMPTY_INPUT, &value))
+ xf86Info.allowEmptyInput = TRUE;
xf86Info.useDefaultFontPath = TRUE;
xf86Info.useDefaultFontPathFrom = X_DEFAULT;
@@ -1841,7 +1841,9 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen)
indp = xnfalloc(sizeof(IDevPtr));
*indp = NULL;
servlayoutp->inputs = indp;
-
+ if (!xf86Info.allowEmptyInput && !checkCoreInputDevices(servlayoutp, TRUE))
+ return FALSE;
+
return TRUE;
}
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 94baf13..3ff5776 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -672,21 +672,6 @@ default.
.BI "Option \*qIgnoreABI\*q \*q" boolean \*q
Allow modules built for a different, potentially incompatible version of
the X server to load. Disabled by default.
-.TP 7
-.BI "Option \*qAllowEmptyInput\*q \*q" boolean \*q
-If enabled, don't add the standard keyboard and mouse drivers, if there are no
-input devices in the config file. Enabled by default if AutoAddDevices and
-AutoEnableDevices is enabled, otherwise disabled.
-.TP 7
-.BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
-If this option is disabled, then no devices will be added from HAL events.
-Enabled by default.
-.TP 7
-.BI "Option \*qAutoEnableDevices\*q \*q" boolean \*q
-If this option is disabled, then the devices will be added (and the
-DevicePresenceNotify event sent), but not enabled, thus leaving policy up
-to the client.
-Enabled by default.
.SH "MODULE SECTION"
The
.B Module
More information about the xorg-commit
mailing list