alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Re-render bar on IPC updates

Browse source
This commit is contained in:
Drew DeVault 2018-03-29 10:38:17 -04:00
parent 3a458cd7b5
commit 86ba0fc15d
3 changed files with 53 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/swaybar/ipc.h
View file

@ -1,9 +1,10 @@
#ifndef _SWAYBAR_IPC_H #ifndef _SWAYBAR_IPC_H
#define _SWAYBAR_IPC_H #define _SWAYBAR_IPC_H
#include <stdbool.h>
#include "swaybar/bar.h" #include "swaybar/bar.h"
void ipc_initialize(struct swaybar *bar, const char *bar_id); void ipc_initialize(struct swaybar *bar, const char *bar_id);
void handle_ipc_event(struct swaybar *bar); bool handle_ipc_event(struct swaybar *bar);
void ipc_get_workspaces(struct swaybar *bar); void ipc_get_workspaces(struct swaybar *bar);
#endif #endif

8
swaybar/bar.c
View file

@ -143,11 +143,17 @@ static void display_in(int fd, short mask, void *_bar) {
static void ipc_in(int fd, short mask, void *_bar) { static void ipc_in(int fd, short mask, void *_bar) {
struct swaybar *bar = (struct swaybar *)_bar; struct swaybar *bar = (struct swaybar *)_bar;
handle_ipc_event(bar); if (handle_ipc_event(bar)) {
struct swaybar_output *output;
wl_list_for_each(output, &bar->outputs, link) {
render_frame(bar, output);
}
}
} }
void bar_run(struct swaybar *bar) { void bar_run(struct swaybar *bar) {
add_event(wl_display_get_fd(bar->display), POLLIN, display_in, bar); add_event(wl_display_get_fd(bar->display), POLLIN, display_in, bar);
add_event(bar->ipc_event_socketfd, POLLIN, ipc_in, bar);
while (1) { while (1) {
event_loop_poll(); event_loop_poll();
} }

48
swaybar/ipc.c
View file

@ -3,6 +3,7 @@
#include <string.h> #include <string.h>
#include <strings.h> #include <strings.h>
#include <json-c/json.h> #include <json-c/json.h>
#include <wlr/util/log.h>
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/ipc.h" #include "swaybar/ipc.h"
#include "ipc-client.h" #include "ipc-client.h"
@ -288,10 +289,51 @@ void ipc_initialize(struct swaybar *bar, const char *bar_id) {
ipc_parse_config(bar->config, res); ipc_parse_config(bar->config, res);
free(res); free(res);
ipc_get_outputs(bar); ipc_get_outputs(bar);
// TODO: subscribe to stuff
const char *subscribe = "[ \"workspace\", \"mode\" ]";
len = strlen(subscribe);
free(ipc_single_command(bar->ipc_event_socketfd,
IPC_SUBSCRIBE, subscribe, &len));
} }
void handle_ipc_event(struct swaybar *bar) { bool handle_ipc_event(struct swaybar *bar) {
struct ipc_response *resp = ipc_recv_response(bar->ipc_event_socketfd); struct ipc_response *resp = ipc_recv_response(bar->ipc_event_socketfd);
free_ipc_response(resp); if (!resp) {
return false;
}
switch (resp->type) {
case IPC_EVENT_WORKSPACE:
ipc_get_workspaces(bar);
break;
case IPC_EVENT_MODE: {
json_object *result = json_tokener_parse(resp->payload);
if (!result) {
free_ipc_response(resp);
wlr_log(L_ERROR, "failed to parse payload as json");
return false;
}
json_object *json_change;
if (json_object_object_get_ex(result, "change", &json_change)) {
const char *change = json_object_get_string(json_change);
free(bar->config->mode);
if (strcmp(change, "default") == 0) {
bar->config->mode = NULL;
} else {
bar->config->mode = strdup(change);
}
} else {
wlr_log(L_ERROR, "failed to parse response");
json_object_put(result);
free_ipc_response(resp);
return false;
}
json_object_put(result);
break;
}
default:
free_ipc_response(resp);
return false;
}
free_ipc_response(resp);
return true;
} }