Index: CHANGELOG
===================================================================
RCS file: /cvs/cvsroot/openbox/CHANGELOG,v
retrieving revision 1.92
diff -p -u -r1.92 CHANGELOG
--- CHANGELOG 5 Mar 2006 23:23:55 -0000 1.92
+++ CHANGELOG 17 Apr 2006 15:21:33 -0000
@@ -1,4 +1,17 @@
-3.3:
+HAX:
+ * Add new yes in in rc.xml to disable
+ the menu title - Javeed Shaikh
+ * Add 'split' gradient option - Brandon Cash
+ * Add menu.border.color option
+ * hardcore grip size to 23px
+ * Replace fleur cursor with cross
+ * Lighten the way bevels are draw a lot
+ * Fix interlacing issues - Brandon Cash
+ * Draw dock like menu, not inactive window
+
+CVS:
+ * Add smoother icons drawing using new algorithm
+ * Fix 1bit bitmaps on msbfirst architectures
* Add a showDelay option for the dock.
* Fixed onscreen-keeping code which broke a bit in -rc2.
* Fix incorrect handling of window properties on 64 bit arches.
Index: openbox/config.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/config.c,v
retrieving revision 1.92
diff -p -u -r1.92 config.c
--- openbox/config.c 25 Sep 2005 14:45:24 -0000 1.92
+++ openbox/config.c 17 Apr 2006 15:21:34 -0000
@@ -36,6 +36,7 @@ ObPlacePolicy config_place_policy;
gchar *config_theme;
gboolean config_theme_keepborder;
gboolean config_theme_hidedisabled;
+gboolean config_theme_hidemenuheader;
gchar *config_title_layout;
@@ -260,6 +261,8 @@ static void parse_theme(ObParseInst *i,
config_theme_keepborder = parse_bool(doc, n);
if ((n = parse_find_node("hideDisabled", node)))
config_theme_hidedisabled = parse_bool(doc, n);
+ if ((n = parse_find_node("hideMenuHeader", node)))
+ config_theme_hidemenuheader = parse_bool(doc, n);
}
static void parse_desktops(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -563,6 +566,7 @@ void config_startup(ObParseInst *i)
config_title_layout = g_strdup("NLIMC");
config_theme_keepborder = TRUE;
config_theme_hidedisabled = FALSE;
+ config_theme_hidemenuheader = FALSE;
parse_register(i, "theme", parse_theme, NULL);
Index: openbox/config.h
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/config.h,v
retrieving revision 1.57
diff -p -u -r1.57 config.h
--- openbox/config.h 25 Sep 2005 14:45:24 -0000 1.57
+++ openbox/config.h 17 Apr 2006 15:21:34 -0000
@@ -88,6 +88,8 @@ extern gchar *config_theme;
extern gboolean config_theme_keepborder;
/* Hide window frame buttons that the window doesn't allow */
extern gboolean config_theme_hidedisabled;
+/* Hide the menu header? */
+extern gboolean config_theme_hidemenuheader;
/* Titlebar button layout */
extern gchar *config_title_layout;
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 17 Apr 2006 15:21:35 -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: openbox/menu.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/menu.c,v
retrieving revision 1.106
diff -p -u -r1.106 menu.c
--- openbox/menu.c 14 Sep 2005 18:01:58 -0000 1.106
+++ openbox/menu.c 17 Apr 2006 15:21:35 -0000
@@ -29,6 +29,7 @@
#include "client_menu.h"
#include "client_list_menu.h"
#include "parser/parse.h"
+#include "mainloop.h"
typedef struct _ObMenuParseState ObMenuParseState;
Index: openbox/menuframe.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/menuframe.c,v
retrieving revision 1.52
diff -p -u -r1.52 menuframe.c
--- openbox/menuframe.c 14 Sep 2005 17:40:47 -0000 1.52
+++ openbox/menuframe.c 17 Apr 2006 15:21:37 -0000
@@ -61,7 +61,7 @@ ObMenuFrame* menu_frame_new(ObMenu *menu
self->type = Window_Menu;
self->menu = menu;
self->selected = NULL;
- self->show_title = TRUE;
+ self->show_title = !config_theme_hidemenuheader;
self->client = client;
attr.event_mask = FRAME_EVENTMASK;
@@ -411,7 +411,7 @@ static void menu_frame_render(ObMenuFram
XSetWindowBorderWidth(ob_display, self->window, ob_rr_theme->bwidth);
XSetWindowBorder(ob_display, self->window,
- RrColorPixel(ob_rr_theme->b_color));
+ RrColorPixel(ob_rr_theme->mb_color));
if (!self->parent && self->show_title) {
XMoveWindow(ob_display, self->title,
Index: openbox/openbox.c
===================================================================
RCS file: /cvs/cvsroot/openbox/openbox/openbox.c,v
retrieving revision 1.130
diff -p -u -r1.130 openbox.c
--- openbox/openbox.c 1 Apr 2005 13:04:55 -0000 1.130
+++ openbox/openbox.c 17 Apr 2006 15:21:37 -0000
@@ -163,7 +163,7 @@ gint main(gint argc, gchar **argv)
cursors[OB_CURSOR_BUSY] =
XCreateFontCursor(ob_display, XC_watch);
cursors[OB_CURSOR_MOVE] =
- XCreateFontCursor(ob_display, XC_fleur);
+ XCreateFontCursor(ob_display, XC_plus);
cursors[OB_CURSOR_NORTH] =
XCreateFontCursor(ob_display, XC_top_side);
cursors[OB_CURSOR_NORTHEAST] =
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 17 Apr 2006 15:21:38 -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,66 @@ 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;
+
+
+ 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 +634,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.18
diff -p -u -r1.18 image.c
--- render/image.c 16 Mar 2006 23:53:11 -0000 1.18
+++ render/image.c 17 Apr 2006 15:21:38 -0000
@@ -175,6 +175,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 17 Apr 2006 15:21:38 -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 17 Apr 2006 15:21:40 -0000
@@ -186,6 +186,13 @@ RrTheme* RrThemeNew(const RrInstance *in
if (!read_color(db, inst,
"border.color", &theme->b_color))
theme->b_color = RrColorNew(inst, 0, 0, 0);
+ //evil stalks you
+ if (!read_color(db, inst,
+ "menu.border.color", &theme->mb_color))
+ theme->mb_color = RrColorNew(inst,
+ theme->b_color->r,
+ theme->b_color->g,
+ theme->b_color->b);
if (!read_color(db, inst,
"window.active.client.color",
&theme->cb_focused_color))
@@ -904,7 +911,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;
}
@@ -1200,6 +1207,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 {
Index: render/theme.h
===================================================================
RCS file: /cvs/cvsroot/openbox/render/theme.h,v
retrieving revision 1.37
diff -p -u -r1.37 theme.h
--- render/theme.h 14 Jul 2005 20:41:24 -0000 1.37
+++ render/theme.h 17 Apr 2006 15:21:42 -0000
@@ -48,6 +48,7 @@ struct _RrTheme {
/* style settings - colors */
RrColor *b_color;
+ RrColor *mb_color;
RrColor *cb_focused_color;
RrColor *cb_unfocused_color;
RrColor *title_focused_color;