aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-06-14 14:50:09 -0400
committerDrew DeVault <sir@cmpwn.com>2017-06-14 14:50:09 -0400
commit3f24f8a1bee10fb3aadf8c57ca107fe5aaa7cffa (patch)
tree923093315e92cc5351644b145dbad74b4317d9dd /include
parentd6905f86cb9d430e0ba05c6a066ed350761116d1 (diff)
Flesh out touch events and add demo
Diffstat (limited to 'include')
-rw-r--r--include/backend/libinput.h2
-rw-r--r--include/wlr/types.h29
2 files changed, 28 insertions, 3 deletions
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index dd24fbb0..2427ae5c 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -56,7 +56,5 @@ void handle_touch_motion(struct libinput_event *event,
struct libinput_device *device);
void handle_touch_cancel(struct libinput_event *event,
struct libinput_device *device);
-void handle_touch_frame(struct libinput_event *event,
- struct libinput_device *device);
#endif
diff --git a/include/wlr/types.h b/include/wlr/types.h
index b4d69ccb..4763013a 100644
--- a/include/wlr/types.h
+++ b/include/wlr/types.h
@@ -146,10 +146,37 @@ struct wlr_touch {
struct wl_signal up;
struct wl_signal motion;
struct wl_signal cancel;
- struct wl_signal frame;
} events;
};
+struct wlr_touch_down {
+ uint32_t time_sec;
+ uint64_t time_usec;
+ int32_t slot;
+ double x_mm, y_mm;
+ double width_mm, height_mm;
+};
+
+struct wlr_touch_up {
+ uint32_t time_sec;
+ uint64_t time_usec;
+ int32_t slot;
+};
+
+struct wlr_touch_motion {
+ uint32_t time_sec;
+ uint64_t time_usec;
+ int32_t slot;
+ double x_mm, y_mm;
+ double width_mm, height_mm;
+};
+
+struct wlr_touch_cancel {
+ uint32_t time_sec;
+ uint64_t time_usec;
+ int32_t slot;
+};
+
// TODO: tablet & tablet tool
// TODO: gestures
// TODO: switch