diff options
Diffstat (limited to 'swaybar')
-rw-r--r-- | swaybar/bar.c | 11 | ||||
-rw-r--r-- | swaybar/config.c | 2 | ||||
-rw-r--r-- | swaybar/ipc.c | 5 | ||||
-rw-r--r-- | swaybar/main.c | 2 | ||||
-rw-r--r-- | swaybar/render.c | 6 | ||||
-rw-r--r-- | swaybar/status_line.c | 4 |
6 files changed, 14 insertions, 16 deletions
diff --git a/swaybar/bar.c b/swaybar/bar.c index e3e53622..c6596864 100644 --- a/swaybar/bar.c +++ b/swaybar/bar.c | |||
@@ -5,15 +5,14 @@ | |||
5 | #include <errno.h> | 5 | #include <errno.h> |
6 | #include <sys/wait.h> | 6 | #include <sys/wait.h> |
7 | #include <poll.h> | 7 | #include <poll.h> |
8 | 8 | #include "swaybar/ipc.h" | |
9 | #include "swaybar/render.h" | ||
10 | #include "swaybar/config.h" | ||
11 | #include "swaybar/status_line.h" | ||
12 | #include "swaybar/bar.h" | ||
9 | #include "ipc-client.h" | 13 | #include "ipc-client.h" |
10 | #include "list.h" | 14 | #include "list.h" |
11 | #include "log.h" | 15 | #include "log.h" |
12 | #include "bar/ipc.h" | ||
13 | #include "bar/render.h" | ||
14 | #include "bar/config.h" | ||
15 | #include "bar/status_line.h" | ||
16 | #include "bar/bar.h" | ||
17 | 16 | ||
18 | static void bar_init(struct bar *bar) { | 17 | static void bar_init(struct bar *bar) { |
19 | bar->config = init_config(); | 18 | bar->config = init_config(); |
diff --git a/swaybar/config.c b/swaybar/config.c index b5dca668..c5437ee7 100644 --- a/swaybar/config.c +++ b/swaybar/config.c | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | #include "wayland-desktop-shell-client-protocol.h" | 4 | #include "wayland-desktop-shell-client-protocol.h" |
5 | #include "log.h" | 5 | #include "log.h" |
6 | #include "bar/config.h" | 6 | #include "swaybar/config.h" |
7 | 7 | ||
8 | uint32_t parse_position(const char *position) { | 8 | uint32_t parse_position(const char *position) { |
9 | if (strcmp("top", position) == 0) { | 9 | if (strcmp("top", position) == 0) { |
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index ad4f9ef8..8d62d223 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -1,11 +1,10 @@ | |||
1 | #include <string.h> | 1 | #include <string.h> |
2 | #include <json-c/json.h> | 2 | #include <json-c/json.h> |
3 | 3 | #include "swaybar/config.h" | |
4 | #include "swaybar/ipc.h" | ||
4 | #include "ipc-client.h" | 5 | #include "ipc-client.h" |
5 | #include "list.h" | 6 | #include "list.h" |
6 | #include "log.h" | 7 | #include "log.h" |
7 | #include "bar/config.h" | ||
8 | #include "bar/ipc.h" | ||
9 | 8 | ||
10 | void ipc_send_workspace_command(const char *workspace_name) { | 9 | void ipc_send_workspace_command(const char *workspace_name) { |
11 | uint32_t size = strlen("workspace ") + strlen(workspace_name) + 1; | 10 | uint32_t size = strlen("workspace ") + strlen(workspace_name) + 1; |
diff --git a/swaybar/main.c b/swaybar/main.c index d7534f5d..c9a554a3 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -3,9 +3,9 @@ | |||
3 | #include <string.h> | 3 | #include <string.h> |
4 | #include <stdbool.h> | 4 | #include <stdbool.h> |
5 | #include <getopt.h> | 5 | #include <getopt.h> |
6 | #include "swaybar/bar.h" | ||
6 | #include "ipc-client.h" | 7 | #include "ipc-client.h" |
7 | #include "log.h" | 8 | #include "log.h" |
8 | #include "bar/bar.h" | ||
9 | 9 | ||
10 | /* global bar state */ | 10 | /* global bar state */ |
11 | struct bar swaybar; | 11 | struct bar swaybar; |
diff --git a/swaybar/render.c b/swaybar/render.c index cea36f52..83b4cec7 100644 --- a/swaybar/render.c +++ b/swaybar/render.c | |||
@@ -5,9 +5,9 @@ | |||
5 | #include "client/cairo.h" | 5 | #include "client/cairo.h" |
6 | #include "client/pango.h" | 6 | #include "client/pango.h" |
7 | #include "client/window.h" | 7 | #include "client/window.h" |
8 | #include "bar/config.h" | 8 | #include "swaybar/config.h" |
9 | #include "bar/status_line.h" | 9 | #include "swaybar/status_line.h" |
10 | #include "bar/render.h" | 10 | #include "swaybar/render.h" |
11 | 11 | ||
12 | 12 | ||
13 | /* internal spacing */ | 13 | /* internal spacing */ |
diff --git a/swaybar/status_line.c b/swaybar/status_line.c index 33a8908f..c7055d4c 100644 --- a/swaybar/status_line.c +++ b/swaybar/status_line.c | |||
@@ -3,9 +3,9 @@ | |||
3 | #include <unistd.h> | 3 | #include <unistd.h> |
4 | #include <json-c/json.h> | 4 | #include <json-c/json.h> |
5 | 5 | ||
6 | #include "swaybar/config.h" | ||
7 | #include "swaybar/status_line.h" | ||
6 | #include "log.h" | 8 | #include "log.h" |
7 | #include "bar/config.h" | ||
8 | #include "bar/status_line.h" | ||
9 | #include "util.h" | 9 | #include "util.h" |
10 | 10 | ||
11 | #define I3JSON_MAXDEPTH 4 | 11 | #define I3JSON_MAXDEPTH 4 |