Index: openbox/config.c =================================================================== RCS file: /cvs/cvsroot/openbox/openbox/config.c,v retrieving revision 1.112 diff -p -u -r1.112 config.c --- openbox/config.c 19 Aug 2006 17:50:12 -0000 1.112 +++ openbox/config.c 21 Aug 2006 20:49:05 -0000 @@ -38,6 +38,7 @@ ObPlacePolicy config_place_policy; gchar *config_theme; gboolean config_theme_keepborder; gboolean config_theme_hidedisabled; +gboolean config_theme_hidemenuheader; gchar *config_title_layout; gboolean config_title_number; @@ -438,6 +439,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, @@ -746,7 +749,8 @@ void config_startup(ObParseInst *i) config_title_number = TRUE; config_theme_keepborder = TRUE; config_theme_hidedisabled = FALSE; - + config_theme_hidemenuheader = FALSE; + parse_register(i, "theme", parse_theme, NULL); config_desktops_num = 4; Index: openbox/config.h =================================================================== RCS file: /cvs/cvsroot/openbox/openbox/config.h,v retrieving revision 1.62 diff -p -u -r1.62 config.h --- openbox/config.h 16 Aug 2006 19:32:13 -0000 1.62 +++ openbox/config.h 21 Aug 2006 20:49:05 -0000 @@ -39,6 +39,8 @@ extern guint config_focus_delay; extern gboolean config_focus_raise; /*! Focus the last focused window, not under the mouse, in follow mouse mode */ extern gboolean config_focus_last; +/* Hide the menu header? */ +extern gboolean config_theme_hidemenuheader; extern ObPlacePolicy config_place_policy; Index: openbox/menuframe.c =================================================================== RCS file: /cvs/cvsroot/openbox/openbox/menuframe.c,v retrieving revision 1.56 diff -p -u -r1.56 menuframe.c --- openbox/menuframe.c 19 Aug 2006 05:05:35 -0000 1.56 +++ openbox/menuframe.c 21 Aug 2006 20:49:06 -0000 @@ -63,7 +63,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; @@ -414,7 +414,8 @@ 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)); - + XSetWindowBorder(ob_display, self->window, + RrColorPixel(ob_rr_theme->mb_color)); if (!self->parent && self->show_title) { XMoveWindow(ob_display, self->title, -ob_rr_theme->bwidth, h - ob_rr_theme->bwidth); Index: openbox/openbox.c =================================================================== RCS file: /cvs/cvsroot/openbox/openbox/openbox.c,v retrieving revision 1.132 diff -p -u -r1.132 openbox.c --- openbox/openbox.c 17 Aug 2006 19:26:55 -0000 1.132 +++ openbox/openbox.c 21 Aug 2006 20:49:08 -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_left_ptr); cursors[OB_CURSOR_NORTH] = XCreateFontCursor(ob_display, XC_top_side); cursors[OB_CURSOR_NORTHEAST] = Index: openbox/screen.c =================================================================== RCS file: /cvs/cvsroot/openbox/openbox/screen.c,v retrieving revision 1.121 diff -p -u -r1.121 screen.c --- openbox/screen.c 7 Oct 2005 17:00:35 -0000 1.121 +++ openbox/screen.c 21 Aug 2006 20:49:09 -0000 @@ -42,11 +42,6 @@ #endif #include -/*! The event mask to grab on the root window */ -#define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \ - EnterWindowMask | LeaveWindowMask | \ - SubstructureNotifyMask | SubstructureRedirectMask | \ - ButtonPressMask | ButtonReleaseMask | ButtonMotionMask) guint screen_num_desktops; guint screen_num_monitors; @@ -175,8 +170,12 @@ gboolean screen_annex() xerror_set_ignore(TRUE); xerror_occured = FALSE; - XSelectInput(ob_display, RootWindow(ob_display, ob_screen), - ROOT_EVENTMASK); + XSelectInput(ob_display, RootWindow(ob_display, ob_screen), + StructureNotifyMask | PropertyChangeMask | + EnterWindowMask | LeaveWindowMask | + SubstructureNotifyMask | SubstructureRedirectMask + | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask +); xerror_set_ignore(FALSE); if (xerror_occured) { g_warning("A window manager is already running on screen %d", Index: render/gradient.c =================================================================== RCS file: /cvs/cvsroot/openbox/render/gradient.c,v retrieving revision 1.51 diff -p -u -r1.51 gradient.c --- render/gradient.c 20 Aug 2006 07:15:18 -0000 1.51 +++ render/gradient.c 21 Aug 2006 20:49:09 -0000 @@ -140,11 +140,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; @@ -152,11 +152,11 @@ 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); + b = (b >> 1) + (b >> 2)* 1.7;; *down = (r << RrDefaultRedOffset) + (g << RrDefaultGreenOffset) + (b << RrDefaultBlueOffset); } @@ -167,11 +167,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; @@ -180,11 +180,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); } Index: render/theme.c =================================================================== RCS file: /cvs/cvsroot/openbox/render/theme.c,v retrieving revision 1.79 diff -p -u -r1.79 theme.c --- render/theme.c 18 Aug 2006 19:48:48 -0000 1.79 +++ render/theme.c 21 Aug 2006 20:49:11 -0000 @@ -186,6 +186,12 @@ RrTheme* RrThemeNew(const RrInstance *in if (!read_color(db, inst, "border.color", &theme->b_color)) theme->b_color = RrColorNew(inst, 0, 0, 0); + 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)) 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 21 Aug 2006 20:49:14 -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;