summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-24 15:55:58 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-24 15:55:58 +0100
commited227f5664196d85194d63d01a5382499867a386 (patch)
tree0474bff44ae5880fd3336a0a9dd04641793f153e
parentMerge pull request #467 from mikkeloscar/swaybar-refactor (diff)
downloadsway-ed227f5664196d85194d63d01a5382499867a386.tar.gz
sway-ed227f5664196d85194d63d01a5382499867a386.tar.zst
sway-ed227f5664196d85194d63d01a5382499867a386.zip
swaybar: move headers to include/bar
-rw-r--r--include/bar/bar.h (renamed from swaybar/bar.h)0
-rw-r--r--include/bar/config.h (renamed from swaybar/config.h)0
-rw-r--r--include/bar/ipc.h (renamed from swaybar/ipc.h)0
-rw-r--r--include/bar/render.h (renamed from swaybar/render.h)0
-rw-r--r--include/bar/status_line.h (renamed from swaybar/status_line.h)0
-rw-r--r--swaybar/bar.c10
-rw-r--r--swaybar/config.c2
-rw-r--r--swaybar/ipc.c4
-rw-r--r--swaybar/main.c2
-rw-r--r--swaybar/render.c6
-rw-r--r--swaybar/status_line.c4
11 files changed, 14 insertions, 14 deletions
diff --git a/swaybar/bar.h b/include/bar/bar.h
index 89496da6..89496da6 100644
--- a/swaybar/bar.h
+++ b/include/bar/bar.h
diff --git a/swaybar/config.h b/include/bar/config.h
index 508b9c42..508b9c42 100644
--- a/swaybar/config.h
+++ b/include/bar/config.h
diff --git a/swaybar/ipc.h b/include/bar/ipc.h
index c3f661f8..c3f661f8 100644
--- a/swaybar/ipc.h
+++ b/include/bar/ipc.h
diff --git a/swaybar/render.h b/include/bar/render.h
index 931a1cdd..931a1cdd 100644
--- a/swaybar/render.h
+++ b/include/bar/render.h
diff --git a/swaybar/status_line.h b/include/bar/status_line.h
index 273542dc..273542dc 100644
--- a/swaybar/status_line.h
+++ b/include/bar/status_line.h
diff --git a/swaybar/bar.c b/swaybar/bar.c
index fc01863b..d80c9af3 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -8,11 +8,11 @@
8#include "ipc-client.h" 8#include "ipc-client.h"
9#include "list.h" 9#include "list.h"
10#include "log.h" 10#include "log.h"
11#include "ipc.h" 11#include "bar/ipc.h"
12#include "render.h" 12#include "bar/render.h"
13#include "config.h" 13#include "bar/config.h"
14#include "status_line.h" 14#include "bar/status_line.h"
15#include "bar.h" 15#include "bar/bar.h"
16 16
17static void bar_init(struct bar *bar) { 17static void bar_init(struct bar *bar) {
18 bar->config = init_config(); 18 bar->config = init_config();
diff --git a/swaybar/config.c b/swaybar/config.c
index 28b609e6..92251831 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 "config.h" 6#include "bar/config.h"
7 7
8uint32_t parse_color(const char *color) { 8uint32_t parse_color(const char *color) {
9 if (color[0] != '#') { 9 if (color[0] != '#') {
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 547041ce..4104103d 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -4,8 +4,8 @@
4#include "ipc-client.h" 4#include "ipc-client.h"
5#include "list.h" 5#include "list.h"
6#include "log.h" 6#include "log.h"
7#include "config.h" 7#include "bar/config.h"
8#include "ipc.h" 8#include "bar/ipc.h"
9 9
10static void ipc_parse_config(struct config *config, const char *payload) { 10static void ipc_parse_config(struct config *config, const char *payload) {
11 json_object *bar_config = json_tokener_parse(payload); 11 json_object *bar_config = json_tokener_parse(payload);
diff --git a/swaybar/main.c b/swaybar/main.c
index fc5acdae..737ee647 100644
--- a/swaybar/main.c
+++ b/swaybar/main.c
@@ -5,7 +5,7 @@
5#include <getopt.h> 5#include <getopt.h>
6#include "ipc-client.h" 6#include "ipc-client.h"
7#include "log.h" 7#include "log.h"
8#include "bar.h" 8#include "bar/bar.h"
9 9
10/* global bar state */ 10/* global bar state */
11struct bar swaybar; 11struct bar swaybar;
diff --git a/swaybar/render.c b/swaybar/render.c
index f3ce6010..bac44075 100644
--- a/swaybar/render.c
+++ b/swaybar/render.c
@@ -4,9 +4,9 @@
4 4
5#include "client/pango.h" 5#include "client/pango.h"
6#include "client/window.h" 6#include "client/window.h"
7#include "config.h" 7#include "bar/config.h"
8#include "status_line.h" 8#include "bar/status_line.h"
9#include "render.h" 9#include "bar/render.h"
10 10
11 11
12/* internal spacing */ 12/* internal spacing */
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 6b630c49..ba6de6a1 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -4,8 +4,8 @@
4#include <json-c/json.h> 4#include <json-c/json.h>
5 5
6#include "log.h" 6#include "log.h"
7#include "config.h" 7#include "bar/config.h"
8#include "status_line.h" 8#include "bar/status_line.h"
9 9
10#define I3JSON_MAXDEPTH 4 10#define I3JSON_MAXDEPTH 4
11#define I3JSON_UNKNOWN 0 11#define I3JSON_UNKNOWN 0