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 /sway/ipc-server.c | |
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 'sway/ipc-server.c')
-rw-r--r-- | sway/ipc-server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 96889b39..abdaa237 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -336,13 +336,15 @@ void ipc_event_barconfig_update(struct bar_config *bar) { | |||
336 | json_object_put(json); | 336 | json_object_put(json); |
337 | } | 337 | } |
338 | 338 | ||
339 | void ipc_event_mode(const char *mode) { | 339 | void ipc_event_mode(const char *mode, bool pango) { |
340 | if (!ipc_has_event_listeners(IPC_EVENT_MODE)) { | 340 | if (!ipc_has_event_listeners(IPC_EVENT_MODE)) { |
341 | return; | 341 | return; |
342 | } | 342 | } |
343 | wlr_log(L_DEBUG, "Sending mode::%s event", mode); | 343 | wlr_log(L_DEBUG, "Sending mode::%s event", mode); |
344 | json_object *obj = json_object_new_object(); | 344 | json_object *obj = json_object_new_object(); |
345 | json_object_object_add(obj, "change", json_object_new_string(mode)); | 345 | json_object_object_add(obj, "change", json_object_new_string(mode)); |
346 | json_object_object_add(obj, "pango_markup", | ||
347 | json_object_new_boolean(pango)); | ||
346 | 348 | ||
347 | const char *json_string = json_object_to_json_string(obj); | 349 | const char *json_string = json_object_to_json_string(obj); |
348 | ipc_send_event(json_string, IPC_EVENT_MODE); | 350 | ipc_send_event(json_string, IPC_EVENT_MODE); |