aboutsummaryrefslogtreecommitdiff
path: root/include/sway
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-06-11 21:41:02 -0400
committerSimon Ser <contact@emersion.fr>2019-06-12 07:56:41 +0300
commit9670ccee683ab985e89eb04302fb998c4161f2d6 (patch)
treef7cafeaf55a7c139e97a920b0b43bcb080d3a27c /include/sway
parent2b5bf78fafdf027624ca88e1f703bc9e577f4690 (diff)
downloadsway-9670ccee683ab985e89eb04302fb998c4161f2d6.tar.xz
bindings: defer while initiailizing
This adds the logic to defer binding execution while sway is still initializing. Without this, the binding command would be executed, but the command handler would return CMD_DEFER, which was being treated as a failure to run. To avoid partial executions, this will defer all bindings while config->active is false.
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/config.h5
-rw-r--r--include/sway/input/seat.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 57ae3c63..9736a665 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -559,6 +559,11 @@ bool read_config(FILE *file, struct sway_config *config,
void run_deferred_commands(void);
/**
+ * Run the binding commands that were deferred when initializing the inputs
+ */
+void run_deferred_bindings(void);
+
+/**
* Adds a warning entry to the swaynag instance used for errors.
*/
void config_add_swaynag_warning(char *fmt, ...);
diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h
index eb6c09a1..c963de9b 100644
--- a/include/sway/input/seat.h
+++ b/include/sway/input/seat.h
@@ -78,6 +78,8 @@ struct sway_seat {
uint32_t last_button_serial;
+ list_t *deferred_bindings; // struct sway_binding
+
struct wl_listener focus_destroy;
struct wl_listener new_node;
struct wl_listener request_start_drag;