mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-26 06:59:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config reload: destroy old seat when removed from config

Browse source 
This adds new sway_seat_destroy and sway_cursor_destroy helpers
and compare new and old config on free
This commit is contained in:
Dominique Martinet 2018-01-16 21:16:04 +01:00
parent 869be4378d
commit 5766f426aa
7 changed files with 45 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sway/config.c
View file

@ -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;