mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-11-17 07:48:28 +01:00
Wire up basic IPC support
This commit is contained in:
Drew DeVault
parent
cab1352801
commit
5c9ad035db
7 changed files with 225 additions and 25 deletions
|
|
@ -17,6 +17,9 @@ struct swaybar {
|
|||
struct swaybar_config *config;
|
||||
struct swaybar_output *focused_output;
|
||||
|
||||
int ipc_event_socketfd;
|
||||
int ipc_socketfd;
|
||||
|
||||
struct wl_list outputs;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,21 +2,20 @@
|
|||
#define _SWAYBAR_CONFIG_H
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include "list.h"
|
||||
#include <wayland-client.h>
|
||||
#include "util.h"
|
||||
|
||||
/**
|
||||
* Colors for a box with background, border and text colors.
|
||||
*/
|
||||
struct box_colors {
|
||||
uint32_t border;
|
||||
uint32_t background;
|
||||
uint32_t text;
|
||||
};
|
||||
|
||||
/**
|
||||
* Swaybar config.
|
||||
*/
|
||||
struct config_output {
|
||||
struct wl_list link;
|
||||
char *name;
|
||||
};
|
||||
|
||||
struct swaybar_config {
|
||||
char *status_command;
|
||||
bool pango_markup;
|
||||
|
|
@ -28,8 +27,7 @@ struct swaybar_config {
|
|||
bool binding_mode_indicator;
|
||||
bool wrap_scroll;
|
||||
bool workspace_buttons;
|
||||
bool all_outputs;
|
||||
list_t *outputs;
|
||||
struct wl_list outputs;
|
||||
int height;
|
||||
|
||||
struct {
|
||||
|
|
@ -51,5 +49,6 @@ struct swaybar_config {
|
|||
|
||||
struct swaybar_config *init_config();
|
||||
void free_config(struct swaybar_config *config);
|
||||
uint32_t parse_position(const char *position);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
#define _SWAYBAR_IPC_H
|
||||
#include "swaybar/bar.h"
|
||||
|
||||
void ipc_bar_init(struct swaybar *bar, const char *bar_id);
|
||||
bool handle_ipc_event(struct swaybar *bar);
|
||||
void ipc_send_workspace_command(const char *workspace_name);
|
||||
void ipc_get_config(struct swaybar *bar, const char *bar_id);
|
||||
void handle_ipc_event(struct swaybar *bar);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
#include "swaybar/config.h"
|
||||
#include "swaybar/event_loop.h"
|
||||
#include "swaybar/bar.h"
|
||||
#include "swaybar/ipc.h"
|
||||
#include "ipc-client.h"
|
||||
#include "list.h"
|
||||
#include "pango.h"
|
||||
#include "pool-buffer.h"
|
||||
|
|
@ -92,6 +94,10 @@ void bar_setup(struct swaybar *bar,
|
|||
bar_init(bar);
|
||||
init_event_loop();
|
||||
|
||||
bar->ipc_socketfd = ipc_open_socket(socket_path);
|
||||
bar->ipc_event_socketfd = ipc_open_socket(socket_path);
|
||||
ipc_get_config(bar, bar_id);
|
||||
|
||||
assert(bar->display = wl_display_connect(NULL));
|
||||
|
||||
struct wl_registry *registry = wl_display_get_registry(bar->display);
|
||||
|
|
@ -122,6 +128,11 @@ static void display_in(int fd, short mask, void *_bar) {
|
|||
}
|
||||
}
|
||||
|
||||
static void ipc_in(int fd, short mask, void *_bar) {
|
||||
struct swaybar *bar = (struct swaybar *)_bar;
|
||||
handle_ipc_event(bar);
|
||||
}
|
||||
|
||||
void bar_run(struct swaybar *bar) {
|
||||
add_event(wl_display_get_fd(bar->display), POLLIN, display_in, bar);
|
||||
while (1) {
|
||||
|
|
|
|||
|
|
@ -22,17 +22,6 @@ uint32_t parse_position(const char *position) {
|
|||
}
|
||||
}
|
||||
|
||||
char *parse_font(const char *font) {
|
||||
char *new_font = NULL;
|
||||
if (strncmp("pango:", font, 6) == 0) {
|
||||
font += 6;
|
||||
}
|
||||
|
||||
new_font = strdup(font);
|
||||
|
||||
return new_font;
|
||||
}
|
||||
|
||||
struct swaybar_config *init_config() {
|
||||
struct swaybar_config *config = calloc(1, sizeof(struct swaybar_config));
|
||||
config->status_command = NULL;
|
||||
|
|
@ -45,8 +34,7 @@ struct swaybar_config *init_config() {
|
|||
config->binding_mode_indicator = true;
|
||||
config->wrap_scroll = false;
|
||||
config->workspace_buttons = true;
|
||||
config->all_outputs = false;
|
||||
config->outputs = create_list();
|
||||
wl_list_init(&config->outputs);
|
||||
|
||||
/* height */
|
||||
config->height = 0;
|
||||
|
|
|
|||
199
swaybar/ipc.c
Normal file
199
swaybar/ipc.c
Normal file
|
|
@ -0,0 +1,199 @@
|
|||
#define _XOPEN_SOURCE 500
|
||||
#include <string.h>
|
||||
#include <strings.h>
|
||||
#include <json-c/json.h>
|
||||
#include "swaybar/config.h"
|
||||
#include "swaybar/ipc.h"
|
||||
#include "ipc-client.h"
|
||||
|
||||
char *parse_font(const char *font) {
|
||||
char *new_font = NULL;
|
||||
if (strncmp("pango:", font, 6) == 0) {
|
||||
font += 6;
|
||||
}
|
||||
new_font = strdup(font);
|
||||
return new_font;
|
||||
}
|
||||
|
||||
static void ipc_parse_colors(
|
||||
struct swaybar_config *config, json_object *colors) {
|
||||
json_object *background, *statusline, *separator;
|
||||
json_object *focused_background, *focused_statusline, *focused_separator;
|
||||
json_object *focused_workspace_border, *focused_workspace_bg, *focused_workspace_text;
|
||||
json_object *inactive_workspace_border, *inactive_workspace_bg, *inactive_workspace_text;
|
||||
json_object *active_workspace_border, *active_workspace_bg, *active_workspace_text;
|
||||
json_object *urgent_workspace_border, *urgent_workspace_bg, *urgent_workspace_text;
|
||||
json_object *binding_mode_border, *binding_mode_bg, *binding_mode_text;
|
||||
json_object_object_get_ex(colors, "background", &background);
|
||||
json_object_object_get_ex(colors, "statusline", &statusline);
|
||||
json_object_object_get_ex(colors, "separator", &separator);
|
||||
json_object_object_get_ex(colors, "focused_background", &focused_background);
|
||||
json_object_object_get_ex(colors, "focused_statusline", &focused_statusline);
|
||||
json_object_object_get_ex(colors, "focused_separator", &focused_separator);
|
||||
json_object_object_get_ex(colors, "focused_workspace_border", &focused_workspace_border);
|
||||
json_object_object_get_ex(colors, "focused_workspace_bg", &focused_workspace_bg);
|
||||
json_object_object_get_ex(colors, "focused_workspace_text", &focused_workspace_text);
|
||||
json_object_object_get_ex(colors, "active_workspace_border", &active_workspace_border);
|
||||
json_object_object_get_ex(colors, "active_workspace_bg", &active_workspace_bg);
|
||||
json_object_object_get_ex(colors, "active_workspace_text", &active_workspace_text);
|
||||
json_object_object_get_ex(colors, "inactive_workspace_border", &inactive_workspace_border);
|
||||
json_object_object_get_ex(colors, "inactive_workspace_bg", &inactive_workspace_bg);
|
||||
json_object_object_get_ex(colors, "inactive_workspace_text", &inactive_workspace_text);
|
||||
json_object_object_get_ex(colors, "urgent_workspace_border", &urgent_workspace_border);
|
||||
json_object_object_get_ex(colors, "urgent_workspace_bg", &urgent_workspace_bg);
|
||||
json_object_object_get_ex(colors, "urgent_workspace_text", &urgent_workspace_text);
|
||||
json_object_object_get_ex(colors, "binding_mode_border", &binding_mode_border);
|
||||
json_object_object_get_ex(colors, "binding_mode_bg", &binding_mode_bg);
|
||||
json_object_object_get_ex(colors, "binding_mode_text", &binding_mode_text);
|
||||
if (background) {
|
||||
config->colors.background = parse_color(json_object_get_string(background));
|
||||
}
|
||||
if (statusline) {
|
||||
config->colors.statusline = parse_color(json_object_get_string(statusline));
|
||||
}
|
||||
if (separator) {
|
||||
config->colors.separator = parse_color(json_object_get_string(separator));
|
||||
}
|
||||
if (focused_background) {
|
||||
config->colors.focused_background = parse_color(json_object_get_string(focused_background));
|
||||
}
|
||||
if (focused_statusline) {
|
||||
config->colors.focused_statusline = parse_color(json_object_get_string(focused_statusline));
|
||||
}
|
||||
if (focused_separator) {
|
||||
config->colors.focused_separator = parse_color(json_object_get_string(focused_separator));
|
||||
}
|
||||
if (focused_workspace_border) {
|
||||
config->colors.focused_workspace.border = parse_color(json_object_get_string(focused_workspace_border));
|
||||
}
|
||||
if (focused_workspace_bg) {
|
||||
config->colors.focused_workspace.background = parse_color(json_object_get_string(focused_workspace_bg));
|
||||
}
|
||||
if (focused_workspace_text) {
|
||||
config->colors.focused_workspace.text = parse_color(json_object_get_string(focused_workspace_text));
|
||||
}
|
||||
if (active_workspace_border) {
|
||||
config->colors.active_workspace.border = parse_color(json_object_get_string(active_workspace_border));
|
||||
}
|
||||
if (active_workspace_bg) {
|
||||
config->colors.active_workspace.background = parse_color(json_object_get_string(active_workspace_bg));
|
||||
}
|
||||
if (active_workspace_text) {
|
||||
config->colors.active_workspace.text = parse_color(json_object_get_string(active_workspace_text));
|
||||
}
|
||||
if (inactive_workspace_border) {
|
||||
config->colors.inactive_workspace.border = parse_color(json_object_get_string(inactive_workspace_border));
|
||||
}
|
||||
if (inactive_workspace_bg) {
|
||||
config->colors.inactive_workspace.background = parse_color(json_object_get_string(inactive_workspace_bg));
|
||||
}
|
||||
if (inactive_workspace_text) {
|
||||
config->colors.inactive_workspace.text = parse_color(json_object_get_string(inactive_workspace_text));
|
||||
}
|
||||
if (binding_mode_border) {
|
||||
config->colors.binding_mode.border = parse_color(json_object_get_string(binding_mode_border));
|
||||
}
|
||||
if (binding_mode_bg) {
|
||||
config->colors.binding_mode.background = parse_color(json_object_get_string(binding_mode_bg));
|
||||
}
|
||||
if (binding_mode_text) {
|
||||
config->colors.binding_mode.text = parse_color(json_object_get_string(binding_mode_text));
|
||||
}
|
||||
}
|
||||
|
||||
static void ipc_parse_config(
|
||||
struct swaybar_config *config, const char *payload) {
|
||||
json_object *bar_config = json_tokener_parse(payload);
|
||||
json_object *markup, *mode, *hidden_bar, *position, *status_command;
|
||||
json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers;
|
||||
json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs;
|
||||
json_object_object_get_ex(bar_config, "mode", &mode);
|
||||
json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar);
|
||||
json_object_object_get_ex(bar_config, "position", &position);
|
||||
json_object_object_get_ex(bar_config, "status_command", &status_command);
|
||||
json_object_object_get_ex(bar_config, "font", &font);
|
||||
json_object_object_get_ex(bar_config, "bar_height", &bar_height);
|
||||
json_object_object_get_ex(bar_config, "wrap_scroll", &wrap_scroll);
|
||||
json_object_object_get_ex(bar_config, "workspace_buttons", &workspace_buttons);
|
||||
json_object_object_get_ex(bar_config, "strip_workspace_numbers", &strip_workspace_numbers);
|
||||
json_object_object_get_ex(bar_config, "binding_mode_indicator", &binding_mode_indicator);
|
||||
json_object_object_get_ex(bar_config, "verbose", &verbose);
|
||||
json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol);
|
||||
json_object_object_get_ex(bar_config, "colors", &colors);
|
||||
json_object_object_get_ex(bar_config, "outputs", &outputs);
|
||||
json_object_object_get_ex(bar_config, "pango_markup", &markup);
|
||||
if (status_command) {
|
||||
free(config->status_command);
|
||||
config->status_command = strdup(json_object_get_string(status_command));
|
||||
}
|
||||
if (position) {
|
||||
config->position = parse_position(json_object_get_string(position));
|
||||
}
|
||||
if (font) {
|
||||
free(config->font);
|
||||
config->font = parse_font(json_object_get_string(font));
|
||||
}
|
||||
if (sep_symbol) {
|
||||
free(config->sep_symbol);
|
||||
config->sep_symbol = strdup(json_object_get_string(sep_symbol));
|
||||
}
|
||||
if (strip_workspace_numbers) {
|
||||
config->strip_workspace_numbers = json_object_get_boolean(strip_workspace_numbers);
|
||||
}
|
||||
if (binding_mode_indicator) {
|
||||
config->binding_mode_indicator = json_object_get_boolean(binding_mode_indicator);
|
||||
}
|
||||
if (wrap_scroll) {
|
||||
config->wrap_scroll = json_object_get_boolean(wrap_scroll);
|
||||
}
|
||||
if (workspace_buttons) {
|
||||
config->workspace_buttons = json_object_get_boolean(workspace_buttons);
|
||||
}
|
||||
if (bar_height) {
|
||||
config->height = json_object_get_int(bar_height);
|
||||
}
|
||||
if (markup) {
|
||||
config->pango_markup = json_object_get_boolean(markup);
|
||||
}
|
||||
|
||||
struct config_output *output, *tmp;
|
||||
wl_list_for_each_safe(output, tmp, &config->outputs, link) {
|
||||
wl_list_remove(&output->link);
|
||||
free(output->name);
|
||||
free(output);
|
||||
}
|
||||
if (outputs) {
|
||||
int length = json_object_array_length(outputs);
|
||||
for (int i = 0; i < length; ++i) {
|
||||
json_object *output = json_object_array_get_idx(outputs, i);
|
||||
const char *name = json_object_get_string(output);
|
||||
if (strcmp("*", name) == 0) {
|
||||
// TODO: do we need to clear out the list here or something
|
||||
break;
|
||||
}
|
||||
struct config_output *coutput = calloc(
|
||||
1, sizeof(struct config_output));
|
||||
coutput->name = strdup(name);
|
||||
wl_list_insert(&config->outputs, &coutput->link);
|
||||
}
|
||||
}
|
||||
|
||||
if (colors) {
|
||||
ipc_parse_colors(config, colors);
|
||||
}
|
||||
|
||||
json_object_put(bar_config);
|
||||
}
|
||||
|
||||
void ipc_get_config(struct swaybar *bar, const char *bar_id) {
|
||||
uint32_t len = strlen(bar_id);
|
||||
char *res = ipc_single_command(bar->ipc_socketfd,
|
||||
IPC_GET_BAR_CONFIG, bar_id, &len);
|
||||
ipc_parse_config(bar->config, res);
|
||||
free(res);
|
||||
}
|
||||
|
||||
void handle_ipc_event(struct swaybar *bar) {
|
||||
struct ipc_response *resp = ipc_recv_response(bar->ipc_event_socketfd);
|
||||
free_ipc_response(resp);
|
||||
}
|
||||
|
|
@ -4,6 +4,7 @@ executable(
|
|||
'bar.c',
|
||||
'config.c',
|
||||
'event_loop.c',
|
||||
'ipc.c',
|
||||
'main.c',
|
||||
'render.c',
|
||||
],
|
||||
|
|
|
|||
Loading…
Reference in a new issue