[PATCH xf86-input-mouse] Install xf86-mouse.pc file
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Makefile.am |3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 01da486..77e9962 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,9 @@ SUBDIRS = include src man MAINTAINERCLEANFILES = ChangeLog INSTALL +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xf86-mouse.pc + .PHONY: ChangeLog INSTALL INSTALL: -- 1.7.10.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 xorg-gtest] aclocal: fill AS_IF with noop statements
Expanding this macro fails on some machines (RHEL6). It expands to if test condition; then fi Empty statements are invalid. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- aclocal/xorg-gtest.m4 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4 index 6efff08..0f6aa85 100644 --- a/aclocal/xorg-gtest.m4 +++ b/aclocal/xorg-gtest.m4 @@ -47,7 +47,7 @@ AC_DEFUN([_CHECK_GTEST], AS_IF([test x$have_gtest = xyes], [AC_SUBST(GTEST_CPPFLAGS)] -[AC_SUBST(GTEST_SOURCE)]) +[AC_SUBST(GTEST_SOURCE)] [:]) ]) # _CHECK_GTEST # CHECK_XORG_GTEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -- 1.7.10.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 fixesproto] fixesproto v6: Pointer barrier thresholds
v2: Use a GenericEvent for BarrierNotify
Add PointerReleased event type
Clarify scope of barrier event-id
Release multiple barriers in a single ReleasePointer call.
v3: Fix trailing whitespace
Remove window parameter from SelectBarrierInput
Align structs to 4-byte boundaries
Clarify when PointerBarriers generate BarrierEvent events
Signed-off-by: Christopher James Halse Rogers
christopher.halse.rog...@canonical.com
---
configure.ac |2 +-
fixesproto.txt | 144 +++-
xfixesproto.h | 76 ++
xfixeswire.h | 20 +++-
4 files changed, 238 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index f85b802..07dd29a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-AC_INIT([FixesProto], [5.0],
+AC_INIT([FixesProto], [6.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
diff --git a/fixesproto.txt b/fixesproto.txt
index 5903ac9..8b9cd42 100644
--- a/fixesproto.txt
+++ b/fixesproto.txt
@@ -1,5 +1,5 @@
The XFIXES Extension
- Version 5.0
+ Version 6.0
Document Revision 1
2010-11-15
Keith Packard
@@ -628,6 +628,13 @@ CreatePointerBarrier
axis travel through a vertical barrier, for example) and excess set
bits are ignored.
+ A pointer hitting the barrier results in a BarrierNotify event. A
+ barrier that allows pointer motion due to the bits set in directions
+ is not considered to have been hit and will not generate a
+ BarrierNotify. For example, a barrier with BarrierPositiveX set
+ will not send a BarrierNotify when the pointer passes through it
+ in the positive X direction.
+
If the server supports the X Input Extension version 2 or higher,
the devices element names a set of master device to apply the
barrier to. If XIAllDevices or XIAllMasterDevices are given, the
@@ -650,6 +657,141 @@ DestroyPointerBarrier
Errors: Barrier
+* XFIXES VERSION 6 OR BETTER ***
+
+13. Pointer Barriers Expansion
+
+This update extends pointer barriers to optionally allow the pointer through
+when a threshold is reached. This can be useful for desktop environments that
+wish to use a large region of the screen, such as an entire edge, to provide a
+casual target while allowing determined movement to pass through.
+
+13.1 Types
+
+ BarrierEvent: {Hit, ThresholdExceeded,
PointerReleased}
+ BarrierEventID: CARD32
+ BarrierEventDetails:{ barrier: BARRIER,
+ type: BarrierEvent,
+ event-id: BarrierEventID }
+
+13.2 Events
+
+BarrierNotify
+
+ type: BYTE
+ extension: CARD8
+ sequenceNumber: CARD16
+ length: CARD32
+ evtype: CARD16
+ window: WINDOW
+ x, y: INT16
+ dx, dy: FP3232
+ raw-dx, raw-dy: FP3232
+ dt: INT16
+ deviceid: DEVICEID
+ num-details:CARD16
+ details:LISTofBarrierEventDetails
+
+ BarrierNotify uses the X Generic Event extension. Type is thus always
+ GenericEvent (35), extension is the major opcode of this extension,
+ sequenceNumber is the low 16 bits of the request sequence number,
+ length is how much bigger than 32 bytes the event is, in units of
+ 4 bytes. Evtype is the type of this event, which is always
+ BarrierNotify (0).
+
+ (x, y) contain the coordinates of the pointer after restriction by
+ any applicable barriers or server-side clamping (such as to screen
+ edges).
+
+ (dx, dy) and (raw-dx, raw-dy) are the valuators for the input event
+ which caused the BarrierNotify to be emitted, before any clamping
+ (such as to the screen edge, or by a barrier) is applied.
+ (dx, dy) are the values after acceleration, (raw-dx, raw-dy) are the
+ raw values before any acceleration is applied. dt is the server time
+ in milliseconds since the last input event, and deviceid is the id of
+ the input device which triggered the barrier.
+
+ Each item in the details list contains the information for a barrier
+ triggered by this input event. If there are multiple overlapping
+ barriers blocking pointer motion each
[PATCH xf86-input-mouse] Fix compiler warnings
pnp.c: In function 'probePs2ProtocolPnP':
pnp.c:711:31: warning: declaration of 'seq' shadows a previous local
[-Wshadow]
pnp.c:705:23: warning: shadowed declaration is here [-Wshadow]
mouse.c: In function 'MouseCommonOptions':
mouse.c:330:13: warning: declaration of 'i' shadows a previous local
[-Wshadow]
mouse.c:279:9: warning: shadowed declaration is here [-Wshadow]
mouse.c: In function 'autoProbeMouse':
mouse.c:3602:29: warning: declaration of 'proto' shadows a global
declaration [-Wshadow]
mouse.c:2482:22: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
src/mouse.c | 14 +++---
src/pnp.c |4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/mouse.c b/src/mouse.c
index 70ea7fb..719b1fa 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -327,7 +327,7 @@ MouseCommonOptions(InputInfoPtr pInfo)
int lock; /* lock button */
int target; /* target button */
int lockM,targetM;/* bitmasks for drag lock, target */
-int i, j; /* indexes */
+int j;/* indexes */
char *s1; /* parse input string */
DragLockPtr pLock;
@@ -3599,14 +3599,14 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool
lostSync)
}
case AUTOPROBE_SWITCH_PROTOCOL:
{
-MouseProtocolID proto;
+MouseProtocolID prot;
MouseProtocolPtr pProto;
void *defaults;
AP_DBG((State SWITCH_PROTOCOL\n));
-proto = mPriv-protoList[mPriv-protocolID++];
-if (proto == PROT_UNKNOWN)
+prot = mPriv-protoList[mPriv-protocolID++];
+if (prot == PROT_UNKNOWN)
mPriv-autoState = AUTOPROBE_SWITCHSERIAL;
-else if (!((pProto = GetProtocol(proto))
+else if (!((pProto = GetProtocol(prot))
((defaults = pProto-defaults)))
|| (mPriv-serialDefaultsNum == -1
(defaults == msDefaults))
@@ -3614,8 +3614,8 @@ autoProbeMouse(InputInfoPtr pInfo, Bool inSync, Bool
lostSync)
serialDefaultsList[mPriv-serialDefaultsNum]
== defaults)) {
AP_DBG((Changing Protocol to %s\n,
-ProtocolIDToName(proto)));
-SetMouseProto(pMse,proto);
+ProtocolIDToName(prot)));
+SetMouseProto(pMse,prot);
FlushButtons(pMse);
RESET_VALIDATION;
mPriv-autoState = AUTOPROBE_VALIDATE2;
diff --git a/src/pnp.c b/src/pnp.c
index 6eba24d..e5c4bc7 100644
--- a/src/pnp.c
+++ b/src/pnp.c
@@ -708,8 +708,8 @@ probePs2ProtocolPnP(InputInfoPtr pInfo)
u = ps2GetDeviceID(pInfo);
if (u == 0x03) {
/* found IntelliMouse now try IntelliExplorer */
-unsigned char seq[] = { 243, 200, 243, 200, 243, 80 };
-if (ps2SendPacket(pInfo,seq,sizeof(seq))) {
+unsigned char im_seq[] = { 243, 200, 243, 200, 243, 80 };
+if (ps2SendPacket(pInfo,im_seq,sizeof(im_seq))) {
u = ps2GetDeviceID(pInfo);
if (u == 0x04)
ret = PROT_EXPPS2;
--
1.7.10.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
