Add scratchpad patch
This commit is contained in:
parent
c8a78307a3
commit
8f355ffaee
70
config.h
70
config.h
@ -5,15 +5,21 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const unsigned int gappih = 10; /* horiz inner gap between windows */
|
||||
static const unsigned int gappiv = 10; /* vert inner gap between windows */
|
||||
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
|
||||
static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
|
||||
static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
|
||||
static int smartgaps = 1; /* 1 means no outer gap when there is only one window */
|
||||
static const unsigned int gappoh =
|
||||
10; /* horiz outer gap between windows and screen edge */
|
||||
static const unsigned int gappov =
|
||||
10; /* vert outer gap between windows and screen edge */
|
||||
static const int swallowfloating =
|
||||
0; /* 1 means swallow floating windows by default */
|
||||
static int smartgaps =
|
||||
1; /* 1 means no outer gap when there is only one window */
|
||||
|
||||
static const int showbar = 1; /* 0 means no bar */
|
||||
static const int topbar = 1; /* 0 means bottom bar */
|
||||
static const char *fonts[] = { "FiraCode Nerd Font:size=11:antialias=true:autohint=true" };
|
||||
static const char dmenufont[] = "SauceCodePro Nerd Font:size=10:antialias=true:autohint=true";
|
||||
static const char *fonts[] = {
|
||||
"FiraCode Nerd Font:size=11:antialias=true:autohint=true"};
|
||||
static const char dmenufont[] =
|
||||
"SauceCodePro Nerd Font:size=10:antialias=true:autohint=true";
|
||||
static const char col_gray1[] = "#282828";
|
||||
static const char col_gray2[] = "#444444";
|
||||
static const char col_gray3[] = "#ebdbb2";
|
||||
@ -30,11 +36,14 @@ static const char *colors[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = {col_gray3, col_gray1, "#000000"},
|
||||
[SchemeSel] = {col_gray3, col_cyan, col_cyan},
|
||||
[SchemeStatus] = { col_gray4, col_gray1, "#000000" }, // Statusbar right {text,background,not used but cannot be empty}
|
||||
[SchemeTagsSel] = { col_gray3, col_gray1, col_gray1 }, // Tagbar left selected {text,background,not used but cannot be empty}
|
||||
[SchemeTagsNorm] = { col_gray4, col_gray1, col_gray1 }, // Tagbar left unselected {text,background,not used but cannot be empty}
|
||||
[SchemeInfoSel] = { col_gray3, col_gray1, col_gray1 }, // infobar middle selected {text,background,not used but cannot be empty}
|
||||
[SchemeInfoNorm] = { col_green, col_gray1, col_gray1}, // infobar middle unselected {text,background,not used but cannot be empty}
|
||||
[SchemeStatus] = {col_gray4, col_gray1, "#000000"},
|
||||
[SchemeTagsSel] = {col_gray3, col_gray1, col_gray1},
|
||||
// Tagbar left unselected {text,background,not used but cannot be empty}
|
||||
[SchemeTagsNorm] = {col_gray4, col_gray1, col_gray1},
|
||||
// infobar middle selected {text,background,not used but cannot be empty}
|
||||
[SchemeInfoSel] = {col_gray3, col_gray1, col_gray1},
|
||||
// infobar middle unselected {text,background,not used but cannot be empty}
|
||||
[SchemeInfoNorm] = {col_green, col_gray1, col_gray1},
|
||||
[SchemeWarn] = {col_yellow, col_gray1, col_gray1},
|
||||
[SchemeUrgent] = {col_red, col_gray1, col_gray1},
|
||||
};
|
||||
@ -49,8 +58,7 @@ static const unsigned int alphas[][3] = {
|
||||
[SchemeInfoSel] = {OPAQUE, baralpha, borderalpha},
|
||||
[SchemeInfoNorm] = {OPAQUE, baralpha, borderalpha},
|
||||
[SchemeWarn] = {OPAQUE, baralpha, borderalpha},
|
||||
[SchemeUrgent]= { OPAQUE, baralpha, borderalpha }
|
||||
};
|
||||
[SchemeUrgent] = {OPAQUE, baralpha, borderalpha}};
|
||||
|
||||
/* tagging */
|
||||
static const char *tags[] = {"", "", "", "", "", ""};
|
||||
@ -60,7 +68,8 @@ static const Rule rules[] = {
|
||||
* WM_CLASS(STRING) = instance, class
|
||||
* WM_NAME(STRING) = title
|
||||
*/
|
||||
/* class instance title tags mask isfloating isterminal noswallow, monitor */
|
||||
/* class instance title tags mask isfloating isterminal
|
||||
noswallow, monitor */
|
||||
{"Gimp", NULL, NULL, 0, 1, 0, 0, -1},
|
||||
{"Brave-browser", NULL, NULL, 0, 0, 0, 0, 1},
|
||||
{"mpv", NULL, NULL, 0, 1, 0, 0, -1},
|
||||
@ -93,7 +102,8 @@ static const Rule rules[] = {
|
||||
/* layout(s) */
|
||||
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */
|
||||
static const int nmaster = 1; /* number of clients in master area */
|
||||
static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
|
||||
static const int resizehints =
|
||||
0; /* 1 means respect size hints in tiled resizals */
|
||||
|
||||
#define FORCE_VSPLIT 1
|
||||
#include "vanitygaps.c"
|
||||
@ -115,17 +125,25 @@ static const Layout layouts[] = {
|
||||
{MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
|
||||
|
||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||
#define SHCMD(cmd) \
|
||||
{ \
|
||||
.v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } \
|
||||
}
|
||||
|
||||
/* commands */
|
||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
||||
static char dmenumon[2] =
|
||||
"0"; /* component of dmenucmd, manipulated in spawn() */
|
||||
static const char *dmenucmd[] = {"rofi", "-show", "drun", NULL};
|
||||
static const char *termcmd[] = {"st", NULL};
|
||||
static const char scratchpadname[] = "scratchpad";
|
||||
static const char *scratchpadcmd[] = {"st", "-t", scratchpadname,
|
||||
"-g", "120x34", NULL};
|
||||
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{MODKEY, XK_p, spawn, {.v = dmenucmd}},
|
||||
{MODKEY | ShiftMask, XK_Return, spawn, {.v = termcmd}},
|
||||
{MODKEY, XK_8, togglescratch, {.v = scratchpadcmd}},
|
||||
{MODKEY, XK_b, togglebar, {0}},
|
||||
{MODKEY, XK_j, focusstack, {.i = +1}},
|
||||
{MODKEY, XK_k, focusstack, {.i = -1}},
|
||||
@ -154,21 +172,14 @@ static Key keys[] = {
|
||||
{MODKEY | ShiftMask, XK_Up, moveresize, {.v = "0x 0y 0w -25h"}},
|
||||
{MODKEY | ShiftMask, XK_Right, moveresize, {.v = "0x 0y 25w 0h"}},
|
||||
{MODKEY | ShiftMask, XK_Left, moveresize, {.v = "0x 0y -25w 0h"}},
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
TAGKEYS( XK_4, 3)
|
||||
TAGKEYS( XK_5, 4)
|
||||
TAGKEYS( XK_6, 5)
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
TAGKEYS( XK_0, 9)
|
||||
{ MODKEY|ShiftMask, XK_q, quit, {1} },
|
||||
TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3)
|
||||
TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6)
|
||||
TAGKEYS(XK_0, 9){MODKEY | ShiftMask, XK_q, quit, {1}},
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||
* ClkClientWin, or ClkRootWin */
|
||||
static Button buttons[] = {
|
||||
/* click event mask button function argument */
|
||||
{ClkLtSymbol, 0, Button1, setlayout, {0}},
|
||||
@ -183,4 +194,3 @@ static Button buttons[] = {
|
||||
{ClkTagBar, MODKEY, Button1, tag, {0}},
|
||||
{ClkTagBar, MODKEY, Button3, toggletag, {0}},
|
||||
};
|
||||
|
||||
|
||||
34
dwm.c
34
dwm.c
@ -232,6 +232,7 @@ static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void togglebar(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglescratch(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
static void toggleview(const Arg *arg);
|
||||
static void unfocus(Client *c, int setfocus);
|
||||
@ -316,6 +317,8 @@ struct Pertag {
|
||||
int showbars[LENGTH(tags) + 1]; /* display bar for the current tag */
|
||||
};
|
||||
|
||||
static unsigned int scratchtag = 1 << LENGTH(tags);
|
||||
|
||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
||||
|
||||
@ -1210,6 +1213,14 @@ manage(Window w, XWindowAttributes *wa)
|
||||
&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
|
||||
c->bw = borderpx;
|
||||
|
||||
selmon->tagset[selmon->seltags] &= ~scratchtag;
|
||||
if (!strcmp(c->name, scratchpadname)) {
|
||||
c->mon->tagset[c->mon->seltags] |= c->tags = scratchtag;
|
||||
c->isfloating = True;
|
||||
c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
|
||||
c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
|
||||
}
|
||||
|
||||
wc.border_width = c->bw;
|
||||
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
||||
XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
|
||||
@ -1914,6 +1925,7 @@ spawn(const Arg *arg)
|
||||
{
|
||||
if (arg->v == dmenucmd)
|
||||
dmenumon[0] = '0' + selmon->num;
|
||||
selmon->tagset[selmon->seltags] &= ~scratchtag;
|
||||
if (fork() == 0) {
|
||||
if (dpy)
|
||||
close(ConnectionNumber(dpy));
|
||||
@ -1977,6 +1989,28 @@ togglefloating(const Arg *arg)
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
void
|
||||
togglescratch(const Arg *arg)
|
||||
{
|
||||
Client *c;
|
||||
unsigned int found = 0;
|
||||
|
||||
for (c = selmon->clients; c && !(found = c->tags & scratchtag); c = c->next);
|
||||
if (found) {
|
||||
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ scratchtag;
|
||||
if (newtagset) {
|
||||
selmon->tagset[selmon->seltags] = newtagset;
|
||||
focus(NULL);
|
||||
arrange(selmon);
|
||||
}
|
||||
if (ISVISIBLE(c)) {
|
||||
focus(c);
|
||||
restack(selmon);
|
||||
}
|
||||
} else
|
||||
spawn(arg);
|
||||
}
|
||||
|
||||
void
|
||||
toggletag(const Arg *arg)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user