[PATCH keyboard 2/2] Removed unnecessary code, since ABI_XINPUT_VERSION = 2

2011-02-17 Thread Alexandr Shadchin
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/kbd.c | 44 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index e0f0d33..d89d234 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -276,51 +276,7 @@

[PATCH keyboard 1/2] Require server 1.4 or later

2011-02-17 Thread Alexandr Shadchin
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index f6ebb96..f6fdf26 100644 --- a/configure.ac +++ b/configure.ac @@ -45,7 +45,7 @@ XORG_MACROS_VERSION(1.8)

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread olafBuddenhagen
Hi, On Wed, Feb 16, 2011 at 09:07:46AM +0100, Mark Kettenis wrote: From: Van de Bugger van.de.bug...@gmail.com Date: Wed, 16 Feb 2011 00:15:52 +0300 ...by using dynamically allocated buffers. No need in PATH_MAX, MAXPATHLEN. No more Path too long errors. Not really. Instead fopen(3)

[PATCH] Turn shadowfb off on virtualized hardware

2011-02-17 Thread Adam Jackson
There's no benefit to shadowfb, since the framebuffer is in the same memory domain as host memory; all you're doing is adding extra copies. Signed-off-by: Adam Jackson a...@redhat.com --- src/vesa.c | 34 +++--- 1 files changed, 31 insertions(+), 3 deletions(-)

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Alan Coopersmith
On 02/17/11 07:25 AM, olafbuddenha...@gmx.net wrote: In short, using dynamic allocation and checking for error returns is actually the *pragmatic* approach. I'd think the pragmatic approach would be to tell anyone putting a XKB config file in a path longer than 1024 characters to stop being an

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Daniel Stone
On Thu, Feb 17, 2011 at 10:01:37AM -0800, Alan Coopersmith wrote: On 02/17/11 07:25 AM, olafbuddenha...@gmx.net wrote: In short, using dynamic allocation and checking for error returns is actually the *pragmatic* approach. I'd think the pragmatic approach would be to tell anyone putting a

[PATCH setxkbmap] Set of macros converted to enum type.

2011-02-17 Thread Van de Bugger
Signed-off-by: Van de Bugger van.de.bug...@gmail.com --- setxkbmap.c | 27 +++ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/setxkbmap.c b/setxkbmap.c index 0c43be5..e47278d 100644 --- a/setxkbmap.c +++ b/setxkbmap.c @@ -57,15 +57,18 @@ #define

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Van de Bugger
Not really. Instead fopen(3) will fail and a more cryptic Didn't find error message will be printed. I am going to fix it eventually. On Wed, 2011-02-16 at 09:07 +0100, Mark Kettenis wrote: From: Van de Bugger van.de.bug...@gmail.com Date: Wed, 16 Feb 2011 00:15:52 +0300 From

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Van de Bugger
Hi, guys, if you are happy with /usr/share/xkb it does not mean that everybody should be happy too. I started looking into keyboard stuff because I am not satisfied with system-provided configuration. I want to customize keyboard a bit and keep my customizations in my private directory, not in

Re: [PATCH keyboard 2/2] Removed unnecessary code, since ABI_XINPUT_VERSION = 2

2011-02-17 Thread Peter Hutterer
On Thu, Feb 17, 2011 at 03:40:29PM +0500, Alexandr Shadchin wrote: Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/kbd.c | 44 1 files changed, 0 insertions(+), 44 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index

Re: [PATCH setxkbmap] Set of macros converted to enum type.

2011-02-17 Thread Peter Hutterer
On Thu, Feb 17, 2011 at 10:41:29PM +0300, Van de Bugger wrote: Signed-off-by: Van de Bugger van.de.bug...@gmail.com --- setxkbmap.c | 27 +++ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/setxkbmap.c b/setxkbmap.c index 0c43be5..e47278d 100644

[PATCH keyboard 1/5] Removed option XLeds

2011-02-17 Thread Alexandr Shadchin
IMHO nobody needs because it works not correctly and still not fixed Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- man/kbd.man |7 --- src/kbd.c | 19 +-- src/xf86OSKbd.h |1 - 3 files changed, 1 insertions(+), 26 deletions(-) diff

[PATCH keyboard 2/5] Removed function InitKBD

2011-02-17 Thread Alexandr Shadchin
Before calling InitKBD called KbdCtrl, which sets the LEDS in accordance with the ctrl-leds. Therefore, further manipulation InitKBD do not matter. Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/kbd.c | 53 + 1 files

[PATCH keyboard 3/5] Removed useless leds and keyLeds (members structure KbdDevRec)

2011-02-17 Thread Alexandr Shadchin
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/kbd.c | 31 --- src/xf86OSKbd.h |2 -- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index bb1a177..283c0f1 100644 --- a/src/kbd.c +++ b/src/kbd.c

[PATCH keyboard 4/5] Removed useless defines (CAPSFLAG etc.)

2011-02-17 Thread Alexandr Shadchin
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/kbd.c |6 -- 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/kbd.c b/src/kbd.c index 283c0f1..5f2aa80 100644 --- a/src/kbd.c +++ b/src/kbd.c @@ -41,12 +41,6 @@ #include xkbstr.h #include xkbsrv.h

[PATCH keyboard 5/5] Removed no longer needed GetLeds

2011-02-17 Thread Alexandr Shadchin
Signed-off-by: Alexandr Shadchin alexandr.shadc...@gmail.com --- src/bsd_kbd.c | 39 --- src/hurd_kbd.c |7 --- src/lnx_kbd.c | 16 src/sun_kbd.c | 15 --- src/xf86OSKbd.h |2 -- 5 files changed, 0

Re: [PATCH keyboard 2/5] Removed function InitKBD

2011-02-17 Thread Alan Coopersmith
Why have you decided to remove the functionality of initializing the state of things like NumLock based on the initial LED state? It was a bit of the hack to propogate things like NumLock on by default from the BIOS up through to the X server, but it worked.(At least it used to, I haven't

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Daniel Stone
On Thu, Feb 17, 2011 at 11:28:19PM +0300, Van de Bugger wrote: Thus, I want my keyboard stuff to be located in a place of my choice. Probably, I like very-very-very-long directory and file names, and my names are not in Latin alphabet, so 1024 bytes may actually mean just 512 characters or

Re: [PATCH setxkbmap] Eliminate limitations on path length.

2011-02-17 Thread Alan Coopersmith
On 02/17/11 04:36 PM, Daniel Stone wrote: On Thu, Feb 17, 2011 at 11:28:19PM +0300, Van de Bugger wrote: Thus, I want my keyboard stuff to be located in a place of my choice. Probably, I like very-very-very-long directory and file names, and my names are not in Latin alphabet, so 1024 bytes

[PATCH setxkbmap] man: multiple layouts can be specified (#34118)

2011-02-17 Thread Peter Hutterer
X.Org Bug 34118 http://bugs.freedesktop.org/show_bug.cgi?id=34118 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- man/setxkbmap.man |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/setxkbmap.man b/man/setxkbmap.man index 1c0b87a..22b2798 100644 ---

[PATCH 01/20] mi: remove static GenerateEvent variable.

2011-02-17 Thread Peter Hutterer
Push into the respective devices. This should have no functional changes since we never warp more than one device at a time. In the glorious future with true multithreading, still the better thing to do. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/mipointer.c |9 +

[PATCH 02/20] mi: Add a few comments explaining various cursor move functions.

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/mipointer.c | 153 ++-- 1 files changed, 138 insertions(+), 15 deletions(-) diff --git a/mi/mipointer.c b/mi/mipointer.c index 5ee456c..a3c26d03 100644 --- a/mi/mipointer.c +++

[PATCH 03/20] mi: remove if 0 code.

2011-02-17 Thread Peter Hutterer
Note sure why this is in if 0 but it's been that way since 2007. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/mipointer.c | 25 - 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/mi/mipointer.c b/mi/mipointer.c index a3c26d03..124f9de

[PATCH 04/20] mi: simplify a check for keyboard condition

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/mipointer.c |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/mi/mipointer.c b/mi/mipointer.c index 124f9de..aa0ca6d 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -193,8 +193,7 @@ miPointerDisplayCursor

[PATCH 05/20] dix: replace direct master access with GetMaster and temp. device.

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/getevents.c |9 + 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dix/getevents.c b/dix/getevents.c index 794df42..60282a8 100644 --- a/dix/getevents.c +++ b/dix/getevents.c @@ -866,10 +866,11 @@

[PATCH 06/20] Fix two incorrect checks for master devices.

2011-02-17 Thread Peter Hutterer
These two were sideeffects of lastSlave being in the same field as the master. For devices generated by the master device directly, lastSlave was 0 and the device would (with the old checks) be interpreted as floating. Add the required checks to safeguard against master devices. Signed-off-by:

[PATCH 07/20] dix: Simplify retrieving the master device.

2011-02-17 Thread Peter Hutterer
GetMaster() returns NULL for floating slaves. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dix/events.c b/dix/events.c index 07f8b05..4826781 100644 --- a/dix/events.c +++ b/dix/events.c @@

[PATCH 08/20] dix: Add IsFloating(device) wrapper.

2011-02-17 Thread Peter Hutterer
Simplifies check for floating devices. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c |7 +++ include/dix.h |1 + 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dix/events.c b/dix/events.c index 4826781..f6d92cf 100644 --- a/dix/events.c +++

[PATCH 10/20] Switch to use IsFloating()

2011-02-17 Thread Peter Hutterer
This is not a straightforward search/replacement due to a long-standing issue. dev-u.master is the same field as dev-u.lastSlave. Thus, if dev is a master device, a check for dev-u.master may give us false positives and false negatives. The switch to IsFloating() spells out these cases and

[PATCH 11/20] dix: add MASTER_ATTACHED as allowed type for GetMaster().

2011-02-17 Thread Peter Hutterer
In some cases, we don't know/care whether we want the master pointer or keyboard for a device. Add a new type MASTER_ATTACHED to return the master this device is attached to. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |7 +-- include/inputstr.h |1 +

[PATCH 12/20] Xi: replace a direct master access with GetMaster()

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index ea9daa9..0df6579 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -869,7 +869,7 @@ UpdateDeviceState(DeviceIntPtr

[PATCH 13/20] dix: fix up a master check in ChangeKeyboardMapping handling.

2011-02-17 Thread Peter Hutterer
We don't just care about the directly attached master, we care about the master keyboard. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 8be1903..f7018d0 100644

[PATCH 14/20] dix: fix a master device access in change_modmap.

2011-02-17 Thread Peter Hutterer
We need to check if our master keyboard is the given device since we may be a pointer with keys and thus need to change the modmap too. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/inpututils.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH 15/20] xfree86: update GetMaster check for the VCP.

2011-02-17 Thread Peter Hutterer
Same result, but now also triggers on slave keyboards that send pointer events. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- hw/xfree86/ramdac/xf86Cursor.c |6 ++ 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/xfree86/ramdac/xf86Cursor.c

[PATCH 16/20] mi: update macro to search for MASTER_POINTER

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/midispcur.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mi/midispcur.c b/mi/midispcur.c index 48feb88..9b3e87a 100644 --- a/mi/midispcur.c +++ b/mi/midispcur.c @@ -76,7 +76,7 @@ typedef struct { #define

[PATCH 17/20] mi: check for MASTER_POINTER instead of manual checks.

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- mi/mipointer.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mi/mipointer.c b/mi/mipointer.c index 5b82978..209ea06 100644 --- a/mi/mipointer.c +++ b/mi/mipointer.c @@ -540,7 +540,7 @@ miPointerMoveNoEvent

[PATCH 18/20] xkb: Fix a check for MASTER_KEYBOARD

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- xkb/xkb.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xkb/xkb.c b/xkb/xkb.c index 43d847a..169c604 100644 --- a/xkb/xkb.c +++ b/xkb/xkb.c @@ -5831,6 +5831,7 @@ ProcXkbGetKbdByName(ClientPtr client) if

[PATCH 19/20] input: Change a bunch of direct dev-u.master accesses to use GetMaster()

2011-02-17 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c |2 +- Xi/xichangehierarchy.c |4 ++-- Xi/xiquerydevice.c |2 +- dix/devices.c | 10 +- dix/events.c |4 ++-- mi/mieq.c | 10 ++ 6 files

[PATCH 20/20] Move master/lastSlave out of the union into separate fields.

2011-02-17 Thread Peter Hutterer
The removal of the double-use will cause some suble bugs as some conditions to check for the dev-u.master case were broken and also evaluated as true if lastSlave was set (instead of master). Also breaks the input ABI. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c

Re: [PATCH] Fix build with BSD make.

2011-02-17 Thread Alan Coopersmith
On 02/15/11 06:22 AM, Dan Nicholson wrote: On Mon, Feb 14, 2011 at 08:43:08AM +0100, Matthieu Herrb wrote: On Sun, Feb 13, 2011 at 04:44:35PM -0800, Alan Coopersmith wrote: On 02/13/11 12:51 PM, Matthieu Herrb wrote: $ is not allowed in explicit rules. Solaris make has the same limitation,

[PATCH:bitmap] atobm only depends on xproto, not x11

2011-02-17 Thread Alan Coopersmith
It only includes X11/Xos.h, no headers or functions from libX11. Due to a typo in Makefile.am (also fixed) it wasn't actually linking with libX11 even though it had x11 in its PKG_CHECK_MODULES list. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- Makefile.am |2 +-