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

rootston: remove devices from seat

This commit is contained in:
Tony Crisci 2017-11-08 09:04:33 -05:00
parent eb3c367c63
commit a00b7f1e9b
3 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rootston/keyboard.h
View File

@ -11,8 +11,6 @@ struct roots_keyboard {
struct roots_seat *seat; struct roots_seat *seat;
struct wlr_input_device *device; struct wlr_input_device *device;
struct keyboard_config *config; struct keyboard_config *config;
struct wl_list seat_link;
// XXX temporary
struct wl_list link; struct wl_list link;
struct wl_listener keyboard_key; struct wl_listener keyboard_key;
@ -24,8 +22,7 @@ struct roots_keyboard {
struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device, struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,
struct roots_input *input); struct roots_input *input);
void roots_keyboard_destroy(struct wlr_input_device *device, void roots_keyboard_destroy(struct roots_keyboard *keyboard);
struct roots_input *input);
void roots_keyboard_handle_key(struct roots_keyboard *keyboard, void roots_keyboard_handle_key(struct roots_keyboard *keyboard,
struct wlr_event_keyboard_key *event); struct wlr_event_keyboard_key *event);

3
rootston/keyboard.c
View File

@ -225,8 +225,7 @@ struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,
return keyboard; return keyboard;
} }
void roots_keyboard_destroy(struct wlr_input_device *device, struct roots_input *input) { void roots_keyboard_destroy(struct roots_keyboard *keyboard) {
struct roots_keyboard *keyboard = device->data;
wl_list_remove(&keyboard->link); wl_list_remove(&keyboard->link);
free(keyboard->config); free(keyboard->config);
free(keyboard); free(keyboard);

42
rootston/seat.c
View File

@ -271,7 +271,7 @@ static void seat_add_keyboard(struct roots_seat *seat, struct wlr_input_device *
struct roots_keyboard *keyboard = roots_keyboard_create(device, seat->input); struct roots_keyboard *keyboard = roots_keyboard_create(device, seat->input);
keyboard->seat = seat; keyboard->seat = seat;
wl_list_insert(&seat->keyboards, &keyboard->seat_link); wl_list_insert(&seat->keyboards, &keyboard->link);
keyboard->keyboard_key.notify = handle_keyboard_key; keyboard->keyboard_key.notify = handle_keyboard_key;
wl_signal_add(&keyboard->device->keyboard->events.key, wl_signal_add(&keyboard->device->keyboard->events.key,
@ -354,17 +354,39 @@ void roots_seat_add_device(struct roots_seat *seat,
static void seat_remove_keyboard(struct roots_seat *seat, static void seat_remove_keyboard(struct roots_seat *seat,
struct wlr_input_device *device) { struct wlr_input_device *device) {
// TODO struct roots_keyboard *keyboard;
wl_list_for_each(keyboard, &seat->keyboards, link) {
if (keyboard->device == device) {
roots_keyboard_destroy(keyboard);
return;
}
}
} }
static void seat_remove_pointer(struct roots_seat *seat, static void seat_remove_pointer(struct roots_seat *seat,
struct wlr_input_device *device) { struct wlr_input_device *device) {
// TODO struct roots_pointer *pointer;
wl_list_for_each(pointer, &seat->pointers, link) {
if (pointer->device == device) {
wl_list_remove(&pointer->link);
wlr_cursor_detach_input_device(seat->cursor->cursor, device);
free(pointer);
return;
}
}
} }
static void seat_remove_touch(struct roots_seat *seat, static void seat_remove_touch(struct roots_seat *seat,
struct wlr_input_device *device) { struct wlr_input_device *device) {
// TODO struct roots_touch *touch;
wl_list_for_each(touch, &seat->touch, link) {
if (touch->device == device) {
wl_list_remove(&touch->link);
wlr_cursor_detach_input_device(seat->cursor->cursor, device);
free(touch);
return;
}
}
} }
static void seat_remove_tablet_pad(struct roots_seat *seat, static void seat_remove_tablet_pad(struct roots_seat *seat,
@ -374,7 +396,15 @@ static void seat_remove_tablet_pad(struct roots_seat *seat,
static void seat_remove_tablet_tool(struct roots_seat *seat, static void seat_remove_tablet_tool(struct roots_seat *seat,
struct wlr_input_device *device) { struct wlr_input_device *device) {
// TODO struct roots_tablet_tool *tablet_tool;
wl_list_for_each(tablet_tool, &seat->tablet_tools, link) {
if (tablet_tool->device == device) {
wl_list_remove(&tablet_tool->link);
wlr_cursor_detach_input_device(seat->cursor->cursor, device);
free(tablet_tool);
return;
}
}
} }
void roots_seat_remove_device(struct roots_seat *seat, void roots_seat_remove_device(struct roots_seat *seat,
@ -410,7 +440,7 @@ void roots_seat_configure_xcursor(struct roots_seat *seat) {
bool roots_seat_has_meta_pressed(struct roots_seat *seat) { bool roots_seat_has_meta_pressed(struct roots_seat *seat) {
struct roots_keyboard *keyboard; struct roots_keyboard *keyboard;
wl_list_for_each(keyboard, &seat->keyboards, seat_link) { wl_list_for_each(keyboard, &seat->keyboards, link) {
if (!keyboard->config->meta_key) { if (!keyboard->config->meta_key) {
continue; continue;
} }