diff options
author | 2018-07-10 22:05:33 +1000 | |
---|---|---|
committer | 2018-07-10 22:05:33 +1000 | |
commit | 8afe68f92063ff6db061f721868f601b2fc20191 (patch) | |
tree | 751b5569e4e05149c7a7cd7e0d8084be5ff62063 /include | |
parent | Merge pull request #2236 from kupospelov/fix-stacked-layout (diff) | |
parent | Add get_config message type to ipc (diff) | |
download | sway-8afe68f92063ff6db061f721868f601b2fc20191.tar.gz sway-8afe68f92063ff6db061f721868f601b2fc20191.tar.zst sway-8afe68f92063ff6db061f721868f601b2fc20191.zip |
Merge pull request #2232 from ianyfan/ipc
Add some missing ipc message types from i3
Diffstat (limited to 'include')
-rw-r--r-- | include/ipc.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 4 |
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 { | |||
13 | IPC_GET_MARKS = 5, | 13 | IPC_GET_MARKS = 5, |
14 | IPC_GET_BAR_CONFIG = 6, | 14 | IPC_GET_BAR_CONFIG = 6, |
15 | IPC_GET_VERSION = 7, | 15 | IPC_GET_VERSION = 7, |
16 | IPC_GET_BINDING_MODES = 8, | ||
17 | IPC_GET_CONFIG = 9, | ||
16 | 18 | ||
17 | // sway-specific command types | 19 | // sway-specific command types |
18 | IPC_GET_INPUTS = 100, | 20 | 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 { | |||
341 | int gaps_outer; | 341 | int gaps_outer; |
342 | 342 | ||
343 | list_t *config_chain; | 343 | list_t *config_chain; |
344 | const char *current_config_path; | ||
344 | const char *current_config; | 345 | const char *current_config; |
345 | 346 | ||
346 | enum sway_container_border border; | 347 | enum sway_container_border border; |
@@ -496,7 +497,4 @@ void config_update_font_height(bool recalculate); | |||
496 | /* Global config singleton. */ | 497 | /* Global config singleton. */ |
497 | extern struct sway_config *config; | 498 | extern struct sway_config *config; |
498 | 499 | ||
499 | /* Config file currently being read */ | ||
500 | extern const char *current_config_path; | ||
501 | |||
502 | #endif | 500 | #endif |