aboutsummaryrefslogtreecommitdiffstats
path: root/swaybar/main.c
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-03 18:52:53 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-03 18:52:53 +0100
commita20226772ee1236cbeabc6fbb3efdce64e407932 (patch)
tree852873a655d09c9332dc0d5f546f8181df24ebf6 /swaybar/main.c
parentMerge pull request #421 from crondog/splittoggle (diff)
downloadsway-a20226772ee1236cbeabc6fbb3efdce64e407932.tar.gz
sway-a20226772ee1236cbeabc6fbb3efdce64e407932.tar.zst
sway-a20226772ee1236cbeabc6fbb3efdce64e407932.zip
swaybar: rename ipc_listen_sock.. to ipc_event_sock..
Diffstat (limited to 'swaybar/main.c')
-rw-r--r--swaybar/main.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/swaybar/main.c b/swaybar/main.c
index cbedb200..aa761b7d 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -66,7 +66,7 @@ struct status_block {
66list_t *status_line = NULL; 66list_t *status_line = NULL;
67 67
68list_t *workspaces = NULL; 68list_t *workspaces = NULL;
69int ipc_socketfd, ipc_listen_socketfd; 69int ipc_socketfd, ipc_event_socketfd;
70pid_t pid; 70pid_t pid;
71int status_read_fd; 71int status_read_fd;
72char line[1024]; 72char line[1024];
@@ -155,8 +155,8 @@ void swaybar_teardown() {
155 close(ipc_socketfd); 155 close(ipc_socketfd);
156 } 156 }
157 157
158 if (ipc_listen_socketfd) { 158 if (ipc_event_socketfd) {
159 close(ipc_listen_socketfd); 159 close(ipc_event_socketfd);
160 } 160 }
161} 161}
162 162
@@ -403,9 +403,9 @@ void bar_ipc_init(int outputi, const char *bar_id) {
403 json_object_put(bar_config); 403 json_object_put(bar_config);
404 free(res); 404 free(res);
405 405
406 const char *subscribe_json = "[ \"workspace\" ]"; 406 const char *subscribe_json = "[ \"workspace\", \"mode\" ]";
407 len = strlen(subscribe_json); 407 len = strlen(subscribe_json);
408 res = ipc_single_command(ipc_listen_socketfd, IPC_SUBSCRIBE, subscribe_json, &len); 408 res = ipc_single_command(ipc_event_socketfd, IPC_SUBSCRIBE, subscribe_json, &len);
409 free(res); 409 free(res);
410 410
411 ipc_update_workspaces(); 411 ipc_update_workspaces();
@@ -1015,7 +1015,7 @@ void poll_for_update() {
1015 1015
1016 dirty = false; 1016 dirty = false;
1017 FD_ZERO(&readfds); 1017 FD_ZERO(&readfds);
1018 FD_SET(ipc_listen_socketfd, &readfds); 1018 FD_SET(ipc_event_socketfd, &readfds);
1019 FD_SET(status_read_fd, &readfds); 1019 FD_SET(status_read_fd, &readfds);
1020 1020
1021 activity = select(FD_SETSIZE, &readfds, NULL, NULL, NULL); 1021 activity = select(FD_SETSIZE, &readfds, NULL, NULL, NULL);
@@ -1023,10 +1023,10 @@ void poll_for_update() {
1023 sway_log(L_ERROR, "polling failed: %d", errno); 1023 sway_log(L_ERROR, "polling failed: %d", errno);
1024 } 1024 }
1025 1025
1026 if (FD_ISSET(ipc_listen_socketfd, &readfds)) { 1026 if (FD_ISSET(ipc_event_socketfd, &readfds)) {
1027 sway_log(L_DEBUG, "Got workspace update."); 1027 sway_log(L_DEBUG, "Got workspace update.");
1028 uint32_t len; 1028 uint32_t len;
1029 char *buf = ipc_recv_response(ipc_listen_socketfd, &len); 1029 char *buf = ipc_recv_response(ipc_event_socketfd, &len);
1030 free(buf); 1030 free(buf);
1031 ipc_update_workspaces(); 1031 ipc_update_workspaces();
1032 dirty = true; 1032 dirty = true;
@@ -1131,7 +1131,7 @@ int main(int argc, char **argv) {
1131 } 1131 }
1132 } 1132 }
1133 ipc_socketfd = ipc_open_socket(socket_path); 1133 ipc_socketfd = ipc_open_socket(socket_path);
1134 ipc_listen_socketfd = ipc_open_socket(socket_path); 1134 ipc_event_socketfd = ipc_open_socket(socket_path);
1135 1135
1136 1136
1137 if (argc == optind) { 1137 if (argc == optind) {