Re: [PATCH 01/02] dri2proto: Add DRI2GetParam request

2012-05-15 Thread Eric Anholt
On Thu, 10 May 2012 00:04:36 -0700, Chad Versace chad.vers...@linux.intel.com wrote: /* * Events @@ -330,4 +331,32 @@ typedef struct { } xDRI2InvalidateBuffers; #define sz_xDRI2InvalidateBuffers 32 +typedef struct { +CARD8 reqType; +CARD8 dri2ReqType; +CARD16

[PATCH 1/5] test: fix redundant declaration of devices warning

2012-05-15 Thread Peter Hutterer
In file included from protocol-xiwarppointer.c:41:0: protocol-common.h:91:23: warning: redundant redeclaration of ‘devices’ [-Wredundant-decls] protocol-common.h:86:3: note: previous declaration of ‘devices’ was here Signed-off-by: Peter Hutterer peter.hutte...@who-t.net ---

[PATCH 2/5] test: fix userdata shadows global declaration warnings

2012-05-15 Thread Peter Hutterer
protocol-xiquerypointer.c:124:72: warning: declaration of ‘userdata’ shadows a global declaration [-Wshadow] and similar Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- test/xi2/protocol-xipassivegrabdevice.c |6 +++--- test/xi2/protocol-xiquerydevice.c |8

[PATCH 3/5] test: fix redundant declaration of BadDevice

2012-05-15 Thread Peter Hutterer
In file included from protocol-common.c:36:0: protocol-common.h:36:12: warning: redundant redeclaration of ‘BadDevice’ [-Wredundant-decls] In file included from protocol-common.c:30:0: ../../Xi/exglobals.h:41:12: note: previous declaration of ‘BadDevice’ was here Signed-off-by: Peter Hutterer

[PATCH 4/5] test: don't shadow parameter 'len'

2012-05-15 Thread Peter Hutterer
protocol-xiquerydevice.c:226:25: warning: declaration of ‘len’ shadows a parameter [-Wshadow] Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- test/xi2/protocol-xiquerydevice.c |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git

[PATCH 5/5] include: don't redeclare device events in xkbsrv.h

2012-05-15 Thread Peter Hutterer
../../include/xkbsrv.h:308:51: warning: redundant redeclaration of ‘DeviceKeyPress’ [-Wredundant-decls] Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- include/xkbsrv.h |3 --- 1 file changed, 3 deletions(-) diff --git a/include/xkbsrv.h b/include/xkbsrv.h index 3b72885..a19c8fb

Re: [PATCH 1/2] rotate: Unregister damage across modesetting

2012-05-15 Thread Michal Suchanek
On 27 August 2011 01:32, Keith Packard kei...@keithp.com wrote: On Thu, 25 Aug 2011 16:14:39 +0100, Chris Wilson ch...@chris-wilson.co.uk wrote: However, actually fixing the bugs revealed by testing might. Having the screen pixmap never change during the server operation isn't a bug, it's

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Michal Suchanek
Hello, On 15 May 2012 06:20, Peter Hutterer peter.hutte...@who-t.net wrote: On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote: diff --git a/dix/enterleave.h b/dix/enterleave.h index 729059b..c937c0e 100644 --- a/dix/enterleave.h +++ b/dix/enterleave.h @@ -60,9 +60,6 @@ extern

[PATCH 0/4] BUG_RETURN_VAL macros

2012-05-15 Thread Peter Hutterer
I got annoyed having to write constructs like BUG_WARN(foo); if (foo) return FALSE; and similar. glib has useful macros like g_return_if_fail and similar, these are macros that essentially do the same job. They shout into the log, but otherwise continue as normal.

[PATCH 1/4] include: add BUG_RETURN_* macros

2012-05-15 Thread Peter Hutterer
Helper functions to avoid things like if (foo) { BUG_WARN(foo); return 1; } Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- include/misc.h | 12 1 file changed, 12 insertions(+) diff --git a/include/misc.h b/include/misc.h index 41c1333..fea74b8 100644 ---

[PATCH 2/4] Replace a few BUG_WARN with BUG_RETURN_VAL

2012-05-15 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c | 25 ++--- dix/getevents.c |5 + dix/touch.c | 17 ++--- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index

[PATCH 3/4] dix: use BUG_RETURN_VAL for pairing errors

2012-05-15 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 51a74b6..04008d4 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -365,13 +365,12 @@

[PATCH 4/4] dix: change still paired warning to use BUG_RETURN_VAL

2012-05-15 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c | 10 +++--- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 04008d4..677b76c 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -457,13 +457,9 @@

[PATCH] dix: rename shadowing loop variable in TouchResizeQueue

2012-05-15 Thread Peter Hutterer
second 'i' shadows the function-wide one, rename to 'j' Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/touch.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dix/touch.c b/dix/touch.c index eeb158e..95a7b06 100644 --- a/dix/touch.c +++ b/dix/touch.c

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Colin Harrison
Hi, Peter Hutterer wrote: enterleave.c: In function 'DeviceFocusOutEvents': enterleave.c:618:9: error: implicit declaration of function 'DeviceFocusEvent' [-Werror=implicit-function-declaration] enterleave.c:618:9: warning: nested extern declaration of 'DeviceFocusEvent' [-Wnested-externs]

[PATCH 0/7] regression fix for f3410b97cf9b48a47bee3d15d232f8a88e75f4ef

2012-05-15 Thread Peter Hutterer
f3410b97cf9b48a47bee3d15d232f8a88e75f4ef introduced a regression, causing a segfault on server shutdown. This is caused by a raw event being sent after the root windows are forcibly set to NULL. This series fixes the issue by disabling all devices first, then proceeding with the normal shutdown.

[PATCH 1/7] dix: drop client argument from PairDevices - unused

2012-05-15 Thread Peter Hutterer
This is a leftover from early MPX days where any keyboard could be paired with any pointer (before the device hierarchy). Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dix/devices.c

[PATCH 2/7] dix: return early from DisableDevice if the device is already disabled

2012-05-15 Thread Peter Hutterer
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/dix/devices.c b/dix/devices.c index 0755cd7..2be8bf1 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -428,6 +428,9 @@ DisableDevice(DeviceIntPtr dev, BOOL

[PATCH 4/7] dix: free the sprite when disabling the device

2012-05-15 Thread Peter Hutterer
Disabled devices don't need sprites (they can't send events anyway) and the device init process is currently geared to check for whether sprite is present to check if the device should be paired/attached. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |2 ++ 1 file

[PATCH 5/7] dix: disable non-sprite-owners first when disabling paired devices

2012-05-15 Thread Peter Hutterer
If a sprite-owner is to be disabled but still paired, disable the paired device first. i.e. disabling a master pointer will disable the master keyboard first. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)

[PATCH 6/7] Xi: drop forced unpairing when changing the hierarchy

2012-05-15 Thread Peter Hutterer
Devices are unpaired as needed on DisableDevice now. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/xichangehierarchy.c |6 -- 1 file changed, 6 deletions(-) diff --git a/Xi/xichangehierarchy.c b/Xi/xichangehierarchy.c index 756aaac..89f16d8 100644 ---

[PATCH 7/7] dix: disable all devices before shutdown

2012-05-15 Thread Peter Hutterer
f3410b97cf9b48a47bee3d15d232f8a88e75f4ef introduced a regression on server shutdown. If any button or key was held on shutdown (ctrl, alt, backspace are usually still down) sending a raw event will segfault the server. The the root windows are set to NULL before calling CloseDownDevices(). Avoid

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 12:18:36PM +0200, Michal Suchanek wrote: Hello, On 15 May 2012 06:20, Peter Hutterer peter.hutte...@who-t.net wrote: On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote: diff --git a/dix/enterleave.h b/dix/enterleave.h index 729059b..c937c0e 100644

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Michal Suchanek
On 15 May 2012 12:38, Peter Hutterer peter.hutte...@who-t.net wrote: On Tue, May 15, 2012 at 12:18:36PM +0200, Michal Suchanek wrote: Hello, On 15 May 2012 06:20, Peter Hutterer peter.hutte...@who-t.net wrote: On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote: diff --git

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 01:17:26PM +0200, Michal Suchanek wrote: On 15 May 2012 12:38, Peter Hutterer peter.hutte...@who-t.net wrote: On Tue, May 15, 2012 at 12:18:36PM +0200, Michal Suchanek wrote: Hello, On 15 May 2012 06:20, Peter Hutterer peter.hutte...@who-t.net wrote: On Mon, May

Re: xserver: Branch 'master' - 14 commits

2012-05-15 Thread Michal Suchanek
On 15 May 2012 13:31, Peter Hutterer peter.hutte...@who-t.net wrote: On Tue, May 15, 2012 at 01:17:26PM +0200, Michal Suchanek wrote: On 15 May 2012 12:38, Peter Hutterer peter.hutte...@who-t.net wrote: On Tue, May 15, 2012 at 12:18:36PM +0200, Michal Suchanek wrote: Hello, On 15 May

[PATCHES] v2 - xserver -remove redundant declarations

2012-05-15 Thread Michal Suchanek
Hello, this is the remainder of the patches to remove X server redundant declaration. Some were merged, some addressed in a Xi patch series by Peter Hutterer. The fontproto one was supposedly discussed already but can't find where.

Re: [PATCH 1/2] rotate: Unregister damage across modesetting

2012-05-15 Thread Keith Packard
On Tue, 15 May 2012 11:41:23 +0200, Michal Suchanek hramr...@gmail.com wrote: How are you going to change screen resolution without changing the pixmap? The pixmap structure gets rewritten with new contents. -- keith.pack...@intel.com pgpVuLmwldtKY.pgp Description: PGP signature

Re: [PATCH 1/4] xf86/modes: drop two uses of screenInfo

2012-05-15 Thread Keith Packard
On Mon, 14 May 2012 13:00:20 +0100, Dave Airlie airl...@gmail.com wrote: -/* if this is called during ScreenInit() we don't have pScrn-pScreen yet */ -ScreenPtr pScreen = screenInfo.screens[pScrn-scrnIndex]; +ScreenPtr pScreen = xf86ScrnToScreen(pScrn); I assume your fine new

Re: [PATCH 4/4] xf86: reimplement XF86SCRNINFO macro using new functions.

2012-05-15 Thread Keith Packard
On Mon, 14 May 2012 13:00:23 +0100, Dave Airlie airl...@gmail.com wrote: - -/* This can get called before the ScrnInfoRec is installed so we - can't rely on getting it with XF86SCRNINFO() */ int scrnIndex = pmap-pScreen-myNum; ScrnInfoPtr scrninfp =

Re: [PATCH 0/7] regression fix for f3410b97cf9b48a47bee3d15d232f8a88e75f4ef

2012-05-15 Thread Chase Douglas
On 05/15/2012 03:36 AM, Peter Hutterer wrote: f3410b97cf9b48a47bee3d15d232f8a88e75f4ef introduced a regression, causing a segfault on server shutdown. This is caused by a raw event being sent after the root windows are forcibly set to NULL. This series fixes the issue by disabling all

Re: [PATCH] dix: rename shadowing loop variable in TouchResizeQueue

2012-05-15 Thread Chase Douglas
On 05/15/2012 03:28 AM, Peter Hutterer wrote: second 'i' shadows the function-wide one, rename to 'j' Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/touch.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dix/touch.c b/dix/touch.c index

Re: [PATCH 0/4] BUG_RETURN_VAL macros

2012-05-15 Thread Chase Douglas
On 05/15/2012 03:26 AM, Peter Hutterer wrote: I got annoyed having to write constructs like BUG_WARN(foo); if (foo) return FALSE; and similar. glib has useful macros like g_return_if_fail and similar, these are macros that essentially do the same job. They shout into the log, but

Re: [PATCH 1/5] test: fix redundant declaration of devices warning

2012-05-15 Thread Chase Douglas
On 05/15/2012 12:02 AM, Peter Hutterer wrote: In file included from protocol-xiwarppointer.c:41:0: protocol-common.h:91:23: warning: redundant redeclaration of ‘devices’ [-Wredundant-decls] protocol-common.h:86:3: note: previous declaration of ‘devices’ was here Signed-off-by: Peter

Re: [PATCH v2] dix: undo transformation for missing valuators (#49347)

2012-05-15 Thread Chase Douglas
On 05/14/2012 10:23 PM, Peter Hutterer wrote: last.valuators contains the transformed valuators of the device. If the device submits events with x/y missing, we need to get that from last.valuators and undo the transformation to that axis. X.Org Bug 49347

Re: [PATCH 1/2] rotate: Unregister damage across modesetting

2012-05-15 Thread Michal Suchanek
On 15 May 2012 17:03, Keith Packard kei...@keithp.com wrote: On Tue, 15 May 2012 11:41:23 +0200, Michal Suchanek hramr...@gmail.com wrote: How are  you going to change screen resolution without changing the pixmap? The pixmap structure gets rewritten with new contents. Indeed, the pixmap

Re: [PATCHES] v2 - xserver -remove redundant declarations

2012-05-15 Thread Dave Airlie
this is the remainder of the patches to remove X server redundant declaration. Some were merged, some addressed in a Xi patch series by Peter Hutterer. The fontproto one was supposedly discussed already but can't find where. http://lists.x.org/archives/xorg-devel/2012-January/028862.html

Re: [PATCH 1/4] xf86/modes: drop two uses of screenInfo

2012-05-15 Thread Dave Airlie
On Tue, May 15, 2012 at 4:16 PM, Keith Packard kei...@keithp.com wrote: On Mon, 14 May 2012 13:00:20 +0100, Dave Airlie airl...@gmail.com wrote: -    /* if this is called during ScreenInit() we don't have pScrn-pScreen yet */ -    ScreenPtr pScreen = screenInfo.screens[pScrn-scrnIndex]; +  

Re: [PATCH 4/4] xf86: reimplement XF86SCRNINFO macro using new functions.

2012-05-15 Thread Dave Airlie
- -    /* This can get called before the ScrnInfoRec is installed so we -       can't rely on getting it with XF86SCRNINFO() */      int scrnIndex = pmap-pScreen-myNum;      ScrnInfoPtr scrninfp = xf86ScreenToScrn(pmap-pScreen);      vgaHWPtr hwp = VGAHWPTR(scrninfp); Your new macro can

Re: [PATCH 2/2] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Chase Douglas
On 05/01/2012 10:21 PM, Peter Hutterer wrote: On Wed, Apr 25, 2012 at 06:15:51PM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- The functions to wait for specific events should probably be moved to xorg-gtest eventually, but I want to make sure they

Re: [PATCH 3/4] dix: use BUG_RETURN_VAL for pairing errors

2012-05-15 Thread Alan Coopersmith
On 05/15/12 03:26 AM, Peter Hutterer wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- dix/devices.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 51a74b6..04008d4 100644 --- a/dix/devices.c +++

Re: [PATCH 1/4] include: add BUG_RETURN_* macros

2012-05-15 Thread Alan Coopersmith
On 05/15/12 03:26 AM, Peter Hutterer wrote: Helper functions to avoid things like if (foo) { BUG_WARN(foo); return 1; } Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- include/misc.h | 12 1 file changed, 12 insertions(+) diff --git

Re: [PATCH 2/4] Replace a few BUG_WARN with BUG_RETURN_VAL

2012-05-15 Thread Alan Coopersmith
On 05/15/12 03:26 AM, Peter Hutterer wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c | 25 ++--- dix/getevents.c |5 + dix/touch.c | 17 ++--- 3 files changed, 17 insertions(+), 30 deletions(-) diff --git

Re: randr provider object

2012-05-15 Thread Adam Jackson
On 5/6/12 12:51 PM, Dave Airlie wrote: The provider object also contains the list of crtcs and outputs controlled by this provider. I don't think you need (or want) outputs here. GetCrtcInfo already gives you the current and possible mapping for crtc-output. The set provider API is then

[PATCH v2 1/3] Add xorg-gtest integration test framework

2012-05-15 Thread Chase Douglas
Signed-off-by: Chase Douglas chase.doug...@canonical.com --- configure.ac| 21 +- m4/xorg-gtest.m4| 110 +++ test/integration/Makefile-xorg-gtest.am | 61 + test/integration/Makefile.am

[PATCH v2 2/3] Add XInput 2.x integration test framework

2012-05-15 Thread Chase Douglas
Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split commit into XInput 2.x integration test framework and XIQueryPointer test configure.ac | 14 +++ test/integration/.gitignore |1 + test/integration/Makefile.am | 24 ++

[PATCH v2 3/3] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Chase Douglas
Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split out from XInput 2.x test framework * Fixed indentation in test assertions * Move recordings to touch_1_begin.record and touch_1_end.record .../recordings/ntrig_dell_xt2/device.prop | 32 +

Re: [PATCH 0/4] BUG_RETURN_VAL macros

2012-05-15 Thread Mark Kettenis
From: Peter Hutterer peter.hutte...@who-t.net Date: Tue, 15 May 2012 20:26:37 +1000 I got annoyed having to write constructs like BUG_WARN(foo); if (foo) return FALSE; and similar. glib has useful macros like g_return_if_fail and similar, these are macros that essentially do the

Re: [PATCH 0/4] BUG_RETURN_VAL macros

2012-05-15 Thread Chase Douglas
On 05/15/2012 11:06 AM, Mark Kettenis wrote: From: Peter Hutterer peter.hutte...@who-t.net Date: Tue, 15 May 2012 20:26:37 +1000 I got annoyed having to write constructs like BUG_WARN(foo); if (foo) return FALSE; and similar. glib has useful macros like g_return_if_fail and similar,

Re: [PATCH 3/3] Make MIPS use existing PowerPC code paths in lnx_video.c

2012-05-15 Thread Adam Jackson
On 5/10/12 2:20 PM, Matt Turner wrote: This allows X to work on the Lemote Yeeloong laptop. This beast apparently has an SiS 315 chip, if the wubs are to be believed? Which I guess explains this... ioBase_phys = 0x1fd0 is certainly a hack, and almost definitely breaks X on SGI MIPS

[PATCH] xserver: drop index argument to ScreenInit (ABI/API) (v2)

2012-05-15 Thread Dave Airlie
This drops the index argument, its the same as pScreen-myNum, and its the last major index abuse I can find. v2: address Alan's review - update docs, fix xwin/xnest/darwin Signed-off-by: Dave Airlie airl...@redhat.com --- dix/dispatch.c |5 ++--- doc/Xserver-spec.xml |

[PATCH] ddc: change API to take ScrnInfoPtr (v2)

2012-05-15 Thread Dave Airlie
This removes all xf86Screens usage from ddc code, it modifies the API for some functions to avoid taking indices. v2: address Alan's comments about dropping DDC2Init parameter. Signed-off-by: Dave Airlie airl...@redhat.com --- hw/xfree86/ddc/ddc.c| 25 +++--

[PATCH] int10/vbe: don't use xf86Screens. (ABI) (v2)

2012-05-15 Thread Dave Airlie
Pass the ScrnInfoPtr instead of the index in the int10 struct. This saves us using it to dereference xf86Screens. v2: address Alan's comment to fix struct alignment. Signed-off-by: Dave Airlie airl...@redhat.com --- hw/xfree86/int10/generic.c |2 +- hw/xfree86/int10/helper_exec.c |

Re: randr provider object

2012-05-15 Thread Dave Airlie
I don't think you need (or want) outputs here.  GetCrtcInfo already gives you the current and possible mapping for crtc-output. Well the main reason was just to provide the application the info in an easy to find place about what resources are on what GPU, so it can draw a pretty picture, we

Re: first set of new APIs + convert server to use them

2012-05-15 Thread Dave Airlie
On Mon, May 14, 2012 at 4:24 PM, Keith Packard kei...@keithp.com wrote: On Mon, 14 May 2012 12:28:52 +0100, Dave Airlie airl...@gmail.com wrote: nobody? ping? Yeah, no love for X server API changes this year. I looked at them briefly and certainly liked the general direction, but didn't get

Re: [PATCH] xfree86: use udev to provide device enumeration for kms devices (v4

2012-05-15 Thread Adam Jackson
On 5/14/12 3:42 AM, Dave Airlie wrote: +struct xf86_platform_device; typedef struct _DriverRec { int driverVersion; @@ -325,9 +326,20 @@ typedef struct _DriverRec { const struct pci_id_match *supported_devices; Bool (*PciProbe) (struct _DriverRec * drv, int entity_num,

Re: first set of new APIs + convert server to use them

2012-05-15 Thread Aaron Plattner
On 05/05/2012 01:49 AM, Dave Airlie wrote: This set of patches provides new APIs for converting scrn-screen and vice versa, and converts most of the low-hanging fruit in the X server to use them. Further changes are needed, but it would be good to get started, and we can start converting over a

Re: randr provider object

2012-05-15 Thread Adam Jackson
On 5/15/12 3:04 PM, Dave Airlie wrote: typedef struct { CARD8 reqType; CARD8 randrReqType; CARD16 length B16; RRProvider provider B32; Time configTimestamp B32; CARD32 new_role B32; CARD32 exclusive_master B32; /* xinerama or GPU switch */ } xRRSetProviderRoleReq;

[PATCH 1/2] Add test for touch end on device disable

2012-05-15 Thread Chase Douglas
When a device is disabled, all physically active touches must end. Signed-off-by: Chase Douglas chase.doug...@canonical.com --- test/integration/xi2.cpp | 71 ++ 1 file changed, 71 insertions(+) diff --git a/test/integration/xi2.cpp

[PATCH 2/2] End physically active touches when device is disabled

2012-05-15 Thread Chase Douglas
Otherwise: * We can't end the touches while device is disabled * New touches after enabling the device may erroneously be mapped to old logical touches Signed-off-by: Chase Douglas chase.doug...@canonical.com --- dix/devices.c | 26 ++ 1 file changed, 26

Re: [PATCH xf86-input-synaptics] Ignore pre-existing touches

2012-05-15 Thread Chase Douglas
On 05/14/2012 07:10 PM, Peter Hutterer wrote: On Mon, May 14, 2012 at 10:20:01AM -0700, Chase Douglas wrote: If a touch is physically active when the device is enabled, then all events for that touch must be ignored. In particular, we cannot close the touch or we will decrement touch count

Re: [PATCH 02/19] xserver: convert block/wakeup handlers to passing ScreenPtr (ABI/API break)

2012-05-15 Thread Adam Jackson
On 5/14/12 12:40 PM, Dave Airlie wrote: diff --git a/dix/dixutils.c b/dix/dixutils.c index 9eb5489..8abd398 100644 --- a/dix/dixutils.c +++ b/dix/dixutils.c @@ -384,7 +384,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask) ++inHandler; for (i = 0; i screenInfo.numScreens; i++)

Re: [PATCH 03/19] xf86: change EnterVT/LeaveVT to take a ScrnInfoPtr (ABI/API break)

2012-05-15 Thread Adam Jackson
On 5/14/12 12:40 PM, Dave Airlie wrote: This modifies the EnterVT/LeaveVT interfaces to take a ScrnInfoPtr instead of an index into xf86Screens. This allows dropping more public dereferences of the xf86Screens and screenInfo. If someone's feeling enterprising: this whole VT idea should really

Re: [PATCH 14/19] int10: cleanup one unnecessary use of xf86Screens

2012-05-15 Thread Adam Jackson
On 5/14/12 12:41 PM, Dave Airlie wrote: Signed-off-by: Dave Airlie airl...@redhat.com Ack, though... diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 8614e0b..4b97520 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -70,12 +70,12 @@

Re: [PATCH] int10/vbe: don't use xf86Screens. (ABI) (v2)

2012-05-15 Thread Adam Jackson
On 5/15/12 2:52 PM, Dave Airlie wrote: Pass the ScrnInfoPtr instead of the index in the int10 struct. Mostly good, but... @@ -340,7 +341,7 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) if (!DDC_data) return NULL; -pMonitor = xf86InterpretEDID(pVbe-pInt10-scrnIndex,

Re: no more indexes - clean up API

2012-05-15 Thread Adam Jackson
On 5/14/12 12:40 PM, Dave Airlie wrote: The screen/scrninfo APIs are very into passing index values, that are then immediately used to lookup a global array, this is not an API, its whatever the opposite is. This set of patches changes all the API passing of screen indices (apart from the

Re: convert some more users to the screen conversion functions.

2012-05-15 Thread Adam Jackson
On 5/14/12 8:00 AM, Dave Airlie wrote: These are just some more simple patches to move to using the Screen-Scrn and Scrn-Screen conversion functions in various parts of the server. The last is an API change but should be fine from ABI pov. These are last set of patches before major ABI

Re: no more indexes - clean up API

2012-05-15 Thread Alan Coopersmith
On 05/15/12 02:10 PM, Adam Jackson wrote: There's a lot of cleanup material if anyone really wanted to go after it after this, 4/19 for example I think we could drop FreeScreen from the ScrnInfoRec entirely with only modest driver fixups. Not for Dave's series, but I've always dreamed of

Re: no more indexes - clean up API

2012-05-15 Thread Adam Jackson
On 5/15/12 5:33 PM, Alan Coopersmith wrote: On 05/15/12 02:10 PM, Adam Jackson wrote: There's a lot of cleanup material if anyone really wanted to go after it after this, 4/19 for example I think we could drop FreeScreen from the ScrnInfoRec entirely with only modest driver fixups. Not for

Re: [PATCH 0/4] BUG_RETURN_VAL macros

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 08:06:48PM +0200, Mark Kettenis wrote: From: Peter Hutterer peter.hutte...@who-t.net Date: Tue, 15 May 2012 20:26:37 +1000 I got annoyed having to write constructs like BUG_WARN(foo); if (foo) return FALSE; and similar. glib has useful macros like

Re: [PATCH 2/4] Replace a few BUG_WARN with BUG_RETURN_VAL

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 10:49:59AM -0700, Alan Coopersmith wrote: On 05/15/12 03:26 AM, Peter Hutterer wrote: Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Xi/exevents.c | 25 ++--- dix/getevents.c |5 + dix/touch.c | 17

Re: [PATCH 2/2] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 10:44:51AM -0700, Chase Douglas wrote: On 05/01/2012 10:21 PM, Peter Hutterer wrote: On Wed, Apr 25, 2012 at 06:15:51PM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- The functions to wait for specific events should

[PATCH xorg-gtest] m4: if a source is specified, use that for the include path

2012-05-15 Thread Peter Hutterer
Don't require users to specify both source and include path. We can assume that if they have the source at a certain location, they want those headers too. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- m4/gtest.m4 | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)

[PATCH xorg-gtest] examples: built tests as noinst_PROGRAMS

2012-05-15 Thread Peter Hutterer
check_PROGRAMS is only built on make check, so it's a good way of introducing build errors until later (as we discovered in the server). Always built the tests, running them is optional. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- examples/Makefile.am |4 ++-- 1 file changed,

Re: [PATCH v2 1/3] Add xorg-gtest integration test framework

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 11:05:25AM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- configure.ac| 21 +- m4/xorg-gtest.m4| 110 +++

Re: [PATCH v2 2/3] Add XInput 2.x integration test framework

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 11:05:26AM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split commit into XInput 2.x integration test framework and XIQueryPointer test configure.ac | 14 +++

Re: [PATCH v2 3/3] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 11:05:27AM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split out from XInput 2.x test framework * Fixed indentation in test assertions * Move recordings to touch_1_begin.record and touch_1_end.record

Re: [PATCH xorg-gtest] m4: if a source is specified, use that for the include path

2012-05-15 Thread Chase Douglas
On 05/15/2012 04:07 PM, Peter Hutterer wrote: Don't require users to specify both source and include path. We can assume that if they have the source at a certain location, they want those headers too. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- m4/gtest.m4 | 12

Re: [PATCH v2 1/3] Add xorg-gtest integration test framework

2012-05-15 Thread Chase Douglas
On 05/15/2012 04:18 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:25AM -0700, Chase Douglas wrote: [snip] diff --git a/m4/xorg-gtest.m4 b/m4/xorg-gtest.m4 new file mode 100644 index 000..52dd5aa --- /dev/null +++ b/m4/xorg-gtest.m4 @@ -0,0 +1,110 @@ +# serial 1 + +#

Re: [PATCH v2 2/3] Add XInput 2.x integration test framework

2012-05-15 Thread Chase Douglas
On 05/15/2012 04:26 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:26AM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split commit into XInput 2.x integration test framework and XIQueryPointer test configure.ac

Re: [PATCH v2 3/3] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Chase Douglas
On 05/15/2012 04:36 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:27AM -0700, Chase Douglas wrote: [snip] diff --git a/test/integration/recordings/ntrig_dell_xt2/touch_1_begin.record b/test/integration/recordings/ntrig_dell_xt2/touch_1_begin.record new file mode 100644 index

Re: [PATCH xorg-gtest] examples: built tests as noinst_PROGRAMS

2012-05-15 Thread Chase Douglas
On 05/15/2012 04:08 PM, Peter Hutterer wrote: check_PROGRAMS is only built on make check, so it's a good way of introducing build errors until later (as we discovered in the server). Always built the tests, running them is optional. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net ---

Re: [PATCH 1/4] xf86/modes: drop two uses of screenInfo

2012-05-15 Thread Keith Packard
On Tue, 15 May 2012 17:56:33 +0100, Dave Airlie airl...@gmail.com wrote: On Tue, May 15, 2012 at 4:16 PM, Keith Packard kei...@keithp.com wrote: On Mon, 14 May 2012 13:00:20 +0100, Dave Airlie airl...@gmail.com wrote: -    /* if this is called during ScreenInit() we don't have pScrn-pScreen

Re: [PATCH 1/2 v2] dri2proto: Add DRI2GetParam request

2012-05-15 Thread Chad Versace
Tomorrow (Wednesday) I will submit a v3 of this series that addresses your questions and suggestions. Comments below. On 05/14/2012 05:51 PM, Alan Coopersmith wrote: On 05/14/12 03:23 PM, Chad Versace wrote: +Parameter names in which the value of the most signficant byte is 0 are +

Re: [PATCH v2 1/3] Add xorg-gtest integration test framework

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 04:51:40PM -0700, Chase Douglas wrote: On 05/15/2012 04:18 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:25AM -0700, Chase Douglas wrote: [snip] + + GTEST_CPPFLAGS=$GTEST_CPPFLAGS -I$GTEST_SOURCE + + AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc]

Re: [PATCH v2 3/3] Add test for XIQueryPointer button mask when physical touch is active

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 04:58:15PM -0700, Chase Douglas wrote: On 05/15/2012 04:36 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:27AM -0700, Chase Douglas wrote: [snip] diff --git a/test/integration/recordings/ntrig_dell_xt2/touch_1_begin.record

Re: [PATCH v2 2/3] Add XInput 2.x integration test framework

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 04:56:00PM -0700, Chase Douglas wrote: On 05/15/2012 04:26 PM, Peter Hutterer wrote: On Tue, May 15, 2012 at 11:05:26AM -0700, Chase Douglas wrote: Signed-off-by: Chase Douglas chase.doug...@canonical.com --- Changes since v1: * Split commit into XInput 2.x

Re: [PATCH 1/2] Add test for touch end on device disable

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 01:21:54PM -0700, Chase Douglas wrote: When a device is disabled, all physically active touches must end. Signed-off-by: Chase Douglas chase.doug...@canonical.com Reviewed-by: Peter Hutterer peter.hutte...@who-t.net Cheers, Peter --- test/integration/xi2.cpp |

Re: [PATCH 2/2] End physically active touches when device is disabled

2012-05-15 Thread Peter Hutterer
On Tue, May 15, 2012 at 01:21:55PM -0700, Chase Douglas wrote: Otherwise: * We can't end the touches while device is disabled * New touches after enabling the device may erroneously be mapped to old logical touches Signed-off-by: Chase Douglas chase.doug...@canonical.com ---

Re: [PATCH 1/2 v2] dri2proto: Add DRI2GetParam request

2012-05-15 Thread Alan Coopersmith
On 05/15/12 05:19 PM, Chad Versace wrote: Where will the master list of these be maintained to avoid conflicts? Server ones in dri2proto.txt/dri2proto.h and driver ones in each driver's headers? That is the plan; sorry for not documenting that. I will explicitly document that in