diff --git a/config.def.h b/config.def.h index 81c3fc0..ab609dc 100644 --- a/config.def.h +++ b/config.def.h @@ -58,9 +58,30 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; static const char *termcmd[] = { "st", NULL }; +/* + * Xresources preferences to load at startup + */ +ResourcePref resources[] = { + { "font", STRING, &font }, + { "dmenufont", STRING, &dmenufont }, + { "normbgcolor", STRING, &normbgcolor }, + { "normbordercolor", STRING, &normbordercolor }, + { "normfgcolor", STRING, &normfgcolor }, + { "selbgcolor", STRING, &selbgcolor }, + { "selbordercolor", STRING, &selbordercolor }, + { "selfgcolor", STRING, &selfgcolor }, + { "borderpx", INTEGER, &borderpx }, + { "snap", INTEGER, &snap }, + { "showbar", INTEGER, &showbar }, + { "topbar", INTEGER, &topbar }, + { "nmaster", INTEGER, &nmaster }, + { "resizehints", INTEGER, &resizehints }, + { "mfact", FLOAT, &mfact }, +}; + static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_p, spawn, {.v = dmenucmd } }, diff --git a/config.h b/config.h index c61d8a4..f5baaa3 100644 --- a/config.h +++ b/config.h @@ -6,19 +6,20 @@ #define BROWSER "firefox" /* appearance */ -static unsigned int borderpx = 3; /* border pixel of windows */ -static unsigned int snap = 32; /* snap pixel */ -static int swallowfloating = 0; /* 1 means swallow floating windows by default */ -static int showbar = 1; /* 0 means no bar */ -static int topbar = 1; /* 0 means bottom bar */ -static char *fonts[] = { "IntoneMonoNerdFontMono:size=13", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true", "font-awesome"}; +static unsigned int borderpx = 3; /* border pixel of windows */ +static unsigned int snap = 32; /* snap pixel */ +static int swallowfloating = 0; /* 1 means swallow floating windows by default */ +static int showbar = 1; /* 0 means no bar */ +static int topbar = 1; /* 0 means bottom bar */ +static const char *fonts[] = { "IntoneMonoNerdFontMono:size=13", "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true", "font-awesome" }; +static char dmenufont[] = "IntoneMonoNerdFontMono:size=13"; static char normbgcolor[] = "#222222"; static char normbordercolor[] = "#444444"; static char normfgcolor[] = "#bbbbbb"; static char selfgcolor[] = "#eeeeee"; static char selbordercolor[] = "#770000"; static char selbgcolor[] = "#005577"; -static char *colors[][3] = { +static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor }, [SchemeSel] = { selfgcolor, selbgcolor, selbordercolor }, @@ -31,13 +32,10 @@ static const Rule rules[] = { /* xprop(1): * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title - */ - /* class instance title tags mask isfloating isterminal noswallow monitor */ - { "kdeconnect.daemon", NULL, NULL, 0, 1, 0, 0, -1 }, - { TERMCLASS, NULL, NULL, 0, 0, 1, 0, -1 }, - { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, - { TERMCLASS, "floatterm", NULL, 0, 1, 1, 0, -1 }, - { TERMCLASS, "bg", NULL, 1 << 7, 0, 1, 0, -1 }, + */ + /* class instance title tags mask isfloating monitor */ + { "Gimp", NULL, NULL, 0, 1, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, }; /* layout(s) */ @@ -45,23 +43,19 @@ static float mfact = 0.55; /* factor of master area size [0.05..0.95] */ static int nmaster = 1; /* number of clients in master area */ static int resizehints = 0; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ -#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */ +static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */ static const Layout layouts[] = { /* symbo"kdeconnectd",l arrange function */ { "[]=", tile }, /* Default: Master on left, slaves on right */ - { "TTT", bstack }, /* Master on top, slaves on bottom */ - - { "[@]", spiral }, /* Fibonacci spiral */ - { "[\\]", dwindle }, /* Decreasing in size right and leftward */ - - { "[D]", deck }, /* Master on left, slaves in monocle-like mode on right */ + //{ "TTT", bstack }, /* Master on top, slaves on bottom */ + //{ "[@]", spiral }, /* Fibonacci spiral */ + //{ "[\\]", dwindle }, /* Decreasing in size right and leftward */ + //{ "[D]", deck }, /* Master on left, slaves in monocle-like mode on right */ { "[M]", monocle }, /* All windows on top of eachother */ - - { "|M|", centeredmaster }, /* Master in middle, slaves on sides */ - { ">M>", centeredfloatingmaster }, /* Same but master floats */ - - { "><>", NULL }, /* no layout function means floating behavior */ - { NULL, NULL }, + //{ "|M|", centeredmaster }, /* Master in middle, slaves on sides */ + //{ ">M>", centeredfloatingmaster }, /* Same but master floats */ + //{ "><>", NULL }, /* no layout function means floating behavior */ + //{ NULL, NULL }, }; /* key definitions */ @@ -78,9 +72,30 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL }; static const char *termcmd[] = { TERMINAL, NULL }; +/* + * Xresources preferences to load at startup + */ +//ResourcePref resources[] = { +// { "font", STRING, &font }, +// { "dmenufont", STRING, &dmenufont }, +// { "normbgcolor", STRING, &normbgcolor }, +// { "normbordercolor", STRING, &normbordercolor }, +// { "normfgcolor", STRING, &normfgcolor }, +// { "selbgcolor", STRING, &selbgcolor }, +// { "selbordercolor", STRING, &selbordercolor }, +// { "selfgcolor", STRING, &selfgcolor }, +// { "borderpx", INTEGER, &borderpx }, +// { "snap", INTEGER, &snap }, +// { "showbar", INTEGER, &showbar }, +// { "topbar", INTEGER, &topbar }, +// { "nmaster", INTEGER, &nmaster }, +// { "resizehints", INTEGER, &resizehints }, +// { "mfact", FLOAT, &mfact }, +//}; + static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_r, spawn, {.v = dmenucmd } }, @@ -93,21 +108,39 @@ static const Key keys[] = { { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, /* tile */ - { MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */ - { MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */ - { MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ - { MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ - { MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ - { MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ - { MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ + //{ MODKEY|ShiftMask, XK_t, setlayout, {.v = &layouts[1]} }, /* bstack */ + //{ MODKEY, XK_y, setlayout, {.v = &layouts[2]} }, /* spiral */ + //{ MODKEY|ShiftMask, XK_y, setlayout, {.v = &layouts[3]} }, /* dwindle */ + //{ MODKEY, XK_u, setlayout, {.v = &layouts[4]} }, /* deck */ + //{ MODKEY|ShiftMask, XK_u, setlayout, {.v = &layouts[5]} }, /* monocle */ + //{ MODKEY, XK_i, setlayout, {.v = &layouts[6]} }, /* centeredmaster */ + //{ MODKEY|ShiftMask, XK_i, setlayout, {.v = &layouts[7]} }, /* centeredfloatingmaster */ { MODKEY, XK_o, incnmaster, {.i = +1 } }, { MODKEY|ShiftMask, XK_o, incnmaster, {.i = -1 } }, { MODKEY, XK_backslash, view, {0} }, - { MODKEY, XK_f, togglefullscr, {0} }, + //{ MODKEY, XK_f, togglefullscr, {0} }, { MODKEY, XK_period, focusmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = -1 } }, { MODKEY, XK_comma, focusmon, {.i = +1 } }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = +1 } }, { MODKEY, XK_space, zoom, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_q, quit, {0} }, +}; + +/* button definitions */ +/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static const Button buttons[] = { + /* click event mask button function argument */ + { ClkLtSymbol, 0, Button1, setlayout, {0} }, + { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, };