Re: [PATCH] Include client name if available in PrintDeviceGrabInfo

2011-12-08 Thread Rami Ylimäki
On 12/08/2011 09:02 AM, Alan Coopersmith wrote: Also adds missing newline to first line of output. Before patch: [3581472.414] (II) Printing all currently active device grabs: [3581472.414] Active grab 0x180 (core) on device 'Virtual core pointer' (2): client pid 26174 uid 0 gid 10

[PATCH v2 app-xfd] Use the Automake recommended alternative to AX_DEFINE_DIR

2011-12-08 Thread Gaetan Nadon
DATADIR, like any installation variable, is not known at configure time. This is by design to allow setting the variable at make time. The AX_DEFINE_DIR macro worked around this design and consequently cancelled an Automake feature. The alternative method suggested by Automake ends up being

Re: [PATCH app-xfd] Use the Automake recommended alternative to AX_DEFINE_DIR

2011-12-08 Thread Gaetan Nadon
On Wed, 2011-12-07 at 21:10 -0800, Alan Coopersmith wrote: On 12/07/11 10:39, Gaetan Nadon wrote: DATADIR, like any installation variable, is not known at configure time. This is by design to allow setting the variable at make time. The AX_DEFINE_DIR macro worked around this design and

[PATCH 0/7] Fix GLX files generated by Mesa for the server

2011-12-08 Thread Ian Romanick
There has been quite a bit of skew between what's in Mesa and what's needed in the xserver. This patch series cleans that up. Most of the changes are quite mundane and just make the code compile inside the xserver. However, the changes in patch 6/7 modify the way the availability and use of

[PATCH 1/7] glapi/glx: Remove g_disptab.h from xserver generated files

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com That file was removed from the xserver with commit: commit a80780a7638f847c3be20e5e0c7fe85e83d9bdd1 Author: Adam Jackson a...@redhat.com Date: Wed Nov 17 09:03:06 2010 -0500 glx: Remove swap barrier and hyperpipe support

[PATCH 2/7] glapi: Remove mention of nonexistent enums

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com glext.h doesn't have GL_MIN_PROGRAM_TEXEL_OFFSET_EXT or GL_MAX_PROGRAM_TEXEL_OFFSET_EXT. Using them in the XML causes code to be generated for the xserver that won't compile. Use the names that exist instead. Signed-off-by: Ian Romanick

[PATCH 3/7] glapi/glx: Don't send GL API files to the xserver

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com The versions in the xserver and in libGL have diverged enough that the xserver doesn't want these. Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mapi/glapi/gen/Makefile |7 --- 1 files changed, 0 insertions(+), 7 deletions(-)

[PATCH 4/7] glapi/glx: Xserver wants dispatch.h, not glapidispatch.h

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mapi/glapi/gen/Makefile |6 -- src/mapi/glapi/gen/glX_proto_recv.py |2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mapi/glapi/gen/Makefile

[PATCH 5/7] glapi/glx: Generate dispatch.h so that the xserver can use it

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mapi/glapi/gen/gl_table.py |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py index f6182b6..7f3b915

[PATCH 6/7] glapi/glx: Generate glapi_gentable.c so that the xserver can use it

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mapi/glapi/gen/gl_gentable.py | 38 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/mapi/glapi/gen/gl_gentable.py

[PATCH 7/7] glapi/glx: For GLX code, use the existing _X_HIDDEN and _X_INTERNAL defines

2011-12-08 Thread Ian Romanick
From: Ian Romanick ian.d.roman...@intel.com Signed-off-by: Ian Romanick ian.d.roman...@intel.com --- src/mapi/glapi/gen/glX_proto_recv.py | 15 --- src/mapi/glapi/gen/glX_proto_send.py | 16 src/mapi/glapi/gen/glX_proto_size.py | 19 +-- 3 files

Re: [Mesa-dev] [PATCH 0/7] Fix GLX files generated by Mesa for the server

2011-12-08 Thread Brian Paul
On 12/08/2011 01:47 PM, Ian Romanick wrote: There has been quite a bit of skew between what's in Mesa and what's needed in the xserver. This patch series cleans that up. Most of the changes are quite mundane and just make the code compile inside the xserver. However, the changes in patch 6/7

Re: [PATCH xserver] dmx: fix distcheck failure, missing compsize.h in Makefile.am

2011-12-08 Thread Peter Hutterer
On Wed, Dec 07, 2011 at 08:17:29PM -0500, Gaetan Nadon wrote: which was added in commit: dmx: Build fix for -Werror=implicit-function-declaration Signed-off-by: Gaetan Nadon mems...@videotron.ca --- hw/dmx/glxProxy/Makefile.am |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

Re: [PATCH xserver] Replace deprecated CWARNFLAGS with BASE_CFLAGS and NO_STRICT_ALIASING_CFLAG

2011-12-08 Thread Peter Hutterer
On Wed, Dec 07, 2011 at 08:17:28PM -0500, Gaetan Nadon wrote: This patch makes use of the new functions in util-macros 1.16. CWARNGLAGS is left as is for backward compatibility but will no longer be maintained. Modules should migrate to the new BASE_CFLAGS variable and establish if they

Re: [PATCH] xfree86: include xorg-config.h from xaalocal.h

2011-12-08 Thread Alan Coopersmith
On Tue, Dec 6, 2011 at 12:13 AM, Peter Hutterer peter.hutte...@who-t.netwrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- hw/xfree86/xaa/xaalocal.h |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/xfree86/xaa/xaalocal.h

[PULL] Input changes in preparation for multitouch

2011-12-08 Thread Peter Hutterer
A whole bunch of basic changes required for the multitouch support. Does not include any actual MT stuff yet though. Commit cba34d2a7e72ea0c7e5a2d8482607157ceccf8db The following changes since commit fb22a408c69a84f81905147de9e82cf66ffb6eb2: Save major/minor opcodes in ClientRec for

xserver 1.12 schedule? (was: [ANNOUNCE] xorg-server 1.11.99.1)

2011-12-08 Thread Alan Coopersmith
On 11/27/11 17:39, Peter Hutterer wrote: On Sun, Nov 20, 2011 at 03:20:11PM -0800, Keith Packard wrote: We discussed doing regular releases from master, and Jeremy suggested (sensibly) that we just do them whenever there's a stable release. I completely spaced that plan, nor was I looking at

Re: xserver 1.12 schedule? (was: [ANNOUNCE] xorg-server 1.11.99.1)

2011-12-08 Thread Keith Packard
On Thu, 08 Dec 2011 16:54:15 -0800, Alan Coopersmith alan.coopersm...@oracle.com wrote: Did we ever come to a conclusion here? Since no one else has stepped up to plan the katamari release, I'm thinking of having X11R7.7 rolled up around the server 1.12 release schedule, and would like to

Re: [PULL] Input changes in preparation for multitouch

2011-12-08 Thread Keith Packard
On Fri, 9 Dec 2011 10:50:33 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: dix: switch the syncEvent queue to a struct list This exposes PlayReleasedEvents as a global function (for testing), which seems odd, but I guess it's mostly harmless? dix: add CopyGrab() function

Re: [PULL] Input changes in preparation for multitouch

2011-12-08 Thread Peter Hutterer
On Thu, Dec 08, 2011 at 07:04:05PM -0800, Keith Packard wrote: On Fri, 9 Dec 2011 10:50:33 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: dix: switch the syncEvent queue to a struct list This exposes PlayReleasedEvents as a global function (for testing), which seems odd,

[PATCH 01/21] include: add GetXI2MaskByte and GetXI2EventFilterMask to headers

2011-12-08 Thread Peter Hutterer
This is needed for touch event processing. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c|4 ++-- include/input.h |3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dix/events.c b/dix/events.c index 59caa91..5dfcbf3 100644 ---

[PATCH 02/21] Change GetXI2/XI/CoreType to just take a type argument

2011-12-08 Thread Peter Hutterer
Avoids the dummy-event dance if we have an event type and need to get the matching XI2 type. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/eventconvert.c | 16 dix/events.c | 14 +++--- hw/xfree86/common/xf86DGA.c

[PATCH 04/21] dix: deduplicate event delivery code

2011-12-08 Thread Peter Hutterer
Move all the event delivery code into DeliverOneEvent, based on the InputLevel we're sending to. Functional change: we now check XI2 events with XACE too. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 111 - 1

[PATCH 03/21] include: Add an InputLevel enum

2011-12-08 Thread Peter Hutterer
From: Chase Douglas chase.doug...@canonical.com Currently unused, but will be in the future. Signed-off-by: Chase Douglas chase.doug...@canonical.com Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- include/eventconvert.h |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-)

[PATCH 05/21] dix: replace conversion errors with BUG_WARN_MSG

2011-12-08 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 17 + 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dix/events.c b/dix/events.c index ced29f7..705b079 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4149,8 +4149,9 @@

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

2011-12-08 Thread Peter Hutterer
Effective functional change: XI2 events are checked with XACE now. DeliverOneGrabbedEvent is exported for future use by touch events. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 144 include/dix.h |5 ++

[PATCH 07/21] dix: deduplicate callers of DeliverDeviceEvents in DeliverGrabbedEvents

2011-12-08 Thread Peter Hutterer
No functional change. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 18 ++ 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dix/events.c b/dix/events.c index 37039c6..6e015fe 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4156,6

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

2011-12-08 Thread Peter Hutterer
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 b2e82ec..1140554 100644 --- a/Xi/exevents.c +++

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

2011-12-08 Thread Peter Hutterer
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 the correct behaviour: pressing a button that's

[PATCH 10/21] dix: move EventDeliveryState into a header file, we'll need it elsewhere

2011-12-08 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c|7 --- include/input.h |7 +++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dix/events.c b/dix/events.c index 6e015fe..12c1678 100644 --- a/dix/events.c +++ b/dix/events.c @@ -2014,13

[PATCH 11/21] dix: Move grab check and activation logic to CheckPassiveGrab()

2011-12-08 Thread Peter Hutterer
From: Chase Douglas chase.doug...@canonical.com This is needed for future pointer emulation work. Signed-off-by: Chase Douglas chase.doug...@canonical.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 384

[PATCH 12/21] dix: Split ActivatePassiveGrab() from CheckPassiveGrab()

2011-12-08 Thread Peter Hutterer
From: Chase Douglas chase.doug...@canonical.com The changed logic means we don't require the explicit grab = NULL setting and early exit anymore. Not 100% of it, but if we see that message pop up in a log we know it's broken. Signed-off-by: Chase Douglas chase.doug...@canonical.com Reviewed-by:

[PATCH 13/21] dix: remove event type check

2011-12-08 Thread Peter Hutterer
Can't remember why this is there but we'll need to pass in XI2 events soon, so this check is obsolete. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c |7 --- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dix/events.c b/dix/events.c index

[PATCH 14/21] dix: compare the grab type, not the tempGrab type

2011-12-08 Thread Peter Hutterer
No functional change. To get here, GrabMatchesSecond() needs to be TRUE and for that the two grab types must be identical. 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

[PATCH 15/21] dix: split core grab interference check into helper function

2011-12-08 Thread Peter Hutterer
No functional changes. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/events.c | 43 +-- 1 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dix/events.c b/dix/events.c index 349d9b4..4d80358 100644 --- a/dix/events.c +++

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

2011-12-08 Thread Peter Hutterer
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 b/dix/events.c index 4d80358..9fcd447 100644 ---

[PATCH 17/21] dix: split out core state and event state setting into helper functions

2011-12-08 Thread Peter Hutterer
no functional changes. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c| 31 +++ dix/inpututils.c | 39 +++ include/inpututils.h |2 ++ 3 files changed, 44 insertions(+), 28 deletions(-)

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

2011-12-08 Thread Peter Hutterer
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 that the stopAt and do-not-propagate mask is honoured.

[PATCH 19/21] Add GrabIsPointerGrab and GrabIsKeyboardGrab helpers

2011-12-08 Thread Peter Hutterer
No functional changes Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c |8 ++-- dix/grabs.c| 17 + include/dixgrabs.h |2 ++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index

[PATCH 20/21] input: replace GRABTYPE_* with the InputLevel enums

2011-12-08 Thread Peter Hutterer
They achieve the same thing, re-use the more generic InputLevel so we can convert to/fro easier. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c | 26 +++--- Xi/grabdev.c|2 +- Xi/grabdevb.c

[PATCH 21/21] dix: always allocate and set the grab's sync.event

2011-12-08 Thread Peter Hutterer
Allocate the memory at device creation time and always store the event, even if we're not frozen. This way we know which event triggered the grab. Since the event was never freed anyway except on device shutdown, this doesn't really change things much. Signed-off-by: Peter Hutterer

Re: xserver 1.12 schedule? (was: [ANNOUNCE] xorg-server 1.11.99.1)

2011-12-08 Thread Peter Hutterer
On Thu, Dec 08, 2011 at 06:09:09PM -0800, Keith Packard wrote: On Thu, 08 Dec 2011 16:54:15 -0800, Alan Coopersmith alan.coopersm...@oracle.com wrote: Did we ever come to a conclusion here? Since no one else has stepped up to plan the katamari release, I'm thinking of having X11R7.7

Re: [PULL] Input changes in preparation for multitouch

2011-12-08 Thread Keith Packard
On Fri, 9 Dec 2011 13:33:33 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: dix: allocate temporary grabs on the heap does that. I ran this through valgrind and it didn't complain, iirc. With that understood, and with the segfault in 'make check' fixed that we discussed on IRC (a bug in

Re: [PATCH] Include client name if available in PrintDeviceGrabInfo

2011-12-08 Thread Alan Coopersmith
On 12/08/11 01:28, Rami Ylimäki wrote: Reviewed-by: Rami Ylimäki rami.ylim...@vincit.fi Thanks. [3581736.601] Active grab 0x160 (core) on device 'Virtual core pointer' (2): [3581736.601] client pid 26741 /usr/bin/xscreensaver -nosplash + ErrorF( (no client information available for

[PATCH] Change disable_clientpointer return type to void

2011-12-08 Thread Alan Coopersmith
It doesn't return anything, nor does it's caller expect it to. Fixes Solaris Studio compiler error: xichangehierarchy.c, line 214: Function has no return statement : disable_clientpointer Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com --- Xi/xichangehierarchy.c |2 +- 1 files

Re: [PATCH] Change disable_clientpointer return type to void

2011-12-08 Thread Peter Hutterer
On Thu, Dec 08, 2011 at 09:52:07PM -0800, Alan Coopersmith wrote: It doesn't return anything, nor does it's caller expect it to. Fixes Solaris Studio compiler error: xichangehierarchy.c, line 214: Function has no return statement : disable_clientpointer Signed-off-by: Alan Coopersmith