diff options
| author | Keith Packard <keithp@keithp.com> | 2012-08-06 15:13:17 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-08-06 15:13:17 -0700 |
| commit | 94b514d5e4b376d05e106eb3853da511256e8545 (patch) | |
| tree | 722c1aa14315d608b2bf3896340b5ea9720c5a5d | |
| parent | 7d87545ba7395ade507cca7bdca7052b26ed18d8 (diff) | |
| parent | 7328900042b9c1312aed48753fd6054e64613e4c (diff) | |
Merge remote-tracking branch 'whot/for-keith'
| -rw-r--r-- | Xi/exevents.c | 6 | ||||
| -rw-r--r-- | Xi/xiproperty.c | 2 | ||||
| -rw-r--r-- | test/Makefile.am | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index 9f6ec84b9..494d07e20 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -1888,6 +1888,12 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev, if (normal_end) listener->state = LISTENER_HAS_END; } + else if (ev->device_event.flags & TOUCH_ACCEPT) { + /* Touch has been accepted by its owner, which is not this listener */ + if (listener->state != LISTENER_HAS_END) + rc = DeliverOneTouchEvent(client, dev, ti, grab, win, ev); + listener->state = LISTENER_HAS_END; + } out: return rc; diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c index ca731042c..4beedcf6d 100644 --- a/Xi/xiproperty.c +++ b/Xi/xiproperty.c @@ -771,6 +771,8 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, &new_value, checkonly); if (checkonly && rc != Success) { free(new_value.data); + if (add) + XIDestroyDeviceProperty(prop); return rc; } } diff --git a/test/Makefile.am b/test/Makefile.am index aa018c962..34f53fc1e 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -23,11 +23,9 @@ INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \ endif TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) -if XORG if SPECIAL_DTRACE_OBJECTS TEST_LDADD += $(OS_LIB) $(DIX_LIB) endif -endif xkb_LDADD=$(TEST_LDADD) input_LDADD=$(TEST_LDADD) |