[PATCH xserver 1/3] configure.ac: Use -Wl, -all_load when building Xorg on darwin
Signed-off-by: Jeremy Huddleston jerem...@apple.com --- configure.ac |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 6de92b4..cb942fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1680,6 +1680,13 @@ if test x$XORG = xyes; then gnu*) XORG_OS_SUBDIR=hurd ;; + darwin*) + XORG_OS_SUBDIR=stub + LDFLAGS=$LDFLAGS -Wl,-all_load + AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], + [Support for teh Xorg DDX on Mac OS X is in the early stages.], + [If you intended to build XQuartz, please reconfigure with the appropriate options]))]) + ;; *) XORG_OS_SUBDIR=stub AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], -- 1.7.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver 2/3] configure.ac: Remove MIEXT_SHADOW_LIB from XORG_LIBS
This is provided by dixmods/libshadow.so and is not part of the main binary. This addresses a build failure on darwin due to MIEXT_SHADOW_LIB having unsatisfied dependencies (FB_LIB) in XORG_LIBS. Signed-off-by: Jeremy Huddleston jerem...@apple.com --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index cb942fa..000dc83 100644 --- a/configure.ac +++ b/configure.ac @@ -1525,7 +1525,7 @@ if test x$XORG = xyes; then XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS=$XORG_DDXINCS $XORG_OSINCS XORG_CFLAGS=$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H - XORG_LIBS=$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB + XORG_LIBS=$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB dnl == dnl symbol visibility -- 1.7.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH xserver 3/3] xfree86: Don't link libxorgxkb against libdix.la
libdix.a is already provided by XSERVER_LIBS. Including it in libxorgxkb results in duplicate symbols landing in the Xorg binary. Signed-off-by: Jeremy Huddleston jerem...@apple.com --- hw/xfree86/dixmods/Makefile.am |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index b6eb54f..a5be3ae 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -65,4 +65,3 @@ libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS) libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c -libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la -- 1.7.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xserver 1/3] configure.ac: Use -Wl, -all_load when building Xorg on darwin
Gah, yes, I see the typing-too-fast-o. On Jan 9, 2012, at 1:07 AM, Jeremy Huddleston wrote: Signed-off-by: Jeremy Huddleston jerem...@apple.com --- configure.ac |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 6de92b4..cb942fa 100644 --- a/configure.ac +++ b/configure.ac @@ -1680,6 +1680,13 @@ if test x$XORG = xyes; then gnu*) XORG_OS_SUBDIR=hurd ;; + darwin*) + XORG_OS_SUBDIR=stub + LDFLAGS=$LDFLAGS -Wl,-all_load + AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], + [Support for teh Xorg DDX on Mac OS X is in the early stages.], + [If you intended to build XQuartz, please reconfigure with the appropriate options]))]) + ;; *) XORG_OS_SUBDIR=stub AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], -- 1.7.7.4 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] dix: Update pointer limits for floating devices too (#43635)
On 01/09/2012 06:19 AM, Peter Hutterer wrote: When the screen is restructured, the pointer limits need to be reset for floating slave devices as well, not just for master pointers. Only skip devices that don't have a cursor (attached slaves and keyboard) Bug reproducer: float an absolute slave device, rotate the screen - the device is now confined to a section of the screen only. X.Org Bug 43635 http://bugs.freedesktop.org/show_bug.cgi?id=43635 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Makes sense to me. Reviewed-by: Chase Douglas chase.doug...@canonical.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PULL] hw/xwin fixes
Hi Keith, The following set of patches contain various fixes for the XWin DDX. Please consider pulling into master. Thanks. The following changes since commit 98cde254acb9b98337ddecf64c138d38c14ec2bf: Bump version to 1.11.99.901 (1.12 RC1) (2011-12-27 14:02:39 -0800) are available in the git repository at: git://people.freedesktop.org/~jturney/xserver rpavlik-xwin-fixes Ryan Pavlik (11): hw/xwin: Fix a memory leak in error path in winInitWM() hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks() hw/xwin: Remove an empty #if 0/#endif hw/xwin: Fix rrScreenSetSize function pointer mismatch hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine() hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD() hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame() hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow() hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW hw/xwin: Include manifest file in the dist tarball hw/xwin/Makefile.am |3 ++- hw/xwin/winclipboard.h |1 - hw/xwin/winclipboardthread.c |2 ++ hw/xwin/winengine.c |7 ++- hw/xwin/winmultiwindowwm.c | 12 +++- hw/xwin/winnativegdi.c |7 --- hw/xwin/winpfbdd.c |6 +++--- hw/xwin/winrandr.c |2 -- hw/xwin/winshadgdi.c |1 - hw/xwin/winwin32rootless.c |4 +--- hw/xwin/winwin32rootlesswindow.c |3 ++- 11 files changed, 23 insertions(+), 25 deletions(-) ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] hw/xwin fixes
On Mon, 09 Jan 2012 14:32:15 +, Jon TURNEY jon.tur...@dronecode.org.uk wrote: Ryan Pavlik (11): hw/xwin: Fix a memory leak in error path in winInitWM() hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks() hw/xwin: Remove an empty #if 0/#endif hw/xwin: Fix rrScreenSetSize function pointer mismatch hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine() hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD() hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame() hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow() hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW hw/xwin: Include manifest file in the dist tarball Do you want to push a version with the SoB lines included? -- keith.pack...@intel.com pgpLJaM5c6b13.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] hw/xwin fixes
You may consider all of these to include the following: Signed-off-by: Ryan Pavlik rpav...@iastate.edu Thanks for reviewing these, all. Ryan Pavlik On Mon, Jan 9, 2012 at 8:32 AM, Jon TURNEY jon.tur...@dronecode.org.ukwrote: Hi Keith, The following set of patches contain various fixes for the XWin DDX. Please consider pulling into master. Thanks. The following changes since commit 98cde254acb9b98337ddecf64c138d38c14ec2bf: Bump version to 1.11.99.901 (1.12 RC1) (2011-12-27 14:02:39 -0800) are available in the git repository at: git://people.freedesktop.org/~jturney/xserver rpavlik-xwin-fixes Ryan Pavlik (11): hw/xwin: Fix a memory leak in error path in winInitWM() hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks() hw/xwin: Remove an empty #if 0/#endif hw/xwin: Fix rrScreenSetSize function pointer mismatch hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine() hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD() hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame() hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow() hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW hw/xwin: Include manifest file in the dist tarball hw/xwin/Makefile.am |3 ++- hw/xwin/winclipboard.h |1 - hw/xwin/winclipboardthread.c |2 ++ hw/xwin/winengine.c |7 ++- hw/xwin/winmultiwindowwm.c | 12 +++- hw/xwin/winnativegdi.c |7 --- hw/xwin/winpfbdd.c |6 +++--- hw/xwin/winrandr.c |2 -- hw/xwin/winshadgdi.c |1 - hw/xwin/winwin32rootless.c |4 +--- hw/xwin/winwin32rootlesswindow.c |3 ++- 11 files changed, 23 insertions(+), 25 deletions(-) -- Ryan Pavlik HCI Graduate Student Virtual Reality Applications Center Iowa State University rpav...@iastate.edu http://academic.cleardefinition.com ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] hw/xwin fixes
On 09/01/2012 17:27, Keith Packard wrote: On Mon, 09 Jan 2012 14:32:15 +, Jon TURNEY jon.turney-grjqepx9rppajuda+fb...@public.gmane.org wrote: Ryan Pavlik (11): hw/xwin: Fix a memory leak in error path in winInitWM() hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks() hw/xwin: Remove an empty #if 0/#endif hw/xwin: Fix rrScreenSetSize function pointer mismatch hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine() hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD() hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame() hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow() hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW hw/xwin: Include manifest file in the dist tarball Do you want to push a version with the SoB lines included? I have pushed a version with the Signoff lines added to the same branch. ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] miext/damage: Only wrap into the GC ops chain if there's a listener (v2.1)
On 01/06/2012 10:46 AM, Adam Jackson wrote:
Before:
4000 trep @ 0.0009 msec (1148346.9/sec): PutImage 10x10 square
6000 trep @ 0.0005 msec (2091666.1/sec): ShmPutImage 10x10 square
After:
4000 trep @ 0.0008 msec (1191807.5/sec): PutImage 10x10 square
6000 trep @ 0.0005 msec (2180983.0/sec): ShmPutImage 10x10 square
v2: Bump drawable serial number on damage register/unregister to trigger
ValidateGC, otherwise a Damage created after the GC was validated
would never be called, and a Damage destroyed on a validated GC
would probably crash the next GC draw. Spotted by Aaron Plattner.
v2.1: Actually include the above change.
Reviewed-by: Eric Anholte...@anholt.net
Signed-off-by: Adam Jacksona...@redhat.com
---
miext/damage/damage.c |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index d791211..37599dd 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -437,9 +437,13 @@ damageValidateGC(GCPtr pGC,
unsigned long changes,
DrawablePtr pDrawable)
{
+drawableDamage(pDrawable);
DAMAGE_GC_FUNC_PROLOGUE (pGC);
(*pGC-funcs-ValidateGC)(pGC, changes, pDrawable);
-pGCPriv-ops = pGC-ops; /* just so it's not NULL */
+if (pDamage)
+ pGCPriv-ops = pGC-ops; /* just so it's not NULL */
+else
+ pGCPriv-ops = NULL;
DAMAGE_GC_FUNC_EPILOGUE (pGC);
}
@@ -1766,12 +1770,15 @@ void miDamageCreate (DamagePtr pDamage)
{
}
+/* Bump serial on register/unregister to trigger ValidateGC */
void miDamageRegister (DrawablePtr pDrawable, DamagePtr pDamage)
{
+pDrawable-serialNumber++;
}
void miDamageUnregister (DrawablePtr pDrawable, DamagePtr pDamage)
{
+pDrawable-serialNumber++;
}
I think these need to be pDrawable-serialNumber = NEXT_SERIAL_NUMBER.
Otherwise, creating two pixmaps, validating a GC for the second one,
creating a damage object on the first, and then trying to use the second
GC on the first drawable might cause similar problems.
void miDamageDestroy (DamagePtr pDamage)
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] miext/damage: Only wrap into the GC ops chain if there's a listener (v2.1)
On Mon, 2012-01-09 at 10:21 -0800, Aaron Plattner wrote: I think these need to be pDrawable-serialNumber = NEXT_SERIAL_NUMBER. Otherwise, creating two pixmaps, validating a GC for the second one, creating a damage object on the first, and then trying to use the second GC on the first drawable might cause similar problems. D'oh, forgot that was global. Excellent point again, thanks for catching it. - ajax signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xserver 1/3] configure.ac: Use -Wl, -all_load when building Xorg on darwin
On Mon, 09 Jan 2012 01:16:00 -0800, Jeremy Huddleston jerem...@apple.com wrote: Gah, yes, I see the typing-too-fast-o. And here I was going to ask if that was intentional... -- keith.pack...@intel.com pgpqPTfluhpCc.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] XQuartz Build Fix
On Tue, 27 Dec 2011 13:12:56 -0800, Jeremy Huddleston jerem...@apple.com wrote: Jeremy Huddleston (1): XQuartz: GL: Buildfix for recent GLX changes Merged. 98cde25..a97252d master - master -- keith.pack...@intel.com pgpLwXtwDTqjp.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] Build fixes for ia64, mips, and mipsel
On Sat, 31 Dec 2011 02:40:24 +0100, Cyril Brulebois k...@debian.org wrote: Cyril Brulebois (1): linux/ia64: Fix regression after domain I/O support code removal. Julien Cristau (1): os: don't ignore failure from dladdr Merged. a97252d..1f5587e master - master -- keith.pack...@intel.com pgpXYDncKME1z.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL updated] input fixes
On Mon, 9 Jan 2012 10:54:24 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: Andreas Wettstein (1): xkb: Message actions suppress other key presses #28575 Peter Hutterer (5): xfree86: split warning about missing identifier or input driver dix: send focus events to the immediate parent (#44079) dix: on PointerRootWin send a FocusIn to the sprite window too dix: fix wrong condition checking for attached slave (#44003) Xi: change XIChangeDeviceProperty from const pointer to const void * Merged. 1f5587e..0b2c649 master - master -- keith.pack...@intel.com pgpJzBYweCLd7.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] shape: Report empty region correctly
On Thu, 18 Nov 2010 14:42:20 +0200, Pauli ext-pauli.niemi...@nokia.com wrote: To fix the problem XShapeGetRectangles has to check if there is no rectangles in region and return sane values instead of no rectangles. This is a bug in the shape library, not the server. If you read the shape protocol document, it explicitly says that the empty region should be sent as zero rectangles, not a single empty rectangle, and so we should infer that an empty region will be reported as zero rectangles and not a single empty rectangle. -- keith.pack...@intel.com pgpcv6krxchmL.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] 1.12 fix queue
On Fri, 06 Jan 2012 14:49:38 -0500, Adam Jackson a...@nwnk.net wrote:
Adam Jackson (13):
os: Repack ConnectionOutput for LP64
dix: Repack ClientRec
dix: Pull client-is-local flag up to the ClientRec
dix: Extend initial connection handshake for forwarding proxies
os: Hide the Connection{In,Out}put implementation details
os: Minor header cleanup
dix: Fix types in WindowOptRec
xace: ricer tuning for XaceHook
dix: Tune dtrace hooks around Dispatch
dix: Tune dixLookupDrawable for success
xfree86: Remove the pretense of EDID v2 support
vgahw: Fix DACDelay() macro to use the driver's vtable
Always install xaa sdk headers
Arthur Taylor (1):
linux: Use K_OFF VT KB mode over K_RAW if available.
Chris Halse Rogers (2):
dix: Return BadWindow rather than BadMatch from dixLookupWindow
Revert dix: don't return BadMatch from GetProperty (#23562)
Matthieu Herrb (2):
UnloadSubModule(): accept pointer value '1' and ignore it.
Add OpenBSD support to DetermineClientCmd()
Pauli Nieminen (1):
shape: Report empty region correctly
Zhigang Gong (1):
mi/mibitblt: Fix an overflow bug of bit shift.
I've merged all of these except for 'shape: Report empty region
correctly', to which I replied to the original post (the correct fix is
in the Shape library, not the X server).
0b2c649..f4956fa master - master
--
keith.pack...@intel.com
pgpejCAd6BWDD.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] Multitouch fixes
On Mon, 9 Jan 2012 10:57:56 +1000, Peter Hutterer peter.hutte...@who-t.net wrote: Carlos Garnacho (1): dix: Set XITouchEmulatingPointer on events from the touch sequence emulating pointer events Chase Douglas (2): Don't end touchpoint if owning client hasn't accepted/rejected Remove last listener on touch reject Peter Hutterer (1): Require inputproto 2.1.99.5 Merged. f4956fa..e476af4 master - master -- keith.pack...@intel.com pgp4RTKjQJY5o.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] hw/xwin fixes
On Mon, 09 Jan 2012 14:32:15 +, Jon TURNEY jon.tur...@dronecode.org.uk wrote: Ryan Pavlik (11): hw/xwin: Fix a memory leak in error path in winInitWM() hw/xwin: Fix double-free in error path in winQueryRGBBitsAndMasks() hw/xwin: Remove an empty #if 0/#endif hw/xwin: Fix rrScreenSetSize function pointer mismatch hw/xwin: Clarify an if statement mixed with ifdef in winSetEngine() hw/xwin: Fix possible null ptr deref in winActivateAppNativeGDI() hw/xwin: Fix possible null ptr deref in winActivateAppPrimaryDD() hw/xwin: Fix possible null ptr deref in winMWExtWMRestackFrame() hw/xwin: Fix possible null ptr deref in winMWExtWMDecorateWindow() hw/xwin: Fix duplicate definition of HAS_WINSOCK when building for MinGW hw/xwin: Include manifest file in the dist tarball Merged. e476af4..e722ad6 master - master -- keith.pack...@intel.com pgpZmTn0JZfPY.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] 1.12 fix queue
On 01/09/2012 01:15 PM, Keith Packard wrote:
On Fri, 06 Jan 2012 14:49:38 -0500, Adam Jacksona...@nwnk.net wrote:
Adam Jackson (13):
os: Repack ConnectionOutput for LP64
dix: Repack ClientRec
dix: Pull client-is-local flag up to the ClientRec
dix: Extend initial connection handshake for forwarding proxies
os: Hide the Connection{In,Out}put implementation details
os: Minor header cleanup
dix: Fix types in WindowOptRec
xace: ricer tuning for XaceHook
dix: Tune dtrace hooks around Dispatch
dix: Tune dixLookupDrawable for success
xfree86: Remove the pretense of EDID v2 support
vgahw: Fix DACDelay() macro to use the driver's vtable
Always install xaa sdk headers
Arthur Taylor (1):
linux: Use K_OFF VT KB mode over K_RAW if available.
Chris Halse Rogers (2):
dix: Return BadWindow rather than BadMatch from dixLookupWindow
Revert dix: don't return BadMatch from GetProperty (#23562)
Matthieu Herrb (2):
UnloadSubModule(): accept pointer value '1' and ignore it.
Add OpenBSD support to DetermineClientCmd()
Pauli Nieminen (1):
shape: Report empty region correctly
Zhigang Gong (1):
mi/mibitblt: Fix an overflow bug of bit shift.
I've merged all of these except for 'shape: Report empty region
correctly', to which I replied to the original post (the correct fix is
in the Shape library, not the X server).
0b2c649..f4956fa master - master
Keith, this merge includes some major ABI breakers (e.g. changes to
ClientRec). Whatever happened to the ABI is frozen at RC1 policy?
-- Aaron
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH sis] Use miPointerSetPosition, not miPointerAbsoluteCursor
Reviewed-by: Jeremy Huddleston jerem...@apple.com
Sent from my iPad
On Jan 3, 2012, at 19:26, Peter Hutterer peter.hutte...@who-t.net wrote:
miPointerAbsoluteCursor was removed in '09.
Technically this shouldn't just work on the VCP since any master pointer may
end up in the dead area. However, I suspect the Venn diagramm of MPX users
and sis merged framebuffer users shows little overlap.
miPointerSetPosition's prototype changed a few times, these are a bunch of
untested ifdefs that should be correct according to the git history.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
I do wonder why I bothered. The way I read this is that this code would have
had unresolved symbols since server 1.6 and no-one complained.
src/sis_driver.c | 19 ++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 6f7a15e..3218239 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -85,6 +85,10 @@
#include X11/extensions/dpms.h
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 15
+#include inputstr.h /* for inputInfo */
+#endif
+
#ifdef XF86DRI
#include dri.h
@@ -9346,9 +9350,22 @@ SISMergedPointerMoved(int scrnIndex, int x, int y)
}
}
if(doit) {
-UpdateCurrentTime();
sigstate = xf86BlockSIGIO();
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 15
+{
+double dx = x, dy = y;
+miPointerSetPosition(inputInfo.pointer, Absolute, dx, dy);
+x = (int)dx;
+y = (int)dy;
+}
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 11
+miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 5
+miPointerSetPosition(inputInfo.pointer, x, y);
+#else
+UpdateCurrentTime();
miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+#endif
xf86UnblockSIGIO(sigstate);
return;
}
--
1.7.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH] render: don't bother with animated cursors on floating slaves (#39989)
Sounds reasonable
Reviewed-by: Jeremy Huddleston jerem...@apple.com
Sent from my iPad
On Jan 8, 2012, at 17:20, Peter Hutterer peter.hutte...@who-t.net wrote:
In the case of floating slave devices that is reattached to a master with an
animated cursor, that cursor may jump outside it's window confines. Since
floating slaves never display a cursor anyway, we might as well short-cut
this and exit early.
X.Org Bug 39989 http://bugs.freedesktop.org/show_bug.cgi?id=39989
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Harald Judt h.j...@gmx.at
---
render/animcur.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/render/animcur.c b/render/animcur.c
index 4cf1fdf..0f174fd 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,
AnimCurScreenPtras = GetAnimCurScreen(pScreen);
Boolret;
+if (IsFloating(pDev))
+return FALSE;
+
Unwrap (as, pScreen, DisplayCursor);
if (IsAnimCur(pCursor))
{
--
1.7.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PULL] 1.12 fix queue
On 1/9/12 5:42 PM, Keith Packard wrote: On Mon, 9 Jan 2012 14:07:27 -0800, Aaron Plattneraplatt...@nvidia.com wrote: Keith, this merge includes some major ABI breakers (e.g. changes to ClientRec). Whatever happened to the ABI is frozen at RC1 policy? Ajax? Was this sequence intended for 1.13? The ABI changes were intended for 1.12, but were in a tree that never got pulled. I'd express some frustration that changes I send never get review or pull notice, but it's as much or more my fault for not being persistent or leading enough by example. Most of the ABI changes are easy to revert, and I guess I don't really care if they go in now or later. The r/R convention change depends on 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96 though, which would be a little unfortunate to lose. Oh well. Anyway. Revert these commits (in this order): a4553019a10b4e01cc06f3081db71a83338697b4 48e7a2ef574c8b38c4f8f07b45f54c8bfd02552b 78fa121f4097d29458e5453c13473595df06e26e 49d38b75c8f3276cfce33ffe6b8c4fbeb1081b96 f702372822dadb1fef92cfc25086481f640147b3 d5f724544afd2949cebfcf4f0b4510ec0c701bec - ajax ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH intel-gpu-tools v2 0/6] Convert debugger to Automake
On Fri, Jan 06, 2012 at 06:25:04PM -0500, Gaetan Nadon wrote: Version 2 improves commit messages and custom build commands Also fixed some nits in other makefiles. I checked that the binaries produced have the same size, but I'd like someone to run a sanity check on the module. I ran distcheck, out-of-source build and build from tarball. A Tested-by tag would be appreciated. I'll be away for the next few days. I'll collect review tags and I'll push the patches next week if all goes well. Gaetan Nadon (6): Debugger: convert existing makefiles to Automake. Benchmark: use correct src and build location lib: fix include directives, alphabetize sources scripts: use PYTHON primary directive for python scripts tools: use correct src and build location config: remove unused AC_DEFINE for CAIRO, LIBUDEV and GLIB Makefile.am|8 ++-- benchmarks/Makefile.am | 29 +++ configure.ac | 60 +++ debugger/Makefile.am | 27 +-- debugger/system_routine/.gitignore | 12 - debugger/system_routine/GNUmakefile.in |3 - debugger/system_routine/Makefile | 84 debugger/system_routine/Makefile.am| 42 lib/Makefile.am| 45 - scripts/Makefile.am|7 +-- tools/Makefile.am | 78 ++ 11 files changed, 174 insertions(+), 221 deletions(-) delete mode 100644 debugger/system_routine/GNUmakefile.in delete mode 100644 debugger/system_routine/Makefile create mode 100644 debugger/system_routine/Makefile.am Acked-by: Ben Widawsky b...@bwidawsk.net ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH v2 xf86-input-evdev] Copy last valuator values into new touch valuator masks
On Thu, Jan 05, 2012 at 01:28:43PM -0800, Chase Douglas wrote:
Evdev is a 100% stateful protocol. The following represents three
touches. Two touches begin and end at the same time at (500, 500) and
(1000, 1000). The third touch begins after the first two end, and is at
(500, 500).
ABS_MT_SLOT 0 /* Set touch slot */
ABS_MT_TRACKING_ID0 /* New touch with ID 0 in slot 0 */
ABS_MT_POSITION_X 500 /* Initial X position */
ABS_MT_POSITION_Y 500 /* Initial Y position */
ABS_MT_SLOT 1 /* Set touch slot */
ABS_MT_TRACKING_ID1 /* New touch with ID 1 in slot 1 */
ABS_MT_POSITION_X 1000/* Initial X position */
ABS_MT_POSITION_Y 1000/* Initial Y position */
SYNC /* End of frame */
ABS_MT_SLOT 0 /* Go back to slot 0 */
ABS_MT_TRACKING_ID-1 /* Touch in slot 0 ended */
ABS_MT_SLOT 1 /* Go to slot 1 */
ABS_MT_TRACKING_ID-1 /* Touch in slot 1 ended */
SYNC /* End of frame */
ABS_MT_SLOT 0 /* Go back to slot 0 */
ABS_MT_TRACKING_ID2 /* New touch in slot 0 with ID 2 */
SYNC /* End of frame */
ABS_MT_TRACKING_ID-1 /* Touch in last slot (0) ended */
SYNC /* End of frame */
Note that touch 2 has the same X and Y position as touch 0. This is
implied because no new value was emitted for slot 0. In fact, Linux will
not emit an event in the same slot with the same event type and code
unless the value has changed. Thus, we can only assume that all the MT
valuators have the same values as they were when they were last sent for
the given slot.
This change adds an array of valuator mask to hold all the last valuator
values that came from evdev for each slot. When a new touch begins, all
the last values are copied into it.
This patch assumes initial axis values of 0 in each slot. Linux and
mtdev do not provide a facility to query the current values of axes in
each slot yet. This may cause spurious incorrect touch valuator values
at the beginning of an X session, but there's nothing we can do about it
right now.
Signed-off-by: Chase Douglas chase.doug...@canonical.com
---
Changes since v1:
* Hold the last values *per-slot* instead of globally
src/evdev.c | 80
---
src/evdev.h |1 +
2 files changed, 77 insertions(+), 4 deletions(-)
diff --git a/src/evdev.c b/src/evdev.c
index 82cdb00..ec6650e 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -746,6 +746,24 @@ EvdevProcessTouch(InputInfoPtr pInfo)
valuator_mask_zero(pEvdev-mt_mask);
}
+static int
+num_slots(EvdevPtr pEvdev)
+{
+int value = pEvdev-absinfo[ABS_MT_SLOT].maximum -
+pEvdev-absinfo[ABS_MT_SLOT].minimum + 1;
+
+/* If we don't know how many slots there are, assume at least 10 */
+return value 1 ? value : 10;
+}
+
+static int
+last_mt_vals_slot(EvdevPtr pEvdev)
+{
+int value = pEvdev-cur_slot - pEvdev-absinfo[ABS_MT_SLOT].minimum;
+
+return value num_slots(pEvdev) ? value : -1;
+}
+
static void
EvdevProcessTouchEvent(InputInfoPtr pInfo, struct input_event *ev)
{
@@ -757,16 +775,29 @@ EvdevProcessTouchEvent(InputInfoPtr pInfo, struct
input_event *ev)
pEvdev-cur_slot = ev-value;
} else
{
+int slot_index = last_mt_vals_slot(pEvdev);
+
if (pEvdev-slot_state == SLOTSTATE_EMPTY)
pEvdev-slot_state = SLOTSTATE_UPDATE;
if (ev-code == ABS_MT_TRACKING_ID) {
-if (ev-value = 0)
-pEvdev-slot_state = SLOTSTATE_OPEN;
-else
-pEvdev-slot_state = SLOTSTATE_CLOSE;
+if (ev-value = 0) {
+pEvdev-slot_state = SLOTSTATE_OPEN;
+
+if (slot_index = 0)
+valuator_mask_copy(pEvdev-mt_mask,
+pEvdev-last_mt_vals[slot_index]);
please align with the opening (
+else
+xf86IDrvMsg(pInfo, X_WARNING,
+Attempted to copy values from out-of-range
+slot, touch events may be incorrect.\n);
+} else
+pEvdev-slot_state = SLOTSTATE_CLOSE;
} else {
map = pEvdev-axis_map[ev-code];
valuator_mask_set(pEvdev-mt_mask, map, ev-value);
+if (slot_index = 0)
+valuator_mask_set(pEvdev-last_mt_vals[slot_index], map,
+ ev-value);
fwiw, coding style in evdev is { on the next line (with a few
accidental/historical exceptions)
}
}
}
@@ -1256,6 +1287,24 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device)
goto out;
}
+pEvdev-last_mt_vals = calloc(num_slots(pEvdev), sizeof(ValuatorMask
*));
+
