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

Merge pull request #2942 from ianyfan/swaybar

Browse source 
swaybar: absorb bar_init function into bar_setup
This commit is contained in:
Drew DeVault 2018-10-23 14:19:11 +02:00 committed by GitHub
parent 862a4f69be 48cf430cee
commit 7160b8aae9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
swaybar/bar.c
View file

@ -26,11 +26,6 @@
#include "wlr-layer-shell-unstable-v1-client-protocol.h" #include "wlr-layer-shell-unstable-v1-client-protocol.h"
#include "xdg-output-unstable-v1-client-protocol.h" #include "xdg-output-unstable-v1-client-protocol.h"
static void bar_init(struct swaybar *bar) {
bar->config = init_config();
wl_list_init(&bar->outputs);
}
void free_workspaces(struct wl_list *list) { void free_workspaces(struct wl_list *list) {
struct swaybar_workspace *ws, *tmp; struct swaybar_workspace *ws, *tmp;
wl_list_for_each_safe(ws, tmp, list, link) { wl_list_for_each_safe(ws, tmp, list, link) {
@ -327,7 +322,9 @@ static const struct wl_registry_listener registry_listener = {
}; };
bool bar_setup(struct swaybar *bar, const char *socket_path) { bool bar_setup(struct swaybar *bar, const char *socket_path) {
bar_init(bar); bar->visible = true;
bar->config = init_config();
wl_list_init(&bar->outputs);
bar->eventloop = loop_create(); bar->eventloop = loop_create();
bar->ipc_socketfd = ipc_open_socket(socket_path); bar->ipc_socketfd = ipc_open_socket(socket_path);
@ -376,7 +373,6 @@ bool bar_setup(struct swaybar *bar, const char *socket_path) {
pointer->cursor_surface = wl_compositor_create_surface(bar->compositor); pointer->cursor_surface = wl_compositor_create_surface(bar->compositor);
assert(pointer->cursor_surface); assert(pointer->cursor_surface);
bar->visible = true;
if (bar->config->workspace_buttons) { if (bar->config->workspace_buttons) {
ipc_get_workspaces(bar); ipc_get_workspaces(bar);
} }