blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #152 from acrisci/feature/wlr-seat-axis-events 

wlr-seat cursor axis events
This commit is contained in:
Drew DeVault 2017-09-22 10:43:48 -04:00 committed by GitHub
parent b6cf9b14a4 e38248f34c
commit 087894ae99
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/compositor.c
View File

@ -468,10 +468,11 @@ static void handle_cursor_motion_absolute(struct wl_listener *listener,
} }
static void handle_cursor_axis(struct wl_listener *listener, void *data) { static void handle_cursor_axis(struct wl_listener *listener, void *data) {
//struct sample_state *sample = struct sample_state *sample =
//wl_container_of(listener, sample, cursor_axis); wl_container_of(listener, sample, cursor_axis);
//struct wlr_event_pointer_axis *event = data; struct wlr_event_pointer_axis *event = data;
wlr_log(L_DEBUG, "TODO: handle cursor axis"); wlr_seat_pointer_send_axis(sample->wl_seat, event->time_sec,
event->orientation, event->delta);
} }
static void handle_cursor_button(struct wl_listener *listener, void *data) { static void handle_cursor_button(struct wl_listener *listener, void *data) {

3
include/wlr/types/wlr_seat.h
View File

@ -109,4 +109,7 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state); uint32_t button, uint32_t state);
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value);
#endif #endif

34
types/wlr_seat.c
View File

@ -260,6 +260,11 @@ static void handle_pointer_focus_resource_destroyed(
wlr_seat_pointer_clear_focus(state->wlr_seat); wlr_seat_pointer_clear_focus(state->wlr_seat);
} }
static bool wlr_seat_pointer_has_focus_resource(struct wlr_seat *wlr_seat) {
return wlr_seat->pointer_state.focused_handle &&
wlr_seat->pointer_state.focused_handle->pointer;
}
void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat, void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
struct wlr_surface *surface, double sx, double sy) { struct wlr_surface *surface, double sx, double sy) {
assert(wlr_seat); assert(wlr_seat);
@ -282,7 +287,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
wlr_seat->pointer_state.focused_surface; wlr_seat->pointer_state.focused_surface;
// leave the previously entered surface // leave the previously entered surface
if (focused_handle && focused_surface) { if (focused_handle && focused_handle->pointer && focused_surface) {
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_leave(focused_handle->pointer, serial, wl_pointer_send_leave(focused_handle->pointer, serial,
focused_surface->resource); focused_surface->resource);
@ -290,7 +295,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat,
} }
// enter the current surface // enter the current surface
if (handle) { if (handle && handle->pointer) {
uint32_t serial = wl_display_next_serial(wlr_seat->display); uint32_t serial = wl_display_next_serial(wlr_seat->display);
wl_pointer_send_enter(handle->pointer, serial, surface->resource, wl_pointer_send_enter(handle->pointer, serial, surface->resource,
wl_fixed_from_double(sx), wl_fixed_from_double(sy)); wl_fixed_from_double(sx), wl_fixed_from_double(sy));
@ -327,8 +332,7 @@ void wlr_seat_pointer_clear_focus(struct wlr_seat *wlr_seat) {
void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
double sx, double sy) { double sx, double sy) {
if (!wlr_seat->pointer_state.focused_handle) { if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) {
// nobody to send the event to
return; return;
} }
@ -339,8 +343,7 @@ void wlr_seat_pointer_send_motion(struct wlr_seat *wlr_seat, uint32_t time,
void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time, void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
uint32_t button, uint32_t state) { uint32_t button, uint32_t state) {
if (!wlr_seat->pointer_state.focused_handle) { if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) {
// nobody to send the event to
return; return;
} }
@ -349,3 +352,22 @@ void wlr_seat_pointer_send_button(struct wlr_seat *wlr_seat, uint32_t time,
serial, time, button, state); serial, time, button, state);
wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer); wl_pointer_send_frame(wlr_seat->pointer_state.focused_handle->pointer);
} }
void wlr_seat_pointer_send_axis(struct wlr_seat *wlr_seat, uint32_t time,
enum wlr_axis_orientation orientation, double value) {
if (!wlr_seat_pointer_has_focus_resource(wlr_seat)) {
return;
}
struct wl_resource *pointer =
wlr_seat->pointer_state.focused_handle->pointer;
if (value) {
wl_pointer_send_axis(pointer, time, orientation,
wl_fixed_from_double(value));
} else {
wl_pointer_send_axis_stop(pointer, time, orientation);
}
wl_pointer_send_frame(pointer);
}