mv xbm/ ..

diff --git a/include/theme/xbm/parse.h b/include/xbm/parse.h
similarity index 95%
rename from include/theme/xbm/parse.h
rename to include/xbm/parse.h
index 4bd4c942cd7fefc9ecd91ebb77bef7f21033a914..5ce59d1b0ab20a7728b7b6959dedbed81966a5bc 100644 (file)
--- a/include/theme/xbm/parse.h
+++ b/include/xbm/parse.h
@@ -8,7 +8,7 @@
 #define __LABWC_PARSE_H
 
 #include <stdint.h>
-#include "theme/xbm/tokenize.h"
+#include "xbm/tokenize.h"
 
 struct pixmap {
        uint32_t *data;

diff --git a/include/theme/xbm/tokenize.h b/include/xbm/tokenize.h
similarity index 100%
rename from include/theme/xbm/tokenize.h
rename to include/xbm/tokenize.h

diff --git a/include/theme/xbm/xbm.h b/include/xbm/xbm.h
similarity index 88%
rename from include/theme/xbm/xbm.h
rename to include/xbm/xbm.h
index 47907f246335366a4a2a4644c968433bf79fa47d..1ddb6212593a04d5a8ccf6570bde5874fd6700e9 100644 (file)
--- a/include/theme/xbm/xbm.h
+++ b/include/xbm/xbm.h
@@ -3,7 +3,7 @@
 
 #include <wlr/render/wlr_renderer.h>
 
-#include "theme/xbm/parse.h"
+#include "xbm/parse.h"
 
 /**
  * xbm_load - load theme xbm files into global theme struct

diff --git a/src/main.c b/src/main.c
index b9e330c6f9b3f969a9c242c708e44c53397d66a2..b42f02c2e4eaa39185b9a1b935b96d3bbc1301b0 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include "labwc.h"
 #include "theme/theme.h"
-#include "theme/xbm/xbm.h"
+#include "xbm/xbm.h"
 #include "common/spawn.h"
 
 #include <cairo.h>

diff --git a/src/meson.build b/src/meson.build
index 0678cd9f1b7fd7500f75b70562d208692cc62be2..2e4a3cb9116f22affca3ba226508d895dfc4f51a 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,3 +16,4 @@ subdir('common')
 subdir('config')
 subdir('theme')
 subdir('debug')
+subdir('xbm')

diff --git a/src/theme/meson.build b/src/theme/meson.build
index e7181a0668521beb7c310cef0caeba8468fd082f..a9bef667c75b0ed293cbaafb46bdb0723123eda4 100644 (file)
--- a/src/theme/meson.build
+++ b/src/theme/meson.build
@@ -2,4 +2,3 @@ labwc_sources += files(
   'theme.c',
 )
 
-subdir('xbm')

diff --git a/src/theme/xbm/meson.build b/src/xbm/meson.build
similarity index 100%
rename from src/theme/xbm/meson.build
rename to src/xbm/meson.build

diff --git a/src/theme/xbm/parse.c b/src/xbm/parse.c
similarity index 98%
rename from src/theme/xbm/parse.c
rename to src/xbm/parse.c
index dae2ced019cf8a70939155fcb664138be768a2a1..1b36e574a1db89436b73f08c2d0115825510f914 100644 (file)
--- a/src/theme/xbm/parse.c
+++ b/src/xbm/parse.c
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "theme/xbm/parse.h"
+#include "xbm/parse.h"
 #include "common/bug-on.h"
 
 static uint32_t color;

diff --git a/src/theme/xbm/tokenize.c b/src/xbm/tokenize.c
similarity index 98%
rename from src/theme/xbm/tokenize.c
rename to src/xbm/tokenize.c
index 9cc74a83ce31ec88cd25659a99682139959cf38d..d01d7038c09ee35dfe0cf77409745054a44dc2fb 100644 (file)
--- a/src/theme/xbm/tokenize.c
+++ b/src/xbm/tokenize.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "theme/xbm/tokenize.h"
+#include "xbm/tokenize.h"
 
 static char *current_buffer_position;
 static struct token *tokens;

diff --git a/src/theme/xbm/xbm.c b/src/xbm/xbm.c
similarity index 97%
rename from src/theme/xbm/xbm.c
rename to src/xbm/xbm.c
index 895047c5fce5d598db500acbc35997a1e015ab4d..4da5e84b9bd9268a82e91741ff6b2d75ae708993 100644 (file)
--- a/src/theme/xbm/xbm.c
+++ b/src/xbm/xbm.c
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 
 #include "theme/theme.h"
-#include "theme/xbm/xbm.h"
-#include "theme/xbm/parse.h"
+#include "xbm/xbm.h"
+#include "xbm/parse.h"
 #include "config/rcxml.h"
 #include "common/dir.h"
 #include "common/grab-file.h"

diff --git a/tools/rcxml/Makefile b/tools/rcxml/Makefile
index c1ef9bebda40f31d8d194b541dd73d17ac4e8b27..1b4dbf26101552da63d04de314657c789de03b26 100644 (file)
--- a/tools/rcxml/Makefile
+++ b/tools/rcxml/Makefile
@@ -15,6 +15,7 @@ SRC = \
        ../../src/common/dir.c \
        ../../src/common/buf.c \
        ../../src/common/font.c \
+       ../../src/common/log.c \
        ../../src/config/keybind.c
 
 

diff --git a/tools/rcxml/rcxml-print-nodenames.c b/tools/rcxml/rcxml-print-nodenames.c
index 6fd3c5e6e99045f80327ef1dc7f5e40ad0c1ca26..9e6b03a692261ce6bcbd588b3391f2d1b0f7f69d 100644 (file)
--- a/tools/rcxml/rcxml-print-nodenames.c
+++ b/tools/rcxml/rcxml-print-nodenames.c
@@ -1,9 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <cairo.h>
+#include <pango/pangocairo.h>
 
 #include "config/rcxml.h"
 #include "common/buf.h"
+#include "common/log.h"
 
 struct rcxml rc = { 0 };
 
@@ -20,4 +23,5 @@ int main(int argc, char **argv)
        rcxml_read(argv[1]);
        printf("%s", b.buf);
        free(b.buf);
+       pango_cairo_font_map_set_default(NULL);
 }

diff --git a/tools/theme/Makefile b/tools/theme/Makefile
index cbfeb893c19ac70a6e56abda5e80a85c0be03010..643d154d9f98e1e7f060029c28e88200fbe13b57 100644 (file)
--- a/tools/theme/Makefile
+++ b/tools/theme/Makefile
@@ -10,7 +10,8 @@ LDFLAGS   += -DWLR_USE_UNSTABLE
 SRCS = \
        theme-helper.c \
        ../../src/theme/theme.c \
-       ../../src/common/dir.c
+       ../../src/common/dir.c \
+       ../../src/common/log.c
 
 all:
        gcc $(CFLAGS) -o theme-helper $(SRCS) $(LDFLAGS)

diff --git a/tools/xbm/Makefile b/tools/xbm/Makefile
index 938753d1661960bb90ed275c45d7041e8b421f32..6810ef3b64ce5b85cdddec31fd0c446d47902f95 100644 (file)
--- a/tools/xbm/Makefile
+++ b/tools/xbm/Makefile
@@ -7,10 +7,10 @@ PROGS        = xbm-tokenize xbm-parse
 
 DEP_TOKENIZE = \
               ../../src/common/buf.c \
-              ../../src/theme/xbm/tokenize.c
+              ../../src/xbm/tokenize.c
 
 DEP_PARSE    = $(DEP_TOKENIZE) \
-              ../../src/theme/xbm/parse.c \
+              ../../src/xbm/parse.c \
               ../../src/common/grab-file.c
 
 all: $(PROGS)

diff --git a/tools/xbm/xbm-parse.c b/tools/xbm/xbm-parse.c
index 5bdbf28f61412d0ff855218f61e163ea912df802..84a7c4ae22779f95cc26f2a5bf90a85b46f3287c 100644 (file)
--- a/tools/xbm/xbm-parse.c
+++ b/tools/xbm/xbm-parse.c
@@ -3,9 +3,11 @@
 #include <string.h>
 #include <cairo.h>
 
-#include "theme/xbm/parse.h"
+#include "xbm/parse.h"
 #include "common/grab-file.h"
 
+static float red[] = { 1.0, 0.0, 0.0, 1.0 };
+
 int main(int argc, char **argv)
 {
        struct token *tokens;
@@ -20,6 +22,7 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        tokens = tokenize_xbm(buffer);
        free(buffer);
+       parse_set_color(red);
        struct pixmap pixmap = parse_xbm_tokens(tokens);
        free(tokens);
 

diff --git a/tools/xbm/xbm-tokenize.c b/tools/xbm/xbm-tokenize.c
index c299464b9e9926c36556c1b1888d790e73680df2..a5bc4f69212ad6834af57aef80be6ca0c310c668 100644 (file)
--- a/tools/xbm/xbm-tokenize.c
+++ b/tools/xbm/xbm-tokenize.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include "common/buf.h"
-#include "theme/xbm/tokenize.h"
+#include "xbm/tokenize.h"
 
 /* Read file into buffer, because it's easier to tokenize that way */
 char *read_file(const char *filename)