aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRyan Dwyer <RyanDwyer@users.noreply.github.com>2018-07-10 22:05:33 +1000
committerGitHub <noreply@github.com>2018-07-10 22:05:33 +1000
commit8afe68f92063ff6db061f721868f601b2fc20191 (patch)
tree751b5569e4e05149c7a7cd7e0d8084be5ff62063 /include
parentc1bb73f8652f367ee7b7b82f5fc13aff51145358 (diff)
parent23c1c26c3fedf5470dbee9fe97c2374a48588863 (diff)
Merge pull request #2232 from ianyfan/ipc
Add some missing ipc message types from i3
Diffstat (limited to 'include')
-rw-r--r--include/ipc.h2
-rw-r--r--include/sway/config.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/ipc.h b/include/ipc.h
index 8172c782..6f6795b3 100644
--- a/include/ipc.h
+++ b/include/ipc.h
@@ -13,6 +13,8 @@ enum ipc_command_type {
IPC_GET_MARKS = 5,
IPC_GET_BAR_CONFIG = 6,
IPC_GET_VERSION = 7,
+ IPC_GET_BINDING_MODES = 8,
+ IPC_GET_CONFIG = 9,
// sway-specific command types
IPC_GET_INPUTS = 100,
diff --git a/include/sway/config.h b/include/sway/config.h
index ac668c24..d5e4116f 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -341,6 +341,7 @@ struct sway_config {
int gaps_outer;
list_t *config_chain;
+ const char *current_config_path;
const char *current_config;
enum sway_container_border border;
@@ -496,7 +497,4 @@ void config_update_font_height(bool recalculate);
/* Global config singleton. */
extern struct sway_config *config;
-/* Config file currently being read */
-extern const char *current_config_path;
-
#endif