mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-30 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

started ipc approach to bar hiding - builds fine, but bar won't show up right now

Browse source
This commit is contained in:
Calvin Kosmatka 2017-04-10 23:52:23 -05:00
parent 7fee555a46
commit c5dfe70ab1
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/swaybar/config.h
View file

@ -26,6 +26,7 @@ struct config {
char *font; char *font;
char *sep_symbol; char *sep_symbol;
char *mode; char *mode;
char *hidden_state;
bool strip_workspace_numbers; bool strip_workspace_numbers;
bool binding_mode_indicator; bool binding_mode_indicator;
bool wrap_scroll; bool wrap_scroll;

1
swaybar/config.c
View file

@ -37,6 +37,7 @@ struct config *init_config() {
config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM;
config->font = strdup("monospace 10"); config->font = strdup("monospace 10");
config->mode = NULL; config->mode = NULL;
config->hidden_state = NULL;
config->sep_symbol = NULL; config->sep_symbol = NULL;
config->strip_workspace_numbers = false; config->strip_workspace_numbers = false;
config->binding_mode_indicator = true; config->binding_mode_indicator = true;

35
swaybar/ipc.c
View file

@ -7,6 +7,7 @@
#include "ipc-client.h" #include "ipc-client.h"
#include "list.h" #include "list.h"
#include "log.h" #include "log.h"
#include "util.h"
void ipc_send_workspace_command(const char *workspace_name) { void ipc_send_workspace_command(const char *workspace_name) {
uint32_t size = strlen("workspace \"\"") + strlen(workspace_name) + 1; uint32_t size = strlen("workspace \"\"") + strlen(workspace_name) + 1;
@ -19,13 +20,13 @@ void ipc_send_workspace_command(const char *workspace_name) {
static void ipc_parse_config(struct config *config, const char *payload) { static void ipc_parse_config(struct config *config, const char *payload) {
json_object *bar_config = json_tokener_parse(payload); json_object *bar_config = json_tokener_parse(payload);
json_object *tray_output, *mode, *hidden_bar, *position, *status_command; json_object *tray_output, *mode, *hidden_state, *position, *status_command;
json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers; json_object *font, *bar_height, *wrap_scroll, *workspace_buttons, *strip_workspace_numbers;
json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs; json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs;
json_object *markup; json_object *markup;
json_object_object_get_ex(bar_config, "tray_output", &tray_output); json_object_object_get_ex(bar_config, "tray_output", &tray_output);
json_object_object_get_ex(bar_config, "mode", &mode); 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, "hidden_state", &hidden_state);
json_object_object_get_ex(bar_config, "position", &position); 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, "status_command", &status_command);
json_object_object_get_ex(bar_config, "font", &font); json_object_object_get_ex(bar_config, "font", &font);
@ -323,7 +324,9 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
free(res); free(res);
json_object_put(outputs); json_object_put(outputs);
const char *subscribe_json = "[ \"workspace\", \"mode\" ]"; const char *subscribe_json = strcmp(bar->config->mode, "hide") == 0 ?
"[ \"workspace\", \"mode\", \"modifier\" ]"
: "[ \"workspace\", \"mode\" ]";
len = strlen(subscribe_json); len = strlen(subscribe_json);
res = ipc_single_command(bar->ipc_event_socketfd, IPC_SUBSCRIBE, subscribe_json, &len); res = ipc_single_command(bar->ipc_event_socketfd, IPC_SUBSCRIBE, subscribe_json, &len);
free(res); free(res);
@ -364,6 +367,32 @@ bool handle_ipc_event(struct bar *bar) {
json_object_put(result); json_object_put(result);
break; break;
} }
case IPC_EVENT_MODIFIER: {
if (strcmp(bar->config->mode, "hide") == 0) {
json_object *result = json_tokener_parse(resp->payload);
if (!result) {
free_ipc_response(resp);
sway_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);
if (strcmp(change, "pressed") == 0) {
bar->config->hidden_state = "show";
} else { //must be "released"
bar->config->hidden_state = "hide";
}
} else {
sway_log(L_ERROR, "failed to parse response");
}
json_object_put(result);
break;
}
}
default: default:
free_ipc_response(resp); free_ipc_response(resp);
return false; return false;