xserver: Branch 'server-1.7-branch' - 8 commits
Peter Hutterer
whot at kemper.freedesktop.org
Fri Jan 22 16:14:45 PST 2010
configure.ac | 8 +++---
hw/xfree86/doc/man/xorg.conf.man.pre | 46 ++++++++++++++++++++++++++++++++++-
hw/xquartz/bundle/Info.plist.cpp | 4 +--
hw/xquartz/quartzKeyboard.c | 4 ++-
os/utils.c | 4 +--
xorg-server.m4 | 3 +-
6 files changed, 58 insertions(+), 11 deletions(-)
New commits:
commit d3e54304578cbeb948a13654614b75bea4c55449
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sat Jan 23 12:55:38 2010 +1300
xserver 1.7.4.901
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/configure.ac b/configure.ac
index e16eb90..2b6ec6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2010-01-08"
+AC_INIT([xorg-server], 1.7.4.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2010-01-23"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
commit 43412c6b8bc7af7df0c07590002c2f96d57ba861
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Wed Jan 13 11:20:29 2010 -0800
XQuartz: Update copyright in bundle for 2010
Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
(cherry picked from commit 6bde306f7f6b9bbabeaa8bb910ea549be906cd8b)
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 87214f4..e89d985 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -35,9 +35,9 @@
<string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
#endif
<key>NSHumanReadableCopyright</key>
- <string>© 2003-2009 Apple Inc.
+ <string>© 2003-2010 Apple Inc.
© 2003 XFree86 Project, Inc.
-© 2003-2009 X.org Foundation, Inc.
+© 2003-2010 X.org Foundation, Inc.
</string>
<key>NSMainNibFile</key>
<string>main</string>
commit 268c00d24b1938aaa75ad23892fba6ef241fbe9d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Mon Jan 11 18:02:55 2010 -0800
XQuartz: Setup the modifier map in the quartz thread
This avoids possible doing it twice which could result in incorrect
keycodes for alt due to our loss of information about its side.
Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
(cherry picked from commit 6008cc116493cb2825ad0bda0b407b7aefabb3f4)
diff --git a/hw/xquartz/quartzKeyboard.c b/hw/xquartz/quartzKeyboard.c
index 62b2ebb..96b5fa5 100644
--- a/hw/xquartz/quartzKeyboard.c
+++ b/hw/xquartz/quartzKeyboard.c
@@ -260,6 +260,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
break;
case XK_Mode_switch:
+ ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
#ifdef NX_MODIFIERKEY_RALTERNATE
info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
@@ -388,7 +389,6 @@ void DarwinKeyboardReloadHandler(void) {
pthread_mutex_lock(&keyInfo_mutex); {
/* Initialize our keySyms */
- DarwinBuildModifierMaps(&keyInfo);
keySyms.map = keyInfo.keyMap;
keySyms.mapWidth = GLYPHS_PER_KEY;
keySyms.minKeyCode = MIN_KEYCODE;
@@ -808,5 +808,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
}
}
+ DarwinBuildModifierMaps(info);
+
return TRUE;
}
commit b852834bb1974a2c149869b6e19aff000a2b4187
Author: Simon Thum <simon.thum at gmx.de>
Date: Wed Jan 6 18:13:27 2010 +0100
os: state effect of -a and -t options more precisely
Signed-off-by: Simon Thum <simon.thum at gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 14e4e4a294e648e0bdcb70c34748e1b81c5bb64f)
diff --git a/os/utils.c b/os/utils.c
index 3718b17..d7c8388 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -472,7 +472,7 @@ AdjustWaitForDelay (pointer waitTime, unsigned long newdelay)
void UseMsg(void)
{
ErrorF("use: X [:<display>] [option]\n");
- ErrorF("-a # mouse acceleration (pixels)\n");
+ ErrorF("-a # default pointer acceleration (factor)\n");
ErrorF("-ac disable access control restrictions\n");
ErrorF("-audit int set audit trail level\n");
ErrorF("-auth file select authorization file\n");
@@ -524,7 +524,7 @@ void UseMsg(void)
#endif
ErrorF("-retro start with classic stipple and cursor\n");
ErrorF("-s # screen-saver timeout (minutes)\n");
- ErrorF("-t # mouse threshold (pixels)\n");
+ ErrorF("-t # default pointer threshold (pixels/t)\n");
ErrorF("-terminate terminate at server reset\n");
ErrorF("-to # connection time out\n");
ErrorF("-tst disable testing extensions\n");
commit d76f09406d07fd04a03d9cb3965419b1e95bdd03
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Thu Jan 7 15:23:34 2010 -0500
macros: use PKG_CONFIG variable rather than executable name
User can defined alternate location for pkg-config.
Once option in place, all instances of pkg-config must be converted.
Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit 6a2a57832709798d99d19ff4c587e22f3b3c150d)
diff --git a/xorg-server.m4 b/xorg-server.m4
index 2d16438..bdecf62 100644
--- a/xorg-server.m4
+++ b/xorg-server.m4
@@ -29,8 +29,9 @@ dnl
# is defined, then add $1 to $REQUIRED_MODULES.
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -I`pkg-config --variable=sdkdir xorg-server`"
+ CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`"
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include "xorg-server.h"
#if !defined $1
commit 08c2df881d61fccfd488b5ca4482686a7f3b47c0
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Fri Jan 8 19:04:25 2010 -0500
configure: use backticks rather than $() for commands
This patch to xserver configure.ac is to increase code portability to
non POSIX system by using backticks rather than $() for command
substitution for BUILD_DATE and BUILD_TIME.
Reviewed-by: Rémi Cardona <remi at gentoo.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Signed-off-by: Keith Packard <keithp at keithp.com>
(cherry picked from commit 6313d2da6c6910827d68cf31fe00b46a34c5bfc7)
diff --git a/configure.ac b/configure.ac
index c564cf9..e16eb90 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2020,9 +2020,9 @@ AC_TRY_COMPILE([
AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
-BUILD_DATE="$(date +'%Y%m%d')"
+BUILD_DATE="`date +'%Y%m%d'`"
AC_SUBST([BUILD_DATE])
-BUILD_TIME="$(date +'1%H%M%S')"
+BUILD_TIME="`date +'1%H%M%S'`"
AC_SUBST([BUILD_TIME])
DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
commit b7e903526c28eb4d5368d916708ff30486e94319
Author: Simon Thum <simon.thum at gmx.de>
Date: Tue Jan 19 17:34:49 2010 +1300
xfree86: document pointer acceleration in xorg.conf.man
Signed-off-by: Simon Thum <simon.thum at gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Fernando Carrijo <fcarrijo at yahoo.com.br>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 0722c287a4c8a6cdedca9756192547bfcf77ade5)
Conflicts:
hw/xfree86/doc/man/xorg.conf.man.pre
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 44608ab..687ec76 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -882,6 +882,50 @@ may be reattached or set floating at runtime.
.TP 7
.BI "Option \*qSendDragEvents\*q \*q" boolean \*q
Send core events while dragging. Enabled by default.
+.PP
+For pointing devices, the following options control how the pointer
+is accelerated or decelerated with respect to physical device motion. Most of
+these can be adjusted at runtime, see the xinput(1) man page for details. Only
+the most important acceleration options are discussed here.
+.TP 7
+.BI "Option \*qAccelerationProfile\*q \*q" integer \*q
+Select the profile. In layman's terms, the profile constitutes the "feeling" of
+the acceleration. More formally, it defines how the transfer function (actual
+acceleration as a function of current device velocity and acceleration controls)
+is constructed. This is mainly a matter of personal preference.
+.PP
+.RS 6
+.nf
+.B " 0 classic (mostly compatible)"
+.B "-1 none (only constant deceleration is applied)"
+.B " 1 device-dependent"
+.B " 2 polynomial (polynomial function)"
+.B " 3 smooth linear (soft knee, then linear)"
+.B " 4 simple (normal when slow, otherwise accelerated)"
+.B " 5 power (power function)"
+.B " 6 linear (more speed, more acceleration)"
+.B " 7 limited (like linear, but maxes out at threshold)"
+.fi
+.RE
+.TP 7
+.BI "Option \*qConstantDeceleration\*q \*q" real \*q
+Makes the pointer go
+.B deceleration
+times slower than normal. Most useful for high-resolution devices.
+.TP 7
+.BI "Option \*qAdaptiveDeceleration\*q \*q" real \*q
+Allows to actually decelerate the pointer when going slow. At most, it will be
+.B adaptive deceleration
+times slower. Enables precise pointer placement without sacrificing speed.
+.TP 7
+.BI "Option \*qAccelerationScheme\*q \*q" string \*q
+Selects the scheme, which is the underlying algorithm.
+.PP
+.RS 7
+.nf
+.B "predictable default algorithm (behaving more predictable)"
+.B "lightweight old acceleration code (as specified in the X protocol spec)"
+.B "none no acceleration or deceleration"
.SH "DEVICE SECTION"
The config file may have multiple
.B Device
commit c5e5a7adf0ed378b6f3b28f04af5ad8d967b31bc
Author: Simon Thum <simon.thum at gmx.de>
Date: Tue Jan 19 17:33:09 2010 +1300
doc: actually document SendDragEvents
Signed-off-by: Simon Thum <simon.thum at gmx.de>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
(cherry picked from commit 14039b5a7982fbf8130501bb00766176a4e9bccb)
Conflicts:
hw/xfree86/doc/man/xorg.conf.man.pre
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
index 942c397..44608ab 100644
--- a/hw/xfree86/doc/man/xorg.conf.man.pre
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre
@@ -881,7 +881,7 @@ X Input extension. This option controls the startup behavior only, a device
may be reattached or set floating at runtime.
.TP 7
.BI "Option \*qSendDragEvents\*q \*q" boolean \*q
-???
+Send core events while dragging. Enabled by default.
.SH "DEVICE SECTION"
The config file may have multiple
.B Device
More information about the xorg-commit
mailing list