old scratchpad patch removed
This commit is contained in:
parent
18c6a63f86
commit
11160adf7b
2 changed files with 1 additions and 37 deletions
4
config.h
4
config.h
|
@ -84,8 +84,6 @@ static const Layout layouts[] = {
|
||||||
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[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
|
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
|
||||||
static const char *termcmd[] = { "st", NULL };
|
static const char *termcmd[] = { "st", NULL };
|
||||||
static const char scratchpadname[] = "scratchpad";
|
|
||||||
static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34", NULL };
|
|
||||||
|
|
||||||
#include <X11/XF86keysym.h>
|
#include <X11/XF86keysym.h>
|
||||||
#include "shiftview.c"
|
#include "shiftview.c"
|
||||||
|
@ -161,7 +159,7 @@ static Key keys[] = {
|
||||||
/* { MODKEY, XK_apostrophe, spawn, SHCMD("") }, */
|
/* { MODKEY, XK_apostrophe, spawn, SHCMD("") }, */
|
||||||
/* { MODKEY|ShiftMask, XK_apostrophe, spawn, SHCMD("") }, */
|
/* { MODKEY|ShiftMask, XK_apostrophe, spawn, SHCMD("") }, */
|
||||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
||||||
{ MODKEY|ShiftMask, XK_Return, togglescratch, {.v = scratchpadcmd } },
|
/* { MODKEY|ShiftMask, XK_Return, togglescratch, {.v = scratchpadcmd } }, */
|
||||||
|
|
||||||
{ MODKEY, XK_z, incrgaps, {.i = +1 } },
|
{ MODKEY, XK_z, incrgaps, {.i = +1 } },
|
||||||
{ MODKEY|ShiftMask, XK_z, incrgaps, {.i = -1 } },
|
{ MODKEY|ShiftMask, XK_z, incrgaps, {.i = -1 } },
|
||||||
|
|
34
dwm.c
34
dwm.c
|
@ -253,7 +253,6 @@ static void togglebar(const Arg *arg);
|
||||||
static void togglefloating(const Arg *arg);
|
static void togglefloating(const Arg *arg);
|
||||||
static void togglesticky(const Arg *arg);
|
static void togglesticky(const Arg *arg);
|
||||||
static void togglefullscr(const Arg *arg);
|
static void togglefullscr(const Arg *arg);
|
||||||
static void togglescratch(const Arg *arg);
|
|
||||||
static void toggletag(const Arg *arg);
|
static void toggletag(const Arg *arg);
|
||||||
static void toggleview(const Arg *arg);
|
static void toggleview(const Arg *arg);
|
||||||
static void unfocus(Client *c, int setfocus);
|
static void unfocus(Client *c, int setfocus);
|
||||||
|
@ -328,8 +327,6 @@ static xcb_connection_t *xcon;
|
||||||
/* configuration, allows nested code to access above variables */
|
/* configuration, allows nested code to access above variables */
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
static unsigned int scratchtag = 1 << LENGTH(tags);
|
|
||||||
|
|
||||||
/* compile-time check if all tags fit into an unsigned int bit array. */
|
/* compile-time check if all tags fit into an unsigned int bit array. */
|
||||||
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
||||||
|
|
||||||
|
@ -1226,14 +1223,6 @@ manage(Window w, XWindowAttributes *wa)
|
||||||
&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
|
&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
|
||||||
c->bw = borderpx;
|
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;
|
wc.border_width = c->bw;
|
||||||
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
||||||
XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
|
XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
|
||||||
|
@ -1921,7 +1910,6 @@ spawn(const Arg *arg)
|
||||||
{
|
{
|
||||||
if (arg->v == dmenucmd)
|
if (arg->v == dmenucmd)
|
||||||
dmenumon[0] = '0' + selmon->num;
|
dmenumon[0] = '0' + selmon->num;
|
||||||
selmon->tagset[selmon->seltags] &= ~scratchtag;
|
|
||||||
if (fork() == 0) {
|
if (fork() == 0) {
|
||||||
if (dpy)
|
if (dpy)
|
||||||
close(ConnectionNumber(dpy));
|
close(ConnectionNumber(dpy));
|
||||||
|
@ -1974,28 +1962,6 @@ togglefloating(const Arg *arg)
|
||||||
arrange(selmon);
|
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
|
void
|
||||||
togglefullscr(const Arg *arg)
|
togglefullscr(const Arg *arg)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue