mirror of
https://github.com/tiyn/dwm.git
synced 2025-10-15 20:31:18 +02:00
Compare commits
2 Commits
quitprompt
...
notitle
Author | SHA1 | Date | |
---|---|---|---|
c6698e8bbf | |||
9026191666 |
@@ -93,7 +93,7 @@ static Key keys[] = {
|
|||||||
TAGKEYS( XK_7, 6)
|
TAGKEYS( XK_7, 6)
|
||||||
TAGKEYS( XK_8, 7)
|
TAGKEYS( XK_8, 7)
|
||||||
TAGKEYS( XK_9, 8)
|
TAGKEYS( XK_9, 8)
|
||||||
{ MODKEY|ShiftMask, XK_q, quitprompt, {0} },
|
{ MODKEY|ShiftMask, XK_q, quit, {0} },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* button definitions */
|
/* button definitions */
|
||||||
@@ -102,7 +102,6 @@ static Button buttons[] = {
|
|||||||
/* click event mask button function argument */
|
/* click event mask button function argument */
|
||||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||||
|
81
dwm-notitle-6.2.diff
Normal file
81
dwm-notitle-6.2.diff
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
From 969dbbc548f16da5d94630e3d54e9c96c5296520 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ryan Kes <alrayyes@gmail.com>
|
||||||
|
Date: Thu, 28 Mar 2019 14:36:07 +0100
|
||||||
|
Subject: [PATCH] dwm-notitle-6.2
|
||||||
|
|
||||||
|
---
|
||||||
|
config.def.h | 1 -
|
||||||
|
dwm.c | 20 ++++----------------
|
||||||
|
2 files changed, 4 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/config.def.h b/config.def.h
|
||||||
|
index 1c0b587..19330cd 100644
|
||||||
|
--- a/config.def.h
|
||||||
|
+++ b/config.def.h
|
||||||
|
@@ -102,7 +102,6 @@ static 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} },
|
||||||
|
diff --git a/dwm.c b/dwm.c
|
||||||
|
index 4465af1..bcf5cb1 100644
|
||||||
|
--- a/dwm.c
|
||||||
|
+++ b/dwm.c
|
||||||
|
@@ -64,8 +64,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||||
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
|
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
|
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
+enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
|
||||||
|
+ ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
|
||||||
|
typedef union {
|
||||||
|
int i;
|
||||||
|
@@ -439,10 +439,8 @@ buttonpress(XEvent *e)
|
||||||
|
arg.ui = 1 << i;
|
||||||
|
} else if (ev->x < x + blw)
|
||||||
|
click = ClkLtSymbol;
|
||||||
|
- else if (ev->x > selmon->ww - TEXTW(stext))
|
||||||
|
- click = ClkStatusText;
|
||||||
|
else
|
||||||
|
- click = ClkWinTitle;
|
||||||
|
+ click = ClkStatusText;
|
||||||
|
} else if ((c = wintoclient(ev->window))) {
|
||||||
|
focus(c);
|
||||||
|
restack(selmon);
|
||||||
|
@@ -729,15 +727,8 @@ drawbar(Monitor *m)
|
||||||
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
|
if ((w = m->ww - sw - x) > bh) {
|
||||||
|
- if (m->sel) {
|
||||||
|
- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
||||||
|
- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
||||||
|
- if (m->sel->isfloating)
|
||||||
|
- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
||||||
|
- } else {
|
||||||
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
|
}
|
||||||
|
@@ -1235,11 +1226,8 @@ propertynotify(XEvent *e)
|
||||||
|
drawbars();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
- if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
||||||
|
+ if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
|
||||||
|
updatetitle(c);
|
||||||
|
- if (c == c->mon->sel)
|
||||||
|
- drawbar(c->mon);
|
||||||
|
- }
|
||||||
|
if (ev->atom == netatom[NetWMWindowType])
|
||||||
|
updatewindowtype(c);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.21.0
|
||||||
|
|
@@ -1,92 +0,0 @@
|
|||||||
From eb558048819ed916b272765e64e1ea795a85740e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lerrrtaste <lerrrtaste@protonmail.com>
|
|
||||||
Date: Mon, 18 Jul 2022 12:22:39 +0200
|
|
||||||
Subject: [PATCH] This Patch replaces the default quit behavior with an dmenu
|
|
||||||
prompt. Possible selections are (Quit DWM?) "yes", "no" and "restart". The
|
|
||||||
additional confirmation can save your work from accidentally hitting the quit
|
|
||||||
key by requiring two additional keystrokes (y/yes and RET). Additionally it
|
|
||||||
allows for restarting / reloading dwm without ending the xsession and closing
|
|
||||||
all open x windows. To abort press ESC or n/no and RET.
|
|
||||||
|
|
||||||
---
|
|
||||||
config.def.h | 2 +-
|
|
||||||
dwm.c | 30 ++++++++++++++++++++++++++++++
|
|
||||||
2 files changed, 31 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index a2ac963..9e3b394 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -94,7 +94,7 @@ static Key keys[] = {
|
|
||||||
TAGKEYS( XK_7, 6)
|
|
||||||
TAGKEYS( XK_8, 7)
|
|
||||||
TAGKEYS( XK_9, 8)
|
|
||||||
- { MODKEY|ShiftMask, XK_q, quit, {0} },
|
|
||||||
+ { MODKEY|ShiftMask, XK_q, quitprompt, {0} },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* button definitions */
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 7c0f978..3761ba4 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -188,6 +188,7 @@ static Client *nexttiled(Client *c);
|
|
||||||
static void pop(Client *c);
|
|
||||||
static void propertynotify(XEvent *e);
|
|
||||||
static void quit(const Arg *arg);
|
|
||||||
+static void quitprompt(const Arg *arg);
|
|
||||||
static Monitor *recttomon(int x, int y, int w, int h);
|
|
||||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
|
||||||
static void resizeclient(Client *c, int x, int y, int w, int h);
|
|
||||||
@@ -262,6 +263,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|
||||||
};
|
|
||||||
static Atom wmatom[WMLast], netatom[NetLast];
|
|
||||||
static int running = 1;
|
|
||||||
+static int restart = 1;
|
|
||||||
static Cur *cursor[CurLast];
|
|
||||||
static Clr **scheme;
|
|
||||||
static Display *dpy;
|
|
||||||
@@ -1258,6 +1260,31 @@ quit(const Arg *arg)
|
|
||||||
running = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+quitprompt(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
|
|
||||||
+ if(pp != NULL) {
|
|
||||||
+ char buf[1024];
|
|
||||||
+ if (fgets(buf, sizeof(buf), pp) == NULL) {
|
|
||||||
+ fprintf(stderr, "Quitprompt: Error reading pipe!\n");
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ if (strcmp(buf, "yes\n") == 0) {
|
|
||||||
+ pclose(pp);
|
|
||||||
+ restart = 0;
|
|
||||||
+ quit(NULL);
|
|
||||||
+ } else if (strcmp(buf, "restart\n") == 0) {
|
|
||||||
+ pclose(pp);
|
|
||||||
+ restart = 1;
|
|
||||||
+ quit(NULL);
|
|
||||||
+ } else if (strcmp(buf, "no\n") == 0) {
|
|
||||||
+ pclose(pp);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
Monitor *
|
|
||||||
recttomon(int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
@@ -2155,5 +2182,8 @@ main(int argc, char *argv[])
|
|
||||||
run();
|
|
||||||
cleanup();
|
|
||||||
XCloseDisplay(dpy);
|
|
||||||
+ if (restart == 1) {
|
|
||||||
+ execlp("dwm", "dwm", NULL);
|
|
||||||
+ }
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.36.0
|
|
||||||
|
|
50
dwm.c
50
dwm.c
@@ -64,8 +64,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|||||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin,
|
||||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
ClkRootWin, ClkLast }; /* clicks */
|
||||||
|
|
||||||
typedef union {
|
typedef union {
|
||||||
int i;
|
int i;
|
||||||
@@ -187,7 +187,6 @@ static Client *nexttiled(Client *c);
|
|||||||
static void pop(Client *);
|
static void pop(Client *);
|
||||||
static void propertynotify(XEvent *e);
|
static void propertynotify(XEvent *e);
|
||||||
static void quit(const Arg *arg);
|
static void quit(const Arg *arg);
|
||||||
static void quitprompt(const Arg *arg);
|
|
||||||
static Monitor *recttomon(int x, int y, int w, int h);
|
static Monitor *recttomon(int x, int y, int w, int h);
|
||||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||||
static void resizeclient(Client *c, int x, int y, int w, int h);
|
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
@@ -262,7 +261,6 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|||||||
};
|
};
|
||||||
static Atom wmatom[WMLast], netatom[NetLast];
|
static Atom wmatom[WMLast], netatom[NetLast];
|
||||||
static int running = 1;
|
static int running = 1;
|
||||||
static int restart = 1;
|
|
||||||
static Cur *cursor[CurLast];
|
static Cur *cursor[CurLast];
|
||||||
static Clr **scheme;
|
static Clr **scheme;
|
||||||
static Display *dpy;
|
static Display *dpy;
|
||||||
@@ -441,10 +439,8 @@ buttonpress(XEvent *e)
|
|||||||
arg.ui = 1 << i;
|
arg.ui = 1 << i;
|
||||||
} else if (ev->x < x + blw)
|
} else if (ev->x < x + blw)
|
||||||
click = ClkLtSymbol;
|
click = ClkLtSymbol;
|
||||||
else if (ev->x > selmon->ww - TEXTW(stext))
|
|
||||||
click = ClkStatusText;
|
|
||||||
else
|
else
|
||||||
click = ClkWinTitle;
|
click = ClkStatusText;
|
||||||
} else if ((c = wintoclient(ev->window))) {
|
} else if ((c = wintoclient(ev->window))) {
|
||||||
focus(c);
|
focus(c);
|
||||||
restack(selmon);
|
restack(selmon);
|
||||||
@@ -731,15 +727,8 @@ drawbar(Monitor *m)
|
|||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
if ((w = m->ww - sw - x) > bh) {
|
if ((w = m->ww - sw - x) > bh) {
|
||||||
if (m->sel) {
|
|
||||||
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
||||||
if (m->sel->isfloating)
|
|
||||||
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
|
|
||||||
} else {
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
}
|
}
|
||||||
@@ -1237,11 +1226,8 @@ propertynotify(XEvent *e)
|
|||||||
drawbars();
|
drawbars();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
|
if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
|
||||||
updatetitle(c);
|
updatetitle(c);
|
||||||
if (c == c->mon->sel)
|
|
||||||
drawbar(c->mon);
|
|
||||||
}
|
|
||||||
if (ev->atom == netatom[NetWMWindowType])
|
if (ev->atom == netatom[NetWMWindowType])
|
||||||
updatewindowtype(c);
|
updatewindowtype(c);
|
||||||
}
|
}
|
||||||
@@ -1253,31 +1239,6 @@ quit(const Arg *arg)
|
|||||||
running = 0;
|
running = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
quitprompt(const Arg *arg)
|
|
||||||
{
|
|
||||||
FILE *pp = popen("echo -e \"no\nrestart\nyes\" | dmenu -i -sb red -p \"Quit DWM?\"", "r");
|
|
||||||
if(pp != NULL) {
|
|
||||||
char buf[1024];
|
|
||||||
if (fgets(buf, sizeof(buf), pp) == NULL) {
|
|
||||||
fprintf(stderr, "Quitprompt: Error reading pipe!\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (strcmp(buf, "yes\n") == 0) {
|
|
||||||
pclose(pp);
|
|
||||||
restart = 0;
|
|
||||||
quit(NULL);
|
|
||||||
} else if (strcmp(buf, "restart\n") == 0) {
|
|
||||||
pclose(pp);
|
|
||||||
restart = 1;
|
|
||||||
quit(NULL);
|
|
||||||
} else if (strcmp(buf, "no\n") == 0) {
|
|
||||||
pclose(pp);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Monitor *
|
Monitor *
|
||||||
recttomon(int x, int y, int w, int h)
|
recttomon(int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
@@ -2172,8 +2133,5 @@ main(int argc, char *argv[])
|
|||||||
run();
|
run();
|
||||||
cleanup();
|
cleanup();
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
if (restart == 1) {
|
|
||||||
execlp("dwm", "dwm", NULL);
|
|
||||||
}
|
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user