diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-01-20 11:32:07 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-01-20 11:34:57 -0500 |
commit | 9e0595f26bcca2a4d0aa735c4cd9fc4f792918bf (patch) | |
tree | 1417f4b913875db24efc5418481ab057679680cd /include | |
parent | Merge pull request #1571 from acrisci/wlroots-modifiers-update (diff) | |
download | sway-9e0595f26bcca2a4d0aa735c4cd9fc4f792918bf.tar.gz sway-9e0595f26bcca2a4d0aa735c4cd9fc4f792918bf.tar.zst sway-9e0595f26bcca2a4d0aa735c4cd9fc4f792918bf.zip |
input config handler context
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/config.h | 8 | ||||
-rw-r--r-- | include/sway/input/input-manager.h | 1 |
2 files changed, 8 insertions, 1 deletions
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 { | |||
350 | list_t *command_policies; | 350 | list_t *command_policies; |
351 | list_t *feature_policies; | 351 | list_t *feature_policies; |
352 | list_t *ipc_policies; | 352 | list_t *ipc_policies; |
353 | |||
354 | // Context for command handlers | ||
355 | struct { | ||
356 | struct input_config *input_config; | ||
357 | } handler_context; | ||
353 | }; | 358 | }; |
354 | 359 | ||
355 | void pid_workspace_add(struct pid_workspace *pw); | 360 | void pid_workspace_add(struct pid_workspace *pw); |
@@ -375,6 +380,9 @@ bool read_config(FILE *file, struct sway_config *config); | |||
375 | * Free config struct | 380 | * Free config struct |
376 | */ | 381 | */ |
377 | void free_config(struct sway_config *config); | 382 | void free_config(struct sway_config *config); |
383 | |||
384 | void config_clear_handler_context(struct sway_config *config); | ||
385 | |||
378 | void free_sway_variable(struct sway_variable *var); | 386 | void free_sway_variable(struct sway_variable *var); |
379 | /** | 387 | /** |
380 | * Does variable replacement for a string based on the config's currently loaded variables. | 388 | * 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 @@ | |||
5 | #include "sway/config.h" | 5 | #include "sway/config.h" |
6 | #include "list.h" | 6 | #include "list.h" |
7 | 7 | ||
8 | extern struct input_config *current_input_config; | ||
9 | extern struct seat_config *current_seat_config; | 8 | extern struct seat_config *current_seat_config; |
10 | 9 | ||
11 | /** | 10 | /** |