mirror of
https://github.com/tiyn/dwm.git
synced 2025-04-19 07:47:46 +02:00
Compare commits
5 Commits
5fb1ba1806
...
00aaef36c5
Author | SHA1 | Date | |
---|---|---|---|
00aaef36c5 | |||
06edec0e26 | |||
d7971a2924 | |||
22b482d2c9 | |||
cdacc63d2c |
@ -23,6 +23,7 @@ The list below shows the currently applied patches to the master branch.
|
|||||||
- dwm-noborder-6.2.diff (removes border if there is only one window)
|
- dwm-noborder-6.2.diff (removes border if there is only one window)
|
||||||
- dwm-notitle-6.2.diff (removes window title in the middle of the bar)
|
- dwm-notitle-6.2.diff (removes window title in the middle of the bar)
|
||||||
- dwm-pertag-20170513-ceac8c9.diff (allows having a layout/mwfact/barpos/nmaster per tag)
|
- dwm-pertag-20170513-ceac8c9.diff (allows having a layout/mwfact/barpos/nmaster per tag)
|
||||||
|
- dwm-quitprompt-20220718-6613d9f.diff (adds a confirmation prompt before exiting dwm)
|
||||||
- dwm-status2d-6.2.diff (adds colors and ability to draw rectangles)
|
- dwm-status2d-6.2.diff (adds colors and ability to draw rectangles)
|
||||||
- dwm-statusallmons-6.2.diff (display statusbar on every monitors)
|
- dwm-statusallmons-6.2.diff (display statusbar on every monitors)
|
||||||
- dwm-statuscmd-6.2.diff (enables dwmblocks compatibility)
|
- dwm-statuscmd-6.2.diff (enables dwmblocks compatibility)
|
||||||
@ -43,7 +44,7 @@ build are the following.
|
|||||||
| Super | | 1/2/.../9/0 | Show tag 1/2/.../9/0 |
|
| Super | | 1/2/.../9/0 | Show tag 1/2/.../9/0 |
|
||||||
| Super | | . | Show monitor lower in stack |
|
| Super | | . | Show monitor lower in stack |
|
||||||
| Super | | , | Show monitor higher in stack |
|
| Super | | , | Show monitor higher in stack |
|
||||||
| Super | Shift | Escape | Quit dwm |
|
| Super | Shift | Escape | Quit dwm with call for confirmation |
|
||||||
| Super | Shift | b | Toggle dwmbar |
|
| Super | Shift | b | Toggle dwmbar |
|
||||||
| Super | Shift | c | Enable deck(/card) layout |
|
| Super | Shift | c | Enable deck(/card) layout |
|
||||||
| Super | Shift | d | Toggle floating/tiled for selected window |
|
| Super | Shift | d | Toggle floating/tiled for selected window |
|
||||||
|
@ -86,7 +86,7 @@ static const Layout layouts[] = {
|
|||||||
|
|
||||||
static Key keys[] = {
|
static Key keys[] = {
|
||||||
/* modifier key function argument */
|
/* modifier key function argument */
|
||||||
{ MODKEY|ShiftMask, XK_Escape, quit, {0} },
|
{ MODKEY|ShiftMask, XK_Escape, quitprompt, {0} },
|
||||||
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
|
{ MODKEY|ShiftMask, XK_b, togglebar, {0} },
|
||||||
{ MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} },
|
{ MODKEY|ShiftMask, XK_c, setlayout, {.v = &layouts[2]} },
|
||||||
{ MODKEY|ShiftMask, XK_d, togglefloating, {0} },
|
{ MODKEY|ShiftMask, XK_d, togglefloating, {0} },
|
||||||
|
92
dwm-quitprompt-20220718-6613d9f.diff
Normal file
92
dwm-quitprompt-20220718-6613d9f.diff
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
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
|
||||||
|
|
30
dwm.c
30
dwm.c
@ -222,6 +222,7 @@ 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 removesystrayicon(Client *i);
|
static void removesystrayicon(Client *i);
|
||||||
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);
|
||||||
@ -314,6 +315,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|||||||
};
|
};
|
||||||
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
||||||
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;
|
||||||
@ -1623,6 +1625,31 @@ quit(const Arg *arg)
|
|||||||
running = 0;
|
running = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
quitprompt(const Arg *arg)
|
||||||
|
{
|
||||||
|
FILE *pp = popen("echo \"no\nrestart\nyes\" | dmenu -i -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)
|
||||||
{
|
{
|
||||||
@ -2859,6 +2886,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user