? mulberry_box.patch
Index: data/rc.xml.in
===================================================================
RCS file: /cvs/cvsroot/openbox/data/rc.xml.in,v
retrieving revision 1.21
diff -p -u -r1.21 rc.xml.in
--- data/rc.xml.in	4 Nov 2004 12:13:25 -0000	1.21
+++ data/rc.xml.in	1 Aug 2005 08:03:43 -0000
@@ -25,6 +25,7 @@
 <theme>
   <name>TheBear</name>
   <titlelayout>NLIMC</titlelayout>
+  <hideDisabled>yes</hideDisabled>
 </theme>
 
 <placement>
@@ -245,10 +246,10 @@
     <mousebind button="Left" action="Press">
       <action name="Focus"/>
     </mousebind>
-    <mousebind button="Right" action="Press">
+    <mousebind button="Middle" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
-    <mousebind button="Left" action="Press">
+    <mousebind button="Right" action="Press">
       <action name="ShowMenu"><menu>client-menu</menu></action>
     </mousebind>
   </context>
Index: openbox/dock.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/dock.c,v
retrieving revision 1.39
diff -p -u -r1.39 dock.c
--- openbox/dock.c	26 Mar 2005 06:34:58 -0000	1.39
+++ openbox/dock.c	1 Aug 2005 08:03:44 -0000
@@ -60,7 +60,7 @@ void dock_startup(gboolean reconfig)
         XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
 
         RrAppearanceFree(dock->a_frame);
-        dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+        dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_menu);
 
         stacking_add(DOCK_AS_WINDOW(dock));
 
@@ -88,7 +88,7 @@ void dock_startup(gboolean reconfig)
                                 RrVisual(ob_rr_inst),
                                 CWOverrideRedirect | CWEventMask,
                                 &attrib);
-    dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+    dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_menu);
     XSetWindowBorder(ob_display, dock->frame,
                      RrColorPixel(ob_rr_theme->b_color));
     XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth);
Index: render/gradient.c
===================================================================
RCS file: /cvs/cvsroot/openbox/render/gradient.c,v
retrieving revision 1.45
diff -p -u -r1.45 gradient.c
--- render/gradient.c	15 Oct 2003 03:59:35 -0000	1.45
+++ render/gradient.c	1 Aug 2005 08:03:45 -0000
@@ -132,11 +132,11 @@ static void highlight(RrPixel32 *x, RrPi
         down = x;
     }
     r = (*up >> RrDefaultRedOffset) & 0xFF;
-    r += r >> 1;
+    r += r >> 3;
     g = (*up >> RrDefaultGreenOffset) & 0xFF;
-    g += g >> 1;
+    g += g >> 3;
     b = (*up >> RrDefaultBlueOffset) & 0xFF;
-    b += b >> 1;
+    b += b >> 3;
     if (r > 0xFF) r = 0xFF;
     if (g > 0xFF) g = 0xFF;
     if (b > 0xFF) b = 0xFF;
@@ -144,12 +144,15 @@ static void highlight(RrPixel32 *x, RrPi
         + (b << RrDefaultBlueOffset);
   
     r = (*down >> RrDefaultRedOffset) & 0xFF;
-    r = (r >> 1) + (r >> 2);
+    r = (r >> 1) + (r >> 2) + (b >> 3);
     g = (*down >> RrDefaultGreenOffset) & 0xFF;
-    g = (g >> 1) + (g >> 2);
+    g = (g >> 1) + (g >> 2) + (b >> 3);
     b = (*down >> RrDefaultBlueOffset) & 0xFF;
-    b = (b >> 1) + (b >> 2);
-    *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
+    b = (b >> 1) + (b >> 2) + (b >> 3);
+    if (r > 0xFF) r = 0xFF;
+    if (g > 0xFF) g = 0xFF;
+    if (b > 0xFF) b = 0xFF;
+  *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset)
         + (b << RrDefaultBlueOffset);
 }
 
@@ -159,14 +162,12 @@ static void create_bevel_colors(RrAppear
 
     /* light color */
     r = l->surface.primary->r;
-    r += r >> 1;
+    r += r >> 3;
     g = l->surface.primary->g;
-    g += g >> 1;
+    g += g >> 3;
     b = l->surface.primary->b;
-    b += b >> 1;
-    if (r > 0xFF) r = 0xFF;
-    if (g > 0xFF) g = 0xFF;
-    if (b > 0xFF) b = 0xFF;
+    b += b >> 3;
+  
     g_assert(!l->surface.bevel_light);
     l->surface.bevel_light = RrColorNew(l->inst, r, g, b);
 
Index: render/image.c
===================================================================
RCS file: /cvs/cvsroot/openbox/render/image.c,v
retrieving revision 1.16
diff -p -u -r1.16 image.c
--- render/image.c	11 Nov 2003 12:04:47 -0000	1.16
+++ render/image.c	1 Aug 2005 08:03:45 -0000
@@ -162,6 +162,7 @@ void RrImageDraw(RrPixel32 *target, RrTe
         guchar alpha, r, g, b, bgr, bgg, bgb;
 
         alpha = *source >> RrDefaultAlphaOffset;
+	alpha /= 1.5;
         r = *source >> RrDefaultRedOffset;
         g = *source >> RrDefaultGreenOffset;
         b = *source >> RrDefaultBlueOffset;
Index: render/theme.c
===================================================================
RCS file: /cvs/cvsroot/openbox/render/theme.c,v
retrieving revision 1.76
diff -p -u -r1.76 theme.c
--- render/theme.c	14 Jul 2005 20:41:24 -0000	1.76
+++ render/theme.c	1 Aug 2005 08:03:47 -0000
@@ -904,7 +904,7 @@ RrTheme* RrThemeNew(const RrInstance *in
             theme->padding * 2;
     }
     theme->button_size = theme->label_height - 2;
-    theme->grip_width = theme->title_height * 1.5;
+    theme->grip_width = 23;
 
     return theme;
 }
Index: themes/TheBear/openbox-3/themerc
===================================================================
RCS file: /cvs/cvsroot/openbox/themes/TheBear/openbox-3/themerc,v
retrieving revision 1.9
diff -p -u -r1.9 themerc
--- themes/TheBear/openbox-3/themerc	28 Sep 2003 09:54:07 -0000	1.9
+++ themes/TheBear/openbox-3/themerc	1 Aug 2005 08:03:47 -0000
@@ -98,7 +98,7 @@ window.active.client.color: #e6e6e6
 
 !! Global width settings
 border.width: 1
-padding.width: 1
+padding.width: 2
 window.handle.width: 3
 window.client.padding.width: 0
 
@@ -107,7 +107,7 @@ window.client.padding.width: 0
 border.color: #222222
 
 !! font me!
-window.active.label.text.font:Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowoffset=1:shadowtint=75
-window.inactive.label.text.font:Bitstream Vera Sans:bold:pixelsize=9
-menu.items.font: Bitstream Vera Sans:pixelsize=10
-menu.title.text.font: Bitstream Vera Sans:bold:pixelsize=9:shadow=y:shadowoffset=1:shadowtint=75
+window.active.label.text.font:Bitstream Vera Sans:bold:size=9:shadow=y:shadowoffset=1:shadowtint=60
+window.inactive.label.text.font:Bitstream Vera Sans:bold:size=9
+menu.items.font: Bitstream Vera Sans:size=9
+menu.title.text.font: Bitstream Vera Sans:bold:size=9:shadow=y:shadowoffset=1:shadowtint=60