diff options
| author |  emersion <contact@emersion.fr> | 2018-07-06 16:22:13 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-06 16:22:13 +0100 |
| commit | b3c55dd909b070625c9bfcebcb89cb8463e2ffc9 (patch) | |
| tree | 714db24403e159b89cf5eaa59ddbd6cccd033947 /include | |
| parent | pango/cairo: set default font map to NULL to free it (diff) | |
| parent | Merge pull request #2220 from ianyfan/remove-input-fix (diff) | |
| download | sway-b3c55dd909b070625c9bfcebcb89cb8463e2ffc9.tar.gz sway-b3c55dd909b070625c9bfcebcb89cb8463e2ffc9.tar.zst sway-b3c55dd909b070625c9bfcebcb89cb8463e2ffc9.zip | |
Merge branch 'master' into leaks
Diffstat (limited to 'include')
| -rw-r--r-- | include/sway/config.h | 1 | ||||
| -rw-r--r-- | include/sway/ipc-server.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index e75b0664..ac668c24 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
| @@ -50,6 +50,7 @@ struct sway_mode { | |||
| 50 | char *name; | 50 | char *name; |
| 51 | list_t *keysym_bindings; | 51 | list_t *keysym_bindings; |
| 52 | list_t *keycode_bindings; | 52 | list_t *keycode_bindings; |
| 53 | bool pango; | ||
| 53 | }; | 54 | }; |
| 54 | 55 | ||
| 55 | struct input_config_mapped_from_region { | 56 | struct input_config_mapped_from_region { |
diff --git a/include/sway/ipc-server.h b/include/sway/ipc-server.h index 026b5554..6469f097 100644 --- a/include/sway/ipc-server.h +++ b/include/sway/ipc-server.h | |||
| @@ -15,6 +15,6 @@ void ipc_event_workspace(struct sway_container *old, | |||
| 15 | struct sway_container *new, const char *change); | 15 | struct sway_container *new, const char *change); |
| 16 | void ipc_event_window(struct sway_container *window, const char *change); | 16 | void ipc_event_window(struct sway_container *window, const char *change); |
| 17 | void ipc_event_barconfig_update(struct bar_config *bar); | 17 | void ipc_event_barconfig_update(struct bar_config *bar); |
| 18 | void ipc_event_mode(const char *mode); | 18 | void ipc_event_mode(const char *mode, bool pango); |
| 19 | 19 | ||
| 20 | #endif | 20 | #endif |