diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 21:40:09 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 22:23:55 +1000 |
commit | 41bfd8c790e6c34dfee9c0135b2455f4ba34c619 (patch) | |
tree | 09c84d0021a8cf7a6ae62f2623ff3739e2fc824e /sway | |
parent | Merge pull request #2789 from RyanDwyer/reload-idle (diff) | |
download | sway-41bfd8c790e6c34dfee9c0135b2455f4ba34c619.tar.gz sway-41bfd8c790e6c34dfee9c0135b2455f4ba34c619.tar.zst sway-41bfd8c790e6c34dfee9c0135b2455f4ba34c619.zip |
swaybar: allow null status_command
Sway sets a default status_command which runs date every second. This
patch removes this behaviour so the user can have a NULL status bar if
desired.
I had to swap swaybar's event_loop_poll and wl_display_flush so that it
would map the initial surface.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/config/bar.c | 4 | ||||
-rw-r--r-- | sway/ipc-json.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sway/config/bar.c b/sway/config/bar.c index 48a632fb..b8695798 100644 --- a/sway/config/bar.c +++ b/sway/config/bar.c | |||
@@ -99,10 +99,6 @@ struct bar_config *default_bar_config(void) { | |||
99 | if (!(bar->bindings = create_list())) { | 99 | if (!(bar->bindings = create_list())) { |
100 | goto cleanup; | 100 | goto cleanup; |
101 | } | 101 | } |
102 | if (!(bar->status_command = | ||
103 | strdup("while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done"))) { | ||
104 | goto cleanup; | ||
105 | } | ||
106 | // set default colors | 102 | // set default colors |
107 | if (!(bar->colors.background = strndup("#000000ff", 9))) { | 103 | if (!(bar->colors.background = strndup("#000000ff", 9))) { |
108 | goto cleanup; | 104 | goto cleanup; |
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 7c5a0a5d..f02f370b 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -514,8 +514,8 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { | |||
514 | json_object_new_string(bar->hidden_state)); | 514 | json_object_new_string(bar->hidden_state)); |
515 | json_object_object_add(json, "position", | 515 | json_object_object_add(json, "position", |
516 | json_object_new_string(bar->position)); | 516 | json_object_new_string(bar->position)); |
517 | json_object_object_add(json, "status_command", | 517 | json_object_object_add(json, "status_command", bar->status_command ? |
518 | json_object_new_string(bar->status_command)); | 518 | json_object_new_string(bar->status_command) : NULL); |
519 | json_object_object_add(json, "font", | 519 | json_object_object_add(json, "font", |
520 | json_object_new_string((bar->font) ? bar->font : config->font)); | 520 | json_object_new_string((bar->font) ? bar->font : config->font)); |
521 | if (bar->separator_symbol) { | 521 | if (bar->separator_symbol) { |