input config handler context

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 {
         list_t *command_policies;
         list_t *feature_policies;
         list_t *ipc_policies;
+
+        // Context for command handlers
+        struct {
+                struct input_config *input_config;
+        } handler_context;
 };
 
 void pid_workspace_add(struct pid_workspace *pw);
@@ -375,6 +380,9 @@ bool read_config(FILE *file, struct sway_config *config);
  * Free config struct
  */
 void free_config(struct sway_config *config);
+
+void config_clear_handler_context(struct sway_config *config);
+
 void free_sway_variable(struct sway_variable *var);
 /**
  * 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 @@
 #include "sway/config.h"
 #include "list.h"
 
-extern struct input_config *current_input_config;
 extern struct seat_config *current_seat_config;
 
 /**