Skip to content

Commit

Permalink
input: disable events for map_to_output devices when output not present
Browse files Browse the repository at this point in the history
  • Loading branch information
Xyene committed Jun 19, 2020
1 parent d328c24 commit fe7c1e2
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 17 deletions.
4 changes: 3 additions & 1 deletion include/sway/input/input-manager.h
Expand Up @@ -44,9 +44,11 @@ void input_manager_configure_xcursor(void);

void input_manager_apply_input_config(struct input_config *input_config);

void input_manager_configure_all_inputs(void);

void input_manager_reset_input(struct sway_input_device *input_device);

void input_manager_reset_all_inputs();
void input_manager_reset_all_inputs(void);

void input_manager_apply_seat_config(struct seat_config *seat_config);

Expand Down
9 changes: 1 addition & 8 deletions sway/config/output.c
Expand Up @@ -481,14 +481,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
// Reconfigure all devices, since input config may have been applied before
// this output came online, and some config items (like map_to_output) are
// dependent on an output being present.
struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &server.input->devices, link) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) {
seat_configure_device(seat, input_device);
}
}

input_manager_configure_all_inputs();
return true;
}

Expand Down
25 changes: 18 additions & 7 deletions sway/input/input-manager.c
Expand Up @@ -521,6 +521,22 @@ static void retranslate_keysyms(struct input_config *input_config) {
}
}

static void input_manager_configure_input(
struct sway_input_device *input_device) {
sway_input_configure_libinput_device(input_device);
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) {
seat_configure_device(seat, input_device);
}
}

void input_manager_configure_all_inputs(void) {
struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &server.input->devices, link) {
input_manager_configure_input(input_device);
}
}

void input_manager_apply_input_config(struct input_config *input_config) {
struct sway_input_device *input_device = NULL;
bool wildcard = strcmp(input_config->identifier, "*") == 0;
Expand All @@ -531,11 +547,7 @@ void input_manager_apply_input_config(struct input_config *input_config) {
if (strcmp(input_device->identifier, input_config->identifier) == 0
|| wildcard
|| type_matches) {
sway_input_configure_libinput_device(input_device);
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &server.input->seats, link) {
seat_configure_device(seat, input_device);
}
input_manager_configure_input(input_device);
}
}

Expand All @@ -550,7 +562,7 @@ void input_manager_reset_input(struct sway_input_device *input_device) {
}
}

void input_manager_reset_all_inputs() {
void input_manager_reset_all_inputs(void) {
struct sway_input_device *input_device = NULL;
wl_list_for_each(input_device, &server.input->devices, link) {
input_manager_reset_input(input_device);
Expand All @@ -568,7 +580,6 @@ void input_manager_reset_all_inputs() {
}
}


void input_manager_apply_seat_config(struct seat_config *seat_config) {
sway_log(SWAY_DEBUG, "applying seat config for seat %s", seat_config->name);
if (strcmp(seat_config->name, "*") == 0) {
Expand Down
19 changes: 18 additions & 1 deletion sway/input/libinput.c
Expand Up @@ -4,6 +4,7 @@
#include <wlr/backend/libinput.h>
#include "log.h"
#include "sway/config.h"
#include "sway/output.h"
#include "sway/input/input-manager.h"
#include "sway/ipc-server.h"

Expand Down Expand Up @@ -190,9 +191,25 @@ static bool config_libinput_pointer(struct libinput_device *device,
sway_log(SWAY_DEBUG, "config_libinput_pointer('%s' on '%s')",
ic->identifier, device_id);
bool changed = false;
if (ic->send_events != INT_MIN) {

struct sway_output *mapped_output = ic->mapped_to_output ?
output_by_name_or_id(ic->mapped_to_output) : NULL;
if (ic->mapped_to_output && (!mapped_output || !mapped_output->enabled)) {
sway_log(SWAY_DEBUG,
"Pointer '%s' is mapped to offline output '%s'; disabling input",
ic->identifier, ic->mapped_to_output);
changed |= set_send_events(device,
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED);
} else if (ic->send_events != INT_MIN) {
changed |= set_send_events(device, ic->send_events);
} else {
// Have to reset to the default mode here, otherwise if ic->send_events
// is unset and a mapped output just came online after being disabled,
// we'd remain stuck sending no events.
changed |= set_send_events(device,
libinput_device_config_send_events_get_default_mode(device));
}

if (ic->tap != INT_MIN) {
changed |= set_tap(device, ic->tap);
}
Expand Down
5 changes: 5 additions & 0 deletions sway/tree/output.c
Expand Up @@ -266,6 +266,11 @@ void output_disable(struct sway_output *output) {
output->current_mode = NULL;

arrange_root();

// Reconfigure all devices, since devices with map_to_output directives
// for an output that goes offline should stop sending events as long
// as the output remains offline.
input_manager_configure_all_inputs();
}

void output_begin_destroy(struct sway_output *output) {
Expand Down

0 comments on commit fe7c1e2

Please sign in to comment.