[hackers] [wmii] Get rid of FOCUSCOLORS

changeset: 1882:67c8788100ac
tag: tip
user: Anthony Martin <ality_AT_suckless.org>
date: Thu Feb 15 10:06:35 2007 -0800
summary: Get rid of FOCUSCOLORS

diff -r dc75d0d0f393 -r 67c8788100ac frame.c
--- a/frame.c Thu Feb 15 16:38:06 2007 +0100
+++ b/frame.c Thu Feb 15 10:06:35 2007 -0800
@@ -226,12 +226,8 @@ frame_delta_h() {
 
 void
 update_frame_widget_colors(Frame *f) {
- if(f->area->sel == f) {
- if(sel_screen && (f->client == sel_client()))
- f->grabbox.color = f->tile.color = f->titlebar.color = def.focuscolor;
- else
- f->grabbox.color = f->tile.color = f->titlebar.color = def.selcolor;
- }
+ if(sel_screen && (f->client == sel_client()))
+ f->grabbox.color = f->tile.color = f->titlebar.color = def.selcolor;
         else
                 f->grabbox.color = f->tile.color = f->titlebar.color = def.normcolor;
         if(f->client->urgent)
diff -r dc75d0d0f393 -r 67c8788100ac fs.c
--- a/fs.c Thu Feb 15 16:38:06 2007 +0100
+++ b/fs.c Thu Feb 15 10:06:35 2007 -0800
@@ -237,11 +237,6 @@ message_root(char *message)
                 srv.running = 0;
         else if(!strncmp(message, "view ", 5))
                 select_view(&message[5]);
- else if(!strncmp(message, "focuscolors ", 12)) {
- message += 12;
- n = strlen(message);
- return parse_colors(&message, (int *)&n, &def.focuscolor);
- }
         else if(!strncmp(message, "selcolors ", 10)) {
                 message += 10;
                 n = strlen(message);
@@ -287,7 +282,6 @@ read_root_ctl() {
         uint i = 0;
         if(screen->sel)
                 i += snprintf(&buffer[i], (BUFFER_SIZE - i), "view %s\n", screen->sel->name);
- i += snprintf(&buffer[i], (BUFFER_SIZE - i), "focuscolors %s\n", def.focuscolor.colstr);
         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), "font %s\n", def.font.fontstr);
diff -r dc75d0d0f393 -r 67c8788100ac main.c
--- a/main.c Thu Feb 15 16:38:06 2007 +0100
+++ b/main.c Thu Feb 15 10:06:35 2007 -0800
@@ -136,7 +136,7 @@ init_screen(WMScreen *screen) {
 
         gcv.subwindow_mode = IncludeInferiors;
         gcv.function = GXxor;
- gcv.foreground = def.selcolor.bg;
+ gcv.foreground = def.normcolor.bg;
         gcv.plane_mask = AllPlanes;
         gcv.graphics_exposures = False;
         xorgc = XCreateGC(blz.dpy, blz.root, GCForeground | GCGraphicsExposures |
diff -r dc75d0d0f393 -r 67c8788100ac rc/wmiirc
--- a/rc/wmiirc Thu Feb 15 16:38:06 2007 +0100
+++ b/rc/wmiirc Thu Feb 15 10:06:35 2007 -0800
@@ -21,19 +21,17 @@ WMII_FONT='-*-fixed-medium-r-normal-*-13
 WMII_FONT='-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*'
 # Colors tuples are "<text> <background> <border>"
 WMII_NORMCOLORS='#222222 #eeeeee #666666'
-WMII_SELCOLORS='#444444 #bbbbbb #556088'
-WMII_FOCUSCOLORS='#ffffff #335577 #447799'
+WMII_SELCOLORS='#ffffff #335577 #447799'
 WMII_BACKGROUND='#333333'
 
 DMENU="dmenu -b -fn $WMII_FONT -nb #eeeeee -nf #222222 -sb #335577 -sf #ffffff"
 WMII_TERM="xterm"
 
-export DMENU WMII_FONT WMII_FOCUSCOLORS WMII_SELCOLORS WMII_NORMCOLORS WMII_TERM
+export DMENU WMII_FONT WMII_SELCOLORS WMII_NORMCOLORS WMII_TERM
 
 # WM CONFIGURATION
 wmiir write /ctl << EOF
 font $WMII_FONT
-focuscolors $WMII_FOCUSCOLORS
 selcolors $WMII_SELCOLORS
 normcolors $WMII_NORMCOLORS
 grabmod $MODKEY
@@ -94,7 +92,7 @@ while read tag
 while read tag
 do
         if [ "X$tag" = "X$seltag" ]; then
- echo "$WMII_FOCUSCOLORS" "$tag" | wmiir create "/lbar/$tag"
+ echo "$WMII_SELCOLORS" "$tag" | wmiir create "/lbar/$tag"
         else
                 echo "$WMII_NORMCOLORS" "$tag" | wmiir create "/lbar/$tag"
         fi
@@ -165,7 +163,7 @@ do
                 wmiir remove "/lbar/$parms"
                 ;;
         FocusTag)
- wmiir write "/lbar/$parms" "$WMII_FOCUSCOLORS" "$parms"
+ wmiir write "/lbar/$parms" "$WMII_SELCOLORS" "$parms"
                 ;;
         UnfocusTag)
                 wmiir write "/lbar/$parms" "$WMII_NORMCOLORS" "$parms"
diff -r dc75d0d0f393 -r 67c8788100ac wmii.h
--- a/wmii.h Thu Feb 15 16:38:06 2007 +0100
+++ b/wmii.h Thu Feb 15 10:06:35 2007 -0800
@@ -27,8 +27,7 @@ typedef long long vlong;
 typedef long long vlong;
 
 #define BLITZ_FONT "-*-fixed-medium-r-normal-*-13-*-*-*-*-*-*-*"
-#define BLITZ_FOCUSCOLORS "#ffffff #335577 #447799"
-#define BLITZ_SELCOLORS "#444444 #bbbbbb #556088"
+#define BLITZ_SELCOLORS "#ffffff #335577 #447799"
 #define BLITZ_NORMCOLORS "#222222 #eeeeee #666666"
 
 typedef struct Blitz Blitz;
@@ -205,7 +204,6 @@ struct Ruleset {
 
 /* global variables */
 struct {
- BlitzColor focuscolor;
         BlitzColor selcolor;
         BlitzColor normcolor;
         BlitzFont font;
Received on Thu Feb 15 2007 - 19:11:19 UTC