diff options
| author | marha <marha@users.sourceforge.net> | 2010-11-14 21:29:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-11-14 21:29:32 +0000 |
| commit | 3425b16d521b8846b95df2b7d32a548d93341f3b (patch) | |
| tree | fa430e95285d90f990b2d5574dad1e409ba5980c /xorg-server/include/inputstr.h | |
| parent | 41c64098a90b4e974d5005a1619472f2e8a64ea1 (diff) | |
| download | vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.tar.gz vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.tar.bz2 vcxsrv-3425b16d521b8846b95df2b7d32a548d93341f3b.zip | |
xserver pixman libX11 libXext 14/11/2010
Diffstat (limited to 'xorg-server/include/inputstr.h')
| -rw-r--r-- | xorg-server/include/inputstr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index c37f30073..edb7988c3 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -60,6 +60,7 @@ SOFTWARE. #define BitIsOn(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
#define SetBit(ptr, bit) (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
#define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
+extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
#define SameClient(obj,client) \
(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
@@ -217,6 +218,7 @@ typedef struct _AxisInfo { int min_value;
int max_value;
Atom label;
+ CARD8 mode;
} AxisInfo, *AxisInfoPtr;
typedef struct _ValuatorAccelerationRec {
@@ -238,7 +240,6 @@ typedef struct _ValuatorClassRec { AxisInfoPtr axes;
unsigned short numAxes;
double *axisVal; /* always absolute, but device-coord system */
- CARD8 mode;
ValuatorAccelerationRec accelScheme;
} ValuatorClassRec, *ValuatorClassPtr;
@@ -271,7 +272,7 @@ typedef struct _FocusClassRec { typedef struct _ProximityClassRec {
int sourceid;
- char pad;
+ char in_proximity;
} ProximityClassRec, *ProximityClassPtr;
typedef struct _AbsoluteClassRec {
|