move the openbox engine into librender and the kernel. the theme is loaded and stored inside librender. the frame is decorated and managed inside the kernel.

5 files changed, 7 insertions, 138 deletions

diff --git a/build/Makefile.engines b/build/Makefile.engines
deleted file mode 100644
index cc1cd840..00000000
--- a/build/Makefile.engines
+++ /dev/null
@@ -1,14 +0,0 @@
-include build/Makefile.incl
-
-all clean distclean:
-	@$(MAKE) -$(MAKEFLAGS) -f build/Makefile.engines.openbox $@
-
-install:
-	@$(MAKE) -$(MAKEFLAGS) -f build/Makefile.engines.openbox $@
-	$(LIBTOOL) --mode=finish $(DESTDIR)$(enginedir)
-
-uninstall:
-	@$(MAKE) -$(MAKEFLAGS) -f build/Makefile.engines.openbox $@
-	-rmdir $(DESTDIR)$(enginedir)
-
-.PHONY: all clean distclean install uninstall
diff --git a/build/Makefile.engines.openbox b/build/Makefile.engines.openbox
deleted file mode 100644
index 3830dd29..00000000
--- a/build/Makefile.engines.openbox
+++ /dev/null
@@ -1,47 +0,0 @@
-include build/Makefile.incl
-
-dir = engines/openbox
-theme = operation
-
-CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Engine-Openbox\" \
-            -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)/openbox\"
-LDFLAGS += -module -avoid-version
-
-target = openbox.la
-sources = obengine.c obtheme.c obrender.c
-
-srcdir := $(srcdir)/$(dir)
-target := $(addprefix $(dir)/,$(target))
-objects := $(addprefix $(dir)/,$(sources:.c=.lo))
-sources := $(addprefix $(srcdir)/,$(sources))
-deps := $(addprefix $(depdir)/,$(objects:.lo=.d))
-depdir := $(depdir)/$(dir)
-
-all: $(target)
-
-$(target): $(objects)
-	$(LINK) -rpath $(enginedir) -o $@ $^ $(LDFLAGS)
-
-$(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
-	$(LTCOMPILE) -c -o $@ $<
-
-$(depdir)/%.d: $(srcdir)/%.c
-	@echo Building dependancies for $<
-	$(INSTALL) -d $(depdir)
-	@$(DEPCOMPILE) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
-
-install:
-	$(INSTALL) -d $(DESTDIR)$(enginedir)/
-	$(LIBTOOL) --mode=install $(INSTALL) $(target) \
-		$(DESTDIR)$(enginedir)/$(notdir $(target))
-
-uninstall:
-	$(LTRM) $(DESTDIR)$(enginedir)/$(notdir $(target))
-
-clean:
-	$(LTCLEAN) $(target) $(objects)
-	$(RM) $(srcdir)/*\~
-
--include $(deps)
-
-.PHONY: all install uninstall clean distclean
diff --git a/build/Makefile.kernel b/build/Makefile.kernel
index a58798e2..e0ccfa26 100644
--- a/build/Makefile.kernel
+++ b/build/Makefile.kernel
@@ -9,8 +9,8 @@ LIBS += $(GLIB_LIBS) $(GMODULE_LIBS) $(XFT_LIBS) $(X_LIBS) $(XINERAMA_LIBS) \
 LDFLAGS += -Lrender -export-dynamic
 
 target = openbox3
-sources = action.c client.c config.c dispatch.c engine.c event.c group.c \
-          extensions.c focus.c frame.c grab.c menu.c openbox.c \
+sources = action.c client.c config.c dispatch.c event.c group.c \
+          extensions.c focus.c frame.c grab.c menu.c openbox.c framerender.c \
           parse.c plugin.c prop.c screen.c stacking.c timer.c xerror.c \
           parse.lex.c parse.tab.c
 
@@ -41,7 +41,7 @@ $(dir)/%.lo: $(srcdir)/%.c $(depdir)/%.d
 
 $(depdir)/%.d: $(srcdir)/%.c
 	@echo Building dependancies for $<
-	$(INSTALL) -d $(depdir)
+	@$(INSTALL) -d $(depdir)
 	@$(CC) $(CPPFLAGS) $(CFLAGS) -w -MM -MF $@ -MQ $(<:.c=.lo) $<
 
 install:
diff --git a/build/Makefile.render b/build/Makefile.render
index 178ba971..e47afa2a 100644
--- a/build/Makefile.render
+++ b/build/Makefile.render
@@ -1,11 +1,13 @@
 include build/Makefile.incl
 
 dir = render
+theme = operation
 
-CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\"
+CPPFLAGS += $(GLIB_CFLAGS) $(XFT_CFLAGS) -DG_LOG_DOMAIN=\"Render\" \
+            -DDEFAULT_THEME=\"$(theme)\" -DTHEMEDIR=\"$(themedir)\"
 
 target = libobrender.la
-sources = color.c font.c gradient.c image.c mask.c render.c test.c
+sources = color.c font.c gradient.c image.c mask.c render.c theme.c
 
 srcdir := $(srcdir)/$(dir)
 target := $(addprefix $(dir)/, $(target))
diff --git a/build/Makefile.themes.openbox b/build/Makefile.themes.openbox
deleted file mode 100644
index 71294b19..00000000
--- a/build/Makefile.themes.openbox
+++ /dev/null
@@ -1,72 +0,0 @@
-include build/Makefile.incl
-
-dir = themes/openbox
-
-files = artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux \
-        frobozz frobust mbdtex miklos nyz nyzclone ob20 operation \
-        outcomes paper purplehaaze shade steelblue steelblue2 \
-        the_orange trisb twice warp-xp
-
-srcdir := $(srcdir)/$(dir)
-dir := $(DESTDIR)$(themedir)/$(notdir $(dir))
-sources := $(addprefix $(srcdir)/,$(files))
-
-fieron_buttons_dir := $(dir)/fieron_buttons
-fieron_buttons_srcdir := $(srcdir)/fieron_buttons
-fieron_buttons := close.xbm icon.xbm max.xbm stick.xbm
-fieron_buttons_sources := $(addprefix $(fieron_buttons_srcdir)/,$(fieron_buttons))
-
-fieron2_buttons_dir:=$(dir)/fieron2_buttons
-fieron2_buttons_srcdir:=$(srcdir)/fieron2_buttons
-fieron2_buttons:=close.xbm icon.xbm max.xbm stick.xbm
-fieron2_buttons_sources := $(addprefix $(fieron2_buttons_srcdir)/,$(fieron2_buttons))
-
-ebox_buttons_dir:=$(dir)/ebox_buttons
-ebox_buttons_srcdir:=$(srcdir)/ebox_buttons
-ebox_buttons:=close.xbm icon.xbm max.xbm
-ebox_buttons_sources := $(addprefix $(ebox_buttons_srcdir)/,$(ebox_buttons))
-
-all:
-
-install:
-	$(INSTALL) -d $(dir)
-	for i in $(sources); do \
-		$(INSTALL) -m 644 $$i $(dir); \
-	done
-
-	$(INSTALL) -d $(fieron_buttons_dir)
-	for i in $(fieron_buttons_sources); do \
-		$(INSTALL) $$i $(fieron_buttons_dir); \
-	done
-	$(INSTALL) -d $(fieron2_buttons_dir)
-	for i in $(fieron2_buttons_sources); do \
-		$(INSTALL) $$i $(fieron2_buttons_dir); \
-	done
-	$(INSTALL) -d $(ebox_buttons_dir)
-	for i in $(ebox_buttons_sources); do \
-		$(INSTALL) $$i $(ebox_buttons_dir); \
-	done
-
-uninstall:
-	for i in $(ebox_buttons); do \
-		$(RM) $(ebox_buttons_dir)/$$i; \
-	done
-	-rmdir $(ebox_buttons_dir)
-	for i in $(fieron2_buttons); do \
-		$(RM) $(fieron2_buttons_dir)/$$i; \
-	done
-	-rmdir $(fieron2_buttons_dir)
-	for i in $(fieron_buttons); do \
-		$(RM) $(fieron_buttons_dir)/$$i; \
-	done
-	-rmdir $(fieron_buttons_dir)
-	for i in $(files); do \
-		$(RM) $(dir)/$$i; \
-	done
-	-rmdir $(dir)
-
-clean:
-
-distclean:
-
-.PHONY: all clean distclean install uninstall