commit 38903e580166b1fd4b55daa0c8b60d40f805f31c
parent 0c58673c6a108ba241419a0f1d5fecd47f22370e
Author: Drew DeVault <sir@cmpwn.com>
Date: Mon, 29 Jan 2018 16:16:23 -0500
Merge pull request #1555 from martinetd/cmd_reload
commands: add 'reload' command
Diffstat:
10 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
@@ -25,6 +25,7 @@ struct sway_cursor {
struct wl_listener request_set_cursor;
};
+void sway_cursor_destroy(struct sway_cursor *cursor);
struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
#endif
diff --git a/include/sway/input/input-manager.h b/include/sway/input/input-manager.h
@@ -46,4 +46,6 @@ void sway_input_manager_apply_seat_config(struct sway_input_manager *input,
struct sway_seat *sway_input_manager_get_default_seat(
struct sway_input_manager *input);
+struct sway_seat *input_manager_get_seat(struct sway_input_manager *input,
+ const char *seat_name);
#endif
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
@@ -29,6 +29,8 @@ struct sway_seat {
struct sway_seat *sway_seat_create(struct sway_input_manager *input,
const char *seat_name);
+void sway_seat_destroy(struct sway_seat *seat);
+
void sway_seat_add_device(struct sway_seat *seat,
struct sway_input_device *device);
diff --git a/sway/commands.c b/sway/commands.c
@@ -136,6 +136,7 @@ static struct cmd_handler handlers[] = {
{ "input", cmd_input },
{ "kill", cmd_kill },
{ "output", cmd_output },
+ { "reload", cmd_reload },
{ "seat", cmd_seat },
{ "set", cmd_set },
};
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
@@ -0,0 +1,21 @@
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "sway/layout.h"
+
+struct cmd_results *cmd_reload(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if (config->reading) {
+ return cmd_results_new(CMD_FAILURE, "reload", "Can't be used in config file.");
+ }
+ if ((error = checkarg(argc, "reload", EXPECTED_EQUAL_TO, 0))) {
+ return error;
+ }
+ if (!load_main_config(config->current_config, true)) {
+ return cmd_results_new(CMD_FAILURE, "reload", "Error(s) reloading config.");
+ }
+
+ /* load_swaybars(); -- for when it's implemented */
+
+ arrange_windows(&root_container, -1, -1);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/config.c b/sway/config.c
@@ -21,6 +21,7 @@
#endif
#include <wlr/types/wlr_output.h>
#include "sway/input/input-manager.h"
+#include "sway/input/seat.h"
#include "sway/commands.h"
#include "sway/config.h"
#include "sway/layout.h"
@@ -109,6 +110,23 @@ void free_config(struct sway_config *config) {
free(config);
}
+static void destroy_removed_seats(struct sway_config *old_config,
+ struct sway_config *new_config) {
+ struct seat_config *seat_config;
+ struct sway_seat *seat;
+ int i;
+ for (i = 0; i < old_config->seat_configs->length; i++) {
+ seat_config = old_config->seat_configs->items[i];
+ /* Also destroy seats that aren't present in new config */
+ if (new_config && list_seq_find(new_config->seat_configs,
+ seat_name_cmp, seat_config->name) < 0) {
+ seat = input_manager_get_seat(input_manager,
+ seat_config->name);
+ sway_seat_destroy(seat);
+ }
+ }
+}
+
static void config_defaults(struct sway_config *config) {
if (!(config->symbols = create_list())) goto cleanup;
if (!(config->modes = create_list())) goto cleanup;
@@ -382,6 +400,7 @@ bool load_main_config(const char *file, bool is_active) {
}
if (old_config) {
+ destroy_removed_seats(old_config, config);
free_config(old_config);
}
config->reading = false;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
@@ -149,6 +149,16 @@ static void handle_request_set_cursor(struct wl_listener *listener,
wlr_log(L_DEBUG, "TODO: handle request set cursor event: %p", event);
}
+void sway_cursor_destroy(struct sway_cursor *cursor) {
+ if (!cursor) {
+ return;
+ }
+
+ wlr_xcursor_manager_destroy(cursor->xcursor_manager);
+ wlr_cursor_destroy(cursor->cursor);
+ free(cursor);
+}
+
struct sway_cursor *sway_cursor_create(struct sway_seat *seat) {
struct sway_cursor *cursor = calloc(1, sizeof(struct sway_cursor));
if (!sway_assert(cursor, "could not allocate sway cursor")) {
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c
@@ -23,7 +23,7 @@ struct sway_input_manager *input_manager;
struct input_config *current_input_config = NULL;
struct seat_config *current_seat_config = NULL;
-static struct sway_seat *input_manager_get_seat(
+struct sway_seat *input_manager_get_seat(
struct sway_input_manager *input, const char *seat_name) {
struct sway_seat *seat = NULL;
wl_list_for_each(seat, &input->seats, link) {
diff --git a/sway/input/seat.c b/sway/input/seat.c
@@ -21,6 +21,16 @@ static void seat_device_destroy(struct sway_seat_device *seat_device) {
free(seat_device);
}
+void sway_seat_destroy(struct sway_seat *seat) {
+ struct sway_seat_device *seat_device, *next;
+ wl_list_for_each_safe(seat_device, next, &seat->devices, link) {
+ seat_device_destroy(seat_device);
+ }
+ sway_cursor_destroy(seat->cursor);
+ wl_list_remove(&seat->link);
+ wlr_seat_destroy(seat->wlr_seat);
+}
+
struct sway_seat *sway_seat_create(struct sway_input_manager *input,
const char *seat_name) {
struct sway_seat *seat = calloc(1, sizeof(struct sway_seat));
diff --git a/sway/meson.build b/sway/meson.build
@@ -34,6 +34,7 @@ sway_sources = files(
'commands/input/xkb_rules.c',
'commands/input/xkb_variant.c',
'commands/output.c',
+ 'commands/reload.c',
'config.c',
'config/output.c',
'config/seat.c',
