diff options
| author | Keith Packard <keithp@keithp.com> | 2013-01-20 15:52:26 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-01-20 15:52:26 -0800 |
| commit | 591c06277bb120ab9615633f2d28addbd3a2aa5f (patch) | |
| tree | 8260caa54750fd5160743cd0ee458c3e2a0a6f8d /include | |
| parent | 6703a7c7cf1a349c137e247a0c8eb462ff7b07be (diff) | |
| parent | fa6ab7d9b2d7fd8184f1e068360607845f5c33ab (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 4 | ||||
| -rw-r--r-- | include/inputstr.h | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/include/input.h b/include/input.h index 23a20b59d..f53ed9905 100644 --- a/include/input.h +++ b/include/input.h @@ -565,9 +565,9 @@ extern void TouchEventHistoryPush(TouchPointInfoPtr ti, const DeviceEvent *ev); extern void TouchEventHistoryReplay(TouchPointInfoPtr ti, DeviceIntPtr dev, XID resource); extern Bool TouchResourceIsOwner(TouchPointInfoPtr ti, XID resource); -extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, +extern void TouchAddListener(TouchPointInfoPtr ti, XID resource, int resource_type, enum InputLevel level, enum TouchListenerType type, - enum TouchListenerState state, WindowPtr window); + enum TouchListenerState state, WindowPtr window, GrabPtr grab); extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource); extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev); diff --git a/include/inputstr.h b/include/inputstr.h index 17cee9854..fc21913e1 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -298,6 +298,17 @@ typedef struct _ValuatorClassRec { int v_scroll_axis; /* vert smooth-scrolling axis */ } ValuatorClassRec; +typedef struct _TouchListener { + XID listener; /* grabs/event selection IDs receiving + * events for this touch */ + int resource_type; /* listener's resource type */ + enum TouchListenerType type; + enum TouchListenerState state; + enum InputLevel level; /* matters only for emulating touches */ + WindowPtr window; + GrabPtr grab; +} TouchListener; + typedef struct _TouchPointInfo { uint32_t client_id; /* touch ID as seen in client events */ int sourceid; /* Source device's ID for this touchpoint */ @@ -306,14 +317,7 @@ typedef struct _TouchPointInfo { * but still owned by a grab */ SpriteRec sprite; /* window trace for delivery */ ValuatorMask *valuators; /* last recorded axis values */ - struct _TouchListener { - XID listener; /* grabs/event selection IDs receiving - * events for this touch */ - enum TouchListenerType type; - enum TouchListenerState state; - enum InputLevel level; /* matters only for emulating touches */ - WindowPtr window; - } *listeners; + TouchListener *listeners; /* set of listeners */ int num_listeners; int num_grabs; /* number of open grabs on this touch * which have not accepted or rejected */ |