mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 01:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

swaybar: combine ipc command and event sockets

Browse source
This commit is contained in:
progandy 2016-01-08 18:32:10 +01:00
parent 227d9b82e4
commit 96d787fc49
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
swaybar/main.c
View file

@ -66,7 +66,7 @@ struct status_block {
list_t *status_line = NULL; list_t *status_line = NULL;
list_t *workspaces = NULL; list_t *workspaces = NULL;
int ipc_socketfd, ipc_event_socketfd; int ipc_socketfd;
pid_t pid; pid_t pid;
int status_read_fd; int status_read_fd;
char line[1024]; char line[1024];
@ -158,10 +158,6 @@ void swaybar_teardown() {
if (ipc_socketfd) { if (ipc_socketfd) {
close(ipc_socketfd); close(ipc_socketfd);
} }
if (ipc_event_socketfd) {
close(ipc_event_socketfd);
}
} }
void sway_terminate(void) { void sway_terminate(void) {
@ -193,18 +189,15 @@ void free_workspace(void *item) {
free(ws); free(ws);
} }
void ipc_update_workspaces() { void ipc_update_workspaces(char *payload) {
if (workspaces) { if (workspaces) {
list_foreach(workspaces, free_workspace); list_foreach(workspaces, free_workspace);
list_free(workspaces); list_free(workspaces);
} }
workspaces = create_list(); workspaces = create_list();
uint32_t len = 0; json_object *results = json_tokener_parse(payload);
char *res = ipc_single_command(ipc_socketfd, IPC_GET_WORKSPACES, NULL, &len);
json_object *results = json_tokener_parse(res);
if (!results) { if (!results) {
free(res);
return; return;
} }
@ -234,7 +227,6 @@ void ipc_update_workspaces() {
} }
json_object_put(results); json_object_put(results);
free(res);
} }
uint32_t parse_color(const char *color) { uint32_t parse_color(const char *color) {
@ -421,10 +413,10 @@ void bar_ipc_init(int outputi, const char *bar_id) {
const char *subscribe_json = "[ \"workspace\", \"mode\" ]"; const char *subscribe_json = "[ \"workspace\", \"mode\" ]";
len = strlen(subscribe_json); len = strlen(subscribe_json);
res = ipc_single_command(ipc_event_socketfd, IPC_SUBSCRIBE, subscribe_json, &len); res = ipc_single_command(ipc_socketfd, IPC_SUBSCRIBE, subscribe_json, &len);
free(res); free(res);
ipc_update_workspaces(); ipc_send_command(ipc_socketfd, IPC_GET_WORKSPACES, NULL, 0);
} }
/** /**
@ -705,7 +697,7 @@ void render() {
double x = 0.5; double x = 0.5;
// Workspaces // Workspaces
if (workspace_buttons) { if (workspace_buttons && workspaces) {
for (i = 0; i < workspaces->length; ++i) { for (i = 0; i < workspaces->length; ++i) {
struct workspace *ws = workspaces->items[i]; struct workspace *ws = workspaces->items[i];
render_workspace_button(ws, &x); render_workspace_button(ws, &x);
@ -1076,10 +1068,13 @@ int i3json_handle_fd(int fd) {
} }
bool handle_ipc_event() { bool handle_ipc_event() {
struct ipc_response *resp = ipc_recv_response(ipc_event_socketfd); struct ipc_response *resp = ipc_recv_response(ipc_socketfd);
switch (resp->type) { switch (resp->type) {
case IPC_GET_WORKSPACES:
ipc_update_workspaces(resp->payload);
break;
case IPC_EVENT_WORKSPACE: case IPC_EVENT_WORKSPACE:
ipc_update_workspaces(); ipc_send_command(ipc_socketfd, IPC_GET_WORKSPACES, NULL, 0);
break; break;
case IPC_EVENT_MODE: { case IPC_EVENT_MODE: {
json_object *result = json_tokener_parse(resp->payload); json_object *result = json_tokener_parse(resp->payload);
@ -1129,7 +1124,7 @@ void poll_for_update() {
dirty = false; dirty = false;
FD_ZERO(&readfds); FD_ZERO(&readfds);
FD_SET(ipc_event_socketfd, &readfds); FD_SET(ipc_socketfd, &readfds);
FD_SET(status_read_fd, &readfds); FD_SET(status_read_fd, &readfds);
activity = select(FD_SETSIZE, &readfds, NULL, NULL, NULL); activity = select(FD_SETSIZE, &readfds, NULL, NULL, NULL);
@ -1137,7 +1132,7 @@ void poll_for_update() {
sway_log(L_ERROR, "polling failed: %d", errno); sway_log(L_ERROR, "polling failed: %d", errno);
} }
if (FD_ISSET(ipc_event_socketfd, &readfds)) { if (FD_ISSET(ipc_socketfd, &readfds)) {
sway_log(L_DEBUG, "Got IPC event."); sway_log(L_DEBUG, "Got IPC event.");
dirty = handle_ipc_event(); dirty = handle_ipc_event();
} }
@ -1300,7 +1295,6 @@ int main(int argc, char **argv) {
} }
} }
ipc_socketfd = ipc_open_socket(socket_path); ipc_socketfd = ipc_open_socket(socket_path);
ipc_event_socketfd = ipc_open_socket(socket_path);
if (argc == optind) { if (argc == optind) {