diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 08:02:14 +0100 |
| commit | 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch) | |
| tree | 18dc73394bd3921415b57b5847f03a9753374e99 /xorg-server/Xi | |
| parent | 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff) | |
| parent | 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff) | |
| download | vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 5 nov 2012
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/mesa/main/.gitignore
xorg-server/Xi/chgdctl.c
xorg-server/dix/getevents.c
xorg-server/hw/xwin/winprefs.c
xorg-server/os/utils.c
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/chgdctl.c | 1 | ||||
| -rw-r--r-- | xorg-server/Xi/exevents.c | 5 | ||||
| -rw-r--r-- | xorg-server/Xi/xiproperty.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c index ec5975981..916226ea4 100644 --- a/xorg-server/Xi/chgdctl.c +++ b/xorg-server/Xi/chgdctl.c @@ -127,6 +127,7 @@ ProcXChangeDeviceControl(ClientPtr client) rep.RepType = X_ChangeDeviceControl; rep.sequenceNumber = client->sequence; rep.length = 0; + rep.status = Success; switch (stuff->control) { case DEVICE_RESOLUTION: diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c index 2a097d74f..2a77ac22d 100644 --- a/xorg-server/Xi/exevents.c +++ b/xorg-server/Xi/exevents.c @@ -1866,6 +1866,11 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev, goto out; } + if (listener->state == LISTENER_AWAITING_BEGIN) { + listener->state = LISTENER_HAS_END; + goto out; + } + /* Event in response to reject */ if (ev->device_event.flags & TOUCH_REJECT) { if (listener->state != LISTENER_HAS_END) diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c index 39c55f823..ba5d99912 100644 --- a/xorg-server/Xi/xiproperty.c +++ b/xorg-server/Xi/xiproperty.c @@ -105,6 +105,9 @@ static struct dev_properties { {0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID}, {0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID}, {0, AXIS_LABEL_PROP_ABS_MT_PRESSURE}, + {0, AXIS_LABEL_PROP_ABS_MT_DISTANCE}, + {0, AXIS_LABEL_PROP_ABS_MT_TOOL_X}, + {0, AXIS_LABEL_PROP_ABS_MT_TOOL_Y}, {0, AXIS_LABEL_PROP_ABS_MISC}, {0, BTN_LABEL_PROP}, {0, BTN_LABEL_PROP_BTN_UNKNOWN}, |