mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-05-25 21:38:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

i3-compat: swaybar: default to first bar-id

Browse source 
When launching swaybar from the command line without a --bar-id flag,
default to the first configured bar.

This is a mirror of i3 PR https://github.com/i3/i3/pull/4231.

This makes it easier to call swaybar from the command line since the
majority of swaybar users have only one bar configured.
This commit is contained in:
Orestis Floros 2026-05-23 10:16:11 +02:00 • committed by Simon Ser
parent 9c663b1fa1
commit e52c14d535
2 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
swaybar/ipc.c
View file

@ -417,6 +417,28 @@ void ipc_execute_binding(struct swaybar *bar, struct swaybar_binding *bind) {
} }
bool ipc_initialize(struct swaybar *bar) { bool ipc_initialize(struct swaybar *bar) {
if (!bar->id) {
uint32_t len = 0;
char *res = ipc_single_command(bar->ipc_socketfd,
IPC_GET_BAR_CONFIG, "", &len);
json_object *bars = json_tokener_parse(res);
if (!json_object_is_type(bars, json_type_array)
|| json_object_array_length(bars) == 0) {
sway_log(SWAY_ERROR, "No bar configuration found, "
"please configure a bar block in your sway config file.");
json_object_put(bars);
free(res);
return false;
}
json_object *first = json_object_array_get_idx(bars, 0);
bar->id = strdup(json_object_get_string(first));
json_object_put(bars);
free(res);
sway_log(SWAY_INFO, "Using first bar config: %s. "
"Use --bar_id to manually select a different bar configuration.",
bar->id);
}
uint32_t len = strlen(bar->id); uint32_t len = strlen(bar->id);
char *res = ipc_single_command(bar->ipc_socketfd, char *res = ipc_single_command(bar->ipc_socketfd,
IPC_GET_BAR_CONFIG, bar->id, &len); IPC_GET_BAR_CONFIG, bar->id, &len);

6
swaybar/main.c
View file

@ -72,12 +72,6 @@ int main(int argc, char **argv) {
sway_log_init(SWAY_INFO, NULL); sway_log_init(SWAY_INFO, NULL);
} }
if (!swaybar.id) {
sway_log(SWAY_ERROR, "No bar_id passed. "
"Provide --bar_id or let sway start swaybar");
return 1;
}
if (!socket_path) { if (!socket_path) {
socket_path = get_socketpath(); socket_path = get_socketpath();
if (!socket_path) { if (!socket_path) {