From fadbdcd13c7fcbbad0eebc4867e23cf71c01df1d Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 27 Sep 2018 12:21:30 +0200 Subject: [PATCH] seat: remove unused keyboard focus_change event --- include/wlr/types/wlr_seat.h | 14 +------------- types/seat/wlr_seat.c | 2 -- types/seat/wlr_seat_keyboard.c | 10 ---------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 4daefff1..59de8207 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -148,7 +148,7 @@ struct wlr_seat_pointer_state { struct wl_listener surface_destroy; struct { - struct wl_signal focus_change; + struct wl_signal focus_change; // wlr_seat_pointer_focus_change_event } events; }; @@ -168,10 +168,6 @@ struct wlr_seat_keyboard_state { struct wlr_seat_keyboard_grab *grab; struct wlr_seat_keyboard_grab *default_grab; - - struct { - struct wl_signal focus_change; - } events; }; struct wlr_seat_touch_state { @@ -252,14 +248,6 @@ struct wlr_seat_pointer_focus_change_event { double sx, sy; }; -struct wlr_seat_keyboard_focus_change_event { - struct wlr_seat *seat; - struct wlr_surface *old_surface, *new_surface; - size_t num_keycodes; - uint32_t *keycodes; - struct wlr_keyboard_modifiers *modifiers; -}; - /** * Allocates a new wlr_seat and adds a wl_seat global to the display. */ diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c index c4da29e2..1940d7d6 100644 --- a/types/seat/wlr_seat.c +++ b/types/seat/wlr_seat.c @@ -243,8 +243,6 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) { seat->keyboard_state.seat = seat; wl_list_init(&seat->keyboard_state.surface_destroy.link); - wl_signal_init(&seat->keyboard_state.events.focus_change); - // touch state struct wlr_seat_touch_grab *touch_grab = calloc(1, sizeof(struct wlr_seat_touch_grab)); diff --git a/types/seat/wlr_seat_keyboard.c b/types/seat/wlr_seat_keyboard.c index 4f95b265..e8ea300e 100644 --- a/types/seat/wlr_seat_keyboard.c +++ b/types/seat/wlr_seat_keyboard.c @@ -291,16 +291,6 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat, // as it targets seat->keyboard_state.focused_client wlr_seat_keyboard_send_modifiers(seat, modifiers); } - - struct wlr_seat_keyboard_focus_change_event event = { - .seat = seat, - .new_surface = surface, - .old_surface = focused_surface, - .num_keycodes = num_keycodes, - .keycodes = keycodes, - .modifiers = modifiers, - }; - wlr_signal_emit_safe(&seat->keyboard_state.events.focus_change, &event); } void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat,