mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

seat: use wlr_seat_keyboard_notify_enter() correctly

Browse source
This commit is contained in:
Johan Malm 2020-10-05 20:27:52 +01:00
parent 25829d122c
commit 50bcfa00f3
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/desktop.c
View file

@ -81,10 +81,10 @@ focus_view(struct view *view)
move_to_front(view); move_to_front(view);
set_activated(view->surface, true); set_activated(view->surface, true);
struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(wlr_seat);
wlr_seat_keyboard_notify_enter(wlr_seat, view->surface, struct wlr_keyboard *kb = &server->seat.keyboard_group->keyboard;
keyboard->keycodes, keyboard->num_keycodes, wlr_seat_keyboard_notify_enter(wlr_seat, view->surface, kb->keycodes,
&keyboard->modifiers); kb->num_keycodes, &kb->modifiers);
move_xwayland_sub_views_to_front(view); move_xwayland_sub_views_to_front(view);
} }

18
src/seat.c
View file

@ -1,7 +1,8 @@
#include <assert.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "labwc.h" #include "labwc.h"
static struct wlr_seat *current_seat; static struct seat *current_seat;
static void static void
input_device_destroy(struct wl_listener *listener, void *data) input_device_destroy(struct wl_listener *listener, void *data)
@ -79,7 +80,7 @@ seat_init(struct server *server)
wlr_log(WLR_ERROR, "cannot allocate seat"); wlr_log(WLR_ERROR, "cannot allocate seat");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
current_seat = seat->seat; current_seat = seat;
wl_list_init(&seat->inputs); wl_list_init(&seat->inputs);
seat->new_input.notify = new_input_notify; seat->new_input.notify = new_input_notify;
@ -108,6 +109,9 @@ seat_finish(struct server *server)
wl_list_remove(&seat->request_cursor.link); wl_list_remove(&seat->request_cursor.link);
wl_list_remove(&seat->request_set_selection.link); wl_list_remove(&seat->request_set_selection.link);
wl_list_remove(&seat->new_input.link); wl_list_remove(&seat->new_input.link);
if (seat->keyboard_group) {
wlr_keyboard_group_destroy(seat->keyboard_group);
}
wlr_xcursor_manager_destroy(seat->xcursor_manager); wlr_xcursor_manager_destroy(seat->xcursor_manager);
wlr_cursor_destroy(seat->cursor); wlr_cursor_destroy(seat->cursor);
wlr_seat_destroy(server->seat.seat); wlr_seat_destroy(server->seat.seat);
@ -116,16 +120,18 @@ seat_finish(struct server *server)
void void
seat_focus_surface(struct wlr_surface *surface) seat_focus_surface(struct wlr_surface *surface)
{ {
struct wlr_seat *wlr_seat = current_seat->seat;
if (!surface) { if (!surface) {
wlr_seat_keyboard_notify_clear_focus(current_seat); wlr_seat_keyboard_notify_clear_focus(wlr_seat);
return; return;
} }
/* TODO: add keyboard stuff */ struct wlr_keyboard *kb = &current_seat->keyboard_group->keyboard;
wlr_seat_keyboard_notify_enter(current_seat, surface, NULL, 0, NULL); wlr_seat_keyboard_notify_enter(wlr_seat, surface, kb->keycodes,
kb->num_keycodes, &kb->modifiers);
} }
struct wlr_surface * struct wlr_surface *
seat_focused_surface(void) seat_focused_surface(void)
{ {
return current_seat->keyboard_state.focused_surface; return current_seat->seat->keyboard_state.focused_surface;
} }