aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/seat
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-12-27 00:46:55 -0500
committerLibravatar emersion <contact@emersion.fr>2018-12-29 19:40:40 +0100
commit3e8f548d1d0acb3aba384842615e6528b3027283 (patch)
tree8c0bd5fbcc42d9ad08a4630940598719f3d6a54e /sway/commands/seat
parentsway-output(5): doc scaling consideration for pos (diff)
downloadsway-3e8f548d1d0acb3aba384842615e6528b3027283.tar.gz
sway-3e8f548d1d0acb3aba384842615e6528b3027283.tar.zst
sway-3e8f548d1d0acb3aba384842615e6528b3027283.zip
Revamp seat configs
This makes seat configs work like output and input configs do. This also adds support for wildcard seat configs. A seat config is still created in the main seat command handler, but instead of creating a new one in the subcommands and destroying the main seat command's instance, the seat subcommands modify the main one. The seat config is then stored, where it is merged appropriately. The seat config returned from `store_seat_config` is then applied. When attempting to apply a wildcard seat config, a seat specific config is queried for and if found, that is used. Otherwise, the wildcard config is applied directly. Additionally, instead of adding input devices to the default seat directly when there is no seat configs, a seat config for the default seat is created with only fallback set to true, which is more explicit. It also fixes an issue where running a seat command at runtime (with no seat config in the sway config), would result in all input devices being removed from the default seat and leaving sway in an unusable state. Also, instead of checking for any seat config, the search is for a seat config with a fallback option seat. This makes it so if there are only seat configs with fallback set to -1, the default seat is still created since there is no explicit notion on what to do regarding fallbacks. However, if there is even a single fallback 0, then the default seat is not used as a fallback. This will be needed for seat subcommands like hide_cursor where the user may only want to set that property without effecting anything else.
Diffstat (limited to 'sway/commands/seat')
-rw-r--r--sway/commands/seat/attach.c21
-rw-r--r--sway/commands/seat/fallback.c19
2 files changed, 13 insertions, 27 deletions
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 8d646c2d..0fb17f1d 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -1,10 +1,7 @@
1#define _POSIX_C_SOURCE 200809L 1#define _POSIX_C_SOURCE 200809L
2#include <string.h> 2#include <string.h>
3#include <strings.h>
4#include "sway/input/input-manager.h"
5#include "sway/commands.h" 3#include "sway/commands.h"
6#include "sway/config.h" 4#include "sway/config.h"
7#include "log.h"
8#include "stringop.h" 5#include "stringop.h"
9 6
10struct cmd_results *seat_cmd_attach(int argc, char **argv) { 7struct cmd_results *seat_cmd_attach(int argc, char **argv) {
@@ -12,19 +9,17 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
12 if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) { 9 if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) {
13 return error; 10 return error;
14 } 11 }
15 struct seat_config *current_seat_config = 12 if (!config->handler_context.seat_config) {
16 config->handler_context.seat_config;
17 if (!current_seat_config) {
18 return cmd_results_new(CMD_FAILURE, "attach", "No seat defined"); 13 return cmd_results_new(CMD_FAILURE, "attach", "No seat defined");
19 } 14 }
20 15
21 struct seat_config *new_config = new_seat_config(current_seat_config->name); 16 struct seat_attachment_config *attachment = seat_attachment_config_new();
22 struct seat_attachment_config *new_attachment = seat_attachment_config_new(); 17 if (!attachment) {
23 new_attachment->identifier = strdup(argv[0]); 18 return cmd_results_new(CMD_FAILURE, "attach",
24 list_add(new_config->attachments, new_attachment); 19 "Failed to allocate seat attachment config");
25
26 if (!config->validating) {
27 apply_seat_config(new_config);
28 } 20 }
21 attachment->identifier = strdup(argv[0]);
22 list_add(config->handler_context.seat_config->attachments, attachment);
23
29 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 24 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
30} 25}
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index a0ddf3ef..8f1ab12c 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -1,27 +1,18 @@
1#include <string.h>
2#include <strings.h>
3#include "sway/config.h" 1#include "sway/config.h"
4#include "sway/commands.h" 2#include "sway/commands.h"
5#include "sway/input/input-manager.h"
6#include "util.h" 3#include "util.h"
7 4
8struct cmd_results *seat_cmd_fallback(int argc, char **argv) { 5struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
9 struct cmd_results *error = NULL; 6 struct cmd_results *error = NULL;
10 if ((error = checkarg(argc, "fallback", EXPECTED_AT_LEAST, 1))) { 7 if ((error = checkarg(argc, "fallback", EXPECTED_EQUAL_TO, 1))) {
11 return error; 8 return error;
12 } 9 }
13 struct seat_config *current_seat_config = 10 if (!config->handler_context.seat_config) {
14 config->handler_context.seat_config;
15 if (!current_seat_config) {
16 return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined"); 11 return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined");
17 } 12 }
18 struct seat_config *new_config =
19 new_seat_config(current_seat_config->name);
20
21 new_config->fallback = parse_boolean(argv[0], false);
22 13
23 if (!config->validating) { 14 config->handler_context.seat_config->fallback =
24 apply_seat_config(new_config); 15 parse_boolean(argv[0], false);
25 } 16
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 17 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27} 18}