Merge branch 'master' into next

[i3/i3] / include / bindings.h

diff --git a/include/bindings.h b/include/bindings.h
index e2acc313485a805898a90ccac2ba922e858db2fb..19345f8c82ad6c6144d8c7bbde53f849bceb86eb 100644 (file)
--- a/include/bindings.h
+++ b/include/bindings.h
@@ -24,7 +24,7 @@ const char *DEFAULT_BINDING_MODE;
  *
  */
 Binding *configure_binding(const char *bindtype, const char *modifiers, const char *input_code,
-                           const char *release, const char *command, const char *mode);
+                           const char *release, const char *whole_window, const char *command, const char *mode);
 
 /**
  * Grab the bound keys (tell X to send us keypress events for those keycodes)
@@ -60,6 +60,11 @@ void switch_mode(const char *new_mode);
  */
 void check_for_duplicate_bindings(struct context *context);
 
+/**
+ * Frees the binding. If bind is null, it simply returns.
+ */
+void binding_free(Binding *bind);
+
 /**
  * Runs the given binding and handles parse errors. If con is passed, it will
  * execute the command binding with that container selected by criteria.