remove buttons from themes when they are using the defaults already f…

…or clarity

some small changes to themes..
  buttons can hide themselves now, so removed the empty disabled masks for
    Bear2 and Natura
install the default xbms for reference to the doc dir
install some basic documentation to the doc dir

Makefile.am

@@ -1,5 +1,6 @@
 SUBDIRS = m4 po
 
+docxbmdir       = $(docdir)/xbm
 themedir        = $(datadir)/themes
 localedir       = $(datadir)/locale
 configdir       = $(sysconfdir)/xdg
@@ -247,28 +248,27 @@ tools_gnome_panel_control_gnome_panel_control_SOURCES = \
 	tools/gnome-panel-control/gnome-panel-control.c
 
 
+## default button masks ##
+dist_docxbm_DATA = \
+        data/xbm/bullet.xbm \
+        data/xbm/close.xbm \
+        data/xbm/desk_toggled.xbm \
+        data/xbm/desk.xbm \
+        data/xbm/iconify.xbm \
+        data/xbm/max_toggled.xbm \
+        data/xbm/max.xbm \
+        data/xbm/shade_toggled.xbm \
+        data/xbm/shade.xbm
+
+
 ## themes ##
 
 clearlooks_themedir = $(themedir)/Clearlooks/openbox-3
 dist_clearlooks_theme_DATA= \
-	themes/Clearlooks/openbox-3/bullet.xbm \
-	themes/Clearlooks/openbox-3/close.xbm \
-	themes/Clearlooks/openbox-3/desk_toggled.xbm \
-	themes/Clearlooks/openbox-3/desk.xbm \
-	themes/Clearlooks/openbox-3/iconify.xbm \
-	themes/Clearlooks/openbox-3/max_toggled.xbm \
-	themes/Clearlooks/openbox-3/max.xbm \
 	themes/Clearlooks/openbox-3/themerc.xml
 
 clearlooksolive_themedir = $(themedir)/Clearlooks-Olive/openbox-3
 dist_clearlooksolive_theme_DATA= \
-	themes/Clearlooks-Olive/openbox-3/bullet.xbm \
-	themes/Clearlooks-Olive/openbox-3/close.xbm \
-	themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm \
-	themes/Clearlooks-Olive/openbox-3/desk.xbm \
-	themes/Clearlooks-Olive/openbox-3/iconify.xbm \
-	themes/Clearlooks-Olive/openbox-3/max_toggled.xbm \
-	themes/Clearlooks-Olive/openbox-3/max.xbm \
 	themes/Clearlooks-Olive/openbox-3/themerc.xml
 
 mikachu_themedir = $(themedir)/Mikachu/openbox-3
@@ -286,25 +286,19 @@ dist_natura_theme_DATA= \
 	themes/Natura/openbox-3/close_hover.xbm \
 	themes/Natura/openbox-3/close.xbm \
 	themes/Natura/openbox-3/desk_toggled.xbm \
+	themes/Natura/openbox-3/desk_hover.xbm \
 	themes/Natura/openbox-3/desk.xbm \
-	themes/Natura/openbox-3/iconify_disabled.xbm \
 	themes/Natura/openbox-3/iconify_hover.xbm \
 	themes/Natura/openbox-3/iconify.xbm \
-	themes/Natura/openbox-3/max_disabled.xbm \
 	themes/Natura/openbox-3/max_hover.xbm \
 	themes/Natura/openbox-3/max_toggled.xbm \
 	themes/Natura/openbox-3/max.xbm \
 	themes/Natura/openbox-3/shade.xbm \
+	themes/Natura/openbox-3/shade_hover.xbm \
 	themes/Natura/openbox-3/themerc.xml
 
 artwizboxed_themedir = $(themedir)/Artwiz-boxed/openbox-3
 dist_artwizboxed_theme_DATA= \
-	themes/Artwiz-boxed/openbox-3/close.xbm \
-	themes/Artwiz-boxed/openbox-3/desk_toggled.xbm \
-	themes/Artwiz-boxed/openbox-3/desk.xbm \
-	themes/Artwiz-boxed/openbox-3/iconify.xbm \
-	themes/Artwiz-boxed/openbox-3/max_toggled.xbm \
-	themes/Artwiz-boxed/openbox-3/max.xbm \
 	themes/Artwiz-boxed/openbox-3/themerc.xml
 
 bear2_themedir = $(themedir)/Bear2/openbox-3
@@ -313,10 +307,8 @@ dist_bear2_theme_DATA= \
 	themes/Bear2/openbox-3/close.xbm \
 	themes/Bear2/openbox-3/desk_toggled.xbm \
 	themes/Bear2/openbox-3/desk.xbm \
-	themes/Bear2/openbox-3/iconify_disabled.xbm \
 	themes/Bear2/openbox-3/iconify_pressed.xbm \
 	themes/Bear2/openbox-3/iconify.xbm \
-	themes/Bear2/openbox-3/max_disabled.xbm \
 	themes/Bear2/openbox-3/max_pressed.xbm \
 	themes/Bear2/openbox-3/max_toggled.xbm \
 	themes/Bear2/openbox-3/max.xbm \
@@ -330,17 +322,10 @@ dist_orang_theme_DATA= \
 
 syscrash_themedir = $(themedir)/Syscrash/openbox-3
 dist_syscrash_theme_DATA= \
-	themes/Syscrash/openbox-3/bullet.xbm \
-	themes/Syscrash/openbox-3/close_disabled.xbm \
-	themes/Syscrash/openbox-3/close.xbm \
-	themes/Syscrash/openbox-3/desk_toggled.xbm \
-	themes/Syscrash/openbox-3/desk.xbm \
-	themes/Syscrash/openbox-3/iconify.xbm \
 	themes/Syscrash/openbox-3/max_disabled.xbm \
 	themes/Syscrash/openbox-3/max_pressed.xbm \
 	themes/Syscrash/openbox-3/max_toggled.xbm \
 	themes/Syscrash/openbox-3/max.xbm \
-	themes/Syscrash/openbox-3/shade.xbm \
 	themes/Syscrash/openbox-3/themerc.xml
 
 ## public headers ##
@@ -432,14 +417,16 @@ dist_noinst_DATA = \
 	tests/title.c \
 	tests/urgent.c
 
+dist_doc_DATA = \
+	COMPLIANCE \
+	README \
+	AUTHORS
+
 EXTRA_DIST = \
 	config.rpath \
 	mkinstalldirs \
 	CHANGELOG \
-	COMPLIANCE \
-	README \
-	COPYING \
-	AUTHORS
+	COPYING
 
 #doc:
 #       $(MAKE) -$(MAKEFLAGS) -C doc/doxygen doc

themes/Clearlooks/openbox-3/iconify.xbm → data/xbm/shade.xbm

@@ -1,4 +1,4 @@
 #define iconify_width 6
 #define iconify_height 6
 static unsigned char iconify_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
+   0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 };

themes/Syscrash/openbox-3/iconify.xbm → data/xbm/shade_toggled.xbm

@@ -1,4 +1,4 @@
 #define iconify_width 6
 #define iconify_height 6
 static unsigned char iconify_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f };
+   0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00 };

themes/Bear2/openbox-3/themerc.xml

@@ -42,7 +42,7 @@
           <primary r="167" g="206" b="242" a="255"/>
         </pressed>
         <disabled>
-          <image r="221" g="221" b="221" a="255"/>
+          <image r="109" g="143" b="188" a="255"/>
           <style>parentrelative</style>
         </disabled>
         <hover>
@@ -93,7 +93,7 @@
           <primary r="79" g="80" b="81" a="255"/>
         </pressed>
         <disabled>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="208" g="208" b="208" a="255"/>
           <style>parentrelative</style>
         </disabled>
         <hover>

themes/Natura/openbox-3/desk.xbm

@@ -1,4 +1,4 @@
 #define desk_width 8
 #define desk_height 8
 static unsigned char desk_bits[] = {
-   0x00, 0x00, 0x48, 0x78, 0x7f, 0x78, 0x48, 0x00 };
+   0x00, 0x00, 0x48, 0x78, 0x7e, 0x78, 0x48, 0x00 };

themes/Natura/openbox-3/desk_hover.xbm

@@ -0,0 +1,4 @@
+#define desk_hover_width 8
+#define desk_hover_height 8
+static unsigned char desk_hover_bits[] = {
+   0x00, 0x88, 0x88, 0xf8, 0xff, 0xf8, 0x88, 0x88 };

themes/Natura/openbox-3/shade.xbm

@@ -1,4 +1,4 @@
 #define shade_width 8
 #define shade_height 8
 static unsigned char shade_bits[] = {
-   0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+   0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00 };

themes/Natura/openbox-3/shade_hover.xbm

@@ -0,0 +1,4 @@
+#define shade_hover_width 8
+#define shade_hover_height 8
+static unsigned char shade_hover_bits[] = {
+   0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };

themes/Natura/openbox-3/themerc.xml

@@ -43,10 +43,10 @@
           <style>parentrelative</style>
           <primary r="52" g="59" b="64" a="255"/>
           <secondary r="0" g="0" b="0" a="255"/>
-          <border r="149" g="165" b="178" a="255"/>
+          <border r="177" g="161" b="158" a="255"/>
         </pressed>
         <disabled>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="114" g="94" b="81" a="255"/>
           <style>parentrelative</style>
           <border r="78" g="88" b="96" a="255"/>
         </disabled>
@@ -107,13 +107,13 @@
           <border r="123" g="125" b="123" a="255"/>
         </pressed>
         <disabled>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="221" g="221" b="221" a="255"/>
           <style>parentrelative</style>
           <primary r="238" g="238" b="238" a="255"/>
           <border r="201" g="201" b="201" a="255"/>
         </disabled>
         <hover>
-          <image r="255" g="255" b="255" a="255"/>
+          <image r="160" g="160" b="160" a="255"/>
           <style>parentrelative</style>
           <primary r="175" g="177" b="178" a="255"/>
           <border r="217" g="223" b="228" a="255"/>

themes/Syscrash/openbox-3/max_pressed.xbm

@@ -1,4 +1,4 @@
-#define max_width 5
-#define max_height 5
+#define max_width 6
+#define max_height 6
 static unsigned char max_bits[] = {
-   0x1f, 0x1f, 0x11, 0x11, 0x1f };
+   0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };