aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-server.c
diff options
context:
space:
mode:
authorLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-07 11:37:51 -0600
committerLibravatar Calvin Lee <cyrus296@gmail.com>2017-04-07 11:37:51 -0600
commit154c6718c1f0e34e0f217150ba2770ee100e5b38 (patch)
treeb929def6e7bcdbff10a7f1cc815f9a278821c666 /sway/ipc-server.c
parentMerge pull request #1153 from SirCmpwn/fix-1152 (diff)
downloadsway-154c6718c1f0e34e0f217150ba2770ee100e5b38.tar.gz
sway-154c6718c1f0e34e0f217150ba2770ee100e5b38.tar.zst
sway-154c6718c1f0e34e0f217150ba2770ee100e5b38.zip
Add `-t get_marks` and use more i3-like marks
In i3 every mark is unique and one mark cannot be used in more than one window, sway behavior has been amended to match this. `swaymsg -t get_marks` will now return an array of all marks used in sway. See #98
Diffstat (limited to 'sway/ipc-server.c')
-rw-r--r--sway/ipc-server.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
index 984e6754..6554098b 100644
--- a/sway/ipc-server.c
+++ b/sway/ipc-server.c
@@ -63,6 +63,7 @@ void ipc_client_handle_command(struct ipc_client *client);
63bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t payload_length); 63bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t payload_length);
64void ipc_get_workspaces_callback(swayc_t *workspace, void *data); 64void ipc_get_workspaces_callback(swayc_t *workspace, void *data);
65void ipc_get_outputs_callback(swayc_t *container, void *data); 65void ipc_get_outputs_callback(swayc_t *container, void *data);
66static void ipc_get_marks_callback(swayc_t *container, void *data);
66 67
67void ipc_init(void) { 68void ipc_init(void) {
68 ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); 69 ipc_socket = socket(AF_UNIX, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
@@ -464,6 +465,19 @@ void ipc_client_handle_command(struct ipc_client *client) {
464 goto exit_cleanup; 465 goto exit_cleanup;
465 } 466 }
466 467
468 case IPC_GET_MARKS:
469 {
470 if (!(client->security_policy & IPC_FEATURE_GET_MARKS)) {
471 goto exit_denied;
472 }
473 json_object *marks = json_object_new_array();
474 container_map(&root_container, ipc_get_marks_callback, marks);
475 const char *json_string = json_object_to_json_string(marks);
476 ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
477 json_object_put(marks);
478 goto exit_cleanup;
479 }
480
467 case IPC_GET_VERSION: 481 case IPC_GET_VERSION:
468 { 482 {
469 json_object *version = ipc_json_get_version(); 483 json_object *version = ipc_json_get_version();
@@ -617,6 +631,16 @@ void ipc_get_outputs_callback(swayc_t *container, void *data) {
617 } 631 }
618} 632}
619 633
634static void ipc_get_marks_callback(swayc_t *container, void *data) {
635 json_object *object = (json_object *)data;
636 if (container->marks) {
637 for (int i = 0; i < container->marks->length; ++i) {
638 char *mark = (char *)container->marks->items[i];
639 json_object_array_add(object, json_object_new_string(mark));
640 }
641 }
642}
643
620void ipc_send_event(const char *json_string, enum ipc_command_type event) { 644void ipc_send_event(const char *json_string, enum ipc_command_type event) {
621 static struct { 645 static struct {
622 enum ipc_command_type event; 646 enum ipc_command_type event;