diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-08 16:07:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-08 16:07:08 +0000 |
| commit | 8308417ba79394ca96a326c8cb5c36024b36c1e2 (patch) | |
| tree | c6e087e837c83457b68a7a10363af47778a9b1b7 /xorg-server/dix | |
| parent | fea28ce54ffbea6eda28791518ccca0e0df2df0d (diff) | |
| parent | 531a0d974b98074978535f086a73b6b662fa0cea (diff) | |
| download | vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.tar.gz vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.tar.bz2 vcxsrv-8308417ba79394ca96a326c8cb5c36024b36c1e2.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/eventconvert.c | 8 | ||||
| -rw-r--r-- | xorg-server/dix/privates.c | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c index e9297149c..dff1a5631 100644 --- a/xorg-server/dix/eventconvert.c +++ b/xorg-server/dix/eventconvert.c @@ -326,14 +326,6 @@ countValuators(DeviceEvent *ev, int *first) {
if (BitIsOn(ev->valuators.mask, i))
{
- /* Assume mode of first_valuator matches XI1 device mode. Stop when the
- * event mode changes since XI1 can't handle mixed mode devices.
- */
- if (first_valuator > -1 &&
- BitIsOn(ev->valuators.mode, i) !=
- BitIsOn(ev->valuators.mode, first_valuator))
- break;
-
if (first_valuator == -1)
first_valuator = i;
last_valuator = i;
diff --git a/xorg-server/dix/privates.c b/xorg-server/dix/privates.c index 3c743deb3..d261f6895 100644 --- a/xorg-server/dix/privates.c +++ b/xorg-server/dix/privates.c @@ -465,7 +465,8 @@ static const char *key_names[PRIVATE_LAST] = { /*[PRIVATE_DAMAGE] =*/ "DAMAGE",
/*[PRIVATE_GLYPH] =*/ "GLYPH",
/*[PRIVATE_GLYPHSET] =*/ "GLYPHSET",
- /*[PRIVATE_PICTURE] =*/ "PICTURE"
+ /*[PRIVATE_PICTURE] =*/ "PICTURE" ,
+ /*[PRIVATE_SYNC_FENCE] =*/ "SYNC_FENCE"
};
void
|