comparison aewl.c @ 764:15660880e23d

removed unnessasary color pair
author meillo@marmaro.de
date Fri, 05 Dec 2008 19:08:47 +0100
parents 17428bca4a12
children 3f7c68a720b5
comparison
equal deleted inserted replaced
763:17428bca4a12 764:15660880e23d
55 #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) 55 #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
56 56
57 enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */ 57 enum { NetSupported, NetWMName, NetLast }; /* EWMH atoms */
58 enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */ 58 enum { WMProtocols, WMDelete, WMState, WMLast }; /* default atoms */
59 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ 59 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
60 enum { ColBorder, ColFG, ColBG, ColLast }; /* color */ 60 enum { ColFG, ColBG, ColLast }; /* color */
61 61
62 typedef struct { 62 typedef struct {
63 int ascent; 63 int ascent;
64 int descent; 64 int descent;
65 int height; 65 int height;
1218 focus(Client *c) { 1218 focus(Client *c) {
1219 if(c && !isvisible(c)) 1219 if(c && !isvisible(c))
1220 return; 1220 return;
1221 if(sel && sel != c) { 1221 if(sel && sel != c) {
1222 grabbuttons(sel, False); 1222 grabbuttons(sel, False);
1223 XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]); 1223 XSetWindowBorder(dpy, sel->win, dc.norm[ColBG]);
1224 } 1224 }
1225 if(c) { 1225 if(c) {
1226 detachstack(c); 1226 detachstack(c);
1227 c->snext = stack; 1227 c->snext = stack;
1228 stack = c; 1228 stack = c;
1231 sel = c; 1231 sel = c;
1232 drawstatus(); 1232 drawstatus();
1233 if(!selscreen) 1233 if(!selscreen)
1234 return; 1234 return;
1235 if(c) { 1235 if(c) {
1236 XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]); 1236 XSetWindowBorder(dpy, c->win, dc.sel[ColBG]);
1237 XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); 1237 XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
1238 } else { 1238 } else {
1239 XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); 1239 XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
1240 } 1240 }
1241 } 1241 }
1307 updatesizehints(c); 1307 updatesizehints(c);
1308 XSelectInput(dpy, c->win, 1308 XSelectInput(dpy, c->win,
1309 StructureNotifyMask | PropertyChangeMask | EnterWindowMask); 1309 StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
1310 XGetTransientForHint(dpy, c->win, &trans); 1310 XGetTransientForHint(dpy, c->win, &trans);
1311 grabbuttons(c, False); 1311 grabbuttons(c, False);
1312 XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]); 1312 XSetWindowBorder(dpy, c->win, dc.norm[ColBG]);
1313 updatetitle(c); 1313 updatetitle(c);
1314 setgroup(c, getclient(trans)); 1314 setgroup(c, getclient(trans));
1315 if(!c->isfloat) 1315 if(!c->isfloat)
1316 c->isfloat = trans || c->isfixed; 1316 c->isfloat = trans || c->isfixed;
1317 if(clients) 1317 if(clients)
1584 XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa); 1584 XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
1585 grabkeys(); 1585 grabkeys();
1586 initrregs(); 1586 initrregs();
1587 selgroup = True; 1587 selgroup = True;
1588 /* style */ 1588 /* style */
1589 dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
1590 dc.norm[ColBG] = getcolor(NORMBGCOLOR); 1589 dc.norm[ColBG] = getcolor(NORMBGCOLOR);
1591 dc.norm[ColFG] = getcolor(NORMFGCOLOR); 1590 dc.norm[ColFG] = getcolor(NORMFGCOLOR);
1592 dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
1593 dc.sel[ColBG] = getcolor(SELBGCOLOR); 1591 dc.sel[ColBG] = getcolor(SELBGCOLOR);
1594 dc.sel[ColFG] = getcolor(SELFGCOLOR); 1592 dc.sel[ColFG] = getcolor(SELFGCOLOR);
1595 setfont(FONT); 1593 setfont(FONT);
1596 /* geometry */ 1594 /* geometry */
1597 sx = sy = 0; 1595 sx = sy = 0;