all repos — openbox @ 3bee91aaf9c9893fb4a516432ad195a117baf1ce

openbox fork - make it a bit more like ryudo 

remove buttons from themes when they are using the defaults already for 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
Dana Jansens danakj@orodu.net
commit

3bee91aaf9c9893fb4a516432ad195a117baf1ce

parent

41f0ff035bef7fb14e4ede5aa36c71e8948731b9

39 files changed, 43 insertions(+), 140 deletions(-)

jump to
M Makefile.am → 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 @@ themes/Bear2/openbox-3/close_pressed.xbm \
 	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 @@ themes/Orang/openbox-3/themerc.xml
 
 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 @@ tests/strut.c \
 	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
D themes/Artwiz-boxed/openbox-3/close.xbm 
@@ -1,4 +0,0 @@ 
-#define close_width 7
-#define close_height 7
-static unsigned char close_bits[] = {
-   0x41, 0x22, 0x14, 0x08, 0x14, 0x22, 0x41 };
D themes/Artwiz-boxed/openbox-3/desk.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_width 7
-#define desk_height 7
-static unsigned char desk_bits[] = {
-   0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x00 };
D themes/Artwiz-boxed/openbox-3/desk_toggled.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_toggled_width 7
-#define desk_toggled_height 7
-static unsigned char desk_toggled_bits[] = {
-   0x00, 0x22, 0x00, 0x00, 0x00, 0x22, 0x00 };
D themes/Artwiz-boxed/openbox-3/iconify.xbm 
@@ -1,4 +0,0 @@ 
-#define iconify_width 7
-#define iconify_height 7
-static unsigned char iconify_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x7f, 0x41, 0x7f };
D themes/Artwiz-boxed/openbox-3/max.xbm 
@@ -1,4 +0,0 @@ 
-#define max_width 7
-#define max_height 7
-static unsigned char max_bits[] = {
-   0x7f, 0x7f, 0x41, 0x41, 0x41, 0x41, 0x7f };
D themes/Artwiz-boxed/openbox-3/max_toggled.xbm 
@@ -1,4 +0,0 @@ 
-#define max_toggled_width 7
-#define max_toggled_height 7
-static unsigned char max_toggled_bits[] = {
-   0x7c, 0x44, 0x5f, 0x55, 0x7d, 0x11, 0x1f };
D themes/Bear2/openbox-3/iconify_disabled.xbm 
@@ -1,5 +0,0 @@ 
-#define iconify_disabled_width 10
-#define iconify_disabled_height 10
-static unsigned char iconify_disabled_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
D themes/Bear2/openbox-3/max_disabled.xbm 
@@ -1,5 +0,0 @@ 
-#define max_disabled_width 10
-#define max_disabled_height 10
-static unsigned char max_disabled_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
M themes/Bear2/openbox-3/themerc.xml → themes/Bear2/openbox-3/themerc.xml 
@@ -42,7 +42,7 @@ <style>parentrelative</style>
           <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 @@ <style>parentrelative</style>
           <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>
D themes/Clearlooks-Olive/openbox-3/bullet.xbm 
@@ -1,4 +0,0 @@ 
-#define bullet_width 4
-#define bullet_height 7
-static unsigned char bullet_bits[] = {
-   0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
D themes/Clearlooks-Olive/openbox-3/close.xbm 
@@ -1,4 +0,0 @@ 
-#define close_width 6
-#define close_height 6
-static unsigned char close_bits[] = {
-   0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
D themes/Clearlooks-Olive/openbox-3/desk.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_width 6
-#define desk_height 6
-static unsigned char desk_bits[] = {
-   0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };
D themes/Clearlooks-Olive/openbox-3/desk_toggled.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_toggle_width 6
-#define desk_toggle_height 6
-static unsigned char desk_toggle_bits[] = {
-   0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 };
M themes/Clearlooks-Olive/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 };
D themes/Clearlooks-Olive/openbox-3/max.xbm 
@@ -1,4 +0,0 @@ 
-#define max_width 6
-#define max_height 6
-static unsigned char max_bits[] = {
-   0x3f, 0x3f, 0x21, 0x21, 0x21, 0x3f };
D themes/Clearlooks-Olive/openbox-3/max_toggled.xbm 
@@ -1,4 +0,0 @@ 
-#define max_width 6
-#define max_height 6
-static unsigned char max_bits[] = {
-   0x3e, 0x22, 0x2f, 0x29, 0x39, 0x0f };
M themes/Natura/openbox-3/desk.xbm → 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 };
A 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 };
D themes/Natura/openbox-3/iconify_disabled.xbm 
@@ -1,5 +0,0 @@ 
-#define iconify_disabled_width 10
-#define iconify_disabled_height 10
-static unsigned char iconify_disabled_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
D themes/Natura/openbox-3/max_disabled.xbm 
@@ -1,5 +0,0 @@ 
-#define max_disabled_width 10
-#define max_disabled_height 10
-static unsigned char max_disabled_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
M themes/Natura/openbox-3/shade.xbm → 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 };
A 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 };
M themes/Natura/openbox-3/themerc.xml → themes/Natura/openbox-3/themerc.xml 
@@ -43,10 +43,10 @@ <image r="182" g="182" b="182" a="255"/>
           <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 @@ <primary r="197" g="194" b="197" a="255"/>
           <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"/>
D themes/Syscrash/openbox-3/bullet.xbm 
@@ -1,4 +0,0 @@ 
-#define bullet_width 4
-#define bullet_height 7
-static unsigned char bullet_bits[] = {
-   0x01, 0x03, 0x07, 0x0f, 0x07, 0x03, 0x01 };
D themes/Syscrash/openbox-3/close.xbm 
@@ -1,4 +0,0 @@ 
-#define close_width 6
-#define close_height 6
-static unsigned char close_bits[] = {
-   0x33, 0x3f, 0x1e, 0x1e, 0x3f, 0x33 };
D themes/Syscrash/openbox-3/close_disabled.xbm 
@@ -1,4 +0,0 @@ 
-#define close_width 5
-#define close_height 5
-static unsigned char close_bits[] = {
-   0x1b, 0x1f, 0x0e, 0x1f, 0x1b };
D themes/Syscrash/openbox-3/desk.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_width 6
-#define desk_height 6
-static unsigned char desk_bits[] = {
-   0x33, 0x33, 0x00, 0x00, 0x33, 0x33 };
D themes/Syscrash/openbox-3/desk_toggled.xbm 
@@ -1,4 +0,0 @@ 
-#define desk_toggle_width 6
-#define desk_toggle_height 6
-static unsigned char desk_toggle_bits[] = {
-   0x00, 0x1e, 0x1a, 0x16, 0x1e, 0x00 };
M 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 };
M themes/Syscrash/openbox-3/max_pressed.xbm → 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 };
D themes/Syscrash/openbox-3/shade.xbm 
@@ -1,4 +0,0 @@ 
-#define shade_width 7
-#define shade_height 7
-static unsigned char shade_bits[] = {
-   0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00 };