frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'whot/for-keith'

This commit is contained in:
Keith Packard 2012-08-06 15:13:17 -07:00
parent 7d87545ba7 7328900042
commit 94b514d5e4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xi/exevents.c
View File

@ -1888,6 +1888,12 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
if (normal_end) if (normal_end)
listener->state = LISTENER_HAS_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: out:
return rc; return rc;

2
Xi/xiproperty.c
View File

@ -771,6 +771,8 @@ XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type,
&new_value, checkonly); &new_value, checkonly);
if (checkonly && rc != Success) { if (checkonly && rc != Success) {
free(new_value.data); free(new_value.data);
if (add)
XIDestroyDeviceProperty(prop);
return rc; return rc;
} }
} }

2
test/Makefile.am
View File

@ -23,11 +23,9 @@ INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
endif endif
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
if XORG
if SPECIAL_DTRACE_OBJECTS if SPECIAL_DTRACE_OBJECTS
TEST_LDADD += $(OS_LIB) $(DIX_LIB) TEST_LDADD += $(OS_LIB) $(DIX_LIB)
endif endif
endif
xkb_LDADD=$(TEST_LDADD) xkb_LDADD=$(TEST_LDADD)
input_LDADD=$(TEST_LDADD) input_LDADD=$(TEST_LDADD)