diff options
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 154 |
1 files changed, 77 insertions, 77 deletions
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index aabed7ff..79737a20 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -392,19 +392,6 @@ void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, void wlr_seat_pointer_send_frame(struct wlr_seat *wlr_seat); /** - * Start a grab of the pointer of this seat. The grabber is responsible for - * handling all pointer events until the grab ends. - */ -void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat, - struct wlr_seat_pointer_grab *grab); - -/** - * End the grab of the pointer of this seat. This reverts the grab back to the - * default grab for the pointer. - */ -void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat); - -/** * Notify the seat of a pointer enter event to the given surface and request it * to be the focused surface for the pointer. Pass surface-local coordinates * where the enter occurred. @@ -441,32 +428,32 @@ void wlr_seat_pointer_notify_axis(struct wlr_seat *wlr_seat, uint32_t time_msec, void wlr_seat_pointer_notify_frame(struct wlr_seat *wlr_seat); /** - * Whether or not the pointer has a grab other than the default grab. + * Start a grab of the pointer of this seat. The grabber is responsible for + * handling all pointer events until the grab ends. */ -bool wlr_seat_pointer_has_grab(struct wlr_seat *seat); +void wlr_seat_pointer_start_grab(struct wlr_seat *wlr_seat, + struct wlr_seat_pointer_grab *grab); /** - * Set this keyboard as the active keyboard for the seat. + * End the grab of the pointer of this seat. This reverts the grab back to the + * default grab for the pointer. */ -void wlr_seat_set_keyboard(struct wlr_seat *seat, struct wlr_input_device *dev); +void wlr_seat_pointer_end_grab(struct wlr_seat *wlr_seat); /** - * Get the active keyboard for the seat. + * Whether or not the pointer has a grab other than the default grab. */ -struct wlr_keyboard *wlr_seat_get_keyboard(struct wlr_seat *seat); +bool wlr_seat_pointer_has_grab(struct wlr_seat *seat); /** - * Start a grab of the keyboard of this seat. The grabber is responsible for - * handling all keyboard events until the grab ends. + * Set this keyboard as the active keyboard for the seat. */ -void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat, - struct wlr_seat_keyboard_grab *grab); +void wlr_seat_set_keyboard(struct wlr_seat *seat, struct wlr_input_device *dev); /** - * End the grab of the keyboard of this seat. This reverts the grab back to the - * default grab for the keyboard. + * Get the active keyboard for the seat. */ -void wlr_seat_keyboard_end_grab(struct wlr_seat *wlr_seat); +struct wlr_keyboard *wlr_seat_get_keyboard(struct wlr_seat *seat); /** * Send the keyboard key to focused keyboard resources. Compositors should use @@ -476,13 +463,6 @@ void wlr_seat_keyboard_send_key(struct wlr_seat *seat, uint32_t time_msec, uint32_t key, uint32_t state); /** - * Notify the seat that a key has been pressed on the keyboard. Defers to any - * keyboard grabs. - */ -void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time_msec, - uint32_t key, uint32_t state); - -/** * Send the modifier state to focused keyboard resources. Compositors should use * `wlr_seat_keyboard_notify_modifiers()` to respect any keyboard grabs. */ @@ -490,22 +470,6 @@ void wlr_seat_keyboard_send_modifiers(struct wlr_seat *seat, struct wlr_keyboard_modifiers *modifiers); /** - * Notify the seat that the modifiers for the keyboard have changed. Defers to - * any keyboard grabs. - */ -void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat, - struct wlr_keyboard_modifiers *modifiers); - -/** - * Notify the seat that the keyboard focus has changed and request it to be the - * focused surface for this keyboard. Defers to any current grab of the seat's - * keyboard. - */ -void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat, - struct wlr_surface *surface, uint32_t keycodes[], size_t num_keycodes, - struct wlr_keyboard_modifiers *modifiers); - -/** * Send a keyboard enter event to the given surface and consider it to be the * focused surface for the keyboard. This will send a leave event to the last * surface that was entered. Compositors should use @@ -522,53 +486,52 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat, void wlr_seat_keyboard_clear_focus(struct wlr_seat *wlr_seat); /** - * Whether or not the keyboard has a grab other than the default grab + * Notify the seat that a key has been pressed on the keyboard. Defers to any + * keyboard grabs. */ -bool wlr_seat_keyboard_has_grab(struct wlr_seat *seat); +void wlr_seat_keyboard_notify_key(struct wlr_seat *seat, uint32_t time_msec, + uint32_t key, uint32_t state); /** - * Start a grab of the touch device of this seat. The grabber is responsible for - * handling all touch events until the grab ends. + * Notify the seat that the modifiers for the keyboard have changed. Defers to + * any keyboard grabs. */ -void wlr_seat_touch_start_grab(struct wlr_seat *wlr_seat, - struct wlr_seat_touch_grab *grab); +void wlr_seat_keyboard_notify_modifiers(struct wlr_seat *seat, + struct wlr_keyboard_modifiers *modifiers); /** - * End the grab of the touch device of this seat. This reverts the grab back to - * the default grab for the touch device. + * Notify the seat that the keyboard focus has changed and request it to be the + * focused surface for this keyboard. Defers to any current grab of the seat's + * keyboard. */ -void wlr_seat_touch_end_grab(struct wlr_seat *wlr_seat); +void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat, + struct wlr_surface *surface, uint32_t keycodes[], size_t num_keycodes, + struct wlr_keyboard_modifiers *modifiers); /** - * Get the active touch point with the given `touch_id`. If the touch point does - * not exist or is no longer active, returns NULL. + * Start a grab of the keyboard of this seat. The grabber is responsible for + * handling all keyboard events until the grab ends. */ -struct wlr_touch_point *wlr_seat_touch_get_point(struct wlr_seat *seat, - int32_t touch_id); +void wlr_seat_keyboard_start_grab(struct wlr_seat *wlr_seat, + struct wlr_seat_keyboard_grab *grab); /** - * Notify the seat of a touch down on the given surface. Defers to any grab of - * the touch device. + * End the grab of the keyboard of this seat. This reverts the grab back to the + * default grab for the keyboard. */ -uint32_t wlr_seat_touch_notify_down(struct wlr_seat *seat, - struct wlr_surface *surface, uint32_t time_msec, - int32_t touch_id, double sx, double sy); +void wlr_seat_keyboard_end_grab(struct wlr_seat *wlr_seat); /** - * Notify the seat that the touch point given by `touch_id` is up. Defers to any - * grab of the touch device. + * Whether or not the keyboard has a grab other than the default grab */ -void wlr_seat_touch_notify_up(struct wlr_seat *seat, uint32_t time_msec, - int32_t touch_id); +bool wlr_seat_keyboard_has_grab(struct wlr_seat *seat); /** - * Notify the seat that the touch point given by `touch_id` has moved. Defers to - * any grab of the touch device. The seat should be notified of touch motion - * even if the surface is not the owner of the touch point for processing by - * grabs. + * Get the active touch point with the given `touch_id`. If the touch point does + * not exist or is no longer active, returns NULL. */ -void wlr_seat_touch_notify_motion(struct wlr_seat *seat, uint32_t time_msec, - int32_t touch_id, double sx, double sy); +struct wlr_touch_point *wlr_seat_touch_get_point(struct wlr_seat *seat, + int32_t touch_id); /** * Notify the seat that the touch point given by `touch_id` has entered a new @@ -616,11 +579,48 @@ void wlr_seat_touch_send_motion(struct wlr_seat *seat, uint32_t time_msec, int32_t touch_id, double sx, double sy); /** + * Notify the seat of a touch down on the given surface. Defers to any grab of + * the touch device. + */ +uint32_t wlr_seat_touch_notify_down(struct wlr_seat *seat, + struct wlr_surface *surface, uint32_t time_msec, + int32_t touch_id, double sx, double sy); + +/** + * Notify the seat that the touch point given by `touch_id` is up. Defers to any + * grab of the touch device. + */ +void wlr_seat_touch_notify_up(struct wlr_seat *seat, uint32_t time_msec, + int32_t touch_id); + +/** + * Notify the seat that the touch point given by `touch_id` has moved. Defers to + * any grab of the touch device. The seat should be notified of touch motion + * even if the surface is not the owner of the touch point for processing by + * grabs. + */ +void wlr_seat_touch_notify_motion(struct wlr_seat *seat, uint32_t time_msec, + int32_t touch_id, double sx, double sy); + +/** * How many touch points are currently down for the seat. */ int wlr_seat_touch_num_points(struct wlr_seat *seat); /** + * Start a grab of the touch device of this seat. The grabber is responsible for + * handling all touch events until the grab ends. + */ +void wlr_seat_touch_start_grab(struct wlr_seat *wlr_seat, + struct wlr_seat_touch_grab *grab); + +/** + * End the grab of the touch device of this seat. This reverts the grab back to + * the default grab for the touch device. + */ +void wlr_seat_touch_end_grab(struct wlr_seat *wlr_seat); + +/** * Whether or not the seat has a touch grab other than the default grab. */ bool wlr_seat_touch_has_grab(struct wlr_seat *seat); |