[crux-commits] r1777 - crux-2.2/ports/opt/openbox

Author: tilman Date: 2006-08-27 12:26:46 +0200 (Sun, 27 Aug 2006) New Revision: 1777 Removed: crux-2.2/ports/opt/openbox/pipedsplitgradient.diff Modified: crux-2.2/ports/opt/openbox/.footprint crux-2.2/ports/opt/openbox/.md5sum crux-2.2/ports/opt/openbox/Pkgfile Log: openbox: updated to 3.3 Modified: crux-2.2/ports/opt/openbox/.footprint =================================================================== --- crux-2.2/ports/opt/openbox/.footprint 2006-08-27 09:19:45 UTC (rev 1776) +++ crux-2.2/ports/opt/openbox/.footprint 2006-08-27 10:26:46 UTC (rev 1777) @@ -12,6 +12,13 @@ drwxr-xr-x root/root usr/include/openbox/ drwxr-xr-x root/root usr/include/openbox/3.3/ drwxr-xr-x root/root usr/include/openbox/3.3/openbox/ +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/color.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/font.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/geom.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/gradient.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/image.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/instance.h +-rw-r--r-- root/root usr/include/openbox/3.3/openbox/mask.h -rw-r--r-- root/root usr/include/openbox/3.3/openbox/parse.h -rw-r--r-- root/root usr/include/openbox/3.3/openbox/render.h -rw-r--r-- root/root usr/include/openbox/3.3/openbox/theme.h @@ -19,14 +26,14 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libobparser.a -rwxr-xr-x root/root usr/lib/libobparser.la -lrwxrwxrwx root/root usr/lib/libobparser.so -> libobparser.so.0.2.1 -lrwxrwxrwx root/root usr/lib/libobparser.so.0 -> libobparser.so.0.2.1 --rwxr-xr-x root/root usr/lib/libobparser.so.0.2.1 +lrwxrwxrwx root/root usr/lib/libobparser.so -> libobparser.so.0.4.0 +lrwxrwxrwx root/root usr/lib/libobparser.so.0 -> libobparser.so.0.4.0 +-rwxr-xr-x root/root usr/lib/libobparser.so.0.4.0 -rw-r--r-- root/root usr/lib/libobrender.a -rwxr-xr-x root/root usr/lib/libobrender.la -lrwxrwxrwx root/root usr/lib/libobrender.so -> libobrender.so.0.2.1 -lrwxrwxrwx root/root usr/lib/libobrender.so.0 -> libobrender.so.0.2.1 --rwxr-xr-x root/root usr/lib/libobrender.so.0.2.1 +lrwxrwxrwx root/root usr/lib/libobrender.so -> libobrender.so.0.4.0 +lrwxrwxrwx root/root usr/lib/libobrender.so.0 -> libobrender.so.0.4.0 +-rwxr-xr-x root/root usr/lib/libobrender.so.0.4.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/obparser-3.0.pc -rw-r--r-- root/root usr/lib/pkgconfig/obrender-3.0.pc @@ -41,36 +48,69 @@ drwxr-xr-x root/root usr/share/pixmaps/ -rw-r--r-- root/root usr/share/pixmaps/openbox.png drwxr-xr-x root/root usr/share/themes/ -drwxr-xr-x root/root usr/share/themes/Allegro/ -drwxr-xr-x root/root usr/share/themes/Allegro/openbox-3/ --rw-r--r-- root/root usr/share/themes/Allegro/openbox-3/bullet.xbm --rw-r--r-- root/root usr/share/themes/Allegro/openbox-3/themerc -drwxr-xr-x root/root usr/share/themes/Artwiz/ -drwxr-xr-x root/root usr/share/themes/Artwiz/openbox-3/ --rw-r--r-- root/root usr/share/themes/Artwiz/openbox-3/themerc -drwxr-xr-x root/root usr/share/themes/Blah41/ -drwxr-xr-x root/root usr/share/themes/Blah41/openbox-3/ --rw-r--r-- root/root usr/share/themes/Blah41/openbox-3/themerc -drwxr-xr-x root/root usr/share/themes/Om4Ob/ -drwxr-xr-x root/root usr/share/themes/Om4Ob/openbox-3/ --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/close.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/close_hover.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/desk.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/desk_hover.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/desk_toggled.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/iconify.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/iconify_hover.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/iconify_pressed.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/max.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/max_disabled.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/max_hover.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/max_pressed.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/max_toggled.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/shade.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/shade_disabled.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/shade_hover.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/shade_toggled.xbm --rw-r--r-- root/root usr/share/themes/Om4Ob/openbox-3/themerc -drwxr-xr-x root/root usr/share/themes/TheBear/ -drwxr-xr-x root/root usr/share/themes/TheBear/openbox-3/ --rw-r--r-- root/root usr/share/themes/TheBear/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/Mikachu/ +drwxr-xr-x root/root usr/share/themes/Mikachu/openbox-3/ +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/bullet.xbm +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/close.xbm +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/desk.xbm +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/iconify.xbm +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/max.xbm +-rw-r--r-- root/root usr/share/themes/Mikachu/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/Natura/ +drwxr-xr-x root/root usr/share/themes/Natura/openbox-3/ +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/close.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/close_hover.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/desk.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/desk_toggled.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/iconify.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/iconify_disabled.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/iconify_hover.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/max.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/max_disabled.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/max_hover.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/max_toggled.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/shade.xbm +-rw-r--r-- root/root usr/share/themes/Natura/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/artwiz-boxed/ +drwxr-xr-x root/root usr/share/themes/artwiz-boxed/openbox-3/ +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/bullet.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/close.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/desk.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/desk_toggled.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/iconify.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/max.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/max_toggled.xbm +-rw-r--r-- root/root usr/share/themes/artwiz-boxed/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/bear2/ +drwxr-xr-x root/root usr/share/themes/bear2/openbox-3/ +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/close.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/close_pressed.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/desk.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/desk_toggled.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/iconify.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/iconify_disabled.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/iconify_pressed.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/max.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/max_disabled.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/max_pressed.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/max_toggled.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/shade.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/shade_pressed.xbm +-rw-r--r-- root/root usr/share/themes/bear2/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/orang/ +drwxr-xr-x root/root usr/share/themes/orang/openbox-3/ +-rw-r--r-- root/root usr/share/themes/orang/openbox-3/themerc +drwxr-xr-x root/root usr/share/themes/syscrash/ +drwxr-xr-x root/root usr/share/themes/syscrash/openbox-3/ +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/bullet.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/close.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/close_disabled.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/desk.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/desk_toggled.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/iconify.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/max.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/max_disabled.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/max_pressed.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/max_toggled.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/shade.xbm +-rw-r--r-- root/root usr/share/themes/syscrash/openbox-3/themerc Modified: crux-2.2/ports/opt/openbox/.md5sum =================================================================== --- crux-2.2/ports/opt/openbox/.md5sum 2006-08-27 09:19:45 UTC (rev 1776) +++ crux-2.2/ports/opt/openbox/.md5sum 2006-08-27 10:26:46 UTC (rev 1777) @@ -1,2 +1 @@ -1ff100d27cc1f47dadebb884a696dac3 openbox-3.3-rc2.tar.gz -6e47f504826b206926cf34f57e215dd5 pipedsplitgradient.diff +35e228b33ab7d5d0995b5beb9c127808 openbox-3.3.tar.gz Modified: crux-2.2/ports/opt/openbox/Pkgfile =================================================================== --- crux-2.2/ports/opt/openbox/Pkgfile 2006-08-27 09:19:45 UTC (rev 1776) +++ crux-2.2/ports/opt/openbox/Pkgfile 2006-08-27 10:26:46 UTC (rev 1777) @@ -4,19 +4,15 @@ # Depends on: x11, glib, libxml2, pango name=openbox -version=3.3-rc2 -release=3 -source=(http://www.icculus.org/$name/releases/$name-$version.tar.gz \ - pipedsplitgradient.diff) +version=3.3 +release=1 +source=(http://www.icculus.org/$name/releases/$name-$version.tar.gz) build() { cd $name-$version - sed -i -e 's/pango_font_description_set_size/pango_font_description_set_absolute_size/' render/font.c - patch -Np0 -i $SRC/pipedsplitgradient.diff + ./configure --prefix=/usr --disable-nls - ./configure --prefix=/usr \ - --disable-nls make make DESTDIR=$PKG install } Deleted: crux-2.2/ports/opt/openbox/pipedsplitgradient.diff =================================================================== --- crux-2.2/ports/opt/openbox/pipedsplitgradient.diff 2006-08-27 09:19:45 UTC (rev 1776) +++ crux-2.2/ports/opt/openbox/pipedsplitgradient.diff 2006-08-27 10:26:46 UTC (rev 1777) @@ -1,283 +0,0 @@ -# all thanks go to Brandon Cash caiphp.com, who did 99% of the work for this -# he is the hero of this story! - -Index: openbox/dock.c -=================================================================== -RCS file: /cvs/cvsroot/openbox/openbox/dock.c,v -retrieving revision 1.40 -diff -p -u -r1.40 dock.c ---- openbox/dock.c 25 Sep 2005 14:45:24 -0000 1.40 -+++ openbox/dock.c 27 Jan 2006 17:24:45 -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 27 Jan 2006 17:24:46 -0000 -@@ -24,6 +24,7 @@ - - static void highlight(RrPixel32 *x, RrPixel32 *y, gboolean raised); - static void gradient_solid(RrAppearance *l, gint w, gint h); -+static void gradient_split(RrAppearance *a, gint w, gint h); - static void gradient_vertical(RrSurface *sf, gint w, gint h); - static void gradient_horizontal(RrSurface *sf, gint w, gint h); - static void gradient_diagonal(RrSurface *sf, gint w, gint h); -@@ -41,6 +42,9 @@ void RrRender(RrAppearance *a, gint w, g - case RR_SURFACE_SOLID: - gradient_solid(a, w, h); - break; -+ case RR_SURFACE_SPLIT: -+ gradient_split(a, w, h); -+ break; - case RR_SURFACE_VERTICAL: - gradient_vertical(&a->surface, w, h); - break; -@@ -60,7 +64,7 @@ void RrRender(RrAppearance *a, gint w, g - g_assert_not_reached(); /* unhandled gradient */ - return; - } -- -+ - if (a->surface.interlaced) { - gint i; - RrPixel32 *p; -@@ -76,7 +80,7 @@ void RrRender(RrAppearance *a, gint w, g - for (x = 0; x < w; ++x, ++p) - *p = current; - } -- -+ - if (a->surface.relief == RR_RELIEF_FLAT && a->surface.border) { - r = a->surface.border_color->r; - g = a->surface.border_color->g; -@@ -132,11 +136,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 +148,15 @@ static void highlight(RrPixel32 *x, RrPi - + (b << RrDefaultBlueOffset); - - r = (*down >> RrDefaultRedOffset) & 0xFF; -- r = (r >> 1) + (r >> 2); -+ r = (r >> 1) + (r >> 2) * 1.7; - g = (*down >> RrDefaultGreenOffset) & 0xFF; -- g = (g >> 1) + (g >> 2); -+ g = (g >> 1) + (g >> 2) * 1.7; - b = (*down >> RrDefaultBlueOffset) & 0xFF; -- b = (b >> 1) + (b >> 2); -- *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) -+ b = (b >> 1) + (b >> 2) * 1.7; -+ if (r > 0xFF) r = 0xFF; -+ if (g > 0xFF) g = 0xFF; -+ if (b > 0xFF) b = 0xFF; -+ *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) - + (b << RrDefaultBlueOffset); - } - -@@ -159,11 +166,11 @@ 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; -+ b += b >> 3; - if (r > 0xFF) r = 0xFF; - if (g > 0xFF) g = 0xFF; - if (b > 0xFF) b = 0xFF; -@@ -172,11 +179,11 @@ static void create_bevel_colors(RrAppear - - /* dark color */ - r = l->surface.primary->r; -- r = (r >> 1) + (r >> 2); -+ r = (r >> 1) + (r >> 2) * 1.7; - g = l->surface.primary->g; -- g = (g >> 1) + (g >> 2); -+ g = (g >> 1) + (g >> 2) * 1.7; - b = l->surface.primary->b; -- b = (b >> 1) + (b >> 2); -+ b = (b >> 1) + (b >> 2) * 1.7; - g_assert(!l->surface.bevel_dark); - l->surface.bevel_dark = RrColorNew(l->inst, r, g, b); - } -@@ -198,7 +205,7 @@ static void gradient_solid(RrAppearance - - XFillRectangle(RrDisplay(l->inst), l->pixmap, RrColorGC(sp->primary), - 0, 0, w, h); -- -+ - if (sp->interlaced) { - for (i = 0; i < h; i += 2) - XDrawLine(RrDisplay(l->inst), l->pixmap, -@@ -359,6 +366,77 @@ static void gradient_solid(RrAppearance - } \ - } - -+static void gradient_split(RrAppearance *a, gint w, gint h) -+{ -+ gint x, y1, y3, r, g, b; -+ RrSurface *sf = &a->surface; -+ RrPixel32 *data = sf->pixel_data; -+ RrPixel32 current; -+ RrColor *primary_light, *secondary_light; -+ -+/* -+ maybe this is a better way, or maybe not! -+ r = sf->primary->r; -+ r = (r >> 1) + (r >> 2) + (r >> 3) ; -+ g = sf->primary->g; -+ g = (g >> 1) + (g >> 2) + (g >> 3); -+ b = sf->primary->b; -+ b = (b >> 1) + (b >> 2) + (b >> 3); -+ primary_dark = RrColorNew(a->inst, r, g, b); -+*/ -+ -+ -+ r = sf->primary->r; -+ r += r >> 2; -+ g = sf->primary->g; -+ g += g >> 2; -+ b = sf->primary->b; -+ b += b >> 2; -+ if (r > 0xFF) r = 0xFF; -+ if (g > 0xFF) g = 0xFF; -+ if (b > 0xFF) b = 0xFF; -+ primary_light = RrColorNew(a->inst, r, g, b); -+ -+ -+ r = sf->secondary->r; -+ r += r >> 4; -+ g = sf->secondary->g; -+ g += g >> 4; -+ b = sf->secondary->b; -+ b += b >> 4; -+ if (r > 0xFF) r = 0xFF; -+ if (g > 0xFF) g = 0xFF; -+ if (b > 0xFF) b = 0xFF; -+ secondary_light = RrColorNew(a->inst, r, g, b); -+ -+ VARS(y1); -+ SETUP(y1, primary_light, sf->primary, (h / 2) -1); -+ -+ VARS(y3); -+ SETUP(y3, sf->secondary, secondary_light, (h / 2) -1); -+ -+ for (y1 = h - 1; y1 > (h / 2) -1; --y1) { /* 0 -> h-1 */ -+ current = COLOR(y1); -+ for (x = w - 1; x >= 0; --x) /* 0 -> w */ -+ *(data++) = current; -+ -+ NEXT(y1); -+ } -+ -+ -+ for (y3 = (h / 2) - 1; y3 > 0; --y3) { -+ current = COLOR(y3); -+ for (x = w - 1; x >= 0; --x) -+ *(data++) = current; -+ -+ NEXT(y3); -+ } -+ -+ current = COLOR(y3); -+ for (x = w - 1; x >= 0; --x) /* 0 -> w */ -+ *(data++) = current; -+} -+ - static void gradient_horizontal(RrSurface *sf, gint w, gint h) - { - gint x, y; -@@ -567,4 +645,3 @@ static void gradient_pyramid(RrSurface * - *(end-x) = current; - *(end-(inw-x)) = current; - } -- -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 27 Jan 2006 17:24:46 -0000 -@@ -162,6 +162,7 @@ void RrImageDraw(RrPixel32 *target, RrTe - guchar alpha, r, g, b, bgr, bgg, bgb; - - alpha = *source >> RrDefaultAlphaOffset; -+ alpha /= 1.2; - r = *source >> RrDefaultRedOffset; - g = *source >> RrDefaultGreenOffset; - b = *source >> RrDefaultBlueOffset; -Index: render/render.h -=================================================================== -RCS file: /cvs/cvsroot/openbox/render/render.h,v -retrieving revision 1.57 -diff -p -u -r1.57 render.h ---- render/render.h 15 Jul 2005 14:39:31 -0000 1.57 -+++ render/render.h 27 Jan 2006 17:24:46 -0000 -@@ -61,6 +61,7 @@ typedef enum { - RR_SURFACE_NONE, - RR_SURFACE_PARENTREL, - RR_SURFACE_SOLID, -+ RR_SURFACE_SPLIT, - RR_SURFACE_HORIZONTAL, - RR_SURFACE_VERTICAL, - RR_SURFACE_DIAGONAL, -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 27 Jan 2006 17:24:48 -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 = 25; - - return theme; - } -@@ -1200,6 +1200,8 @@ static void parse_appearance(gchar *tex, - *grad = RR_SURFACE_HORIZONTAL; - else if (strstr(tex, "vertical") != NULL) - *grad = RR_SURFACE_VERTICAL; -+ else if (strstr(tex, "split") != NULL) -+ *grad = RR_SURFACE_SPLIT; - else - *grad = RR_SURFACE_DIAGONAL; - } else {