From 976e48d79f46fbab02d7af0ae1b6804018774a63 Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Tue, 12 Jul 2016 13:58:24 +0000 Subject: Initial work on window events --- sway/ipc-server.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'sway/ipc-server.c') diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 0729bfd5..1dc3ab79 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -339,6 +339,8 @@ void ipc_client_handle_command(struct ipc_client *client) { client->subscribed_events |= IPC_EVENT_BARCONFIG_UPDATE; } else if (strcmp(event_type, "mode") == 0) { client->subscribed_events |= IPC_EVENT_MODE; + } else if (strcmp(event_type, "window") == 0) { + client->subscribed_events |= IPC_EVENT_WINDOW; } else if (strcmp(event_type, "modifier") == 0) { client->subscribed_events |= IPC_EVENT_MODIFIER; #if SWAY_BINDING_EVENT @@ -556,6 +558,21 @@ void ipc_event_workspace(swayc_t *old, swayc_t *new, const char *change) { json_object_put(obj); // free } +void ipc_event_window(swayc_t *window, const char *change) { + json_object *obj = json_object_new_object(); + json_object_object_add(obj, "change", json_object_new_string(change)); + if (strcmp(change, "close") == 0 || !window) { + json_object_object_add(obj, "container", NULL); + } else { + json_object_object_add(obj, "container", ipc_json_describe_container(window)); + } + + const char *json_string = json_object_to_json_string(obj); + ipc_send_event(json_string, IPC_EVENT_WINDOW); + + json_object_put(obj); // free +} + void ipc_event_barconfig_update(struct bar_config *bar) { json_object *json = ipc_json_describe_bar_config(bar); const char *json_string = json_object_to_json_string(json); -- cgit v1.2.3 From 2029fef6b8ce7d9e332bd616bb9c6a76fa404c06 Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Tue, 19 Jul 2016 23:28:06 +0300 Subject: More progress on window events --- sway/ipc-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/ipc-server.c') diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 1dc3ab79..24df4649 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -564,7 +564,7 @@ void ipc_event_window(swayc_t *window, const char *change) { if (strcmp(change, "close") == 0 || !window) { json_object_object_add(obj, "container", NULL); } else { - json_object_object_add(obj, "container", ipc_json_describe_container(window)); + json_object_object_add(obj, "container", ipc_json_describe_window(window)); } const char *json_string = json_object_to_json_string(obj); -- cgit v1.2.3 From e5c7b019ffd952010bd8ae25a436c96f223fbb2d Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Wed, 20 Jul 2016 14:56:14 +0300 Subject: Fix dispatching and assigning events --- sway/ipc-server.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'sway/ipc-server.c') diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 24df4649..8110bd41 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -54,6 +54,8 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay void ipc_get_workspaces_callback(swayc_t *workspace, void *data); void ipc_get_outputs_callback(swayc_t *container, void *data); +#define event_mask(ev) (1 << (ev & 0x7F)) + void ipc_init(void) { ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); if (ipc_socket == -1) { @@ -334,18 +336,18 @@ void ipc_client_handle_command(struct ipc_client *client) { for (int i = 0; i < json_object_array_length(request); i++) { const char *event_type = json_object_get_string(json_object_array_get_idx(request, i)); if (strcmp(event_type, "workspace") == 0) { - client->subscribed_events |= IPC_EVENT_WORKSPACE; + client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE); } else if (strcmp(event_type, "barconfig_update") == 0) { - client->subscribed_events |= IPC_EVENT_BARCONFIG_UPDATE; + client->subscribed_events |= event_mask(IPC_EVENT_BARCONFIG_UPDATE); } else if (strcmp(event_type, "mode") == 0) { - client->subscribed_events |= IPC_EVENT_MODE; + client->subscribed_events |= event_mask(IPC_EVENT_MODE); } else if (strcmp(event_type, "window") == 0) { - client->subscribed_events |= IPC_EVENT_WINDOW; + client->subscribed_events |= event_mask(IPC_EVENT_WINDOW); } else if (strcmp(event_type, "modifier") == 0) { - client->subscribed_events |= IPC_EVENT_MODIFIER; + client->subscribed_events |= event_mask(IPC_EVENT_MODIFIER); #if SWAY_BINDING_EVENT } else if (strcmp(event_type, "binding") == 0) { - client->subscribed_events |= IPC_EVENT_BINDING; + client->subscribed_events |= event_mask(IPC_EVENT_BINDING); #endif } else { ipc_send_reply(client, "{\"success\": false}", 18); @@ -524,7 +526,7 @@ void ipc_send_event(const char *json_string, enum ipc_command_type event) { struct ipc_client *client; for (i = 0; i < ipc_client_list->length; i++) { client = ipc_client_list->items[i]; - if ((client->subscribed_events & event) == 0) { + if ((client->subscribed_events & event_mask(event)) == 0) { continue; } client->current_command = event; -- cgit v1.2.3 From f52daa26c9bb4984ec857de1b18560a4c47553c8 Mon Sep 17 00:00:00 2001 From: Mykyta Holubakha Date: Thu, 21 Jul 2016 02:06:34 +0300 Subject: Unite describe_view and describe_window --- sway/ipc-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sway/ipc-server.c') diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 8110bd41..305b6944 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -566,7 +566,7 @@ void ipc_event_window(swayc_t *window, const char *change) { if (strcmp(change, "close") == 0 || !window) { json_object_object_add(obj, "container", NULL); } else { - json_object_object_add(obj, "container", ipc_json_describe_window(window)); + json_object_object_add(obj, "container", ipc_json_describe_container(window)); } const char *json_string = json_object_to_json_string(obj); -- cgit v1.2.3