From 733993a651c71f7e2198d505960d6bbd31e0e107 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Sat, 18 Nov 2017 11:22:02 -0500
Subject: Move everything to sway/old/
---
sway/commands/input.c | 55 ---------------------------------------------------
1 file changed, 55 deletions(-)
delete mode 100644 sway/commands/input.c
(limited to 'sway/commands/input.c')
diff --git a/sway/commands/input.c b/sway/commands/input.c
deleted file mode 100644
index ad53d272..00000000
--- a/sway/commands/input.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <string.h>
-#include <strings.h>
-#include "sway/commands.h"
-#include "sway/input.h"
-#include "log.h"
-
-struct cmd_results *cmd_input(int argc, char **argv) {
- struct cmd_results *error = NULL;
- if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) {
- return error;
- }
-
- if (config->reading && strcmp("{", argv[1]) == 0) {
- current_input_config = new_input_config(argv[0]);
- sway_log(L_DEBUG, "entering input block: %s", current_input_config->identifier);
- return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
- }
-
- if (argc > 2) {
- int argc_new = argc-2;
- char **argv_new = argv+2;
-
- struct cmd_results *res;
- current_input_config = new_input_config(argv[0]);
- if (strcasecmp("accel_profile", argv[1]) == 0) {
- res = input_cmd_accel_profile(argc_new, argv_new);
- } else if (strcasecmp("click_method", argv[1]) == 0) {
- res = input_cmd_click_method(argc_new, argv_new);
- } else if (strcasecmp("drag_lock", argv[1]) == 0) {
- res = input_cmd_drag_lock(argc_new, argv_new);
- } else if (strcasecmp("dwt", argv[1]) == 0) {
- res = input_cmd_dwt(argc_new, argv_new);
- } else if (strcasecmp("events", argv[1]) == 0) {
- res = input_cmd_events(argc_new, argv_new);
- } else if (strcasecmp("left_handed", argv[1]) == 0) {
- res = input_cmd_left_handed(argc_new, argv_new);
- } else if (strcasecmp("middle_emulation", argv[1]) == 0) {
- res = input_cmd_middle_emulation(argc_new, argv_new);
- } else if (strcasecmp("natural_scroll", argv[1]) == 0) {
- res = input_cmd_natural_scroll(argc_new, argv_new);
- } else if (strcasecmp("pointer_accel", argv[1]) == 0) {
- res = input_cmd_pointer_accel(argc_new, argv_new);
- } else if (strcasecmp("scroll_method", argv[1]) == 0) {
- res = input_cmd_scroll_method(argc_new, argv_new);
- } else if (strcasecmp("tap", argv[1]) == 0) {
- res = input_cmd_tap(argc_new, argv_new);
- } else {
- res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
- }
- current_input_config = NULL;
- return res;
- }
-
- return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
-}
--
cgit v1.2.3
From 462a451328a1d6f0b17d34b431d6bf3dec87c1ba Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Mon, 11 Dec 2017 04:17:14 -0500
Subject: input config
---
include/sway/commands.h | 4 ++
include/sway/input/input-manager.h | 2 +
sway/commands.c | 90 ++++++++++++++++++++++++----------
sway/commands/input.c | 55 +++++++++++++++++++++
sway/commands/input/accel_profile.c | 27 ++++++++++
sway/commands/input/click_method.c | 30 ++++++++++++
sway/commands/input/drag_lock.c | 26 ++++++++++
sway/commands/input/dwt.c | 26 ++++++++++
sway/commands/input/events.c | 30 ++++++++++++
sway/commands/input/left_handed.c | 26 ++++++++++
sway/commands/input/middle_emulation.c | 26 ++++++++++
sway/commands/input/natural_scroll.c | 26 ++++++++++
sway/commands/input/pointer_accel.c | 24 +++++++++
sway/commands/input/scroll_method.c | 30 ++++++++++++
sway/commands/input/tap.c | 29 +++++++++++
sway/config.c | 53 ++++++++++++++++++++
sway/meson.build | 12 +++++
17 files changed, 490 insertions(+), 26 deletions(-)
create mode 100644 sway/commands/input.c
create mode 100644 sway/commands/input/accel_profile.c
create mode 100644 sway/commands/input/click_method.c
create mode 100644 sway/commands/input/drag_lock.c
create mode 100644 sway/commands/input/dwt.c
create mode 100644 sway/commands/input/events.c
create mode 100644 sway/commands/input/left_handed.c
create mode 100644 sway/commands/input/middle_emulation.c
create mode 100644 sway/commands/input/natural_scroll.c
create mode 100644 sway/commands/input/pointer_accel.c
create mode 100644 sway/commands/input/scroll_method.c
create mode 100644 sway/commands/input/tap.c
(limited to 'sway/commands/input.c')
diff --git a/include/sway/commands.h b/include/sway/commands.h
index b1f0423d..138e3c29 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -1,6 +1,8 @@
#ifndef _SWAY_COMMANDS_H
#define _SWAY_COMMANDS_H
+#include "config.h"
+
/**
* Indicates the result of a command's execution.
*/
@@ -39,6 +41,8 @@ enum expected_args {
EXPECTED_EQUAL_TO
};
+void input_cmd_apply(struct input_config *input);
+
struct cmd_results *checkarg(int argc, const char *name,
enum expected_args type, int val);
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 9548c170..78bc161f 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -5,6 +5,8 @@
#include "sway/config.h"
#include "list.h"
+extern struct input_config *current_input_config;
+
struct sway_input_manager {
struct wl_listener input_add;
struct wl_listener input_remove;
diff --git a/sway/commands.c b/sway/commands.c
index 05a66a7f..7710c6ab 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -9,6 +9,7 @@
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/security.h"
+#include "sway/input/input-manager.h"
#include "stringop.h"
#include "log.h"
@@ -56,6 +57,44 @@ struct cmd_results *checkarg(int argc, const char *name, enum expected_args type
return error;
}
+void input_cmd_apply(struct input_config *input) {
+ int i;
+ i = list_seq_find(config->input_configs, input_identifier_cmp, input->identifier);
+ if (i >= 0) {
+ // merge existing config
+ struct input_config *ic = config->input_configs->items[i];
+ merge_input_config(ic, input);
+ free_input_config(input);
+ input = ic;
+ } else {
+ list_add(config->input_configs, input);
+ }
+
+ current_input_config = input;
+
+ if (input->identifier) {
+ // Try to find the input device and apply configuration now. If
+ // this is during startup then there will be no container and config
+ // will be applied during normal "new input" event from wlc.
+ /* TODO WLR
+ struct libinput_device *device = NULL;
+ for (int i = 0; i < input_devices->length; ++i) {
+ device = input_devices->items[i];
+ char* dev_identifier = libinput_dev_unique_id(device);
+ if (!dev_identifier) {
+ break;
+ }
+ int match = dev_identifier && strcmp(dev_identifier, input->identifier) == 0;
+ free(dev_identifier);
+ if (match) {
+ apply_input_config(input, device);
+ break;
+ }
+ }
+ */
+ }
+}
+
/**
* Check and add color to buffer.
*
@@ -96,6 +135,7 @@ static struct cmd_handler handlers[] = {
{ "exec_always", cmd_exec_always },
{ "exit", cmd_exit },
{ "include", cmd_include },
+ { "input", cmd_input },
};
static int handler_compare(const void *_a, const void *_b) {
@@ -104,37 +144,35 @@ static int handler_compare(const void *_a, const void *_b) {
return strcasecmp(a->command, b->command);
}
+static struct cmd_handler input_handlers[] = {
+ { "accel_profile", input_cmd_accel_profile },
+ { "click_method", input_cmd_click_method },
+ { "drag_lock", input_cmd_drag_lock },
+ { "dwt", input_cmd_dwt },
+ { "events", input_cmd_events },
+ { "left_handed", input_cmd_left_handed },
+ { "middle_emulation", input_cmd_middle_emulation },
+ { "natural_scroll", input_cmd_natural_scroll },
+ { "pointer_accel", input_cmd_pointer_accel },
+ { "scroll_method", input_cmd_scroll_method },
+ { "tap", input_cmd_tap },
+};
+
static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
struct cmd_handler d = { .command=line };
struct cmd_handler *res = NULL;
sway_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_INPUT);
- /* TODO
- if (block == CMD_BLOCK_BAR) {
- res = bsearch(&d, bar_handlers,
- sizeof(bar_handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
- } else if (block == CMD_BLOCK_BAR_COLORS){
- res = bsearch(&d, bar_colors_handlers,
- sizeof(bar_colors_handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
- } else if (block == CMD_BLOCK_INPUT) {
+
+ if (block == CMD_BLOCK_INPUT) {
res = bsearch(&d, input_handlers,
- sizeof(input_handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
- } else if (block == CMD_BLOCK_IPC) {
- res = bsearch(&d, ipc_handlers,
- sizeof(ipc_handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
- } else if (block == CMD_BLOCK_IPC_EVENTS) {
- res = bsearch(&d, ipc_event_handlers,
- sizeof(ipc_event_handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
+ sizeof(input_handlers) / sizeof(struct cmd_handler),
+ sizeof(struct cmd_handler), handler_compare);
} else {
- */
res = bsearch(&d, handlers,
- sizeof(handlers) / sizeof(struct cmd_handler),
- sizeof(struct cmd_handler), handler_compare);
- //}
+ sizeof(handlers) / sizeof(struct cmd_handler),
+ sizeof(struct cmd_handler), handler_compare);
+ }
+
return res;
}
@@ -238,8 +276,8 @@ struct cmd_results *config_command(char *exec, enum cmd_status block) {
argv[i] = do_var_replacement(argv[i]);
unescape_string(argv[i]);
}
- /* Strip quotes for first argument.
- * TODO This part needs to be handled much better */
+ // Strip quotes for first argument.
+ // TODO This part needs to be handled much better
if (argc>1 && (*argv[1] == '\"' || *argv[1] == '\'')) {
strip_quotes(argv[1]);
}
diff --git a/sway/commands/input.c b/sway/commands/input.c
new file mode 100644
index 00000000..5ca9c2e6
--- /dev/null
+++ b/sway/commands/input.c
@@ -0,0 +1,55 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+struct cmd_results *cmd_input(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 2))) {
+ return error;
+ }
+
+ if (config->reading && strcmp("{", argv[1]) == 0) {
+ current_input_config = new_input_config(argv[0]);
+ sway_log(L_DEBUG, "entering input block: %s", current_input_config->identifier);
+ return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
+ }
+
+ if (argc > 2) {
+ int argc_new = argc-2;
+ char **argv_new = argv+2;
+
+ struct cmd_results *res;
+ current_input_config = new_input_config(argv[0]);
+ if (strcasecmp("accel_profile", argv[1]) == 0) {
+ res = input_cmd_accel_profile(argc_new, argv_new);
+ } else if (strcasecmp("click_method", argv[1]) == 0) {
+ res = input_cmd_click_method(argc_new, argv_new);
+ } else if (strcasecmp("drag_lock", argv[1]) == 0) {
+ res = input_cmd_drag_lock(argc_new, argv_new);
+ } else if (strcasecmp("dwt", argv[1]) == 0) {
+ res = input_cmd_dwt(argc_new, argv_new);
+ } else if (strcasecmp("events", argv[1]) == 0) {
+ res = input_cmd_events(argc_new, argv_new);
+ } else if (strcasecmp("left_handed", argv[1]) == 0) {
+ res = input_cmd_left_handed(argc_new, argv_new);
+ } else if (strcasecmp("middle_emulation", argv[1]) == 0) {
+ res = input_cmd_middle_emulation(argc_new, argv_new);
+ } else if (strcasecmp("natural_scroll", argv[1]) == 0) {
+ res = input_cmd_natural_scroll(argc_new, argv_new);
+ } else if (strcasecmp("pointer_accel", argv[1]) == 0) {
+ res = input_cmd_pointer_accel(argc_new, argv_new);
+ } else if (strcasecmp("scroll_method", argv[1]) == 0) {
+ res = input_cmd_scroll_method(argc_new, argv_new);
+ } else if (strcasecmp("tap", argv[1]) == 0) {
+ res = input_cmd_tap(argc_new, argv_new);
+ } else {
+ res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
+ }
+ current_input_config = NULL;
+ return res;
+ }
+
+ return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
+}
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
new file mode 100644
index 00000000..13ded431
--- /dev/null
+++ b/sway/commands/input/accel_profile.c
@@ -0,0 +1,27 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "accel_profile", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "accel_profile", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "adaptive") == 0) {
+ new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
+ } else if (strcasecmp(argv[0], "flat") == 0) {
+ new_config->accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT;
+ } else {
+ return cmd_results_new(CMD_INVALID, "accel_profile",
+ "Expected 'accel_profile <adaptive|flat>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
new file mode 100644
index 00000000..40f075ce
--- /dev/null
+++ b/sway/commands/input/click_method.c
@@ -0,0 +1,30 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+struct cmd_results *input_cmd_click_method(int argc, char **argv) {
+ sway_log(L_DEBUG, "click_method for device: %d %s", current_input_config==NULL, current_input_config->identifier);
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "click_method", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "none") == 0) {
+ new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_NONE;
+ } else if (strcasecmp(argv[0], "button_areas") == 0) {
+ new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
+ } else if (strcasecmp(argv[0], "clickfinger") == 0) {
+ new_config->click_method = LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER;
+ } else {
+ return cmd_results_new(CMD_INVALID, "click_method", "Expected 'click_method <none|button_areas|clickfinger'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
new file mode 100644
index 00000000..11e7fbea
--- /dev/null
+++ b/sway/commands/input/drag_lock.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "drag_lock", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "drag_lock", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_ENABLED;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->drag_lock = LIBINPUT_CONFIG_DRAG_LOCK_DISABLED;
+ } else {
+ return cmd_results_new(CMD_INVALID, "drag_lock", "Expected 'drag_lock <enabled|disabled>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
new file mode 100644
index 00000000..f3cbf252
--- /dev/null
+++ b/sway/commands/input/dwt.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_dwt(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "dwt", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "dwt", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->dwt = LIBINPUT_CONFIG_DWT_ENABLED;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->dwt = LIBINPUT_CONFIG_DWT_DISABLED;
+ } else {
+ return cmd_results_new(CMD_INVALID, "dwt", "Expected 'dwt <enabled|disabled>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
new file mode 100644
index 00000000..4b2fdff5
--- /dev/null
+++ b/sway/commands/input/events.c
@@ -0,0 +1,30 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+struct cmd_results *input_cmd_events(int argc, char **argv) {
+ sway_log(L_DEBUG, "events for device: %s", current_input_config->identifier);
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "events", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+ } else if (strcasecmp(argv[0], "disabled_on_external_mouse") == 0) {
+ new_config->send_events = LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE;
+ } else {
+ return cmd_results_new(CMD_INVALID, "events", "Expected 'events <enabled|disabled|disabled_on_external_mouse>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
new file mode 100644
index 00000000..715df2a1
--- /dev/null
+++ b/sway/commands/input/left_handed.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "left_handed", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "left_handed", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->left_handed = 1;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->left_handed = 0;
+ } else {
+ return cmd_results_new(CMD_INVALID, "left_handed", "Expected 'left_handed <enabled|disabled>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
new file mode 100644
index 00000000..d31ce950
--- /dev/null
+++ b/sway/commands/input/middle_emulation.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "middle_emulation", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "middle_emulation", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_ENABLED;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->middle_emulation = LIBINPUT_CONFIG_MIDDLE_EMULATION_DISABLED;
+ } else {
+ return cmd_results_new(CMD_INVALID, "middle_emulation", "Expected 'middle_emulation <enabled|disabled>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
new file mode 100644
index 00000000..9d1dc506
--- /dev/null
+++ b/sway/commands/input/natural_scroll.c
@@ -0,0 +1,26 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "natural_scroll", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "natural_scoll", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->natural_scroll = 1;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->natural_scroll = 0;
+ } else {
+ return cmd_results_new(CMD_INVALID, "natural_scroll", "Expected 'natural_scroll <enabled|disabled>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
new file mode 100644
index 00000000..87fb5cff
--- /dev/null
+++ b/sway/commands/input/pointer_accel.c
@@ -0,0 +1,24 @@
+#include <stdlib.h>
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "pointer_accel", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "pointer_accel", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ float pointer_accel = atof(argv[0]);
+ if (pointer_accel < -1 || pointer_accel > 1) {
+ return cmd_results_new(CMD_INVALID, "pointer_accel", "Input out of range [-1, 1]");
+ }
+ new_config->pointer_accel = pointer_accel;
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
new file mode 100644
index 00000000..98873938
--- /dev/null
+++ b/sway/commands/input/scroll_method.c
@@ -0,0 +1,30 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+
+struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "scroll_method", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "scroll_method", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "none") == 0) {
+ new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+ } else if (strcasecmp(argv[0], "two_finger") == 0) {
+ new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+ } else if (strcasecmp(argv[0], "edge") == 0) {
+ new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_EDGE;
+ } else if (strcasecmp(argv[0], "on_button_down") == 0) {
+ new_config->scroll_method = LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
+ } else {
+ return cmd_results_new(CMD_INVALID, "scroll_method", "Expected 'scroll_method <none|two_finger|edge|on_button_down>'");
+ }
+
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
new file mode 100644
index 00000000..1109466f
--- /dev/null
+++ b/sway/commands/input/tap.c
@@ -0,0 +1,29 @@
+#include <string.h>
+#include <strings.h>
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "log.h"
+
+struct cmd_results *input_cmd_tap(int argc, char **argv) {
+ sway_log(L_DEBUG, "tap for device: %s", current_input_config->identifier);
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, "tap", "No input device defined.");
+ }
+ struct input_config *new_config = new_input_config(current_input_config->identifier);
+
+ if (strcasecmp(argv[0], "enabled") == 0) {
+ new_config->tap = LIBINPUT_CONFIG_TAP_ENABLED;
+ } else if (strcasecmp(argv[0], "disabled") == 0) {
+ new_config->tap = LIBINPUT_CONFIG_TAP_DISABLED;
+ } else {
+ return cmd_results_new(CMD_INVALID, "tap", "Expected 'tap <enabled|disabled>'");
+ }
+
+ sway_log(L_DEBUG, "apply-tap for device: %s", current_input_config->identifier);
+ input_cmd_apply(new_config);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config.c b/sway/config.c
index 61131845..ec8e89b4 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -226,6 +226,59 @@ static int qstrcmp(const void* a, const void* b) {
return strcmp(*((char**) a), *((char**) b));
}
+void merge_input_config(struct input_config *dst, struct input_config *src) {
+ if (src->identifier) {
+ if (dst->identifier) {
+ free(dst->identifier);
+ }
+ dst->identifier = strdup(src->identifier);
+ }
+ if (src->accel_profile != INT_MIN) {
+ dst->accel_profile = src->accel_profile;
+ }
+ if (src->click_method != INT_MIN) {
+ dst->click_method = src->click_method;
+ }
+ if (src->drag_lock != INT_MIN) {
+ dst->drag_lock = src->drag_lock;
+ }
+ if (src->dwt != INT_MIN) {
+ dst->dwt = src->dwt;
+ }
+ if (src->middle_emulation != INT_MIN) {
+ dst->middle_emulation = src->middle_emulation;
+ }
+ if (src->natural_scroll != INT_MIN) {
+ dst->natural_scroll = src->natural_scroll;
+ }
+ if (src->pointer_accel != FLT_MIN) {
+ dst->pointer_accel = src->pointer_accel;
+ }
+ if (src->scroll_method != INT_MIN) {
+ dst->scroll_method = src->scroll_method;
+ }
+ if (src->send_events != INT_MIN) {
+ dst->send_events = src->send_events;
+ }
+ if (src->tap != INT_MIN) {
+ dst->tap = src->tap;
+ }
+}
+
+void free_input_config(struct input_config *ic) {
+ if (!ic) {
+ return;
+ }
+ free(ic->identifier);
+ free(ic);
+}
+
+int input_identifier_cmp(const void *item, const void *data) {
+ const struct input_config *ic = item;
+ const char *identifier = data;
+ return strcmp(ic->identifier, identifier);
+}
+
bool load_main_config(const char *file, bool is_active) {
char *path;
if (file != NULL) {
diff --git a/sway/meson.build b/sway/meson.build
index 79201f3a..aa3dd2a7 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -10,6 +10,18 @@ sway_sources = files(
'commands/exec.c',
'commands/exec_always.c',
'commands/include.c',
+ 'commands/input.c',
+ 'commands/input/accel_profile.c',
+ 'commands/input/click_method.c',
+ 'commands/input/drag_lock.c',
+ 'commands/input/dwt.c',
+ 'commands/input/events.c',
+ 'commands/input/left_handed.c',
+ 'commands/input/middle_emulation.c',
+ 'commands/input/natural_scroll.c',
+ 'commands/input/pointer_accel.c',
+ 'commands/input/scroll_method.c',
+ 'commands/input/tap.c',
'config.c',
'ipc-json.c',
'ipc-server.c',
--
cgit v1.2.3
From c41801b75e612b8bfb0e9e386a190b59141f7857 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 16 Dec 2017 20:06:58 -0500
Subject: set keyboard config at runtime
---
sway/commands/input.c | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'sway/commands/input.c')
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 5ca9c2e6..dac028a7 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -44,6 +44,16 @@ struct cmd_results *cmd_input(int argc, char **argv) {
res = input_cmd_scroll_method(argc_new, argv_new);
} else if (strcasecmp("tap", argv[1]) == 0) {
res = input_cmd_tap(argc_new, argv_new);
+ } else if (strcasecmp("xkb_layout", argv[1]) == 0) {
+ res = input_cmd_xkb_layout(argc_new, argv_new);
+ } else if (strcasecmp("xkb_model", argv[1]) == 0) {
+ res = input_cmd_xkb_model(argc_new, argv_new);
+ } else if (strcasecmp("xkb_options", argv[1]) == 0) {
+ res = input_cmd_xkb_options(argc_new, argv_new);
+ } else if (strcasecmp("xkb_rules", argv[1]) == 0) {
+ res = input_cmd_xkb_rules(argc_new, argv_new);
+ } else if (strcasecmp("xkb_variant", argv[1]) == 0) {
+ res = input_cmd_xkb_variant(argc_new, argv_new);
} else {
res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
}
--
cgit v1.2.3
From 5c036a3eac89e3dec71484fe9c22704b120254b1 Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Tue, 19 Dec 2017 05:26:55 -0500
Subject: error on not enough input/seat args for cmd
---
sway/commands/input.c | 88 +++++++++++++++++++++++++--------------------------
sway/commands/seat.c | 32 +++++++++----------
2 files changed, 60 insertions(+), 60 deletions(-)
(limited to 'sway/commands/input.c')
diff --git a/sway/commands/input.c b/sway/commands/input.c
index dac028a7..ccb1d276 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -16,50 +16,50 @@ struct cmd_results *cmd_input(int argc, char **argv) {
return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
}
- if (argc > 2) {
- int argc_new = argc-2;
- char **argv_new = argv+2;
-
- struct cmd_results *res;
- current_input_config = new_input_config(argv[0]);
- if (strcasecmp("accel_profile", argv[1]) == 0) {
- res = input_cmd_accel_profile(argc_new, argv_new);
- } else if (strcasecmp("click_method", argv[1]) == 0) {
- res = input_cmd_click_method(argc_new, argv_new);
- } else if (strcasecmp("drag_lock", argv[1]) == 0) {
- res = input_cmd_drag_lock(argc_new, argv_new);
- } else if (strcasecmp("dwt", argv[1]) == 0) {
- res = input_cmd_dwt(argc_new, argv_new);
- } else if (strcasecmp("events", argv[1]) == 0) {
- res = input_cmd_events(argc_new, argv_new);
- } else if (strcasecmp("left_handed", argv[1]) == 0) {
- res = input_cmd_left_handed(argc_new, argv_new);
- } else if (strcasecmp("middle_emulation", argv[1]) == 0) {
- res = input_cmd_middle_emulation(argc_new, argv_new);
- } else if (strcasecmp("natural_scroll", argv[1]) == 0) {
- res = input_cmd_natural_scroll(argc_new, argv_new);
- } else if (strcasecmp("pointer_accel", argv[1]) == 0) {
- res = input_cmd_pointer_accel(argc_new, argv_new);
- } else if (strcasecmp("scroll_method", argv[1]) == 0) {
- res = input_cmd_scroll_method(argc_new, argv_new);
- } else if (strcasecmp("tap", argv[1]) == 0) {
- res = input_cmd_tap(argc_new, argv_new);
- } else if (strcasecmp("xkb_layout", argv[1]) == 0) {
- res = input_cmd_xkb_layout(argc_new, argv_new);
- } else if (strcasecmp("xkb_model", argv[1]) == 0) {
- res = input_cmd_xkb_model(argc_new, argv_new);
- } else if (strcasecmp("xkb_options", argv[1]) == 0) {
- res = input_cmd_xkb_options(argc_new, argv_new);
- } else if (strcasecmp("xkb_rules", argv[1]) == 0) {
- res = input_cmd_xkb_rules(argc_new, argv_new);
- } else if (strcasecmp("xkb_variant", argv[1]) == 0) {
- res = input_cmd_xkb_variant(argc_new, argv_new);
- } else {
- res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
- }
- current_input_config = NULL;
- return res;
+ if ((error = checkarg(argc, "input", EXPECTED_AT_LEAST, 3))) {
+ return error;
}
- return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
+ int argc_new = argc-2;
+ char **argv_new = argv+2;
+
+ struct cmd_results *res;
+ current_input_config = new_input_config(argv[0]);
+ if (strcasecmp("accel_profile", argv[1]) == 0) {
+ res = input_cmd_accel_profile(argc_new, argv_new);
+ } else if (strcasecmp("click_method", argv[1]) == 0) {
+ res = input_cmd_click_method(argc_new, argv_new);
+ } else if (strcasecmp("drag_lock", argv[1]) == 0) {
+ res = input_cmd_drag_lock(argc_new, argv_new);
+ } else if (strcasecmp("dwt", argv[1]) == 0) {
+ res = input_cmd_dwt(argc_new, argv_new);
+ } else if (strcasecmp("events", argv[1]) == 0) {
+ res = input_cmd_events(argc_new, argv_new);
+ } else if (strcasecmp("left_handed", argv[1]) == 0) {
+ res = input_cmd_left_handed(argc_new, argv_new);
+ } else if (strcasecmp("middle_emulation", argv[1]) == 0) {
+ res = input_cmd_middle_emulation(argc_new, argv_new);
+ } else if (strcasecmp("natural_scroll", argv[1]) == 0) {
+ res = input_cmd_natural_scroll(argc_new, argv_new);
+ } else if (strcasecmp("pointer_accel", argv[1]) == 0) {
+ res = input_cmd_pointer_accel(argc_new, argv_new);
+ } else if (strcasecmp("scroll_method", argv[1]) == 0) {
+ res = input_cmd_scroll_method(argc_new, argv_new);
+ } else if (strcasecmp("tap", argv[1]) == 0) {
+ res = input_cmd_tap(argc_new, argv_new);
+ } else if (strcasecmp("xkb_layout", argv[1]) == 0) {
+ res = input_cmd_xkb_layout(argc_new, argv_new);
+ } else if (strcasecmp("xkb_model", argv[1]) == 0) {
+ res = input_cmd_xkb_model(argc_new, argv_new);
+ } else if (strcasecmp("xkb_options", argv[1]) == 0) {
+ res = input_cmd_xkb_options(argc_new, argv_new);
+ } else if (strcasecmp("xkb_rules", argv[1]) == 0) {
+ res = input_cmd_xkb_rules(argc_new, argv_new);
+ } else if (strcasecmp("xkb_variant", argv[1]) == 0) {
+ res = input_cmd_xkb_variant(argc_new, argv_new);
+ } else {
+ res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
+ }
+ current_input_config = NULL;
+ return res;
}
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 0149762a..155bc510 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -16,22 +16,22 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL);
}
- if (argc > 2) {
- int argc_new = argc-2;
- char **argv_new = argv+2;
-
- struct cmd_results *res;
- current_seat_config = new_seat_config(argv[0]);
- if (strcasecmp("attach", argv[1]) == 0) {
- res = seat_cmd_attach(argc_new, argv_new);
- } else if (strcasecmp("fallback", argv[1]) == 0) {
- res = seat_cmd_fallback(argc_new, argv_new);
- } else {
- res = cmd_results_new(CMD_INVALID, "seat <name>", "Unknown command %s", argv[1]);
- }
- current_seat_config = NULL;
- return res;
+ if ((error = checkarg(argc, "seat", EXPECTED_AT_LEAST, 3))) {
+ return error;
}
- return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL);
+ int argc_new = argc-2;
+ char **argv_new = argv+2;
+
+ struct cmd_results *res;
+ current_seat_config = new_seat_config(argv[0]);
+ if (strcasecmp("attach", argv[1]) == 0) {
+ res = seat_cmd_attach(argc_new, argv_new);
+ } else if (strcasecmp("fallback", argv[1]) == 0) {
+ res = seat_cmd_fallback(argc_new, argv_new);
+ } else {
+ res = cmd_results_new(CMD_INVALID, "seat <name>", "Unknown command %s", argv[1]);
+ }
+ current_seat_config = NULL;
+ return res;
}
--
cgit v1.2.3
From 28b8ea9f1ee57672f39e42521f6ed2aece0d3b2e Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Fri, 29 Dec 2017 11:28:10 +0100
Subject: cmd_input: cleanup around current_input_config
- Restore old one if we weren't part of a block (should be NULL anyway)
- Check current_input_config got properly allocated
- free temporary current_input_config when done using it
---
sway/commands/input.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'sway/commands/input.c')
diff --git a/sway/commands/input.c b/sway/commands/input.c
index ccb1d276..edf45e4c 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -24,7 +24,11 @@ struct cmd_results *cmd_input(int argc, char **argv) {
char **argv_new = argv+2;
struct cmd_results *res;
+ struct input_config *old_input_config = current_input_config;
current_input_config = new_input_config(argv[0]);
+ if (!current_input_config) {
+ return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
+ }
if (strcasecmp("accel_profile", argv[1]) == 0) {
res = input_cmd_accel_profile(argc_new, argv_new);
} else if (strcasecmp("click_method", argv[1]) == 0) {
@@ -60,6 +64,7 @@ struct cmd_results *cmd_input(int argc, char **argv) {
} else {
res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
}
- current_input_config = NULL;
+ free_input_config(current_input_config);
+ current_input_config = old_input_config;
return res;
}
--
cgit v1.2.3
From 67985e903188a464e602d04f9ed218bd397f5ab1 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Fri, 5 Jan 2018 22:32:51 +0100
Subject: sway: change all sway_log to wlr_log
---
common/ipc-client.c | 2 +-
common/readline.c | 4 +--
common/util.c | 2 +-
include/log.h | 25 +--------------
sway/commands.c | 12 +++----
sway/commands/bind.c | 8 ++---
sway/commands/exec.c | 2 +-
sway/commands/exec_always.c | 8 ++---
sway/commands/input.c | 2 +-
sway/commands/input/click_method.c | 2 +-
sway/commands/input/events.c | 2 +-
sway/commands/input/tap.c | 4 +--
sway/commands/input/xkb_layout.c | 4 +--
sway/commands/input/xkb_model.c | 4 +--
sway/commands/input/xkb_options.c | 4 +--
sway/commands/input/xkb_rules.c | 4 +--
sway/commands/input/xkb_variant.c | 4 +--
sway/commands/output.c | 8 ++---
sway/commands/seat.c | 2 +-
sway/commands/set.c | 2 +-
sway/config.c | 66 +++++++++++++++++++-------------------
sway/config/input.c | 6 ++--
sway/config/output.c | 16 ++++-----
sway/config/seat.c | 6 ++--
sway/desktop/output.c | 4 +--
sway/desktop/wl_shell.c | 2 +-
sway/desktop/xdg_shell_v6.c | 2 +-
sway/desktop/xwayland.c | 2 +-
sway/input/cursor.c | 12 +++----
sway/input/input-manager.c | 36 ++++++++++-----------
sway/input/keyboard.c | 6 ++--
sway/input/seat.c | 8 ++---
sway/ipc-server.c | 50 ++++++++++++++---------------
sway/tree/container.c | 14 ++++----
sway/tree/layout.c | 20 ++++++------
sway/tree/workspace.c | 2 +-
36 files changed, 167 insertions(+), 190 deletions(-)
(limited to 'sway/commands/input.c')
diff --git a/common/ipc-client.c b/common/ipc-client.c
index 1ab6627b..582c5e86 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -79,7 +79,7 @@ struct ipc_response *ipc_recv_response(int socketfd) {
error_2:
free(response);
error_1:
- sway_log(L_ERROR, "Unable to allocate memory for IPC response");
+ wlr_log(L_ERROR, "Unable to allocate memory for IPC response");
return NULL;
}
diff --git a/common/readline.c b/common/readline.c
index cc40a2cc..ed5801de 100644
--- a/common/readline.c
+++ b/common/readline.c
@@ -8,7 +8,7 @@ char *read_line(FILE *file) {
char *string = malloc(size);
char lastChar = '\0';
if (!string) {
- sway_log(L_ERROR, "Unable to allocate memory for read_line");
+ wlr_log(L_ERROR, "Unable to allocate memory for read_line");
return NULL;
}
while (1) {
@@ -29,7 +29,7 @@ char *read_line(FILE *file) {
char *new_string = realloc(string, size *= 2);
if (!new_string) {
free(string);
- sway_log(L_ERROR, "Unable to allocate memory for read_line");
+ wlr_log(L_ERROR, "Unable to allocate memory for read_line");
return NULL;
}
string = new_string;
diff --git a/common/util.c b/common/util.c
index 83981160..fb7f9454 100644
--- a/common/util.c
+++ b/common/util.c
@@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) {
int len = strlen(color);
if (len != 6 && len != 8) {
- sway_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color);
+ wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color);
return 0xFFFFFFFF;
}
uint32_t res = (uint32_t)strtoul(color, NULL, 16);
diff --git a/include/log.h b/include/log.h
index a1e33fa2..646776f5 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,22 +1,7 @@
#ifndef _SWAY_LOG_H
#define _SWAY_LOG_H
#include <stdbool.h>
-
-typedef enum {
- L_SILENT = 0,
- L_ERROR = 1,
- L_INFO = 2,
- L_DEBUG = 3,
-} log_importance_t;
-
-void init_log(log_importance_t verbosity);
-void set_log_level(log_importance_t verbosity);
-log_importance_t get_log_level(void);
-void reset_log_level(void);
-// returns whether debug logging is on after switching.
-bool toggle_debug_logging(void);
-void sway_log_colors(int mode);
-void sway_log_errno(log_importance_t verbosity, char* format, ...) __attribute__((format(printf,2,3)));
+#include <wlr/util/log.h>
void _sway_abort(const char *filename, int line, const char* format, ...) __attribute__((format(printf,3,4)));
#define sway_abort(FMT, ...) \
@@ -26,14 +11,6 @@ bool _sway_assert(bool condition, const char *filename, int line, const char* fo
#define sway_assert(COND, FMT, ...) \
_sway_assert(COND, __FILE__, __LINE__, "%s:" FMT, __PRETTY_FUNCTION__, ##__VA_ARGS__)
-void _sway_log(const char *filename, int line, log_importance_t verbosity, const char* format, ...) __attribute__((format(printf,4,5)));
-
-#define sway_log(VERBOSITY, FMT, ...) \
- _sway_log(__FILE__, __LINE__, VERBOSITY, FMT, ##__VA_ARGS__)
-
-#define sway_vlog(VERBOSITY, FMT, VA_ARGS) \
- _sway_vlog(__FILE__, __LINE__, VERBOSITY, FMT, VA_ARGS)
-
void error_handler(int sig);
#endif
diff --git a/sway/commands.c b/sway/commands.c
index f01329db..1005cf68 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -176,7 +176,7 @@ static struct cmd_handler seat_handlers[] = {
static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
struct cmd_handler d = { .command=line };
struct cmd_handler *res = NULL;
- sway_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_SEAT);
+ wlr_log(L_DEBUG, "find_handler(%s) %d", line, block == CMD_BLOCK_SEAT);
if (block == CMD_BLOCK_INPUT) {
res = bsearch(&d, input_handlers,
@@ -215,10 +215,10 @@ struct cmd_results *handle_command(char *_exec) {
cmd = argsep(&cmdlist, ",");
cmd += strspn(cmd, whitespace);
if (strcmp(cmd, "") == 0) {
- sway_log(L_INFO, "Ignoring empty command.");
+ wlr_log(L_INFO, "Ignoring empty command.");
continue;
}
- sway_log(L_INFO, "Handling command '%s'", cmd);
+ wlr_log(L_INFO, "Handling command '%s'", cmd);
//TODO better handling of argv
int argc;
char **argv = split_args(cmd, &argc);
@@ -276,7 +276,7 @@ struct cmd_results *config_command(char *exec, enum cmd_status block) {
goto cleanup;
}
- sway_log(L_INFO, "handling config command '%s'", exec);
+ wlr_log(L_INFO, "handling config command '%s'", exec);
// Endblock
if (**argv == '}') {
results = cmd_results_new(CMD_BLOCK_END, NULL, NULL);
@@ -380,7 +380,7 @@ struct cmd_results *config_commands_command(char *exec) {
}
policy->context = context;
- sway_log(L_INFO, "Set command policy for %s to %d",
+ wlr_log(L_INFO, "Set command policy for %s to %d",
policy->command, policy->context);
results = cmd_results_new(CMD_SUCCESS, NULL, NULL);
@@ -394,7 +394,7 @@ struct cmd_results *cmd_results_new(enum cmd_status status,
const char *input, const char *format, ...) {
struct cmd_results *results = malloc(sizeof(struct cmd_results));
if (!results) {
- sway_log(L_ERROR, "Unable to allocate command results");
+ wlr_log(L_ERROR, "Unable to allocate command results");
return NULL;
}
results->status = status;
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 79121404..cbabb07b 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -145,7 +145,7 @@ struct cmd_results *cmd_bindsym(int argc, char **argv) {
for (int i = 0; i < mode_bindings->length; ++i) {
struct sway_binding *config_binding = mode_bindings->items[i];
if (binding_key_compare(binding, config_binding)) {
- sway_log(L_DEBUG, "overwriting old binding with command '%s'",
+ wlr_log(L_DEBUG, "overwriting old binding with command '%s'",
config_binding->command);
free_sway_binding(config_binding);
mode_bindings->items[i] = binding;
@@ -157,7 +157,7 @@ struct cmd_results *cmd_bindsym(int argc, char **argv) {
list_add(mode_bindings, binding);
}
- sway_log(L_DEBUG, "bindsym - Bound %s to command %s",
+ wlr_log(L_DEBUG, "bindsym - Bound %s to command %s",
argv[0], binding->command);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
@@ -227,7 +227,7 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) {
for (int i = 0; i < mode_bindings->length; ++i) {
struct sway_binding *config_binding = mode_bindings->items[i];
if (binding_key_compare(binding, config_binding)) {
- sway_log(L_DEBUG, "overwriting old binding with command '%s'",
+ wlr_log(L_DEBUG, "overwriting old binding with command '%s'",
config_binding->command);
free_sway_binding(config_binding);
mode_bindings->items[i] = binding;
@@ -239,7 +239,7 @@ struct cmd_results *cmd_bindcode(int argc, char **argv) {
list_add(mode_bindings, binding);
}
- sway_log(L_DEBUG, "bindcode - Bound %s to command %s",
+ wlr_log(L_DEBUG, "bindcode - Bound %s to command %s",
argv[0], binding->command);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
diff --git a/sway/commands/exec.c b/sway/commands/exec.c
index fbbc4941..363d5bef 100644
--- a/sway/commands/exec.c
+++ b/sway/commands/exec.c
@@ -8,7 +8,7 @@ struct cmd_results *cmd_exec(int argc, char **argv) {
if (!config->active) return cmd_results_new(CMD_DEFER, "exec", NULL);
if (config->reloading) {
char *args = join_args(argv, argc);
- sway_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args);
+ wlr_log(L_DEBUG, "Ignoring 'exec %s' due to reload", args);
free(args);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}
diff --git a/sway/commands/exec_always.c b/sway/commands/exec_always.c
index 9527a487..61870c51 100644
--- a/sway/commands/exec_always.c
+++ b/sway/commands/exec_always.c
@@ -20,7 +20,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
char *tmp = NULL;
if (strcmp((char*)*argv, "--no-startup-id") == 0) {
- sway_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
+ wlr_log(L_INFO, "exec switch '--no-startup-id' not supported, ignored.");
if ((error = checkarg(argc - 1, "exec_always", EXPECTED_MORE_THAN, 0))) {
return error;
}
@@ -35,11 +35,11 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
strncpy(cmd, tmp, sizeof(cmd));
cmd[sizeof(cmd) - 1] = 0;
free(tmp);
- sway_log(L_DEBUG, "Executing %s", cmd);
+ wlr_log(L_DEBUG, "Executing %s", cmd);
int fd[2];
if (pipe(fd) != 0) {
- sway_log(L_ERROR, "Unable to create pipe for fork");
+ wlr_log(L_ERROR, "Unable to create pipe for fork");
}
pid_t pid;
@@ -75,7 +75,7 @@ struct cmd_results *cmd_exec_always(int argc, char **argv) {
// cleanup child process
wait(0);
if (*child > 0) {
- sway_log(L_DEBUG, "Child process created with pid %d", *child);
+ wlr_log(L_DEBUG, "Child process created with pid %d", *child);
// TODO: add PID to active workspace
} else {
free(child);
diff --git a/sway/commands/input.c b/sway/commands/input.c
index edf45e4c..5ea39f62 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -12,7 +12,7 @@ struct cmd_results *cmd_input(int argc, char **argv) {
if (config->reading && strcmp("{", argv[1]) == 0) {
current_input_config = new_input_config(argv[0]);
- sway_log(L_DEBUG, "entering input block: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "entering input block: %s", current_input_config->identifier);
return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
}
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index dcf64c1a..22eb15f7 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -6,7 +6,7 @@
#include "log.h"
struct cmd_results *input_cmd_click_method(int argc, char **argv) {
- sway_log(L_DEBUG, "click_method for device: %d %s",
+ wlr_log(L_DEBUG, "click_method for device: %d %s",
current_input_config==NULL, current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index 8a74c11e..a1bfbacd 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -6,7 +6,7 @@
#include "log.h"
struct cmd_results *input_cmd_events(int argc, char **argv) {
- sway_log(L_DEBUG, "events for device: %s",
+ wlr_log(L_DEBUG, "events for device: %s",
current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) {
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index 8547c0cd..ecab9a5b 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -6,7 +6,7 @@
#include "log.h"
struct cmd_results *input_cmd_tap(int argc, char **argv) {
- sway_log(L_DEBUG, "tap for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "tap for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) {
return error;
@@ -26,7 +26,7 @@ struct cmd_results *input_cmd_tap(int argc, char **argv) {
"Expected 'tap <enabled|disabled>'");
}
- sway_log(L_DEBUG, "apply-tap for device: %s",
+ wlr_log(L_DEBUG, "apply-tap for device: %s",
current_input_config->identifier);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index a25d3850..25db1a33 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -5,7 +5,7 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
- sway_log(L_DEBUG, "xkb layout for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "xkb layout for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) {
return error;
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
new_config->xkb_layout = strdup(argv[0]);
- sway_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s",
+ wlr_log(L_DEBUG, "apply-xkb_layout for device: %s layout: %s",
current_input_config->identifier, new_config->xkb_layout);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index 9729e869..819b796b 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -5,7 +5,7 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
- sway_log(L_DEBUG, "xkb model for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "xkb model for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_model", EXPECTED_EQUAL_TO, 1))) {
return error;
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
new_config->xkb_model = strdup(argv[0]);
- sway_log(L_DEBUG, "apply-xkb_model for device: %s model: %s",
+ wlr_log(L_DEBUG, "apply-xkb_model for device: %s model: %s",
current_input_config->identifier, new_config->xkb_model);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index 504849cc..ff5f83ec 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -5,7 +5,7 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
- sway_log(L_DEBUG, "xkb options for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "xkb options for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_options", EXPECTED_EQUAL_TO, 1))) {
return error;
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
new_config->xkb_options = strdup(argv[0]);
- sway_log(L_DEBUG, "apply-xkb_options for device: %s options: %s",
+ wlr_log(L_DEBUG, "apply-xkb_options for device: %s options: %s",
current_input_config->identifier, new_config->xkb_options);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index db7d8abe..aafe0003 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -5,7 +5,7 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
- sway_log(L_DEBUG, "xkb rules for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "xkb rules for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_rules", EXPECTED_EQUAL_TO, 1))) {
return error;
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
new_config->xkb_rules = strdup(argv[0]);
- sway_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s",
+ wlr_log(L_DEBUG, "apply-xkb_rules for device: %s rules: %s",
current_input_config->identifier, new_config->xkb_rules);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index 855e6abc..89a61fdc 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -5,7 +5,7 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
- sway_log(L_DEBUG, "xkb variant for device: %s", current_input_config->identifier);
+ wlr_log(L_DEBUG, "xkb variant for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_variant", EXPECTED_EQUAL_TO, 1))) {
return error;
@@ -18,7 +18,7 @@ struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
new_config->xkb_variant = strdup(argv[0]);
- sway_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s",
+ wlr_log(L_DEBUG, "apply-xkb_variant for device: %s variant: %s",
current_input_config->identifier, new_config->xkb_variant);
apply_input_config(new_config);
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
diff --git a/sway/commands/output.c b/sway/commands/output.c
index 8c0fa63c..e747eb4e 100644
--- a/sway/commands/output.c
+++ b/sway/commands/output.c
@@ -203,12 +203,12 @@ static struct cmd_results *cmd_output_background(struct output_config *output,
if (src) {
sprintf(src, "%s/%s", conf_path, p.we_wordv[0]);
} else {
- sway_log(L_ERROR,
+ wlr_log(L_ERROR,
"Unable to allocate background source");
}
free(conf);
} else {
- sway_log(L_ERROR, "Unable to allocate background source");
+ wlr_log(L_ERROR, "Unable to allocate background source");
}
}
if (!src || access(src, F_OK) == -1) {
@@ -238,7 +238,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
struct output_config *output = new_output_config(argv[0]);
if (!output) {
- sway_log(L_ERROR, "Failed to allocate output config");
+ wlr_log(L_ERROR, "Failed to allocate output config");
return NULL;
}
@@ -284,7 +284,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
list_add(config->output_configs, output);
}
- sway_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
+ wlr_log(L_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
"position %d,%d scale %f transform %d) (bg %s %s)",
output->name, output->enabled, output->width, output->height,
output->refresh_rate, output->x, output->y, output->scale,
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 155bc510..6284002b 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -12,7 +12,7 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
if (config->reading && strcmp("{", argv[1]) == 0) {
current_seat_config = new_seat_config(argv[0]);
- sway_log(L_DEBUG, "entering seat block: %s", current_seat_config->name);
+ wlr_log(L_DEBUG, "entering seat block: %s", current_seat_config->name);
return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL);
}
diff --git a/sway/commands/set.c b/sway/commands/set.c
index dcd928ba..856c73e7 100644
--- a/sway/commands/set.c
+++ b/sway/commands/set.c
@@ -33,7 +33,7 @@ struct cmd_results *cmd_set(int argc, char **argv) {
}
if (argv[0][0] != '$') {
- sway_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
+ wlr_log(L_INFO, "Warning: variable '%s' doesn't start with $", argv[0]);
size_t size = snprintf(NULL, 0, "$%s", argv[0]);
tmp = malloc(size + 1);
diff --git a/sway/config.c b/sway/config.c
index e0a93e19..5ec45b17 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -232,12 +232,12 @@ static char *get_config_path(void) {
char *home = getenv("HOME");
char *config_home = malloc(strlen(home) + strlen("/.config") + 1);
if (!config_home) {
- sway_log(L_ERROR, "Unable to allocate $HOME/.config");
+ wlr_log(L_ERROR, "Unable to allocate $HOME/.config");
} else {
strcpy(config_home, home);
strcat(config_home, "/.config");
setenv("XDG_CONFIG_HOME", config_home, 1);
- sway_log(L_DEBUG, "Set XDG_CONFIG_HOME to %s", config_home);
+ wlr_log(L_DEBUG, "Set XDG_CONFIG_HOME to %s", config_home);
free(config_home);
}
}
@@ -263,7 +263,7 @@ static char *get_config_path(void) {
const char *current_config_path;
static bool load_config(const char *path, struct sway_config *config) {
- sway_log(L_INFO, "Loading config from %s", path);
+ wlr_log(L_INFO, "Loading config from %s", path);
current_config_path = path;
struct stat sb;
@@ -272,13 +272,13 @@ static bool load_config(const char *path, struct sway_config *config) {
}
if (path == NULL) {
- sway_log(L_ERROR, "Unable to find a config file!");
+ wlr_log(L_ERROR, "Unable to find a config file!");
return false;
}
FILE *f = fopen(path, "r");
if (!f) {
- sway_log(L_ERROR, "Unable to open %s for reading", path);
+ wlr_log(L_ERROR, "Unable to open %s for reading", path);
return false;
}
@@ -286,7 +286,7 @@ static bool load_config(const char *path, struct sway_config *config) {
fclose(f);
if (!config_load_success) {
- sway_log(L_ERROR, "Error(s) loading config!");
+ wlr_log(L_ERROR, "Error(s) loading config!");
}
current_config_path = NULL;
@@ -313,7 +313,7 @@ bool load_main_config(const char *file, bool is_active) {
config_defaults(config);
if (is_active) {
- sway_log(L_DEBUG, "Performing configuration file reload");
+ wlr_log(L_DEBUG, "Performing configuration file reload");
config->reloading = true;
config->active = true;
}
@@ -327,7 +327,7 @@ bool load_main_config(const char *file, bool is_active) {
bool success = true;
DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
if (!dir) {
- sway_log(L_ERROR,
+ wlr_log(L_ERROR,
"%s does not exist, sway will have no security configuration"
" and will probably be broken", SYSCONFDIR "/sway/security.d");
} else {
@@ -356,7 +356,7 @@ bool load_main_config(const char *file, bool is_active) {
if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 ||
(((s.st_mode & 0777) != 0644) &&
(s.st_mode & 0777) != 0444)) {
- sway_log(L_ERROR,
+ wlr_log(L_ERROR,
"Refusing to load %s - it must be owned by root "
"and mode 644 or 444", _path);
success = false;
@@ -398,7 +398,7 @@ static bool load_include_config(const char *path, const char *parent_dir,
len = len + strlen(parent_dir) + 2;
full_path = malloc(len * sizeof(char));
if (!full_path) {
- sway_log(L_ERROR,
+ wlr_log(L_ERROR,
"Unable to allocate full path to included config");
return false;
}
@@ -409,7 +409,7 @@ static bool load_include_config(const char *path, const char *parent_dir,
free(full_path);
if (real_path == NULL) {
- sway_log(L_DEBUG, "%s not found.", path);
+ wlr_log(L_DEBUG, "%s not found.", path);
return false;
}
@@ -418,7 +418,7 @@ static bool load_include_config(const char *path, const char *parent_dir,
for (j = 0; j < config->config_chain->length; ++j) {
char *old_path = config->config_chain->items[j];
if (strcmp(real_path, old_path) == 0) {
- sway_log(L_DEBUG,
+ wlr_log(L_DEBUG,
"%s already included once, won't be included again.",
real_path);
free(real_path);
@@ -472,7 +472,7 @@ bool load_include_configs(const char *path, struct sway_config *config) {
// restore wd
if (chdir(wd) < 0) {
free(wd);
- sway_log(L_ERROR, "failed to restore working directory");
+ wlr_log(L_ERROR, "failed to restore working directory");
return false;
}
@@ -508,13 +508,13 @@ bool read_config(FILE *file, struct sway_config *config) {
switch(res->status) {
case CMD_FAILURE:
case CMD_INVALID:
- sway_log(L_ERROR, "Error on line %i '%s': %s (%s)", line_number,
+ wlr_log(L_ERROR, "Error on line %i '%s': %s (%s)", line_number,
line, res->error, config->current_config);
success = false;
break;
case CMD_DEFER:
- sway_log(L_DEBUG, "Deferring command `%s'", line);
+ wlr_log(L_DEBUG, "Deferring command `%s'", line);
list_add(config->cmd_queue, strdup(line));
break;
@@ -522,7 +522,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_MODE;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -530,7 +530,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_INPUT;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -538,7 +538,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_SEAT;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -546,7 +546,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_BAR;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -554,7 +554,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_BAR) {
block = CMD_BLOCK_BAR_COLORS;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -562,7 +562,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_COMMANDS;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -570,7 +570,7 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_END) {
block = CMD_BLOCK_IPC;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
@@ -578,59 +578,59 @@ bool read_config(FILE *file, struct sway_config *config) {
if (block == CMD_BLOCK_IPC) {
block = CMD_BLOCK_IPC_EVENTS;
} else {
- sway_log(L_ERROR, "Invalid block '%s'", line);
+ wlr_log(L_ERROR, "Invalid block '%s'", line);
}
break;
case CMD_BLOCK_END:
switch(block) {
case CMD_BLOCK_MODE:
- sway_log(L_DEBUG, "End of mode block");
+ wlr_log(L_DEBUG, "End of mode block");
config->current_mode = config->modes->items[0];
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_INPUT:
- sway_log(L_DEBUG, "End of input block");
+ wlr_log(L_DEBUG, "End of input block");
free_input_config(current_input_config);
current_input_config = NULL;
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_SEAT:
- sway_log(L_DEBUG, "End of seat block");
+ wlr_log(L_DEBUG, "End of seat block");
current_seat_config = NULL;
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_BAR:
- sway_log(L_DEBUG, "End of bar block");
+ wlr_log(L_DEBUG, "End of bar block");
config->current_bar = NULL;
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_BAR_COLORS:
- sway_log(L_DEBUG, "End of bar colors block");
+ wlr_log(L_DEBUG, "End of bar colors block");
block = CMD_BLOCK_BAR;
break;
case CMD_BLOCK_COMMANDS:
- sway_log(L_DEBUG, "End of commands block");
+ wlr_log(L_DEBUG, "End of commands block");
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_IPC:
- sway_log(L_DEBUG, "End of IPC block");
+ wlr_log(L_DEBUG, "End of IPC block");
block = CMD_BLOCK_END;
break;
case CMD_BLOCK_IPC_EVENTS:
- sway_log(L_DEBUG, "End of IPC events block");
+ wlr_log(L_DEBUG, "End of IPC events block");
block = CMD_BLOCK_IPC;
break;
case CMD_BLOCK_END:
- sway_log(L_ERROR, "Unmatched }");
+ wlr_log(L_ERROR, "Unmatched }");
break;
default:;
@@ -663,7 +663,7 @@ char *do_var_replacement(char *str) {
int vvlen = strlen(var->value);
char *newstr = malloc(strlen(str) - vnlen + vvlen + 1);
if (!newstr) {
- sway_log(L_ERROR,
+ wlr_log(L_ERROR,
"Unable to allocate replacement "
"during variable expansion");
break;
diff --git a/sway/config/input.c b/sway/config/input.c
index 6f8d31f7..96181302 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -8,13 +8,13 @@
struct input_config *new_input_config(const char* identifier) {
struct input_config *input = calloc(1, sizeof(struct input_config));
if (!input) {
- sway_log(L_DEBUG, "Unable to allocate input config");
+ wlr_log(L_DEBUG, "Unable to allocate input config");
return NULL;
}
- sway_log(L_DEBUG, "new_input_config(%s)", identifier);
+ wlr_log(L_DEBUG, "new_input_config(%s)", identifier);
if (!(input->identifier = strdup(identifier))) {
free(input);
- sway_log(L_DEBUG, "Unable to allocate input config");
+ wlr_log(L_DEBUG, "Unable to allocate input config");
return NULL;
}
diff --git a/sway/config/output.c b/sway/config/output.c
index e798a20e..69e883f1 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -84,7 +84,7 @@ static void set_mode(struct wlr_output *output, int width, int height,
float refresh_rate) {
int mhz = (int)(refresh_rate * 1000);
if (wl_list_empty(&output->modes)) {
- sway_log(L_DEBUG, "Assigning custom mode to %s", output->name);
+ wlr_log(L_DEBUG, "Assigning custom mode to %s", output->name);
wlr_output_set_custom_mode(output, width, height, mhz);
return;
}
@@ -100,9 +100,9 @@ static void set_mode(struct wlr_output *output, int width, int height,
}
}
if (!best) {
- sway_log(L_ERROR, "Configured mode for %s not available", output->name);
+ wlr_log(L_ERROR, "Configured mode for %s not available", output->name);
} else {
- sway_log(L_DEBUG, "Assigning configured mode to %s", output->name);
+ wlr_log(L_DEBUG, "Assigning configured mode to %s", output->name);
wlr_output_set_mode(output, best);
}
}
@@ -119,22 +119,22 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
}
if (oc && oc->width > 0 && oc->height > 0) {
- sway_log(L_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
+ wlr_log(L_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
oc->height, oc->refresh_rate);
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
}
if (oc && oc->scale > 0) {
- sway_log(L_DEBUG, "Set %s scale to %f", oc->name, oc->scale);
+ wlr_log(L_DEBUG, "Set %s scale to %f", oc->name, oc->scale);
wlr_output_set_scale(wlr_output, oc->scale);
}
if (oc && oc->transform >= 0) {
- sway_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
+ wlr_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
wlr_output_set_transform(wlr_output, oc->transform);
}
// Find position for it
if (oc && (oc->x != -1 || oc->y != -1)) {
- sway_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
+ wlr_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
wlr_output_layout_add(root_container.sway_root->output_layout,
wlr_output, oc->x, oc->y);
} else {
@@ -165,7 +165,7 @@ void apply_output_config(struct output_config *oc, swayc_t *output) {
terminate_swaybg(output->bg_pid);
}
- sway_log(L_DEBUG, "Setting background for output %d to %s", output_i, oc->background);
+ wlr_log(L_DEBUG, "Setting background for output %d to %s", output_i, oc->background);
size_t bufsize = 12;
char output_id[bufsize];
diff --git a/sway/config/seat.c b/sway/config/seat.c
index 113139e8..03cc6d4e 100644
--- a/sway/config/seat.c
+++ b/sway/config/seat.c
@@ -7,11 +7,11 @@
struct seat_config *new_seat_config(const char* name) {
struct seat_config *seat = calloc(1, sizeof(struct seat_config));
if (!seat) {
- sway_log(L_DEBUG, "Unable to allocate seat config");
+ wlr_log(L_DEBUG, "Unable to allocate seat config");
return NULL;
}
- sway_log(L_DEBUG, "new_seat_config(%s)", name);
+ wlr_log(L_DEBUG, "new_seat_config(%s)", name);
seat->name = strdup(name);
if (!sway_assert(seat->name, "could not allocate name for seat")) {
free(seat);
@@ -34,7 +34,7 @@ struct seat_attachment_config *seat_attachment_config_new() {
struct seat_attachment_config *attachment =
calloc(1, sizeof(struct seat_attachment_config));
if (!attachment) {
- sway_log(L_DEBUG, "cannot allocate attachment config");
+ wlr_log(L_DEBUG, "cannot allocate attachment config");
return NULL;
}
return attachment;
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 3b87c2e7..2b428c30 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -110,7 +110,7 @@ static void output_frame_notify(struct wl_listener *listener, void *data) {
void output_add_notify(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, output_add);
struct wlr_output *wlr_output = data;
- sway_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
+ wlr_log(L_DEBUG, "New output %p: %s", wlr_output, wlr_output->name);
struct sway_output *output = calloc(1, sizeof(struct sway_output));
if (!output) {
@@ -140,7 +140,7 @@ void output_add_notify(struct wl_listener *listener, void *data) {
void output_remove_notify(struct wl_listener *listener, void *data) {
struct sway_server *server = wl_container_of(listener, server, output_remove);
struct wlr_output *wlr_output = data;
- sway_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
+ wlr_log(L_DEBUG, "Output %p %s removed", wlr_output, wlr_output->name);
swayc_t *output_container = NULL;
for (int i = 0 ; i < root_container.children->length; ++i) {
diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index a7bb8eb5..345a1398 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -82,7 +82,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
return;
}
- sway_log(L_DEBUG, "New wl_shell toplevel title='%s' app_id='%s'",
+ wlr_log(L_DEBUG, "New wl_shell toplevel title='%s' app_id='%s'",
shell_surface->title, shell_surface->class);
wlr_wl_shell_surface_ping(shell_surface);
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 5ff19f7e..df48345c 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -88,7 +88,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
return;
}
- sway_log(L_DEBUG, "New xdg_shell_v6 toplevel title='%s' app_id='%s'",
+ wlr_log(L_DEBUG, "New xdg_shell_v6 toplevel title='%s' app_id='%s'",
xdg_surface->title, xdg_surface->app_id);
wlr_xdg_surface_v6_ping(xdg_surface);
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 42e82c64..43bb2e00 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -124,7 +124,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
return;
}
- sway_log(L_DEBUG, "New xwayland surface title='%s' class='%s'",
+ wlr_log(L_DEBUG, "New xwayland surface title='%s' class='%s'",
xsurface->title, xsurface->class);
struct sway_xwayland_surface *sway_surface =
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 3b5cfce5..c51b59f9 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -85,35 +85,35 @@ static void handle_touch_down(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, touch_down);
struct wlr_event_touch_down *event = data;
- sway_log(L_DEBUG, "TODO: handle touch down event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle touch down event: %p", event);
}
static void handle_touch_up(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, touch_up);
struct wlr_event_touch_up *event = data;
- sway_log(L_DEBUG, "TODO: handle touch up event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle touch up event: %p", event);
}
static void handle_touch_motion(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, touch_motion);
struct wlr_event_touch_motion *event = data;
- sway_log(L_DEBUG, "TODO: handle touch motion event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle touch motion event: %p", event);
}
static void handle_tool_axis(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, tool_axis);
struct wlr_event_tablet_tool_axis *event = data;
- sway_log(L_DEBUG, "TODO: handle tool axis event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle tool axis event: %p", event);
}
static void handle_tool_tip(struct wl_listener *listener, void *data) {
struct sway_cursor *cursor =
wl_container_of(listener, cursor, tool_tip);
struct wlr_event_tablet_tool_tip *event = data;
- sway_log(L_DEBUG, "TODO: handle tool tip event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle tool tip event: %p", event);
}
static void handle_request_set_cursor(struct wl_listener *listener,
@@ -121,7 +121,7 @@ static void handle_request_set_cursor(struct wl_listener *listener,
struct sway_cursor *cursor =
wl_container_of(listener, cursor, request_set_cursor);
struct wlr_seat_pointer_request_set_cursor_event *event = data;
- sway_log(L_DEBUG, "TODO: handle request set cursor event: %p", event);
+ wlr_log(L_DEBUG, "TODO: handle request set cursor event: %p", event);
}
struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
index 128a818a..26cf5035 100644
--- a/sway/input/input-manager.c
+++ b/sway/input/input-manager.c
@@ -52,7 +52,7 @@ static char *get_device_identifier(struct wlr_input_device *device) {
int len = snprintf(NULL, 0, fmt, vendor, product, name) + 1;
char *identifier = malloc(len);
if (!identifier) {
- sway_log(L_ERROR, "Unable to allocate unique input device name");
+ wlr_log(L_ERROR, "Unable to allocate unique input device name");
return NULL;
}
@@ -93,60 +93,60 @@ static void sway_input_manager_libinput_config_pointer(struct sway_input_device
}
libinput_device = wlr_libinput_get_device_handle(wlr_device);
- sway_log(L_DEBUG, "sway_input_manager_libinput_config_pointer(%s)", ic->identifier);
+ wlr_log(L_DEBUG, "sway_input_manager_libinput_config_pointer(%s)", ic->identifier);
if (ic->accel_profile != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_profile(%d)",
ic->identifier, ic->accel_profile);
libinput_device_config_accel_set_profile(libinput_device, ic->accel_profile);
}
if (ic->click_method != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) click_set_method(%d)",
ic->identifier, ic->click_method);
libinput_device_config_click_set_method(libinput_device, ic->click_method);
}
if (ic->drag_lock != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_drag_lock_enabled(%d)",
ic->identifier, ic->click_method);
libinput_device_config_tap_set_drag_lock_enabled(libinput_device, ic->drag_lock);
}
if (ic->dwt != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) dwt_set_enabled(%d)",
ic->identifier, ic->dwt);
libinput_device_config_dwt_set_enabled(libinput_device, ic->dwt);
}
if (ic->left_handed != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) left_handed_set_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) left_handed_set_enabled(%d)",
ic->identifier, ic->left_handed);
libinput_device_config_left_handed_set(libinput_device, ic->left_handed);
}
if (ic->middle_emulation != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) middle_emulation_set_enabled(%d)",
ic->identifier, ic->middle_emulation);
libinput_device_config_middle_emulation_set_enabled(libinput_device, ic->middle_emulation);
}
if (ic->natural_scroll != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) natural_scroll_set_enabled(%d)",
ic->identifier, ic->natural_scroll);
libinput_device_config_scroll_set_natural_scroll_enabled(libinput_device, ic->natural_scroll);
}
if (ic->pointer_accel != FLT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) accel_set_speed(%f)",
ic->identifier, ic->pointer_accel);
libinput_device_config_accel_set_speed(libinput_device, ic->pointer_accel);
}
if (ic->scroll_method != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)",
ic->identifier, ic->scroll_method);
libinput_device_config_scroll_set_method(libinput_device, ic->scroll_method);
}
if (ic->send_events != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) send_events_set_mode(%d)",
ic->identifier, ic->send_events);
libinput_device_config_send_events_set_mode(libinput_device, ic->send_events);
}
if (ic->tap != INT_MIN) {
- sway_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
+ wlr_log(L_DEBUG, "libinput_config_pointer(%s) tap_set_enabled(%d)",
ic->identifier, ic->tap);
libinput_device_config_tap_set_enabled(libinput_device, ic->tap);
}
@@ -167,7 +167,7 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
input_device->identifier = get_device_identifier(device);
wl_list_insert(&input->devices, &input_device->link);
- sway_log(L_DEBUG, "adding device: '%s'",
+ wlr_log(L_DEBUG, "adding device: '%s'",
input_device->identifier);
// find config
@@ -185,7 +185,7 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
struct sway_seat *seat = NULL;
if (!input_has_seat_configuration(input)) {
- sway_log(L_DEBUG, "no seat configuration, using default seat");
+ wlr_log(L_DEBUG, "no seat configuration, using default seat");
seat = input_manager_get_seat(input, default_seat);
sway_seat_add_device(seat, input_device);
return;
@@ -213,7 +213,7 @@ static void input_add_notify(struct wl_listener *listener, void *data) {
}
if (!added) {
- sway_log(L_DEBUG,
+ wlr_log(L_DEBUG,
"device '%s' is not configured on any seats",
input_device->identifier);
}
@@ -231,7 +231,7 @@ static void input_remove_notify(struct wl_listener *listener, void *data) {
return;
}
- sway_log(L_DEBUG, "removing device: '%s'",
+ wlr_log(L_DEBUG, "removing device: '%s'",
input_device->identifier);
struct sway_seat *seat = NULL;
@@ -309,7 +309,7 @@ void sway_input_manager_apply_input_config(struct sway_input_manager *input,
void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
struct seat_config *seat_config) {
- sway_log(L_DEBUG, "applying new seat config for seat %s",
+ wlr_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);
if (!seat) {
diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c
index c2bb2578..e7539c48 100644
--- a/sway/input/keyboard.c
+++ b/sway/input/keyboard.c
@@ -90,11 +90,11 @@ static bool binding_matches_key_state(struct sway_binding *binding,
}
static void binding_execute_command(struct sway_binding *binding) {
- sway_log(L_DEBUG, "running command for binding: %s",
+ wlr_log(L_DEBUG, "running command for binding: %s",
binding->command);
struct cmd_results *results = handle_command(binding->command);
if (results->status != CMD_SUCCESS) {
- sway_log(L_DEBUG, "could not run command for binding: %s",
+ wlr_log(L_DEBUG, "could not run command for binding: %s",
binding->command);
}
free_cmd_results(results);
@@ -467,7 +467,7 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) {
xkb_keymap_new_from_names(context, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
if (!keymap) {
- sway_log(L_DEBUG, "cannot configure keyboard: keymap does not exist");
+ wlr_log(L_DEBUG, "cannot configure keyboard: keymap does not exist");
xkb_context_unref(context);
return;
}
diff --git a/sway/input/seat.c b/sway/input/seat.c
index 9a6a667b..268486ab 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -112,7 +112,7 @@ void sway_seat_configure_device(struct sway_seat *seat,
case WLR_INPUT_DEVICE_TOUCH:
case WLR_INPUT_DEVICE_TABLET_PAD:
case WLR_INPUT_DEVICE_TABLET_TOOL:
- sway_log(L_DEBUG, "TODO: configure other devices");
+ wlr_log(L_DEBUG, "TODO: configure other devices");
break;
}
}
@@ -127,11 +127,11 @@ void sway_seat_add_device(struct sway_seat *seat,
struct sway_seat_device *seat_device =
calloc(1, sizeof(struct sway_seat_device));
if (!seat_device) {
- sway_log(L_DEBUG, "could not allocate seat device");
+ wlr_log(L_DEBUG, "could not allocate seat device");
return;
}
- sway_log(L_DEBUG, "adding device %s to seat %s",
+ wlr_log(L_DEBUG, "adding device %s to seat %s",
input_device->identifier, seat->wlr_seat->name);
seat_device->sway_seat = seat;
@@ -150,7 +150,7 @@ void sway_seat_remove_device(struct sway_seat *seat,
return;
}
- sway_log(L_DEBUG, "removing device %s from seat %s",
+ wlr_log(L_DEBUG, "removing device %s from seat %s",
input_device->identifier, seat->wlr_seat->name);
seat_device_destroy(seat_device);
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 046e40a8..d2dd881f 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -125,32 +125,32 @@ struct sockaddr_un *ipc_user_sockaddr(void) {
int ipc_handle_connection(int fd, uint32_t mask, void *data) {
(void) fd;
struct sway_server *server = data;
- sway_log(L_DEBUG, "Event on IPC listening socket");
+ wlr_log(L_DEBUG, "Event on IPC listening socket");
assert(mask == WL_EVENT_READABLE);
int client_fd = accept(ipc_socket, NULL, NULL);
if (client_fd == -1) {
- sway_log_errno(L_ERROR, "Unable to accept IPC client connection");
+ wlr_log_errno(L_ERROR, "Unable to accept IPC client connection");
return 0;
}
int flags;
if ((flags = fcntl(client_fd, F_GETFD)) == -1
|| fcntl(client_fd, F_SETFD, flags|FD_CLOEXEC) == -1) {
- sway_log_errno(L_ERROR, "Unable to set CLOEXEC on IPC client socket");
+ wlr_log_errno(L_ERROR, "Unable to set CLOEXEC on IPC client socket");
close(client_fd);
return 0;
}
if ((flags = fcntl(client_fd, F_GETFL)) == -1
|| fcntl(client_fd, F_SETFL, flags|O_NONBLOCK) == -1) {
- sway_log_errno(L_ERROR, "Unable to set NONBLOCK on IPC client socket");
+ wlr_log_errno(L_ERROR, "Unable to set NONBLOCK on IPC client socket");
close(client_fd);
return 0;
}
struct ipc_client *client = malloc(sizeof(struct ipc_client));
if (!client) {
- sway_log(L_ERROR, "Unable to allocate ipc client");
+ wlr_log(L_ERROR, "Unable to allocate ipc client");
close(client_fd);
return 0;
}
@@ -166,12 +166,12 @@ int ipc_handle_connection(int fd, uint32_t mask, void *data) {
client->write_buffer_len = 0;
client->write_buffer = malloc(client->write_buffer_size);
if (!client->write_buffer) {
- sway_log(L_ERROR, "Unable to allocate ipc client write buffer");
+ wlr_log(L_ERROR, "Unable to allocate ipc client write buffer");
close(client_fd);
return 0;
}
- sway_log(L_DEBUG, "New client: fd %d", client_fd);
+ wlr_log(L_DEBUG, "New client: fd %d", client_fd);
list_add(ipc_client_list, client);
return 0;
}
@@ -182,22 +182,22 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
struct ipc_client *client = data;
if (mask & WL_EVENT_ERROR) {
- sway_log(L_ERROR, "IPC Client socket error, removing client");
+ wlr_log(L_ERROR, "IPC Client socket error, removing client");
ipc_client_disconnect(client);
return 0;
}
if (mask & WL_EVENT_HANGUP) {
- sway_log(L_DEBUG, "Client %d hung up", client->fd);
+ wlr_log(L_DEBUG, "Client %d hung up", client->fd);
ipc_client_disconnect(client);
return 0;
}
- sway_log(L_DEBUG, "Client %d readable", client->fd);
+ wlr_log(L_DEBUG, "Client %d readable", client->fd);
int read_available;
if (ioctl(client_fd, FIONREAD, &read_available) == -1) {
- sway_log_errno(L_INFO, "Unable to read IPC socket buffer size");
+ wlr_log_errno(L_INFO, "Unable to read IPC socket buffer size");
ipc_client_disconnect(client);
return 0;
}
@@ -219,13 +219,13 @@ int ipc_client_handle_readable(int client_fd, uint32_t mask, void *data) {
// Should be fully available, because read_available >= ipc_header_size
ssize_t received = recv(client_fd, buf, ipc_header_size, 0);
if (received == -1) {
- sway_log_errno(L_INFO, "Unable to receive header from IPC client");
+ wlr_log_errno(L_INFO, "Unable to receive header from IPC client");
ipc_client_disconnect(client);
return 0;
}
if (memcmp(buf, ipc_magic, sizeof(ipc_magic)) != 0) {
- sway_log(L_DEBUG, "IPC header check failed");
+ wlr_log(L_DEBUG, "IPC header check failed");
ipc_client_disconnect(client);
return 0;
}
@@ -244,13 +244,13 @@ int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
struct ipc_client *client = data;
if (mask & WL_EVENT_ERROR) {
- sway_log(L_ERROR, "IPC Client socket error, removing client");
+ wlr_log(L_ERROR, "IPC Client socket error, removing client");
ipc_client_disconnect(client);
return 0;
}
if (mask & WL_EVENT_HANGUP) {
- sway_log(L_DEBUG, "Client %d hung up", client->fd);
+ wlr_log(L_DEBUG, "Client %d hung up", client->fd);
ipc_client_disconnect(client);
return 0;
}
@@ -259,14 +259,14 @@ int ipc_client_handle_writable(int client_fd, uint32_t mask, void *data) {
return 0;
}
- sway_log(L_DEBUG, "Client %d writable", client->fd);
+ wlr_log(L_DEBUG, "Client %d writable", client->fd);
ssize_t written = write(client->fd, client->write_buffer, client->write_buffer_len);
if (written == -1 && errno == EAGAIN) {
return 0;
} else if (written == -1) {
- sway_log_errno(L_INFO, "Unable to send data from queue to IPC client");
+ wlr_log_errno(L_INFO, "Unable to send data from queue to IPC client");
ipc_client_disconnect(client);
return 0;
}
@@ -291,7 +291,7 @@ void ipc_client_disconnect(struct ipc_client *client) {
shutdown(client->fd, SHUT_RDWR);
}
- sway_log(L_INFO, "IPC Client %d disconnected", client->fd);
+ wlr_log(L_INFO, "IPC Client %d disconnected", client->fd);
wl_event_source_remove(client->event_source);
if (client->writable_event_source) {
wl_event_source_remove(client->writable_event_source);
@@ -313,7 +313,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
char *buf = malloc(client->payload_length + 1);
if (!buf) {
- sway_log_errno(L_INFO, "Unable to allocate IPC payload");
+ wlr_log_errno(L_INFO, "Unable to allocate IPC payload");
ipc_client_disconnect(client);
return;
}
@@ -322,7 +322,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
ssize_t received = recv(client->fd, buf, client->payload_length, 0);
if (received == -1)
{
- sway_log_errno(L_INFO, "Unable to receive payload from IPC client");
+ wlr_log_errno(L_INFO, "Unable to receive payload from IPC client");
ipc_client_disconnect(client);
free(buf);
return;
@@ -393,12 +393,12 @@ void ipc_client_handle_command(struct ipc_client *client) {
}
default:
- sway_log(L_INFO, "Unknown IPC command type %i", client->current_command);
+ wlr_log(L_INFO, "Unknown IPC command type %i", client->current_command);
goto exit_cleanup;
}
ipc_send_reply(client, error_denied, (uint32_t)strlen(error_denied));
- sway_log(L_DEBUG, "Denied IPC client access to %i", client->current_command);
+ wlr_log(L_DEBUG, "Denied IPC client access to %i", client->current_command);
exit_cleanup:
client->payload_length = 0;
@@ -422,14 +422,14 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
}
if (client->write_buffer_size > 4e6) { // 4 MB
- sway_log(L_ERROR, "Client write buffer too big, disconnecting client");
+ wlr_log(L_ERROR, "Client write buffer too big, disconnecting client");
ipc_client_disconnect(client);
return false;
}
char *new_buffer = realloc(client->write_buffer, client->write_buffer_size);
if (!new_buffer) {
- sway_log(L_ERROR, "Unable to reallocate ipc client write buffer");
+ wlr_log(L_ERROR, "Unable to reallocate ipc client write buffer");
ipc_client_disconnect(client);
return false;
}
@@ -446,6 +446,6 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
ipc_client_handle_writable, client);
}
- sway_log(L_DEBUG, "Added IPC reply to client %d queue: %s", client->fd, payload);
+ wlr_log(L_DEBUG, "Added IPC reply to client %d queue: %s", client->fd, payload);
return true;
}
diff --git a/sway/tree/container.c b/sway/tree/container.c
index c5574275..31ec2ce5 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -92,11 +92,11 @@ swayc_t *new_output(struct sway_output *sway_output) {
if (strcasecmp(name, cur->name) == 0 ||
strcasecmp(identifier, cur->name) == 0) {
- sway_log(L_DEBUG, "Matched output config for %s", name);
+ wlr_log(L_DEBUG, "Matched output config for %s", name);
oc = cur;
}
if (strcasecmp("*", cur->name) == 0) {
- sway_log(L_DEBUG, "Matched wildcard output config for %s", name);
+ wlr_log(L_DEBUG, "Matched wildcard output config for %s", name);
all = cur;
}
@@ -126,7 +126,7 @@ swayc_t *new_output(struct sway_output *sway_output) {
// Create workspace
char *ws_name = workspace_next_name(output->name);
- sway_log(L_DEBUG, "Creating default workspace %s", ws_name);
+ wlr_log(L_DEBUG, "Creating default workspace %s", ws_name);
new_workspace(output, ws_name);
free(ws_name);
return output;
@@ -136,7 +136,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) {
if (!sway_assert(output, "new_workspace called with null output")) {
return NULL;
}
- sway_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
+ wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
swayc_t *workspace = new_swayc(C_WORKSPACE);
workspace->x = output->x;
@@ -159,7 +159,7 @@ swayc_t *new_view(swayc_t *sibling, struct sway_view *sway_view) {
}
const char *title = sway_view->iface.get_prop(sway_view, VIEW_PROP_TITLE);
swayc_t *swayc = new_swayc(C_VIEW);
- sway_log(L_DEBUG, "Adding new view %p:%s to container %p %d",
+ wlr_log(L_DEBUG, "Adding new view %p:%s to container %p %d",
swayc, title, sibling, sibling ? sibling->type : 0);
// Setup values
swayc->sway_view = sway_view;
@@ -200,7 +200,7 @@ swayc_t *destroy_output(swayc_t *output) {
}
}
- sway_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
+ wlr_log(L_DEBUG, "OUTPUT: Destroying output '%s'", output->name);
free_swayc(output);
return &root_container;
@@ -210,7 +210,7 @@ swayc_t *destroy_view(swayc_t *view) {
if (!sway_assert(view, "null view passed to destroy_view")) {
return NULL;
}
- sway_log(L_DEBUG, "Destroying view '%s'", view->name);
+ wlr_log(L_DEBUG, "Destroying view '%s'", view->name);
swayc_t *parent = view->parent;
free_swayc(view);
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 4bcf0e2f..13b8a395 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -59,7 +59,7 @@ void init_layout(void) {
}
void add_child(swayc_t *parent, swayc_t *child) {
- sway_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
+ wlr_log(L_DEBUG, "Adding %p (%d, %fx%f) to %p (%d, %fx%f)",
child, child->type, child->width, child->height,
parent, parent->type, parent->width, parent->height);
list_add(parent->children, child);
@@ -145,7 +145,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
width = floor(width);
height = floor(height);
- sway_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container,
+ wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container,
container->name, container->width, container->height, container->x,
container->y);
@@ -155,7 +155,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
// TODO: wlr_output_layout probably
for (i = 0; i < container->children->length; ++i) {
swayc_t *output = container->children->items[i];
- sway_log(L_DEBUG, "Arranging output '%s' at %f,%f",
+ wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",
output->name, output->x, output->y);
arrange_windows(output, -1, -1);
}
@@ -181,7 +181,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
container->height = output->height;
container->x = x;
container->y = y;
- sway_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
+ wlr_log(L_DEBUG, "Arranging workspace '%s' at %f, %f",
container->name, container->x, container->y);
}
// children are properly handled below
@@ -192,7 +192,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
container->height = height;
container->sway_view->iface.set_size(container->sway_view,
container->width, container->height);
- sway_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
+ wlr_log(L_DEBUG, "Set view to %.f x %.f @ %.f, %.f",
container->width, container->height,
container->x, container->y);
}
@@ -215,7 +215,7 @@ void arrange_windows(swayc_t *container, double width, double height) {
container->children->length);
break;
default:
- sway_log(L_DEBUG, "TODO: arrange layout type %d", container->layout);
+ wlr_log(L_DEBUG, "TODO: arrange layout type %d", container->layout);
apply_horiz_layout(container, x, y, width, height, 0,
container->children->length);
break;
@@ -244,10 +244,10 @@ static void apply_horiz_layout(swayc_t *container,
// Resize windows
double child_x = x;
if (scale > 0.1) {
- sway_log(L_DEBUG, "Arranging %p horizontally", container);
+ wlr_log(L_DEBUG, "Arranging %p horizontally", container);
for (int i = start; i < end; ++i) {
swayc_t *child = container->children->items[i];
- sway_log(L_DEBUG,
+ wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, width, scale);
child->sway_view->iface.set_position(child->sway_view, child_x, y);
@@ -294,10 +294,10 @@ void apply_vert_layout(swayc_t *container,
// Resize
double child_y = y;
if (scale > 0.1) {
- sway_log(L_DEBUG, "Arranging %p vertically", container);
+ wlr_log(L_DEBUG, "Arranging %p vertically", container);
for (i = start; i < end; ++i) {
swayc_t *child = container->children->items[i];
- sway_log(L_DEBUG,
+ wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, height, scale);
child->sway_view->iface.set_position(child->sway_view, x, child_y);
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index e8ed4102..c37a873c 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -11,7 +11,7 @@ void next_name_map(swayc_t *ws, void *data) {
}
char *workspace_next_name(const char *output_name) {
- sway_log(L_DEBUG, "Workspace: Generating new workspace name for output %s",
+ wlr_log(L_DEBUG, "Workspace: Generating new workspace name for output %s",
output_name);
int count = 0;
next_name_map(&root_container, &count);
--
cgit v1.2.3
From 9e0595f26bcca2a4d0aa735c4cd9fc4f792918bf Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 20 Jan 2018 11:32:07 -0500
Subject: input config handler context
---
include/sway/config.h | 8 ++++++++
include/sway/input/input-manager.h | 1 -
sway/commands.c | 3 ---
sway/commands/input.c | 28 +++++++++++++++++++---------
sway/commands/input/accel_profile.c | 2 ++
sway/commands/input/click_method.c | 4 ++--
sway/commands/input/drag_lock.c | 2 ++
sway/commands/input/dwt.c | 2 ++
sway/commands/input/events.c | 6 ++++--
sway/commands/input/left_handed.c | 2 ++
sway/commands/input/middle_emulation.c | 2 ++
sway/commands/input/natural_scroll.c | 2 ++
sway/commands/input/pointer_accel.c | 2 ++
sway/commands/input/scroll_method.c | 2 ++
sway/commands/input/tap.c | 3 ++-
sway/commands/input/xkb_layout.c | 3 ++-
sway/commands/input/xkb_model.c | 3 ++-
sway/commands/input/xkb_options.c | 3 ++-
sway/commands/input/xkb_rules.c | 3 ++-
sway/commands/input/xkb_variant.c | 3 ++-
sway/config.c | 10 ++++++++--
21 files changed, 69 insertions(+), 25 deletions(-)
(limited to 'sway/commands/input.c')
diff --git a/include/sway/config.h b/include/sway/config.h
index 0a9c4595..1ab96b51 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -350,6 +350,11 @@ struct sway_config {
list_t *command_policies;
list_t *feature_policies;
list_t *ipc_policies;
+
+ // Context for command handlers
+ struct {
+ struct input_config *input_config;
+ } handler_context;
};
void pid_workspace_add(struct pid_workspace *pw);
@@ -375,6 +380,9 @@ bool read_config(FILE *file, struct sway_config *config);
* Free config struct
*/
void free_config(struct sway_config *config);
+
+void config_clear_handler_context(struct sway_config *config);
+
void free_sway_variable(struct sway_variable *var);
/**
* Does variable replacement for a string based on the config's currently loaded variables.
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 53064eed..8388f930 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -5,7 +5,6 @@
#include "sway/config.h"
#include "list.h"
-extern struct input_config *current_input_config;
extern struct seat_config *current_seat_config;
/**
diff --git a/sway/commands.c b/sway/commands.c
index 1005cf68..fd2e1514 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -70,10 +70,7 @@ void apply_input_config(struct input_config *input) {
list_add(config->input_configs, input);
}
- struct input_config *old_input_config = current_input_config;
- current_input_config = input;
sway_input_manager_apply_input_config(input_manager, input);
- current_input_config = old_input_config;
}
void apply_seat_config(struct seat_config *seat) {
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 5ea39f62..5de65621 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -11,8 +11,12 @@ struct cmd_results *cmd_input(int argc, char **argv) {
}
if (config->reading && strcmp("{", argv[1]) == 0) {
- current_input_config = new_input_config(argv[0]);
- wlr_log(L_DEBUG, "entering input block: %s", current_input_config->identifier);
+ free_input_config(config->handler_context.input_config);
+ config->handler_context.input_config = new_input_config(argv[0]);
+ if (!config->handler_context.input_config) {
+ return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
+ }
+ wlr_log(L_DEBUG, "entering input block: %s", argv[0]);
return cmd_results_new(CMD_BLOCK_INPUT, NULL, NULL);
}
@@ -20,15 +24,16 @@ struct cmd_results *cmd_input(int argc, char **argv) {
return error;
}
+ bool has_context = (config->handler_context.input_config != NULL);
+ if (!has_context) {
+ // caller did not give a context so create one just for this command
+ config->handler_context.input_config = new_input_config(argv[0]);
+ }
+
int argc_new = argc-2;
char **argv_new = argv+2;
struct cmd_results *res;
- struct input_config *old_input_config = current_input_config;
- current_input_config = new_input_config(argv[0]);
- if (!current_input_config) {
- return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
- }
if (strcasecmp("accel_profile", argv[1]) == 0) {
res = input_cmd_accel_profile(argc_new, argv_new);
} else if (strcasecmp("click_method", argv[1]) == 0) {
@@ -64,7 +69,12 @@ struct cmd_results *cmd_input(int argc, char **argv) {
} else {
res = cmd_results_new(CMD_INVALID, "input <device>", "Unknown command %s", argv[1]);
}
- free_input_config(current_input_config);
- current_input_config = old_input_config;
+
+ if (!has_context) {
+ // clean up the context we created earlier
+ free_input_config(config->handler_context.input_config);
+ config->handler_context.input_config = NULL;
+ }
+
return res;
}
diff --git a/sway/commands/input/accel_profile.c b/sway/commands/input/accel_profile.c
index f72b7d48..37d6e133 100644
--- a/sway/commands/input/accel_profile.c
+++ b/sway/commands/input/accel_profile.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_accel_profile(int argc, char **argv) {
if ((error = checkarg(argc, "accel_profile", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "accel_profile",
"No input device defined.");
diff --git a/sway/commands/input/click_method.c b/sway/commands/input/click_method.c
index 22eb15f7..8f1f0aa7 100644
--- a/sway/commands/input/click_method.c
+++ b/sway/commands/input/click_method.c
@@ -6,12 +6,12 @@
#include "log.h"
struct cmd_results *input_cmd_click_method(int argc, char **argv) {
- wlr_log(L_DEBUG, "click_method for device: %d %s",
- current_input_config==NULL, current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "click_method", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "click_method",
"No input device defined.");
diff --git a/sway/commands/input/drag_lock.c b/sway/commands/input/drag_lock.c
index 1783978a..8273a7d4 100644
--- a/sway/commands/input/drag_lock.c
+++ b/sway/commands/input/drag_lock.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_drag_lock(int argc, char **argv) {
if ((error = checkarg(argc, "drag_lock", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE,
"drag_lock", "No input device defined.");
diff --git a/sway/commands/input/dwt.c b/sway/commands/input/dwt.c
index 8108a110..995a2f47 100644
--- a/sway/commands/input/dwt.c
+++ b/sway/commands/input/dwt.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_dwt(int argc, char **argv) {
if ((error = checkarg(argc, "dwt", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "dwt", "No input device defined.");
}
diff --git a/sway/commands/input/events.c b/sway/commands/input/events.c
index a1bfbacd..2217f5ce 100644
--- a/sway/commands/input/events.c
+++ b/sway/commands/input/events.c
@@ -6,16 +6,18 @@
#include "log.h"
struct cmd_results *input_cmd_events(int argc, char **argv) {
- wlr_log(L_DEBUG, "events for device: %s",
- current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "events", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "events",
"No input device defined.");
}
+ wlr_log(L_DEBUG, "events for device: %s",
+ current_input_config->identifier);
struct input_config *new_config =
new_input_config(current_input_config->identifier);
diff --git a/sway/commands/input/left_handed.c b/sway/commands/input/left_handed.c
index 35740df3..94b8e03e 100644
--- a/sway/commands/input/left_handed.c
+++ b/sway/commands/input/left_handed.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_left_handed(int argc, char **argv) {
if ((error = checkarg(argc, "left_handed", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "left_handed",
"No input device defined.");
diff --git a/sway/commands/input/middle_emulation.c b/sway/commands/input/middle_emulation.c
index 7bc08ae6..a551fd51 100644
--- a/sway/commands/input/middle_emulation.c
+++ b/sway/commands/input/middle_emulation.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_middle_emulation(int argc, char **argv) {
if ((error = checkarg(argc, "middle_emulation", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "middle_emulation",
"No input device defined.");
diff --git a/sway/commands/input/natural_scroll.c b/sway/commands/input/natural_scroll.c
index a7dcdc2c..c4e19b78 100644
--- a/sway/commands/input/natural_scroll.c
+++ b/sway/commands/input/natural_scroll.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_natural_scroll(int argc, char **argv) {
if ((error = checkarg(argc, "natural_scroll", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "natural_scoll",
"No input device defined.");
diff --git a/sway/commands/input/pointer_accel.c b/sway/commands/input/pointer_accel.c
index d2261a63..171063aa 100644
--- a/sway/commands/input/pointer_accel.c
+++ b/sway/commands/input/pointer_accel.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_pointer_accel(int argc, char **argv) {
if ((error = checkarg(argc, "pointer_accel", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE,
"pointer_accel", "No input device defined.");
diff --git a/sway/commands/input/scroll_method.c b/sway/commands/input/scroll_method.c
index 035262cf..0a1c57ac 100644
--- a/sway/commands/input/scroll_method.c
+++ b/sway/commands/input/scroll_method.c
@@ -9,6 +9,8 @@ struct cmd_results *input_cmd_scroll_method(int argc, char **argv) {
if ((error = checkarg(argc, "scroll_method", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "scroll_method",
"No input device defined.");
diff --git a/sway/commands/input/tap.c b/sway/commands/input/tap.c
index ecab9a5b..e7f03058 100644
--- a/sway/commands/input/tap.c
+++ b/sway/commands/input/tap.c
@@ -6,11 +6,12 @@
#include "log.h"
struct cmd_results *input_cmd_tap(int argc, char **argv) {
- wlr_log(L_DEBUG, "tap for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "tap", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "tap", "No input device defined.");
}
diff --git a/sway/commands/input/xkb_layout.c b/sway/commands/input/xkb_layout.c
index 25db1a33..867e65d3 100644
--- a/sway/commands/input/xkb_layout.c
+++ b/sway/commands/input/xkb_layout.c
@@ -5,11 +5,12 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_layout(int argc, char **argv) {
- wlr_log(L_DEBUG, "xkb layout for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_layout", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "xkb_layout", "No input device defined.");
}
diff --git a/sway/commands/input/xkb_model.c b/sway/commands/input/xkb_model.c
index 819b796b..e8c8e04e 100644
--- a/sway/commands/input/xkb_model.c
+++ b/sway/commands/input/xkb_model.c
@@ -5,11 +5,12 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_model(int argc, char **argv) {
- wlr_log(L_DEBUG, "xkb model for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_model", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "xkb_model", "No input device defined.");
}
diff --git a/sway/commands/input/xkb_options.c b/sway/commands/input/xkb_options.c
index ff5f83ec..e9ddd6e3 100644
--- a/sway/commands/input/xkb_options.c
+++ b/sway/commands/input/xkb_options.c
@@ -5,11 +5,12 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_options(int argc, char **argv) {
- wlr_log(L_DEBUG, "xkb options for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_options", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "xkb_options", "No input device defined.");
}
diff --git a/sway/commands/input/xkb_rules.c b/sway/commands/input/xkb_rules.c
index aafe0003..926d0ac1 100644
--- a/sway/commands/input/xkb_rules.c
+++ b/sway/commands/input/xkb_rules.c
@@ -5,11 +5,12 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_rules(int argc, char **argv) {
- wlr_log(L_DEBUG, "xkb rules for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_rules", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "xkb_rules", "No input device defined.");
}
diff --git a/sway/commands/input/xkb_variant.c b/sway/commands/input/xkb_variant.c
index 89a61fdc..0e3ffd41 100644
--- a/sway/commands/input/xkb_variant.c
+++ b/sway/commands/input/xkb_variant.c
@@ -5,11 +5,12 @@
#include "log.h"
struct cmd_results *input_cmd_xkb_variant(int argc, char **argv) {
- wlr_log(L_DEBUG, "xkb variant for device: %s", current_input_config->identifier);
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "xkb_variant", EXPECTED_EQUAL_TO, 1))) {
return error;
}
+ struct input_config *current_input_config =
+ config->handler_context.input_config;
if (!current_input_config) {
return cmd_results_new(CMD_FAILURE, "xkb_variant", "No input device defined.");
}
diff --git a/sway/config.c b/sway/config.c
index 5ec45b17..54357625 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -54,6 +54,8 @@ static void free_mode(struct sway_mode *mode) {
}
void free_config(struct sway_config *config) {
+ config_clear_handler_context(config);
+
int i;
if (!config) {
@@ -480,6 +482,11 @@ bool load_include_configs(const char *path, struct sway_config *config) {
return true;
}
+void config_clear_handler_context(struct sway_config *config) {
+ free_input_config(config->handler_context.input_config);
+
+ memset(&config->handler_context, 0, sizeof(config->handler_context));
+}
bool read_config(FILE *file, struct sway_config *config) {
bool success = true;
@@ -592,8 +599,6 @@ bool read_config(FILE *file, struct sway_config *config) {
case CMD_BLOCK_INPUT:
wlr_log(L_DEBUG, "End of input block");
- free_input_config(current_input_config);
- current_input_config = NULL;
block = CMD_BLOCK_END;
break;
@@ -635,6 +640,7 @@ bool read_config(FILE *file, struct sway_config *config) {
default:;
}
+ config_clear_handler_context(config);
default:;
}
free(line);
--
cgit v1.2.3
From cc3c713889e529c74888d9cd89af7039bfbae20c Mon Sep 17 00:00:00 2001
From: Tony Crisci <tony@dubstepdish.com>
Date: Sat, 20 Jan 2018 11:44:34 -0500
Subject: seat config handler context
---
include/sway/config.h | 1 +
include/sway/input/input-manager.h | 2 --
sway/commands.c | 1 -
sway/commands/input.c | 3 +++
sway/commands/seat.c | 25 +++++++++++++++++++++----
sway/commands/seat/attach.c | 2 ++
sway/commands/seat/fallback.c | 3 +++
sway/config.c | 2 +-
8 files changed, 31 insertions(+), 8 deletions(-)
(limited to 'sway/commands/input.c')
diff --git a/include/sway/config.h b/include/sway/config.h
index 1ab96b51..27fae0c6 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -354,6 +354,7 @@ struct sway_config {
// Context for command handlers
struct {
struct input_config *input_config;
+ struct seat_config *seat_config;
} handler_context;
};
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
index 8388f930..58a93fe3 100644
--- a/include/sway/input/input-manager.h
+++ b/include/sway/input/input-manager.h
@@ -5,8 +5,6 @@
#include "sway/config.h"
#include "list.h"
-extern struct seat_config *current_seat_config;
-
/**
* The global singleton input manager
* TODO: make me not a global
diff --git a/sway/commands.c b/sway/commands.c
index fd2e1514..414ef809 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -86,7 +86,6 @@ void apply_seat_config(struct seat_config *seat) {
list_add(config->seat_configs, seat);
}
- current_seat_config = seat;
sway_input_manager_apply_seat_config(input_manager, seat);
}
diff --git a/sway/commands/input.c b/sway/commands/input.c
index 5de65621..fa9cf05a 100644
--- a/sway/commands/input.c
+++ b/sway/commands/input.c
@@ -28,6 +28,9 @@ struct cmd_results *cmd_input(int argc, char **argv) {
if (!has_context) {
// caller did not give a context so create one just for this command
config->handler_context.input_config = new_input_config(argv[0]);
+ if (!config->handler_context.input_config) {
+ return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
+ }
}
int argc_new = argc-2;
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 6284002b..45079616 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -11,8 +11,12 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
}
if (config->reading && strcmp("{", argv[1]) == 0) {
- current_seat_config = new_seat_config(argv[0]);
- wlr_log(L_DEBUG, "entering seat block: %s", current_seat_config->name);
+ free_seat_config(config->handler_context.seat_config);
+ config->handler_context.seat_config = new_seat_config(argv[0]);
+ if (!config->handler_context.seat_config) {
+ return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
+ }
+ wlr_log(L_DEBUG, "entering seat block: %s", argv[0]);
return cmd_results_new(CMD_BLOCK_SEAT, NULL, NULL);
}
@@ -20,11 +24,18 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
return error;
}
+ bool has_context = (config->handler_context.seat_config != NULL);
+ if (!has_context) {
+ config->handler_context.seat_config = new_seat_config(argv[0]);
+ if (!config->handler_context.seat_config) {
+ return cmd_results_new(CMD_FAILURE, NULL, "Couldn't allocate config");
+ }
+ }
+
int argc_new = argc-2;
char **argv_new = argv+2;
struct cmd_results *res;
- current_seat_config = new_seat_config(argv[0]);
if (strcasecmp("attach", argv[1]) == 0) {
res = seat_cmd_attach(argc_new, argv_new);
} else if (strcasecmp("fallback", argv[1]) == 0) {
@@ -32,6 +43,12 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
} else {
res = cmd_results_new(CMD_INVALID, "seat <name>", "Unknown command %s", argv[1]);
}
- current_seat_config = NULL;
+
+ if (!has_context) {
+ // clean up the context we created earlier
+ free_seat_config(config->handler_context.seat_config);
+ config->handler_context.seat_config = NULL;
+ }
+
return res;
}
diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 80ec63ce..3e771c00 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -12,6 +12,8 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct seat_config *current_seat_config =
+ config->handler_context.seat_config;
if (!current_seat_config) {
return cmd_results_new(CMD_FAILURE, "attach", "No seat defined");
}
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index 7c129aae..56feaab5 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -9,6 +9,8 @@ struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
if ((error = checkarg(argc, "fallback", EXPECTED_AT_LEAST, 1))) {
return error;
}
+ struct seat_config *current_seat_config =
+ config->handler_context.seat_config;
if (!current_seat_config) {
return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined");
}
@@ -20,6 +22,7 @@ struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
} else if (strcasecmp(argv[0], "false") == 0) {
new_config->fallback = 0;
} else {
+ free_seat_config(new_config);
return cmd_results_new(CMD_INVALID, "fallback",
"Expected 'fallback <true|false>'");
}
diff --git a/sway/config.c b/sway/config.c
index 54357625..2683d6bc 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -484,6 +484,7 @@ bool load_include_configs(const char *path, struct sway_config *config) {
void config_clear_handler_context(struct sway_config *config) {
free_input_config(config->handler_context.input_config);
+ free_seat_config(config->handler_context.seat_config);
memset(&config->handler_context, 0, sizeof(config->handler_context));
}
@@ -604,7 +605,6 @@ bool read_config(FILE *file, struct sway_config *config) {
case CMD_BLOCK_SEAT:
wlr_log(L_DEBUG, "End of seat block");
- current_seat_config = NULL;
block = CMD_BLOCK_END;
break;
--
cgit v1.2.3