speedie/speedwm-personal
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Change color names

Browse source
This commit is contained in:
speediegq 2022-10-16 18:10:24 +02:00
parent 5ea15529f9
commit 337bc1bd1c
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
colors.h
View file

@ -8,12 +8,12 @@
static char *colors[][3] = { static char *colors[][3] = {
[SchemeBar] = { col_textnorm, col_background, col_windowbordernorm }, [SchemeBar] = { col_textnorm, col_background, col_windowbordernorm },
[SchemeTags] = { col_textnorm, col_background, col_windowbordernorm }, [SchemeTags] = { col_textnorm, col_background, col_windowbordernorm },
[SchemeNormBorder] = { col_textnorm, col_background, col_windowbordernorm }, [SchemeBorderNorm] = { col_textnorm, col_background, col_windowbordernorm },
[SchemeSelBorder] = { col_textsel, col_windowbordernorm, col_windowbordersel }, [SchemeBorderSel] = { col_textsel, col_windowbordernorm, col_windowbordersel },
[SchemeStatus] = { col_textnorm, col_background, col_textsel }, [SchemeStatus] = { col_textnorm, col_background, col_textsel },
[SchemeNormTitle] = { col_textnorm, col_background, col_background }, [SchemeTitleNorm] = { col_textnorm, col_background, col_background },
[SchemeSelTitle] = { col_textsel, col_title, col_textsel }, [SchemeTitleSel] = { col_textsel, col_title, col_textsel },
[SchemeHiddenTitle] = { col_title, col_background, col_title }, [SchemeTitleHidden] = { col_title, col_background, col_title },
[SchemeLayout] = { col_layouttext, col_layoutbgsel, col_layoutbgnorm }, [SchemeLayout] = { col_layouttext, col_layoutbgsel, col_layoutbgnorm },
[SchemeSystray] = { col_systraybg, col_systraybg, col_systraybg }, [SchemeSystray] = { col_systraybg, col_systraybg, col_systraybg },
/* text background window border /* text background window border
@ -46,12 +46,12 @@ static char *colstatus[] = {
static unsigned int alphas[][3] = { static unsigned int alphas[][3] = {
/* fg bg border/unused */ /* fg bg border/unused */
[SchemeBar] = { OPAQUE, baropacity, baropacity }, [SchemeBar] = { OPAQUE, baropacity, baropacity },
[SchemeNormTitle] = { OPAQUE, normtitleopacity, normtitleopacity }, [SchemeTitleNorm] = { OPAQUE, normtitleopacity, normtitleopacity },
[SchemeSelTitle] = { OPAQUE, seltitleopacity, seltitleopacity }, [SchemeTitleSel] = { OPAQUE, seltitleopacity, seltitleopacity },
[SchemeLayout] = { OPAQUE, layoutopacity, layoutopacity }, [SchemeLayout] = { OPAQUE, layoutopacity, layoutopacity },
[SchemeStatus] = { OPAQUE, statusopacity, statusopacity }, [SchemeStatus] = { OPAQUE, statusopacity, statusopacity },
[SchemeHiddenTitle] = { OPAQUE, hiddenopacity, hiddenopacity }, [SchemeTitleHidden] = { OPAQUE, hiddenopacity, hiddenopacity },
[SchemeNormBorder] = { OPAQUE, normborderopacity, selborderopacity }, [SchemeBorderNorm] = { OPAQUE, normborderopacity, selborderopacity },
[SchemeTags] = { tagselopacity, tagselopacity, tagnormopacity }, [SchemeTags] = { tagselopacity, tagselopacity, tagnormopacity },
[SchemeSystray] = { OPAQUE, systrayopacity, systrayopacity }, [SchemeSystray] = { OPAQUE, systrayopacity, systrayopacity },
}; };

22
speedwm.c
View file

@ -96,14 +96,14 @@
enum { CurNormal, CurResize, CurMove, CurResizeHorzArrow, CurResizeVertArrow, CurLast }; /* cursor */ enum { CurNormal, CurResize, CurMove, CurResizeHorzArrow, CurResizeVertArrow, CurLast }; /* cursor */
/* color schemes */ /* color schemes */
enum { SchemeNormBorder, enum { SchemeBorderNorm,
SchemeSelBorder, SchemeBorderSel,
SchemeTags, SchemeTags,
SchemeBar, SchemeBar,
SchemeHiddenTitle, SchemeTitleHidden,
SchemeLayout, SchemeLayout,
SchemeNormTitle, SchemeTitleNorm,
SchemeSelTitle, SchemeTitleSel,
SchemeStatus, SchemeStatus,
SchemeSystray, SchemeSystray,
}; };
@ -2275,11 +2275,11 @@ resizebarwin(m);
if (!ISVISIBLE(c)) if (!ISVISIBLE(c))
continue; continue;
if (m->sel == c) if (m->sel == c)
scm = SchemeSelTitle; scm = SchemeTitleSel;
else if (HIDDEN(c)) else if (HIDDEN(c))
scm = SchemeHiddenTitle; scm = SchemeTitleHidden;
else else
scm = SchemeNormTitle; scm = SchemeTitleNorm;
drw_setscheme(drw, scheme[scm]); drw_setscheme(drw, scheme[scm]);
if (remainder >= 0) { if (remainder >= 0) {
@ -2401,7 +2401,7 @@ focus(Client *c)
detachstack(c); detachstack(c);
attachstack(c); attachstack(c);
grabbuttons(c, 1); grabbuttons(c, 1);
XSetWindowBorder(dpy, c->win, scheme[SchemeSelBorder][ColBorder].pixel); XSetWindowBorder(dpy, c->win, scheme[SchemeBorderSel][ColBorder].pixel);
setfocus(c); setfocus(c);
#if USEFADE #if USEFADE
opacity(c, activeopacity); opacity(c, activeopacity);
@ -3205,7 +3205,7 @@ manage(Window w, XWindowAttributes *wa)
wc.border_width = c->bw; wc.border_width = c->bw;
XConfigureWindow(dpy, w, CWBorderWidth, &wc); XConfigureWindow(dpy, w, CWBorderWidth, &wc);
XSetWindowBorder(dpy, w, scheme[SchemeNormBorder][ColBorder].pixel); XSetWindowBorder(dpy, w, scheme[SchemeBorderNorm][ColBorder].pixel);
configure(c); /* propagates border_width, if size doesn't change */ configure(c); /* propagates border_width, if size doesn't change */
updatewindowtype(c); updatewindowtype(c);
updatesizehints(c); updatesizehints(c);
@ -5224,7 +5224,7 @@ unfocus(Client *c, int setfocus)
#if USEFADE #if USEFADE
opacity(c, inactiveopacity); opacity(c, inactiveopacity);
#endif #endif
XSetWindowBorder(dpy, c->win, scheme[SchemeNormBorder][ColBorder].pixel); XSetWindowBorder(dpy, c->win, scheme[SchemeBorderNorm][ColBorder].pixel);
if (setfocus) { if (setfocus) {
XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
XDeleteProperty(dpy, root, netatom[NetActiveWindow]); XDeleteProperty(dpy, root, netatom[NetActiveWindow]);