1 files changed, 97 insertions, 117 deletions

diff --git a/sway/config.c b/sway/config.c
index 6e665434..f9131e0f 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -1,3 +1,4 @@
+#undef _POSIX_C_SOURCE
 #define _XOPEN_SOURCE 700 // for realpath
 #include <stdio.h>
 #include <stdbool.h>
@@ -26,7 +27,7 @@
 #include "sway/tree/arrange.h"
 #include "sway/tree/root.h"
 #include "sway/tree/workspace.h"
-#include "cairo.h"
+#include "cairo_util.h"
 #include "pango.h"
 #include "stringop.h"
 #include "list.h"
@@ -36,19 +37,26 @@
 struct sway_config *config = NULL;
 
 static struct xkb_state *keysym_translation_state_create(
-                struct xkb_rule_names rules) {
-        struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+                struct xkb_rule_names rules, uint32_t context_flags) {
+        struct xkb_context *context = xkb_context_new(context_flags | XKB_CONTEXT_NO_SECURE_GETENV);
         struct xkb_keymap *xkb_keymap = xkb_keymap_new_from_names(
                 context,
                 &rules,
                 XKB_KEYMAP_COMPILE_NO_FLAGS);
-
         xkb_context_unref(context);
+        if (xkb_keymap == NULL) {
+                sway_log(SWAY_ERROR, "Failed to compile keysym translation XKB keymap");
+                return NULL;
+        }
+
         return xkb_state_new(xkb_keymap);
 }
 
 static void keysym_translation_state_destroy(
                 struct xkb_state *state) {
+        if (state == NULL) {
+                return;
+        }
         xkb_keymap_unref(xkb_state_get_keymap(state));
         xkb_state_unref(state);
 }
@@ -82,6 +90,12 @@ static void free_mode(struct sway_mode *mode) {
                 }
                 list_free(mode->switch_bindings);
         }
+        if (mode->gesture_bindings) {
+                for (int i = 0; i < mode->gesture_bindings->length; i++) {
+                        free_gesture_binding(mode->gesture_bindings->items[i]);
+                }
+                list_free(mode->gesture_bindings);
+        }
         free(mode);
 }
 
@@ -222,6 +236,7 @@ static void config_defaults(struct sway_config *config) {
         if (!(config->current_mode->keycode_bindings = create_list())) goto cleanup;
         if (!(config->current_mode->mouse_bindings = create_list())) goto cleanup;
         if (!(config->current_mode->switch_bindings = create_list())) goto cleanup;
+        if (!(config->current_mode->gesture_bindings = create_list())) goto cleanup;
         list_add(config->modes, config->current_mode);
 
         config->floating_mod = 0;
@@ -236,7 +251,7 @@ static void config_defaults(struct sway_config *config) {
         config->default_layout = L_NONE;
         config->default_orientation = L_NONE;
         if (!(config->font = strdup("monospace 10"))) goto cleanup;
-        config->font_height = 17; // height of monospace 10
+        config->font_description = pango_font_description_from_string(config->font);
         config->urgent_timeout = 500;
         config->focus_on_window_activation = FOWA_URGENT;
         config->popup_during_fullscreen = POPUP_SMART;
@@ -266,8 +281,9 @@ static void config_defaults(struct sway_config *config) {
         config->title_align = ALIGN_LEFT;
         config->tiling_drag = true;
         config->tiling_drag_threshold = 9;
+        config->primary_selection = true;
 
-        config->smart_gaps = false;
+        config->smart_gaps = SMART_GAPS_OFF;
         config->gaps_inner = 0;
         config->gaps_outer.top = 0;
         config->gaps_outer.right = 0;
@@ -291,6 +307,8 @@ static void config_defaults(struct sway_config *config) {
         config->hide_edge_borders_smart = ESMART_OFF;
         config->hide_lone_tab = false;
 
+        config->has_focused_tab_title = false;
+
         // border colors
         color_to_rgba(config->border_colors.focused.border, 0x4C7899FF);
         color_to_rgba(config->border_colors.focused.background, 0x285577FF);
@@ -326,8 +344,14 @@ static void config_defaults(struct sway_config *config) {
 
         // The keysym to keycode translation
         struct xkb_rule_names rules = {0};
-        config->keysym_translation_state =
-                keysym_translation_state_create(rules);
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
+        if (config->keysym_translation_state == NULL) {
+                config->keysym_translation_state = keysym_translation_state_create(rules,
+                        XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
+        }
+        if (config->keysym_translation_state == NULL) {
+                goto cleanup;
+        }
 
         return;
 cleanup:
@@ -338,35 +362,53 @@ static bool file_exists(const char *path) {
         return path && access(path, R_OK) != -1;
 }
 
+static char *config_path(const char *prefix, const char *config_folder) {
+        if (!prefix || !prefix[0] || !config_folder || !config_folder[0]) {
+                return NULL;
+        }
+        return format_str("%s/%s/config", prefix, config_folder);
+}
+
 static char *get_config_path(void) {
-        static const char *config_paths[] = {
-                "$HOME/.sway/config",
-                "$XDG_CONFIG_HOME/sway/config",
-                "$HOME/.i3/config",
-                "$XDG_CONFIG_HOME/i3/config",
-                SYSCONFDIR "/sway/config",
-                SYSCONFDIR "/i3/config",
+        char *path = NULL;
+        const char *home = getenv("HOME");
+        char *config_home_fallback = NULL;
+
+        const char *config_home = getenv("XDG_CONFIG_HOME");
+        if ((config_home == NULL || config_home[0] == '\0') && home != NULL) {
+                config_home_fallback = format_str("%s/.config", home);
+                config_home = config_home_fallback;
+        }
+
+        struct config_path {
+                const char *prefix;
+                const char *config_folder;
         };
 
-        char *config_home = getenv("XDG_CONFIG_HOME");
-        if (!config_home || !*config_home) {
-                config_paths[1] = "$HOME/.config/sway/config";
-                config_paths[3] = "$HOME/.config/i3/config";
-        }
+        struct config_path config_paths[] = {
+                { .prefix = home, .config_folder = ".sway"},
+                { .prefix = config_home, .config_folder = "sway"},
+                { .prefix = home, .config_folder = ".i3"},
+                { .prefix = config_home, .config_folder = "i3"},
+                { .prefix = SYSCONFDIR, .config_folder = "sway"},
+                { .prefix = SYSCONFDIR, .config_folder = "i3"}
+        };
 
-        for (size_t i = 0; i < sizeof(config_paths) / sizeof(char *); ++i) {
-                wordexp_t p;
-                if (wordexp(config_paths[i], &p, WRDE_UNDEF) == 0) {
-                        char *path = strdup(p.we_wordv[0]);
-                        wordfree(&p);
-                        if (file_exists(path)) {
-                                return path;
-                        }
-                        free(path);
+        size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);
+        for (size_t i = 0; i < num_config_paths; i++) {
+                path = config_path(config_paths[i].prefix, config_paths[i].config_folder);
+                if (!path) {
+                        continue;
+                }
+                if (file_exists(path)) {
+                        break;
                 }
+                free(path);
+                path = NULL;
         }
 
-        return NULL;
+        free(config_home_fallback);
+        return path;
 }
 
 static bool load_config(const char *path, struct sway_config *config,
@@ -438,6 +480,11 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                                 old_config->xwayland ? "enabled" : "disabled");
                 config->xwayland = old_config->xwayland;
 
+                // primary_selection can only be enabled/disabled at launch
+                sway_log(SWAY_DEBUG, "primary_selection will remain %s",
+                                old_config->primary_selection ? "enabled" : "disabled");
+                config->primary_selection = old_config->primary_selection;
+
                 if (!config->validating) {
                         if (old_config->swaybg_client != NULL) {
                                 wl_client_destroy(old_config->swaybg_client);
@@ -457,56 +504,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
 
         config->reading = true;
 
-        // Read security configs
-        // TODO: Security
-        bool success = true;
-        /*
-        DIR *dir = opendir(SYSCONFDIR "/sway/security.d");
-        if (!dir) {
-                sway_log(SWAY_ERROR,
-                        "%s does not exist, sway will have no security configuration"
-                        " and will probably be broken", SYSCONFDIR "/sway/security.d");
-        } else {
-                list_t *secconfigs = create_list();
-                char *base = SYSCONFDIR "/sway/security.d/";
-                struct dirent *ent = readdir(dir);
-                struct stat s;
-                while (ent != NULL) {
-                        char *_path = malloc(strlen(ent->d_name) + strlen(base) + 1);
-                        strcpy(_path, base);
-                        strcat(_path, ent->d_name);
-                        lstat(_path, &s);
-                        if (S_ISREG(s.st_mode) && ent->d_name[0] != '.') {
-                                list_add(secconfigs, _path);
-                        }
-                        else {
-                                free(_path);
-                        }
-                        ent = readdir(dir);
-                }
-                closedir(dir);
-
-                list_qsort(secconfigs, qstrcmp);
-                for (int i = 0; i < secconfigs->length; ++i) {
-                        char *_path = secconfigs->items[i];
-                        if (stat(_path, &s) || s.st_uid != 0 || s.st_gid != 0 ||
-                                        (((s.st_mode & 0777) != 0644) &&
-                                        (s.st_mode & 0777) != 0444)) {
-                                sway_log(SWAY_ERROR,
-                                        "Refusing to load %s - it must be owned by root "
-                                        "and mode 644 or 444", _path);
-                                success = false;
-                        } else {
-                                success = success && load_config(_path, config);
-                        }
-                }
-
-                list_free_items_and_destroy(secconfigs);
-        }
-        */
-
-        success = success && load_config(path, config,
-                        &config->swaynag_config_errors);
+        bool success = load_config(path, config, &config->swaynag_config_errors);
 
         if (validating) {
                 free_config(config);
@@ -514,6 +512,9 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                 return success;
         }
 
+        // Only really necessary if not explicitly `font` is set in the config.
+        config_update_font_height();
+
         if (is_active && !validating) {
                 input_manager_verify_fallback_seat();
 
@@ -531,7 +532,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
                 }
                 sway_switch_retrigger_bindings_for_all();
 
-                reset_outputs();
+                apply_all_output_configs();
                 spawn_swaybg();
 
                 config->reloading = false;
@@ -884,23 +885,18 @@ void config_add_swaynag_warning(char *fmt, ...) {
         if (config->reading && !config->validating) {
                 va_list args;
                 va_start(args, fmt);
-                size_t length = vsnprintf(NULL, 0, fmt, args) + 1;
+                char *str = vformat_str(fmt, args);
                 va_end(args);
-
-                char *temp = malloc(length + 1);
-                if (!temp) {
-                        sway_log(SWAY_ERROR, "Failed to allocate buffer for warning.");
+                if (str == NULL) {
                         return;
                 }
 
-                va_start(args, fmt);
-                vsnprintf(temp, length, fmt, args);
-                va_end(args);
-
                 swaynag_log(config->swaynag_command, &config->swaynag_config_errors,
                         "Warning on line %i (%s) '%s': %s",
                         config->current_config_line_number, config->current_config_path,
-                        config->current_config_line, temp);
+                        config->current_config_line, str);
+
+                free(str);
         }
 }
 
@@ -940,7 +936,7 @@ char *do_var_replacement(char *str) {
                                 int offset = find - str;
                                 strncpy(newptr, str, offset);
                                 newptr += offset;
-                                strncpy(newptr, var->value, vvlen);
+                                memcpy(newptr, var->value, vvlen);
                                 newptr += vvlen;
                                 strcpy(newptr, find + vnlen);
                                 free(str);
@@ -964,31 +960,11 @@ int workspace_output_cmp_workspace(const void *a, const void *b) {
         return lenient_strcmp(wsa->workspace, wsb->workspace);
 }
 
-static void find_font_height_iterator(struct sway_container *con, void *data) {
-        size_t amount_below_baseline = con->title_height - con->title_baseline;
-        size_t extended_height = config->font_baseline + amount_below_baseline;
-        if (extended_height > config->font_height) {
-                config->font_height = extended_height;
-        }
-}
-
-static void find_baseline_iterator(struct sway_container *con, void *data) {
-        bool *recalculate = data;
-        if (*recalculate) {
-                container_calculate_title_height(con);
-        }
-        if (con->title_baseline > config->font_baseline) {
-                config->font_baseline = con->title_baseline;
-        }
-}
 
-void config_update_font_height(bool recalculate) {
-        size_t prev_max_height = config->font_height;
-        config->font_height = 0;
-        config->font_baseline = 0;
+void config_update_font_height(void) {
+        int prev_max_height = config->font_height;
 
-        root_for_each_container(find_baseline_iterator, &recalculate);
-        root_for_each_container(find_font_height_iterator, NULL);
+        get_text_metrics(config->font_description, &config->font_height, &config->font_baseline);
 
         if (config->font_height != prev_max_height) {
                 arrange_root();
@@ -1022,8 +998,12 @@ void translate_keysyms(struct input_config *input_config) {
 
         struct xkb_rule_names rules = {0};
         input_config_fill_rule_names(input_config, &rules);
-        config->keysym_translation_state =
-                keysym_translation_state_create(rules);
+        config->keysym_translation_state = keysym_translation_state_create(rules, 0);
+        if (config->keysym_translation_state == NULL) {
+                sway_log(SWAY_ERROR, "Failed to create keysym translation XKB state "
+                        "for device '%s'", input_config->identifier);
+                return;
+        }
 
         for (int i = 0; i < config->modes->length; ++i) {
                 struct sway_mode *mode = config->modes->items[i];