From 753310837cd3812882d8de67f063bb61813db675 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 14 Dec 2009 08:41:18 +1000 Subject: [PATCH 1/5] xfree86: DontZap has been disabled for a while now, say so in the man page. 1.7 always shipped with DontZap disabled, it's just the default keymaps that may not include the symbol to trigger it. Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith --- hw/xfree86/doc/man/Xorg.man.pre | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre index fe3280038..98a959069 100644 --- a/hw/xfree86/doc/man/Xorg.man.pre +++ b/hw/xfree86/doc/man/Xorg.man.pre @@ -435,11 +435,10 @@ by are: .TP 8 .B Ctrl+Alt+Backspace -Immediately kills the server -- no questions asked. This is disabled by -default. It can be enabled with the -retro command line flag or by setting -the +Immediately kills the server -- no questions asked. It can be disabled by +setting the .B DontZap -__xconfigfile__(__filemansuffix__) file option to a FALSE value. +__xconfigfile__(__filemansuffix__) file option to a TRUE value. .TP 8 .B Ctrl+Alt+Keypad-Plus Change video mode to next one specified in the configuration file. From 801bc8075aee664bd4c6b6ff842ab737c143a1de Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 14 Dec 2009 08:43:19 +1000 Subject: [PATCH 2/5] xfree86: update man page for special keys handling. SpecialKeyHandling was removed from the kbd driver with version 1.4.0. Since this is the only version that will build against server 1.7+ it's not reasonable to mention it in the man page. Reword, point to XKB instead and make clear that some key combinations _may_ not be available in any given config. Reported-by: Derek Fawcus Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith --- hw/xfree86/doc/man/Xorg.man.pre | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/hw/xfree86/doc/man/Xorg.man.pre b/hw/xfree86/doc/man/Xorg.man.pre index 98a959069..bb5a14fb9 100644 --- a/hw/xfree86/doc/man/Xorg.man.pre +++ b/hw/xfree86/doc/man/Xorg.man.pre @@ -421,18 +421,12 @@ The .B __xservername__ server is normally configured to recognize various special combinations of key presses that instruct the server to perform some action, rather -than just sending the key press event to a client application. The -default XKEYBOARD keymap defines the key combinations listed below. -The kbd (__drivermansuffix__) driver also has these key combinations -builtin to its event handler -for cases where the XKEYBOARD extension is not being used. When using -the XKEYBOARD extension, which key combinations perform which actions -is completely configurable. +than just sending the key press event to a client application. These actions +depend on the XKB keymap loaded by a particular keyboard device and may or +may not be available on a given configuration. .PP -The special combinations of key presses recognized directly -by -.B __xservername__ -are: +The following key combinations are commonly part of the default XKEYBOARD +keymap. .TP 8 .B Ctrl+Alt+Backspace Immediately kills the server -- no questions asked. It can be disabled by From 094c6b9f97a9f92e5a0ef3cf5be24c09ed4d6063 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Dec 2009 10:42:32 +1000 Subject: [PATCH 3/5] xfree86: reword InputDevice man sections, deprecate CorePointer/CoreKeyboard Reshuffle and reword - InputDevice sections are only necessary if hotplugging is disabled. Put more emphasis on hotplugging and less on HAL since we'll switch backends eventually. CorePointer, CoreKeyboard, and AlwaysCore should be listed as deprecated since they don't do what they used to since 1.4. These days, only SendCoreEvents matters and it's enabled for any driver calling xf86ProcessCommonOptions (== every driver). It only controls the startup behavior too, so document this. Signed-off-by: Peter Hutterer Acked-by: Keith Packard Reviewed-by: Alan Coopersmith --- hw/xfree86/doc/man/xorg.conf.man.pre | 81 ++++++++++++++-------------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index ace041c92..ff0e4b762 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -769,11 +769,28 @@ Example: the MIT-SHM extension can be disabled with the following entry: The config file may have multiple .B InputDevice sections. -If HAL is not being used for input device configuration, there will normally -be at least two: one for the core (primary) keyboard, -and one of the core pointer. +Recent X servers employ input hotplugging to add input devices, with the HAL +backend being the default backend for X servers since 1.4. It is usually not +necessary to provide +.B InputDevice +sections in the xorg.conf if hotplugging is enabled. +.PP +If hotplugging is disabled, there will normally +be at least two: one for the core (primary) keyboard +and one for the core pointer. If either of these two is missing, a default configuration for the missing -ones will be used. +ones will be used. In the absence of an explicitly specified core input +device, the first +.B InputDevice +marked as +.B CorePointer +(or +.BR CoreKeyboard ) +is used. +If there is no match there, the first +.B InputDevice +that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used. +The final fallback is to use built\-in default configurations. Currently the default configuration may not work as expected on all platforms. .PP .B InputDevice @@ -828,17 +845,6 @@ and .BR mousedrv (__drivermansuffix__) on other platforms. .PP -In the absence of an explicitly specified core input device, the first -.B InputDevice -marked as -.B CorePointer -(or -.BR CoreKeyboard ) -is used. -If there is no match there, the first -.B InputDevice -that uses the \(lqmouse\(rq (or \(lqkbd\(rq) driver is used. -The final fallback is to use built\-in default configurations. .PP .B InputDevice sections recognise some driver\-independent @@ -848,40 +854,31 @@ See the individual input driver manual pages for a description of the device\-specific options. .TP 7 .BI "Option \*qCorePointer\*q" -When this is set, the input device is installed as the core (primary) -pointer device. -There must be exactly one core pointer. -If this option is not set here, or in the -.B ServerLayout -section, or from the -.B \-pointer -command line option, then the first input device that is capable of -being used as a core pointer will be selected as the core pointer. -This option is implicitly set when the obsolete -.B Pointer -section is used. +Deprecated, use +.B SendCoreEvents +instead. .TP 7 .BI "Option \*qCoreKeyboard\*q" -When this is set, the input device is to be installed as the core -(primary) keyboard device. -There must be exactly one core keyboard. -If this option is not set here, in the -.B ServerLayout -section, or from the -.B \-keyboard -command line option, then the first input device that is capable of -being used as a core keyboard will be selected as the core keyboard. -This option is implicitly set when the obsolete -.B Keyboard -section is used. +Deprecated, use +.B SendCoreEvents +instead. .TP 7 .BI "Option \*qAlwaysCore\*q \*q" boolean \*q +.B +Deprecated, use +.B SendCoreEvents +instead. .TP 7 .BI "Option \*qSendCoreEvents\*q \*q" boolean \*q Both of these options are equivalent, and when enabled cause the -input device to always report core events. -This can be used, for example, to allow an additional pointer device to -generate core pointer events (like moving the cursor, etc). +input device to report core events through the master device. They are +enabled by default. Any device configured to send core events will be +attached to the virtual core pointer or keyboard and control the cursor by +default. Devices with +.B SendCoreEvents +disabled will be \*qfloating\*q and only accessible by clients employing the +X Input extension. This option controls the startup behavior only, a device +may be reattached or set floating at runtime. .TP 4 .BI "Option \*qHistorySize\*q \*q" number \*q Sets the motion history size. From 190610e0c62170a27ab3e40c6c6210a583ae1ad4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Dec 2009 11:08:26 +1000 Subject: [PATCH 4/5] xfree86: remove HistorySize from the xorg.conf man page. This option isn't parsed by anything anymore. Signed-off-by: Peter Hutterer Reviewed-by: Keith Packard --- hw/xfree86/doc/man/xorg.conf.man.pre | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index ff0e4b762..84be12c8b 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -879,10 +879,6 @@ default. Devices with disabled will be \*qfloating\*q and only accessible by clients employing the X Input extension. This option controls the startup behavior only, a device may be reattached or set floating at runtime. -.TP 4 -.BI "Option \*qHistorySize\*q \*q" number \*q -Sets the motion history size. -Default: 0. .TP 7 .BI "Option \*qSendDragEvents\*q \*q" boolean \*q ??? From b44c9be244cee286835855483a69c69e80b095c0 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 22 Dec 2009 17:14:09 +0100 Subject: [PATCH 5/5] test/xi2: fix maximum max_keycode (bug#25492) The number of keycodes needs to be lower than 0xFFFD so that the length field of xXIKeyInfo doesn't overflow. Signed-off-by: Julien Cristau Signed-off-by: Peter Hutterer --- test/xi2/protocol-eventconvert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/xi2/protocol-eventconvert.c b/test/xi2/protocol-eventconvert.c index 65ddec507..66686cb1c 100644 --- a/test/xi2/protocol-eventconvert.c +++ b/test/xi2/protocol-eventconvert.c @@ -834,7 +834,7 @@ static void test_convert_XIDeviceChangedEvent(void) in.keys.max_keycode = 1 << 8; test_XIDeviceChangedEvent(&in); - in.keys.max_keycode = 0xFFFD; /* highest range, above that the length + in.keys.max_keycode = 0xFFFC; /* highest range, above that the length field gives up */ test_XIDeviceChangedEvent(&in);