diff options
| author | emersion <contact@emersion.fr> | 2018-08-02 23:49:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-02 23:49:25 +0100 |
| commit | 3a54e2291c017397ceff60511c29fe70d229bc8b (patch) | |
| tree | d340b7776f945462f5ecffc830ada4d5fbe82f51 /sway/config | |
| parent | c35a34262f8da368f65d37f811a2264647e0dae6 (diff) | |
| parent | e07da5fc5c6ac5c186662b56b08ca71531119de0 (diff) | |
Merge branch 'master' into wlr-gamma-control
Diffstat (limited to 'sway/config')
| -rw-r--r-- | sway/config/bar.c | 4 | ||||
| -rw-r--r-- | sway/config/input.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c index 3a74331e..ae9383d6 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c @@ -10,6 +10,7 @@ #include <sys/stat.h> #include <signal.h> #include <strings.h> +#include <signal.h> #include "sway/config.h" #include "stringop.h" #include "list.h" @@ -175,6 +176,9 @@ void invoke_swaybar(struct bar_config *bar) { if (bar->pid == 0) { setpgid(0, 0); close(filedes[0]); + sigset_t set; + sigemptyset(&set); + sigprocmask(SIG_SETMASK, &set, NULL); // run custom swaybar size_t len = snprintf(NULL, 0, "%s -b %s", diff --git a/sway/config/input.c b/sway/config/input.c index 8d687a6d..9885e85c 100644 --- a/sway/config/input.c +++ b/sway/config/input.c @@ -33,6 +33,8 @@ struct input_config *new_input_config(const char* identifier) { input->left_handed = INT_MIN; input->repeat_delay = INT_MIN; input->repeat_rate = INT_MIN; + input->xkb_numlock = INT_MIN; + input->xkb_capslock = INT_MIN; return input; } @@ -104,6 +106,12 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { free(dst->xkb_variant); dst->xkb_variant = strdup(src->xkb_variant); } + if (src->xkb_numlock != INT_MIN) { + dst->xkb_numlock = src->xkb_numlock; + } + if (src->xkb_capslock != INT_MIN) { + dst->xkb_capslock = src->xkb_capslock; + } if (src->mapped_from_region) { free(dst->mapped_from_region); dst->mapped_from_region = |