Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-29 22:23:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup input-manager

Browse source
This commit is contained in:
Tony Crisci 2017-12-17 10:44:53 -05:00
parent 88bcd43ebf
commit a27736adcd
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
sway/input/input-manager.c
View file

@ -94,17 +94,6 @@ static struct sway_input_device *input_sway_device_from_config(
return NULL; return NULL;
} }
static struct sway_input_device *input_sway_device_from_identifier(
struct sway_input_manager *input, char *identifier) {
struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &input->devices, link) {
if (strcmp(input_device->identifier, identifier) == 0) {
return input_device;
}
}
return NULL;
}
static bool input_has_seat_configuration(struct sway_input_manager *input) { static bool input_has_seat_configuration(struct sway_input_manager *input) {
struct sway_seat *seat = NULL; struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
@ -154,7 +143,8 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
bool added = false; bool added = false;
wl_list_for_each(seat, &input->seats, link) { wl_list_for_each(seat, &input->seats, link) {
if (seat->config && if (seat->config &&
(seat_config_get_attachment(seat->config, input_device->identifier) || (seat_config_get_attachment(seat->config,
input_device->identifier) ||
seat_config_get_attachment(seat->config, "*"))) { seat_config_get_attachment(seat->config, "*"))) {
sway_seat_add_device(seat, input_device); sway_seat_add_device(seat, input_device);
added = true; added = true;
@ -263,7 +253,8 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
void sway_input_manager_apply_seat_config(struct sway_input_manager *input, void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
struct seat_config *seat_config) { struct seat_config *seat_config) {
sway_log(L_DEBUG, "applying new seat config for seat %s", seat_config->name); sway_log(L_DEBUG, "applying new seat config for seat %s",
seat_config->name);
struct sway_seat *seat = input_manager_get_seat(input, seat_config->name); struct sway_seat *seat = input_manager_get_seat(input, seat_config->name);
if (!seat) { if (!seat) {
return; return;
@ -282,7 +273,8 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
continue; continue;
} }
if (seat_config_get_attachment(seat->config, "*") || if (seat_config_get_attachment(seat->config, "*") ||
seat_config_get_attachment(seat->config, input_device->identifier)) { seat_config_get_attachment(seat->config,
input_device->identifier)) {
list_add(seat_list, seat); list_add(seat_list, seat);
} }
} }
@ -311,6 +303,7 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
} }
} }
} }
list_free(seat_list);
} }
} }