X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=f0f77bb981eafa12e7ad5422dc1876243361e0ea;hb=db3e93a3c1a57d962741a572a0913ce2555d9dba;hp=750746dfacc613462b1568ab7dc2c2a071275edb;hpb=b8ee3dbc4565efb19338c5cf1948f0f4e2f24fd6;p=chaz%2Fopenbox

diff --git a/src/Makefile.am b/src/Makefile.am
index 750746df..f0f77bb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 DEFAULT_MENU=$(pkgdatadir)/menu
-DEFAULT_STYLE=$(pkgdatadir)/styles/steelblue
+DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
 CPPFLAGS=@CPPFLAGS@ @DEBUG@ \
 -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
@@ -29,95 +29,112 @@ CPPFLAGS=@CPPFLAGS@ @DEBUG@ \
 
 bin_PROGRAMS= openbox
 
-openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Color.cc Configmenu.cc Configuration.cc GCCache.cc Iconmenu.cc Image.cc ImageControl.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Texture.cc Timer.cc Toolbar.cc Util.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc XAtom.cc blackbox.cc i18n.cc main.cc
+openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Color.cc Configmenu.cc Configuration.cc Font.cc GCCache.cc Iconmenu.cc Image.cc ImageControl.cc Netizen.cc Rootmenu.cc Screen.cc Slit.cc Texture.cc Timer.cc Toolbar.cc Util.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc XAtom.cc blackbox.cc i18n.cc main.cc
 
 MAINTAINERCLEANFILES= Makefile.in
 
 distclean-local:
-	rm -f *\~ *.orig *.rej
+	rm -f *\~ *.orig *.rej .\#*
 
 # local dependencies
 
 BaseDisplay.o: BaseDisplay.cc i18n.hh ../nls/blackbox-nls.hh \
-  BaseDisplay.hh Timer.hh Util.hh GCCache.hh Color.hh
+ BaseDisplay.hh Timer.hh Util.hh GCCache.hh Color.hh
 Basemenu.o: Basemenu.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Basemenu.hh GCCache.hh \
-  Color.hh Image.hh Screen.hh Texture.hh Configmenu.hh Iconmenu.hh \
-  Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Basemenu.hh \
+ Font.hh Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh \
+ Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
+ GCCache.hh
 Clientmenu.o: Clientmenu.cc blackbox.hh i18n.hh ../nls/blackbox-nls.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Clientmenu.hh \
-  Basemenu.hh Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh \
-  Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
-  Window.hh Windowmenu.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh \
+ Clientmenu.hh Basemenu.hh Screen.hh Color.hh Texture.hh Image.hh \
+ Configmenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh \
+ Workspacemenu.hh Window.hh Windowmenu.hh
 Color.o: Color.cc Color.hh BaseDisplay.hh Timer.hh Util.hh
-Configmenu.o: Configmenu.cc i18n.hh ../nls/blackbox-nls.hh Configmenu.hh \
-  Basemenu.hh Image.hh Timer.hh BaseDisplay.hh Util.hh Color.hh \
-  Toolbar.hh Screen.hh Texture.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
-  Workspace.hh Workspacemenu.hh blackbox.hh Configuration.hh Window.hh \
-  Windowmenu.hh
+Configmenu.o: Configmenu.cc i18n.hh ../nls/blackbox-nls.hh \
+ Configmenu.hh Basemenu.hh Image.hh Timer.hh BaseDisplay.hh Util.hh \
+ Color.hh Toolbar.hh Screen.hh Texture.hh Iconmenu.hh Netizen.hh \
+ Rootmenu.hh Workspace.hh Workspacemenu.hh blackbox.hh \
+ Configuration.hh XAtom.hh Window.hh Windowmenu.hh
 Configuration.o: Configuration.cc ../config.h Configuration.hh Util.hh
-GCCache.o: GCCache.cc GCCache.hh BaseDisplay.hh Timer.hh Util.hh Color.hh
+Font.o: Font.cc i18n.hh ../nls/blackbox-nls.hh Font.hh Screen.hh \
+ Color.hh Texture.hh Util.hh Image.hh Timer.hh BaseDisplay.hh \
+ Configmenu.hh Basemenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
+ Workspace.hh Workspacemenu.hh blackbox.hh Configuration.hh XAtom.hh \
+ GCCache.hh
+GCCache.o: GCCache.cc GCCache.hh BaseDisplay.hh Timer.hh Util.hh \
+ Color.hh
 Iconmenu.o: Iconmenu.cc i18n.hh ../nls/blackbox-nls.hh Iconmenu.hh \
-  Basemenu.hh Screen.hh Color.hh Texture.hh Util.hh Image.hh Timer.hh \
-  BaseDisplay.hh Configmenu.hh Netizen.hh Rootmenu.hh Workspace.hh \
-  Workspacemenu.hh blackbox.hh Configuration.hh Window.hh Windowmenu.hh
+ Basemenu.hh Screen.hh Color.hh Texture.hh Util.hh Image.hh Timer.hh \
+ BaseDisplay.hh Configmenu.hh Netizen.hh Rootmenu.hh Workspace.hh \
+ Workspacemenu.hh blackbox.hh Configuration.hh XAtom.hh Window.hh \
+ Windowmenu.hh
 Image.o: Image.cc blackbox.hh i18n.hh ../nls/blackbox-nls.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh GCCache.hh Color.hh \
-  Image.hh Texture.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh GCCache.hh \
+ Color.hh Image.hh Texture.hh
 ImageControl.o: ImageControl.cc blackbox.hh i18n.hh \
-  ../nls/blackbox-nls.hh BaseDisplay.hh Timer.hh Util.hh Configuration.hh \
-  Color.hh Image.hh Texture.hh
+ ../nls/blackbox-nls.hh BaseDisplay.hh Timer.hh Util.hh \
+ Configuration.hh XAtom.hh Color.hh Image.hh Texture.hh
 Netizen.o: Netizen.cc Netizen.hh Screen.hh Color.hh Texture.hh Util.hh \
-  Image.hh Timer.hh BaseDisplay.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
-  Rootmenu.hh Workspace.hh Workspacemenu.hh blackbox.hh i18n.hh \
-  ../nls/blackbox-nls.hh Configuration.hh
+ Image.hh Timer.hh BaseDisplay.hh Configmenu.hh Basemenu.hh \
+ Iconmenu.hh Rootmenu.hh Workspace.hh Workspacemenu.hh blackbox.hh \
+ i18n.hh ../nls/blackbox-nls.hh Configuration.hh XAtom.hh
 Rootmenu.o: Rootmenu.cc blackbox.hh i18n.hh ../nls/blackbox-nls.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Rootmenu.hh \
-  Basemenu.hh Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh \
-  Iconmenu.hh Netizen.hh Workspace.hh Workspacemenu.hh
-Screen.o: Screen.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Clientmenu.hh \
-  Basemenu.hh GCCache.hh Color.hh Iconmenu.hh Image.hh Screen.hh \
-  Texture.hh Configmenu.hh Netizen.hh Rootmenu.hh Workspace.hh \
-  Workspacemenu.hh Slit.hh Toolbar.hh Window.hh Windowmenu.hh
-Slit.o: Slit.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh BaseDisplay.hh \
-  Timer.hh Util.hh Configuration.hh Image.hh Color.hh Screen.hh \
-  Texture.hh Configmenu.hh Basemenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
-  Workspace.hh Workspacemenu.hh Slit.hh Toolbar.hh
-Texture.o: Texture.cc Texture.hh Color.hh Util.hh BaseDisplay.hh Timer.hh \
-  Image.hh Screen.hh Configmenu.hh Basemenu.hh Iconmenu.hh Netizen.hh \
-  Rootmenu.hh Workspace.hh Workspacemenu.hh blackbox.hh i18n.hh \
-  ../nls/blackbox-nls.hh Configuration.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Rootmenu.hh \
+ Basemenu.hh Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh \
+ Iconmenu.hh Netizen.hh Workspace.hh Workspacemenu.hh
+Screen.o: Screen.cc ../config.h i18n.hh ../nls/blackbox-nls.hh \
+ blackbox.hh BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh \
+ Clientmenu.hh Basemenu.hh Font.hh Screen.hh Color.hh Texture.hh \
+ Image.hh Configmenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
+ Workspace.hh Workspacemenu.hh GCCache.hh Slit.hh Toolbar.hh Window.hh \
+ Windowmenu.hh
+Slit.o: Slit.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Image.hh \
+ Color.hh Screen.hh Texture.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
+ Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Slit.hh \
+ Toolbar.hh
+Texture.o: Texture.cc Texture.hh Color.hh Util.hh BaseDisplay.hh \
+ Timer.hh Image.hh Screen.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
+ Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh blackbox.hh \
+ i18n.hh ../nls/blackbox-nls.hh Configuration.hh XAtom.hh
 Timer.o: Timer.cc BaseDisplay.hh Timer.hh Util.hh
 Toolbar.o: Toolbar.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Clientmenu.hh \
-  Basemenu.hh GCCache.hh Color.hh Iconmenu.hh Image.hh Rootmenu.hh \
-  Screen.hh Texture.hh Configmenu.hh Netizen.hh Workspace.hh \
-  Workspacemenu.hh Toolbar.hh Window.hh Windowmenu.hh Slit.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh \
+ Clientmenu.hh Basemenu.hh Font.hh Screen.hh Color.hh Texture.hh \
+ Image.hh Configmenu.hh Iconmenu.hh Netizen.hh Rootmenu.hh \
+ Workspace.hh Workspacemenu.hh GCCache.hh Toolbar.hh Window.hh \
+ Windowmenu.hh Slit.hh
 Util.o: Util.cc Util.hh
 Window.o: Window.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh GCCache.hh Color.hh \
-  Iconmenu.hh Basemenu.hh Image.hh Screen.hh Texture.hh Configmenu.hh \
-  Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Toolbar.hh \
-  Window.hh Windowmenu.hh Slit.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Font.hh \
+ Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh Basemenu.hh \
+ Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
+ GCCache.hh Toolbar.hh Window.hh Windowmenu.hh Slit.hh
 Windowmenu.o: Windowmenu.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Screen.hh Color.hh \
-  Texture.hh Image.hh Configmenu.hh Basemenu.hh Iconmenu.hh Netizen.hh \
-  Rootmenu.hh Workspace.hh Workspacemenu.hh Window.hh Windowmenu.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Screen.hh \
+ Color.hh Texture.hh Image.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
+ Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Window.hh \
+ Windowmenu.hh
 Workspace.o: Workspace.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Clientmenu.hh \
-  Basemenu.hh Netizen.hh Screen.hh Color.hh Texture.hh Image.hh \
-  Configmenu.hh Iconmenu.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
-  Toolbar.hh Window.hh Windowmenu.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh \
+ Clientmenu.hh Basemenu.hh Netizen.hh Screen.hh Color.hh Texture.hh \
+ Image.hh Configmenu.hh Iconmenu.hh Rootmenu.hh Workspace.hh \
+ Workspacemenu.hh Toolbar.hh Window.hh Windowmenu.hh
 Workspacemenu.o: Workspacemenu.cc i18n.hh ../nls/blackbox-nls.hh \
-  blackbox.hh BaseDisplay.hh Timer.hh Util.hh Configuration.hh Screen.hh \
-  Color.hh Texture.hh Image.hh Configmenu.hh Basemenu.hh Iconmenu.hh \
-  Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh Toolbar.hh
+ blackbox.hh BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh \
+ Screen.hh Color.hh Texture.hh Image.hh Configmenu.hh Basemenu.hh \
+ Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
+ Toolbar.hh
+XAtom.o: XAtom.cc ../config.h XAtom.hh Screen.hh Color.hh Texture.hh \
+ Util.hh Image.hh Timer.hh BaseDisplay.hh Configmenu.hh Basemenu.hh \
+ Iconmenu.hh Netizen.hh Rootmenu.hh Workspace.hh Workspacemenu.hh \
+ blackbox.hh i18n.hh ../nls/blackbox-nls.hh Configuration.hh
 blackbox.o: blackbox.cc i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh Basemenu.hh \
-  Clientmenu.hh GCCache.hh Color.hh Image.hh Rootmenu.hh Screen.hh \
-  Texture.hh Configmenu.hh Iconmenu.hh Netizen.hh Workspace.hh \
-  Workspacemenu.hh Slit.hh Toolbar.hh Window.hh Windowmenu.hh
+ BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh Basemenu.hh \
+ Clientmenu.hh GCCache.hh Color.hh Image.hh Rootmenu.hh Screen.hh \
+ Texture.hh Configmenu.hh Iconmenu.hh Netizen.hh Workspace.hh \
+ Workspacemenu.hh Slit.hh Toolbar.hh Window.hh Windowmenu.hh
 i18n.o: i18n.cc i18n.hh ../nls/blackbox-nls.hh
-main.o: main.cc ../version.h i18n.hh ../nls/blackbox-nls.hh blackbox.hh \
-  BaseDisplay.hh Timer.hh Util.hh Configuration.hh
+main.o: main.cc ../version.h i18n.hh ../nls/blackbox-nls.hh \
+ blackbox.hh BaseDisplay.hh Timer.hh Util.hh Configuration.hh XAtom.hh