mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-05 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Trigger ipc_event_workspace in all cases

Browse source 
This makes sure that the workspace IPC event is triggered when needed.

Fixes #382 while making sure that the IPC event is only triggered once.
This commit is contained in:
Mikkel Oscar Lyderik 2015-12-21 22:01:36 +01:00
parent 442a54c38b
commit 50b04884b6
4 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sway/ipc-server.c
View file

@ -562,15 +562,23 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
return json;
}
void ipc_event_workspace(swayc_t *old, swayc_t *new) {
void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) {
json_object *obj = json_object_new_object();
json_object_object_add(obj, "change", json_object_new_string("focus"));
if (old) {
json_object_object_add(obj, "old", ipc_json_describe_workspace(old));
} else {
json_object_object_add(obj, "old", NULL);
json_object_object_add(obj, "change", json_object_new_string(change));
if (strcmp("focus", change) == 0) {
if (old) {
json_object_object_add(obj, "old", ipc_json_describe_workspace(old));
} else {
json_object_object_add(obj, "old", NULL);
}
}
json_object_object_add(obj, "current", ipc_json_describe_workspace(new));
if (new) {
json_object_object_add(obj, "current", ipc_json_describe_workspace(new));
} else {
json_object_object_add(obj, "current", NULL);
}
const char *json_string = json_object_to_json_string(obj);
for (int i = 0; i < ipc_client_list->length; i++) {