summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2012-02-03 16:19:05 -0800
committerPeter Hutterer <peter.hutterer@who-t.net>2012-02-08 18:04:14 +1000
commitab60cadc2afb9d8882144e30fde11c3ef0f999cd (patch)
treee4ad06f4a4ccbd31e3c2131e20d52d44e46fdc92 /include
parentf92ba92adfce0e1975feb54ab0e1165b7c2a7bea (diff)
Store window pointer in touch listener record
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
-rw-r--r--include/input.h3
-rw-r--r--include/inputstr.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/input.h b/include/input.h
index fb456175a..53645b4fc 100644
--- a/include/input.h
+++ b/include/input.h
@@ -613,7 +613,8 @@ 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, enum InputLevel level,
- enum TouchListenerType type, enum TouchListenerState state);
+ enum TouchListenerType type, enum TouchListenerState state,
+ WindowPtr window);
extern Bool TouchRemoveListener(TouchPointInfoPtr ti, XID resource);
extern void TouchSetupListeners(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev);
extern Bool TouchEnsureSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
diff --git a/include/inputstr.h b/include/inputstr.h
index c3297db64..4e28bc71d 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -314,6 +314,7 @@ typedef struct _TouchPointInfo {
enum TouchListenerType type;
enum TouchListenerState state;
enum InputLevel level; /* matters only for emulating touches */
+ WindowPtr window;
} *listeners;
int num_listeners;
int num_grabs; /* number of open grabs on this touch