diff -r -u wmii-4_20060821/cmd/wm/frame.c wmii-4_20060821.my/cmd/wm/frame.c --- wmii-4_20060821/cmd/wm/frame.c 2006-07-11 09:00:03.000000000 +0200 +++ wmii-4_20060821.my/cmd/wm/frame.c 2006-08-22 15:00:47.000000000 +0200 @@ -87,15 +87,15 @@ f->tagbar.bcolor[0] = def.bcolor[0]; f->tagbar.bcolor[1] = def.bcolor[1]; f->tagbar.bcolor[2] = def.bcolor[2]; - if(sel_screen && (f->client == sel_client())) - f->tagbar.color = f->tile.color = f->titlebar.color = def.selcolor; - else - f->tagbar.color = f->tile.color = f->titlebar.color = def.normcolor; - if(f->area->sel == f) - f->grabbox.color = def.selcolor; + { + if (sel_screen && (f->client == sel_client())) + f->grabbox.color = f->tagbar.color = f->tile.color = f->titlebar.color = def.focuscolor; + else + f->grabbox.color = f->tagbar.color = f->tile.color = f->titlebar.color = def.selcolor; + } else - f->grabbox.color = def.normcolor; + f->grabbox.color = f->tagbar.color = f->tile.color = f->titlebar.color = def.normcolor; } void diff -r -u wmii-4_20060821/cmd/wm/fs.c wmii-4_20060821.my/cmd/wm/fs.c --- wmii-4_20060821/cmd/wm/fs.c 2006-07-05 16:00:02.000000000 +0200 +++ wmii-4_20060821.my/cmd/wm/fs.c 2006-08-22 14:57:30.000000000 +0200 @@ -265,6 +265,10 @@ message += 11; n = strlen(message); return parse_colors(&message, (int *)&n, &def.normcolor); + }else if(!strncmp(message, "focuscolors ", 12)) { + message += 12; + n = strlen(message); + return parse_colors(&message, (int *)&n, &def.focuscolor); }else if(!strncmp(message, "b1colors ", 9)) { message += 9; n = strlen(message); @@ -312,6 +316,7 @@ i += snprintf(&buffer[i], (BUFFER_SIZE - i), "view %s\n", screen->sel->name); i += snprintf(&buffer[i], (BUFFER_SIZE - i), "selcolors %s\n", def.selcolor.colstr); i += snprintf(&buffer[i], (BUFFER_SIZE - i), "normcolors %s\n", def.normcolor.colstr); + i += snprintf(&buffer[i], (BUFFER_SIZE - i), "focuscolors %s\n", def.focuscolor.colstr); i += snprintf(&buffer[i], (BUFFER_SIZE - i), "font %s\n", def.font.fontstr); i += snprintf(&buffer[i], (BUFFER_SIZE - i), "grabmod %s\n", def.grabmod); i += snprintf(&buffer[i], (BUFFER_SIZE - i), "border %d\n", def.border); diff -r -u wmii-4_20060821/cmd/wm/wm.h wmii-4_20060821.my/cmd/wm/wm.h --- wmii-4_20060821/cmd/wm/wm.h 2006-07-13 22:00:03.000000000 +0200 +++ wmii-4_20060821.my/cmd/wm/wm.h 2006-08-22 14:44:35.000000000 +0200 @@ -148,6 +148,7 @@ struct { BlitzColor selcolor; BlitzColor normcolor; + BlitzColor focuscolor; BlitzColor bcolor[3]; BlitzFont font; unsigned int border; diff -r -u wmii-4_20060821/cmd/wmiimenu.c wmii-4_20060821.my/cmd/wmiimenu.c --- wmii-4_20060821/cmd/wmiimenu.c 2006-07-14 12:00:03.000000000 +0200 +++ wmii-4_20060821.my/cmd/wmiimenu.c 2006-08-22 15:07:42.000000000 +0200 @@ -399,18 +399,18 @@ GrabModeAsync, CurrentTime) != GrabSuccess) usleep(1000); - font.fontstr = getenv("WMII_FONT"); + font.fontstr = getenv("WMIIMENU_FONT"); if (!font.fontstr) font.fontstr = cext_estrdup(BLITZ_FONT); blitz_loadfont(&blz, &font); - if((p = getenv("WMII_NORMCOLORS"))) + if((p = getenv("WMIIMENU_NORMCOLORS"))) cext_strlcpy(normcolor.colstr, p, sizeof(normcolor.colstr)); if(strlen(normcolor.colstr) != 23) cext_strlcpy(normcolor.colstr, BLITZ_NORMCOLORS, sizeof(normcolor.colstr)); blitz_loadcolor(&blz, &normcolor); - if((p = getenv("WMII_SELCOLORS"))) + if((p = getenv("WMIIMENU_SELCOLORS"))) cext_strlcpy(selcolor.colstr, p, sizeof(selcolor.colstr)); if(strlen(selcolor.colstr) != 23) cext_strlcpy(selcolor.colstr, BLITZ_SELCOLORS, sizeof(selcolor.colstr)); diff -r -u wmii-4_20060821/rc/wmiirc wmii-4_20060821.my/rc/wmiirc --- wmii-4_20060821/rc/wmiirc 2006-07-08 20:00:03.000000000 +0200 +++ wmii-4_20060821.my/rc/wmiirc 2006-08-22 15:33:17.723832250 +0200 @@ -22,12 +22,19 @@ RIGHT=l WMII_FONT='fixed' -WMII_SELCOLORS='#ffffff #335577 #447799' -WMII_NORMCOLORS='#222222 #eeeeee #666666' +WMII_SELCOLORS='#000000 #dd7700 #dd7700' +WMII_NORMCOLORS='#000000 #888888 #888888' +WMII_FOCUSCOLORS='#ffffff #bb0000 #bb0000' # dark background #WMII_NORMCOLORS='#eeeeee #111111 #222222' -export WMII_FONT WMII_SELCOLORS WMII_NORMCOLORS +export WMII_FONT WMII_SELCOLORS WMII_NORMCOLORS WMII_FOCUSCOLORS + +WMIIMENU_FONT=$WMII_FONT +WMIIMENU_SELCOLORS=$WMII_FOCUSCOLORS +WMIIMENU_NORMCOLORS=$WMII_NORMCOLORS + +export WMIIMENU_FONT WMIIMENU_SELCOLORS WMIIMENU_NORMCOLORS # stop any running instances or wmiirc echo Start wmiirc | wmiir write /event || exit 1 @@ -37,6 +44,7 @@ font $WMII_FONT selcolors $WMII_SELCOLORS normcolors $WMII_NORMCOLORS +focuscolors $WMII_FOCUSCOLORS grabmod $MODKEY border 2 EOF @@ -118,7 +126,7 @@ while read tag do if [ "X$tag" = "X$seltag" ]; then - echo "$WMII_SELCOLORS" "$tag" | wmiir create "/lbar/$tag" + echo "$WMII_FOCUSCOLORS" "$tag" | wmiir create "/lbar/$tag" else echo "$WMII_NORMCOLORS" "$tag" | wmiir create "/lbar/$tag" fi @@ -146,7 +154,7 @@ wmiir remove "/lbar/$parms" ;; FocusTag) - xwrite "/lbar/$parms" "$WMII_SELCOLORS" "$parms" + xwrite "/lbar/$parms" "$WMII_FOCUSCOLORS" "$parms" ;; UnfocusTag) xwrite "/lbar/$parms" "$WMII_NORMCOLORS" "$parms"