From dc6cf6489246ac78af90aa9b29519556987c5d46 Mon Sep 17 00:00:00 2001 From: Charlotte Meyer Date: Sun, 29 Dec 2019 13:03:54 +0000 Subject: [PATCH] Rename request_set_cursor to seat_request_set_cursor --- include/input/cursor.h | 2 +- kiwmi/input/cursor.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/input/cursor.h b/include/input/cursor.h index 4719012..175a9c0 100644 --- a/include/input/cursor.h +++ b/include/input/cursor.h @@ -20,7 +20,7 @@ struct kiwmi_cursor { struct wl_listener cursor_button; struct wl_listener cursor_axis; struct wl_listener cursor_frame; - struct wl_listener request_set_cursor; + struct wl_listener seat_request_set_cursor; }; struct kiwmi_cursor *cursor_create( diff --git a/kiwmi/input/cursor.c b/kiwmi/input/cursor.c index f533c29..0046e61 100644 --- a/kiwmi/input/cursor.c +++ b/kiwmi/input/cursor.c @@ -140,10 +140,10 @@ cursor_frame_notify(struct wl_listener *listener, void *UNUSED(data)) } static void -request_set_cursor_notify(struct wl_listener *listener, void *data) +seat_request_set_cursor_notify(struct wl_listener *listener, void *data) { struct kiwmi_cursor *cursor = - wl_container_of(listener, cursor, request_set_cursor); + wl_container_of(listener, cursor, seat_request_set_cursor); struct wlr_seat_pointer_request_set_cursor_event *event = data; struct wlr_surface *focused_surface = @@ -207,10 +207,10 @@ cursor_create( cursor->cursor_frame.notify = cursor_frame_notify; wl_signal_add(&cursor->cursor->events.frame, &cursor->cursor_frame); - cursor->request_set_cursor.notify = request_set_cursor_notify; + cursor->seat_request_set_cursor.notify = seat_request_set_cursor_notify; wl_signal_add( &server->input.seat->events.request_set_cursor, - &cursor->request_set_cursor); + &cursor->seat_request_set_cursor); return cursor; }