Re: [PATCH] dix: add a MAXEVENTS define for the number of core + extension events

2011-12-11 Thread walter harms
looks good for me but not compile tested ntl Reviewed-by: wharms wha...@bfs.de Am 11.12.2011 03:55, schrieb Peter Hutterer: Not including GenericEvents Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c |6 +++--- dix/extension.c |3 +--

Re: [REMINDER libX11] XIM: Allow modifier releases in compose sequences (#26705)

2011-12-11 Thread walter harms
hi, i am not a XIM or XKB expert but for me the code looks reasonable. @Andreas Wettstein could you please add a line or two how to test the function ? what does not work (what keys to press) what works after the patch ? re, wh Am 10.12.2011 18:36, schrieb Alan Coopersmith: On 12/10/11

Re: [REMINDER libX11] XIM: Allow modifier releases in compose sequences (#26705)

2011-12-11 Thread James Cloos
wh == walter harms wha...@bfs.de writes: After the loss of my laptop, I’ve been somewhat crippled. Now that a monitor has arrived here I shold be able to spend more time on Xorg, again. wh i am not a XIM or XKB expert but for me the code looks reasonable. Agreed. Reviewed-by: James Cloos

[PATCH 00/25] Noise abatement and eyesore rehabilitation

2011-12-11 Thread Alan Coopersmith
Removes 422 lines of warning messages from the xserver build when using gcc 4.5.2 on Solaris 11 with the latest xorg-macros set of warning flags, and does not introduce any new warnings. There's still plenty more to fix after this batch of course. Alan Coopersmith (25): CheckForEmptyMask does

[PATCH 01/25] CheckForEmptyMask does not need to declare int n twice

2011-12-11 Thread Alan Coopersmith
Just use the existing n variable again in the ARGB_CURSOR loop instead of creating another one. Fixes gcc -Wshadow warning: cursor.c: In function 'CheckForEmptyMask': cursor.c:155:6: warning: declaration of 'n' shadows a previous local cursor.c:146:9: warning: shadowed declaration is here

[PATCH 05/25] constify strings in resource name registry

2011-12-11 Thread Alan Coopersmith
LookupResourceName already returned a const char *, so just needed to change the variable we're storing the list in to be a const char ** and then add const to the name argument to RegisterResourceName (which just stores name in the array) and CreateNewResourceType (which just passes name to

[PATCH 09/25] Constify the reason string throughout the authorization check framework

2011-12-11 Thread Alan Coopersmith
Almost all of the places the string is assigned point to a literal string constant, so use const char * for those, and const char ** for function calls that return it via an argument. Fortunately the top level function, ClientAuthorized, which returns the string as its return value is called

[PATCH 03/25] Use const cast in BitIsOn macro to avoid angering gcc

2011-12-11 Thread Alan Coopersmith
Fixes gcc warnings such as: inpututils.c: In function 'valuator_mask_isset': inpututils.c:498:5: warning: cast discards qualifiers from pointer target type inpututils.c: In function 'CountBits': inpututils.c:613:9: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan

[PATCH 08/25] Constify string for authorization protocol names

2011-12-11 Thread Alan Coopersmith
gcc was warning from storing string constants in a char *name field: auth.c:64:1: warning: initialization discards qualifiers from pointer target type auth.c:72:1: warning: initialization discards qualifiers from pointer target type auth.c:81:1: warning: initialization discards qualifiers from

[PATCH 11/25] WriteToClient: preserve constness of buf while extracting length value

2011-12-11 Thread Alan Coopersmith
Fixes gcc warning: io.c: In function 'WriteToClient': io.c:826:6: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- os/io.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/os/io.c b/os/io.c index

[PATCH 10/25] OsInit: store /dev/null in a const char *

2011-12-11 Thread Alan Coopersmith
It's only passed as the input side of a strcpy and as the filename to fopen, so doesn't need to be non-const. Fixes gcc warning: osinit.c: In function 'OsInit': osinit.c:154:28: warning: initialization discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith

[PATCH 07/25] os/access.c: replace acmp acopy macros with memcmp memcpy calls

2011-12-11 Thread Alan Coopersmith
No need to cast to char * now that all supported platforms use C89-standard void * argument types, so just drop the casts from acmp acopy macros, which clears the gcc warnings for places const pointers were cast non-const: access.c: In function 'DefineSelf': access.c:786:3: warning: cast

[PATCH 04/25] verify_internal_event: preserve constness of data pointer

2011-12-11 Thread Alan Coopersmith
All we're using it for is ErrorF calls, so make it a const char * to stop gcc from warning: inpututils.c: In function 'verify_internal_event': inpututils.c:629:9: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com ---

[PATCH 06/25] xres.c: Preserve constness of string returned by LookupResourceName

2011-12-11 Thread Alan Coopersmith
MakeAtom now accepts a const char * so we don't need to cast down to char * anymore. Fixes gcc warning of: xres.c: In function 'ProcXResQueryClientResources': xres.c:155:6: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com

[PATCH 02/25] Fix deconstifying cast warning in xi2_get_type

2011-12-11 Thread Alan Coopersmith
Since we're just comparing values in the struct, cast it to a const xGenericEvent * to clear gcc warning of: events.c: In function 'xi2_get_type': events.c:193:5: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com ---

[PATCH 12/25] LockServer: store path to LOCKDIR literal string in a const char *

2011-12-11 Thread Alan Coopersmith
And instead of initializing to NULL, then resetting to LOCKDIR almost immediately (before ever using the NULL value), skip directly to setting it to LOCKDIR. tmppath variable is only used as input for generating the path name via calls to strlen, sprintf, etc. Fixes gcc warning of: utils.c: In

[PATCH 13/25] xdmcp.c: fix three small const warnings

2011-12-11 Thread Alan Coopersmith
xdmcp.c:63:36: warning: initialization discards qualifiers from pointer target type xdmcp.c: In function 'XdmcpRegisterConnection': xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type xdmcp.c:482:8: warning: cast discards qualifiers from pointer target type xdmcp.c:482:8:

[PATCH 14/25] CompareISOLatin1Lowered: constify arguments

2011-12-11 Thread Alan Coopersmith
Allows callers to avoid deconstifying arguments when calling, fixing gcc warning: filter.c: In function 'PictureGetFilterId': filter.c:59:2: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- dix/dixutils.c |4 ++--

[PATCH 15/25] x86emu: constify debug strings

2011-12-11 Thread Alan Coopersmith
Strings are all pointers to literal constants, just used as input to printf calls when debugging is enabled. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- hw/xfree86/x86emu/debug.c|4 ++-- hw/xfree86/x86emu/fpu.c | 16

[PATCH 16/25] DoShowOptions: preserve constness of options list as we walk it

2011-12-11 Thread Alan Coopersmith
Since all we do with the option list is walk down the list printing the names, there's no need to cast away its constness. Clears gcc warning: xf86Configure.c: In function 'DoShowOptions': xf86Configure.c:781:4: warning: cast discards qualifiers from pointer target type Signed-off-by: Alan

[PATCH 17/25] Convert KdDoSwitchCmd to use asprintf instead of malloc/strcat/etc.

2011-12-11 Thread Alan Coopersmith
Also fix the reason argument to be const char * to clear several gcc warnings of: kdrive.c:151:2: warning: passing argument 1 of 'KdDoSwitchCmd' discards qualifiers from pointer target type kdrive.c:116:1: note: expected 'char *' but argument is of type 'const char *' Signed-off-by: Alan

[PATCH 18/25] KdParseFindNext: Constify delim argument

2011-12-11 Thread Alan Coopersmith
It's only used as input to strchr to find the delimiters, never written to. Clears a bunch of gcc warnings of the form: kdrive.c:323:2: warning: passing argument 2 of 'KdParseFindNext' discards qualifiers from pointer target type kdrive.c:261:1: note: expected 'char *' but argument is of type

[PATCH 21/25] Remove duplicate declaration of xf86ValidateModesFlags in xf86Modes.h

2011-12-11 Thread Alan Coopersmith
Clears gcc warning in every file that includes xf86Modes.h: xf86Modes.h:102:1: warning: redundant redeclaration of 'xf86ValidateModesFlags' xf86Modes.h:72:1: note: previous declaration of 'xf86ValidateModesFlags' was here Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com ---

[PATCH 22/25] Remove duplicate declarations of KdAdd*Driver in kdrive.h

2011-12-11 Thread Alan Coopersmith
Clears gcc warnings in every file that includes kdrive.h: kdrive.h:507:1: warning: redundant redeclaration of 'KdAddPointerDriver' kdrive.h:225:6: note: previous declaration of 'KdAddPointerDriver' was here kdrive.h:510:1: warning: redundant redeclaration of 'KdAddKeyboardDriver' kdrive.h:284:6:

[PATCH 25/25] xf86 parser: convert Error to a varargs macro to clear gcc format warnings

2011-12-11 Thread Alan Coopersmith
Previously it always passed a format string with exactly one argument, using NULL when the format string needed none. Now pass the right number of arguments to clear gcc warnings of 'too many arguments for format'. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com ---

[PATCH 19/25] XkbFindSrvLedInfo: remove extraneous name-clashing sli variable

2011-12-11 Thread Alan Coopersmith
Variable is already defined outside the outer if statement, and there's no need to redefine inside the if statement. No point in setting sli before if (dev-kbdfeed-xkb_sli==NULL) check - if check is true, we immediately set it, if check is false, we immediately return without further reference or

[PATCH 23/25] xf86Priv.h: Add some noreturn attributes suggested by gcc

2011-12-11 Thread Alan Coopersmith
Both functions call exit() at the end and have no other return path. Also correct comment/heading to reflect commit 6450f6ca7ee0 moving DoShowOptions into xf86Configure.c. Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- hw/xfree86/common/xf86Priv.h |6 ++ 1 files changed,

Re: [REMINDER libX11] XIM: Allow modifier releases in compose sequences (#26705)

2011-12-11 Thread wettstein509
could you please add a line or two how to test the function ? what does not work (what keys to press) what works after the patch ? If you put following in your .XCompose: Shift_R o : odiaeresis Shift_L : BackSpace you can enter ö by pressing and releasing the right Shift key, and then

Re: [PATCH inputproto multitouch] Touch IDs must be at least unique per master device

2011-12-11 Thread Daniel Stone
Hi, On 9 December 2011 21:43, Chase Douglas chase.doug...@canonical.com wrote: XIAllowEvents with a master device and a touch ID must uniquely identify a touch sequence. If touch IDs were unique per slave device, multiple slave devices could have valid sequences with the same touch ID, and the

Re: [PATCH 00/25] Noise abatement and eyesore rehabilitation

2011-12-11 Thread Jamey Sharp
For the series: Reviewed-by: Jamey Sharp ja...@minilop.net Nice work. :-) On Sun, Dec 11, 2011 at 10:16:13AM -0800, Alan Coopersmith wrote: Removes 422 lines of warning messages from the xserver build when using gcc 4.5.2 on Solaris 11 with the latest xorg-macros set of warning flags, and

Re: [PATCH 00/25] Noise abatement and eyesore rehabilitation

2011-12-11 Thread Peter Hutterer
On Sun, Dec 11, 2011 at 10:16:13AM -0800, Alan Coopersmith wrote: Removes 422 lines of warning messages from the xserver build when using gcc 4.5.2 on Solaris 11 with the latest xorg-macros set of warning flags, and does not introduce any new warnings. Reviewed-by: Peter Hutterer

Re: [REMINDER libX11] XIM: Allow modifier releases in compose sequences (#26705)

2011-12-11 Thread James Cloos
I put it though some successful tests and have pushed it as d3b3570592e9b9e57f270a0bd86762fd205a2833 and resolved the bz. Does patchwork need any update, too? -JimC -- James Cloos cl...@jhcloos.com OpenPGP: 1024D/ED7DAEA6 ___

[PATCH inputproto multitouch] Remove XI2.1 and XI2.2 warnings and errors

2011-12-11 Thread Peter Hutterer
This is too much of a pain, anyone who includes XI headers needs to define this. And that affects input and output drivers as well as legacy clients that don't even need the new stuff. Removing the need for defines would be enough but then the warnings clog up the output and hide real warnings.

[PATCH] Xtranssock.c: avoid buffer overrun in SocketReopen

2011-12-11 Thread Robert Bragg
This function was constructing an address from a port string allocating a buffer according to the size of the string but then later copying the address according to sizeof(struct sockaddr). This patch ensures that we allocate a struct sockaddr buffer with enough space for the port string to be

[PATCH:xf86-input-synaptics] Revert: eventcomm: replace synaptics-custom TEST_BIT with server's BitIsOn.

2011-12-11 Thread Cyril Brulebois
This commit reverts 13543b156d78bc4d01a19844a5ee8f283269621b As seen in Debian's #648488, this switch causes a regression on PowerPC, especially seen on iBook G4 with appletouch. Take a defensive stance and revert back to a working state until things have been figured out and fixed properly.

Re: [PATCH inputproto multitouch] Remove XI2.1 and XI2.2 warnings and errors

2011-12-11 Thread Chase Douglas
On 12/11/2011 04:26 PM, Peter Hutterer wrote: This is too much of a pain, anyone who includes XI headers needs to define this. And that affects input and output drivers as well as legacy clients that don't even need the new stuff. Removing the need for defines would be enough but then the

Re: [PATCH inputproto multitouch] Touch IDs must be at least unique per master device

2011-12-11 Thread Chase Douglas
On 12/11/2011 11:41 AM, Daniel Stone wrote: Hi, On 9 December 2011 21:43, Chase Douglas chase.doug...@canonical.com wrote: XIAllowEvents with a master device and a touch ID must uniquely identify a touch sequence. If touch IDs were unique per slave device, multiple slave devices could have

Re: [PATCH inputproto multitouch] Touch IDs must be at least unique per master device

2011-12-11 Thread Chase Douglas
On 12/10/2011 07:04 PM, Peter Hutterer wrote: On Fri, Dec 09, 2011 at 01:43:44PM -0800, Chase Douglas wrote: From: Chase Douglas cndougla@cndougla.(none) XIAllowEvents with a master device and a touch ID must uniquely identify a touch sequence. If touch IDs were unique per slave device,

Re: [PATCH 09/21] Xi: split updating button count and state into helper functions

2011-12-11 Thread Chase Douglas
On 12/08/2011 07:36 PM, Peter Hutterer wrote: Functional change: for a button mapped to 0, the motionHintWindow is not updated to the NullWindow anymore. Before it got updated unconditionally to the button mapping. I have no idea what the practical effect of this is, but I guess it's closer to

Re: [PATCH 18/21] dix: move delivery stop condition out of event mask

2011-12-11 Thread Chase Douglas
On 12/08/2011 07:36 PM, Peter Hutterer wrote: Previously, this was only called if there was a mask match, so even if we had a no-propagate flag set or a stopAt window specified, if no mask triggered on the window we would recurse up to the root window and eventually deliver. Move this, so

Re: [PATCH 16/21] dix: move grab matching code into a helper function

2011-12-11 Thread Chase Douglas
On 12/08/2011 07:36 PM, Peter Hutterer wrote: No functional changes. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 81 +++--- 1 files changed, 60 insertions(+), 21 deletions(-) diff --git a/dix/events.c

Re: [PATCH 06/21] dix: split grab event conversion and conversion into a helper function

2011-12-11 Thread Chase Douglas
Subject message ^^ is wrong. Should it be split into conversion and delivery? Otherwise, it looks fine: Reviewed-by: Chase Douglas chase.doug...@canonical.com On 12/08/2011 07:36 PM, Peter Hutterer wrote: Effective functional change: XI2 events are checked with XACE now.

Re: [PATCH 08/21] Xi: deduplicate button motion mask setting

2011-12-11 Thread Chase Douglas
On 12/08/2011 07:36 PM, Peter Hutterer wrote: No functional changes Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c | 37 + 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index

Re: [PATCH 00/21] Base cleanup patches for touch support

2011-12-11 Thread Chase Douglas
On 12/08/2011 07:36 PM, Peter Hutterer wrote: This is the last batch of cleanup patches I have in my tree before the MT patches start. Most of it is just shuffling code around so we can re-use it easier, but there are a few actual changes hidden in there as well. As far as I can tell, the

Re: [PATCH 4/5] dix: switch EventIsDeliverable to take the event type only

2011-12-11 Thread Chase Douglas
On 12/09/2011 11:54 PM, Peter Hutterer wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel

Re: [PATCH] dix: add a MAXEVENTS define for the number of core + extension events

2011-12-11 Thread Chase Douglas
On 12/10/2011 06:55 PM, Peter Hutterer wrote: Not including GenericEvents Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives:

Re: [PATCH 0/5] More cleanups for multitouch

2011-12-11 Thread Chase Douglas
On 12/09/2011 11:54 PM, Peter Hutterer wrote: Some more little cleanups, no functional changes to speak of. Patches 1, 2, and 3 are there because touch X and Y axes may not be 0 and 1. This was the case in initial implementations that defined a separate touch valuator class that could have