aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlex Maese <memaese@hotmail.com>2018-12-17 14:04:49 -0600
committerAlex Maese <memaese@hotmail.com>2018-12-21 12:20:48 -0600
commita803a007fb9c572e0eccc22ab670ac711cb89b13 (patch)
tree60d4aae0ade156e4dcd4afe6253c4155a0b4adbf /include
parentf5ea393bca7a427c0d97217c67b0be563b28dc19 (diff)
Address @emersion's comments
Diffstat (limited to 'include')
-rw-r--r--include/wlr/types/wlr_relative_pointer_v1.h8
-rw-r--r--include/wlr/types/wlr_seat.h13
2 files changed, 5 insertions, 16 deletions
diff --git a/include/wlr/types/wlr_relative_pointer_v1.h b/include/wlr/types/wlr_relative_pointer_v1.h
index 6f2e0878..292be238 100644
--- a/include/wlr/types/wlr_relative_pointer_v1.h
+++ b/include/wlr/types/wlr_relative_pointer_v1.h
@@ -15,7 +15,7 @@
/**
* This protocol specifies a set of interfaces used for making clients able to
* receive relative pointer events not obstructed by barriers (such as the
- * monitor edge or other pointer barriers).
+ * monitor edge or pointer constraints).
*/
@@ -26,7 +26,7 @@
struct wlr_relative_pointer_manager_v1 {
struct wl_global *global;
- struct wl_list resources;
+ struct wl_list resources; // wl_resource_get_link()
struct wl_list relative_pointers;
struct {
@@ -60,6 +60,8 @@ struct wlr_relative_pointer_v1 {
struct wl_signal destroy;
} events;
+ struct wl_listener seat_destroy;
+
void *data;
};
@@ -69,7 +71,7 @@ void wlr_relative_pointer_manager_v1_destroy(
struct wlr_relative_pointer_manager_v1 *relative_pointer_manager);
void wlr_relative_pointer_v1_send_relative_motion(
- struct wlr_relative_pointer_v1 *relative_pointer, uint64_t time,
+ struct wlr_relative_pointer_v1 *relative_pointer, uint64_t time_msec,
double dx, double dy, double dx_unaccel, double dy_unaccel);
struct wlr_relative_pointer_v1 *wlr_relative_pointer_v1_from_resource(
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index 48c48d73..942a3420 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -314,19 +314,6 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy);
/**
- * Send relative motion events to the surface with pointer focus. Coordinates
- * for the motion event are relative to current pointer location, both
- * accelerated and unaccelerated. Compositors should use
- * `wlr_seat_pointer_notify_relative_motion()` to send relative motion events
- * to respect relative pointer requests by clients.
- *
- * Note that the timestamp is 64 bit, split into high 32 bits and low 32 bits.
- */
-void wlr_seat_pointer_notify_relative_motion(struct wlr_seat *wlr_seat,
- uint64_t time, double dx, double dy,
- double dx_unaccel, double dy_unaccel);
-
-/**
* Send a button event to the surface with pointer focus. Coordinates for the
* button event are surface-local. Returns the serial. Compositors should use
* `wlr_seat_pointer_notify_button()` to send button events to respect pointer