mirror of
https://github.com/swaywm/sway.git
synced 2025-11-13 13:29:49 -05:00
basic configuration
This commit is contained in:
Tony Crisci
parent
c173d30b92
commit
92fef27eaa
15 changed files with 543 additions and 174 deletions
|
|
@ -18,12 +18,13 @@ static const char *default_seat = "seat0";
|
|||
struct sway_input_manager *input_manager;
|
||||
|
||||
struct input_config *current_input_config = NULL;
|
||||
struct seat_config *current_seat_config = NULL;
|
||||
|
||||
static struct sway_seat *input_manager_get_seat(
|
||||
struct sway_input_manager *input, const char *seat_name) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (strcmp(seat->seat->name, seat_name) == 0) {
|
||||
if (strcmp(seat->wlr_seat->name, seat_name) == 0) {
|
||||
return seat;
|
||||
}
|
||||
}
|
||||
|
|
@ -58,56 +59,88 @@ static char *get_device_identifier(struct wlr_input_device *device) {
|
|||
return identifier;
|
||||
}
|
||||
|
||||
static struct sway_input_device *input_sway_device_from_wlr(struct sway_input_manager *input,
|
||||
struct wlr_input_device *device) {
|
||||
struct sway_input_device *sway_device = NULL;
|
||||
wl_list_for_each(sway_device, &input->devices, link) {
|
||||
if (sway_device->wlr_device == device) {
|
||||
return sway_device;
|
||||
static struct sway_input_device *input_sway_device_from_wlr(
|
||||
struct sway_input_manager *input, struct wlr_input_device *device) {
|
||||
struct sway_input_device *input_device = NULL;
|
||||
wl_list_for_each(input_device, &input->devices, link) {
|
||||
if (input_device->wlr_device == device) {
|
||||
return input_device;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static struct sway_input_device *input_sway_device_from_config(struct sway_input_manager *input,
|
||||
struct input_config *config) {
|
||||
struct sway_input_device *sway_device = NULL;
|
||||
wl_list_for_each(sway_device, &input->devices, link) {
|
||||
if (strcmp(sway_device->identifier, config->identifier) == 0) {
|
||||
return sway_device;
|
||||
static struct sway_input_device *input_sway_device_from_config(
|
||||
struct sway_input_manager *input, struct input_config *config) {
|
||||
struct sway_input_device *input_device = NULL;
|
||||
wl_list_for_each(input_device, &input->devices, link) {
|
||||
if (strcmp(input_device->identifier, config->identifier) == 0) {
|
||||
return input_device;
|
||||
}
|
||||
}
|
||||
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) {
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (seat->config) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
static void input_add_notify(struct wl_listener *listener, void *data) {
|
||||
struct sway_input_manager *input =
|
||||
wl_container_of(listener, input, input_add);
|
||||
struct wlr_input_device *device = data;
|
||||
|
||||
struct sway_input_device *sway_device =
|
||||
struct sway_input_device *input_device =
|
||||
calloc(1, sizeof(struct sway_input_device));
|
||||
if (!sway_assert(sway_device, "could not allocate input device")) {
|
||||
if (!sway_assert(input_device, "could not allocate input device")) {
|
||||
return;
|
||||
}
|
||||
|
||||
sway_device->wlr_device = device;
|
||||
sway_device->identifier = get_device_identifier(device);
|
||||
wl_list_insert(&input->devices, &sway_device->link);
|
||||
input_device->wlr_device = device;
|
||||
input_device->identifier = get_device_identifier(device);
|
||||
wl_list_insert(&input->devices, &input_device->link);
|
||||
|
||||
// find config
|
||||
for (int i = 0; i < config->input_configs->length; ++i) {
|
||||
struct input_config *input_config = config->input_configs->items[i];
|
||||
if (strcmp(input_config->identifier, sway_device->identifier) == 0) {
|
||||
sway_device->config = input_config;
|
||||
if (strcmp(input_config->identifier, input_device->identifier) == 0) {
|
||||
input_device->config = input_config;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const char *seat_name =
|
||||
(sway_device->config ? sway_device->config->seat : default_seat);
|
||||
struct sway_seat *seat = input_manager_get_seat(input, seat_name);
|
||||
sway_seat_add_device(seat, sway_device);
|
||||
struct sway_seat *seat = NULL;
|
||||
if (!input_has_seat_configuration(input)) {
|
||||
seat = input_manager_get_seat(input, default_seat);
|
||||
sway_seat_add_device(seat, input_device);
|
||||
return;
|
||||
}
|
||||
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
if (seat->config &&
|
||||
(seat_config_get_attachment(seat->config, input_device->identifier) ||
|
||||
seat_config_get_attachment(seat->config, "*"))) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void input_remove_notify(struct wl_listener *listener, void *data) {
|
||||
|
|
@ -115,21 +148,21 @@ static void input_remove_notify(struct wl_listener *listener, void *data) {
|
|||
wl_container_of(listener, input, input_remove);
|
||||
struct wlr_input_device *device = data;
|
||||
|
||||
struct sway_input_device *sway_device =
|
||||
struct sway_input_device *input_device =
|
||||
input_sway_device_from_wlr(input, device);
|
||||
|
||||
if (!sway_assert(sway_device, "could not find sway device")) {
|
||||
if (!sway_assert(input_device, "could not find sway device")) {
|
||||
return;
|
||||
}
|
||||
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
sway_seat_remove_device(seat, sway_device);
|
||||
sway_seat_remove_device(seat, input_device);
|
||||
}
|
||||
|
||||
wl_list_remove(&sway_device->link);
|
||||
free(sway_device->identifier);
|
||||
free(sway_device);
|
||||
wl_list_remove(&input_device->link);
|
||||
free(input_device->identifier);
|
||||
free(input_device);
|
||||
}
|
||||
|
||||
struct sway_input_manager *sway_input_manager_create(
|
||||
|
|
@ -139,7 +172,6 @@ struct sway_input_manager *sway_input_manager_create(
|
|||
if (!input) {
|
||||
return NULL;
|
||||
}
|
||||
// XXX probably don't need the full server
|
||||
input->server = server;
|
||||
|
||||
wl_list_init(&input->devices);
|
||||
|
|
@ -177,22 +209,53 @@ void sway_input_manager_set_focus(struct sway_input_manager *input,
|
|||
}
|
||||
}
|
||||
|
||||
void sway_input_manager_apply_config(struct sway_input_manager *input,
|
||||
void sway_input_manager_apply_input_config(struct sway_input_manager *input,
|
||||
struct input_config *input_config) {
|
||||
struct sway_input_device *sway_device =
|
||||
struct sway_input_device *input_device =
|
||||
input_sway_device_from_config(input, input_config);
|
||||
if (!sway_device) {
|
||||
if (!input_device) {
|
||||
return;
|
||||
}
|
||||
input_device->config = input_config;
|
||||
|
||||
struct sway_seat *seat = NULL;
|
||||
wl_list_for_each(seat, &input->seats, link) {
|
||||
sway_seat_remove_device(seat, sway_device);
|
||||
sway_seat_configure_device(seat, input_device);
|
||||
}
|
||||
}
|
||||
|
||||
void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
|
||||
struct seat_config *seat_config) {
|
||||
struct sway_seat *seat = input_manager_get_seat(input, seat_config->name);
|
||||
// the old config is invalid so clear it
|
||||
sway_seat_set_config(seat, NULL);
|
||||
|
||||
// clear devices
|
||||
struct sway_input_device *input_device = NULL;
|
||||
wl_list_for_each(input_device, &input->devices, link) {
|
||||
sway_seat_remove_device(seat, input_device);
|
||||
}
|
||||
|
||||
const char *seat_name = (input_config->seat ? input_config->seat : default_seat);
|
||||
seat = input_manager_get_seat(input, seat_name);
|
||||
sway_seat_add_device(seat, sway_device);
|
||||
if (seat_config_get_attachment(seat_config, "*")) {
|
||||
wl_list_for_each(input_device, &input->devices, link) {
|
||||
sway_seat_add_device(seat, input_device);
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < seat_config->attachments->length; ++i) {
|
||||
struct seat_attachment_config *attachment =
|
||||
seat_config->attachments->items[i];
|
||||
|
||||
struct sway_input_device *device =
|
||||
input_sway_device_from_identifier(input,
|
||||
attachment->identifier);
|
||||
|
||||
if (device) {
|
||||
sway_seat_add_device(seat, device);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sway_seat_set_config(seat, seat_config);
|
||||
}
|
||||
|
||||
void sway_input_manager_configure_xcursor(struct sway_input_manager *input) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue