mirror of https://github.com/bakkeby/patches
You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
223 lines
6.7 KiB
Diff
223 lines
6.7 KiB
Diff
From d27eb690b062552395732ff71c046f11e91bdaf2 Mon Sep 17 00:00:00 2001
|
|
From: Bakkeby <bakkeby@gmail.com>
|
|
Date: Mon, 10 Jan 2022 13:44:42 +0100
|
|
Subject: [PATCH 2/2] Adding riodraw on top of swallow
|
|
|
|
---
|
|
config.def.h | 8 ++++
|
|
dwm.c | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
2 files changed, 135 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/config.def.h b/config.def.h
|
|
index dba4b83..191190b 100644
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -6,6 +6,12 @@ static const unsigned int snap = 32; /* snap pixel */
|
|
static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
|
|
static const int showbar = 1; /* 0 means no bar */
|
|
static const int topbar = 1; /* 0 means bottom bar */
|
|
+static const char slopspawnstyle[] = "-t 0 -c 0.92,0.85,0.69,0.3 -o"; /* do NOT define -f (format) here */
|
|
+static const char slopresizestyle[] = "-t 0 -c 0.92,0.85,0.69,0.3"; /* do NOT define -f (format) here */
|
|
+static const int riodraw_borders = 0; /* 0 or 1, indicates whether the area drawn using slop includes the window borders */
|
|
+static const int riodraw_matchpid = 1; /* 0 or 1, indicates whether to match the PID of the client that was spawned with riospawn */
|
|
+static const int riodraw_spawnasync = 0; /* 0 means that the application is only spawned after a successful selection while
|
|
+ * 1 means that the application is being initialised in the background while the selection is made */
|
|
static const char *fonts[] = { "monospace:size=10" };
|
|
static const char dmenufont[] = "monospace:size=10";
|
|
static const char col_gray1[] = "#222222";
|
|
@@ -67,6 +73,8 @@ static Key keys[] = {
|
|
/* modifier key function argument */
|
|
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
|
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
|
+ { MODKEY|ControlMask, XK_Return, riospawn, {.v = termcmd } },
|
|
+ { MODKEY, XK_s, rioresize, {0} },
|
|
{ MODKEY, XK_b, togglebar, {0} },
|
|
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
|
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
|
diff --git a/dwm.c b/dwm.c
|
|
index 8735093..8dc28d3 100644
|
|
--- a/dwm.c
|
|
+++ b/dwm.c
|
|
@@ -205,6 +205,10 @@ 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 resizemouse(const Arg *arg);
|
|
static void restack(Monitor *m);
|
|
+static int riodraw(Client *c, const char slopstyle[]);
|
|
+static void rioposition(Client *c, int x, int y, int w, int h);
|
|
+static void rioresize(const Arg *arg);
|
|
+static void riospawn(const Arg *arg);
|
|
static void run(void);
|
|
static void scan(void);
|
|
static int sendevent(Client *c, Atom proto);
|
|
@@ -219,6 +223,7 @@ static void seturgent(Client *c, int urg);
|
|
static void showhide(Client *c);
|
|
static void sigchld(int unused);
|
|
static void spawn(const Arg *arg);
|
|
+static pid_t spawncmd(const Arg *arg);
|
|
static void tag(const Arg *arg);
|
|
static void tagmon(const Arg *arg);
|
|
static void tile(Monitor *);
|
|
@@ -264,6 +269,8 @@ static int bh, blw = 0; /* bar geometry */
|
|
static int lrpad; /* sum of left and right padding for text */
|
|
static int (*xerrorxlib)(Display *, XErrorEvent *);
|
|
static unsigned int numlockmask = 0;
|
|
+static int riodimensions[4] = { -1, -1, -1, -1 };
|
|
+static pid_t riopid = 0;
|
|
static void (*handler[LASTEvent]) (XEvent *) = {
|
|
[ButtonPress] = buttonpress,
|
|
[ClientMessage] = clientmessage,
|
|
@@ -1126,6 +1133,18 @@ manage(Window w, XWindowAttributes *wa)
|
|
unfocus(selmon->sel, 0);
|
|
c->mon->sel = c;
|
|
}
|
|
+
|
|
+ if (!c->swallowing) {
|
|
+ if (riopid && (!riodraw_matchpid || isdescprocess(riopid, c->pid))) {
|
|
+ if (riodimensions[3] != -1)
|
|
+ rioposition(c, riodimensions[0], riodimensions[1], riodimensions[2], riodimensions[3]);
|
|
+ else {
|
|
+ killclient(&((Arg) { .v = c }));
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
arrange(c->mon);
|
|
XMapWindow(dpy, c->win);
|
|
if (focusclient)
|
|
@@ -1465,6 +1484,105 @@ restack(Monitor *m)
|
|
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
|
}
|
|
|
|
+int
|
|
+riodraw(Client *c, const char slopstyle[])
|
|
+{
|
|
+ int i;
|
|
+ char str[100];
|
|
+ char strout[100];
|
|
+ char tmpstring[30] = {0};
|
|
+ char slopcmd[100] = "slop -f x%xx%yx%wx%hx ";
|
|
+ int firstchar = 0;
|
|
+ int counter = 0;
|
|
+
|
|
+ strcat(slopcmd, slopstyle);
|
|
+ FILE *fp = popen(slopcmd, "r");
|
|
+
|
|
+ while (fgets(str, 100, fp) != NULL)
|
|
+ strcat(strout, str);
|
|
+
|
|
+ pclose(fp);
|
|
+
|
|
+ if (strlen(strout) < 6)
|
|
+ return 0;
|
|
+
|
|
+ for (i = 0; i < strlen(strout); i++){
|
|
+ if (!firstchar) {
|
|
+ if (strout[i] == 'x')
|
|
+ firstchar = 1;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ if (strout[i] != 'x')
|
|
+ tmpstring[strlen(tmpstring)] = strout[i];
|
|
+ else {
|
|
+ riodimensions[counter] = atoi(tmpstring);
|
|
+ counter++;
|
|
+ memset(tmpstring,0,strlen(tmpstring));
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (riodimensions[0] <= -40 || riodimensions[1] <= -40 || riodimensions[2] <= 50 || riodimensions[3] <= 50) {
|
|
+ riodimensions[3] = -1;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ if (c) {
|
|
+ rioposition(c, riodimensions[0], riodimensions[1], riodimensions[2], riodimensions[3]);
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return 1;
|
|
+}
|
|
+
|
|
+void
|
|
+rioposition(Client *c, int x, int y, int w, int h)
|
|
+{
|
|
+ Monitor *m;
|
|
+ if ((m = recttomon(x, y, w, h)) && m != c->mon) {
|
|
+ detach(c);
|
|
+ detachstack(c);
|
|
+ arrange(c->mon);
|
|
+ c->mon = m;
|
|
+ c->tags = m->tagset[m->seltags];
|
|
+ attach(c);
|
|
+ attachstack(c);
|
|
+ selmon = m;
|
|
+ focus(c);
|
|
+ }
|
|
+
|
|
+ c->isfloating = 1;
|
|
+ if (riodraw_borders)
|
|
+ resizeclient(c, x, y, w - (c->bw * 2), h - (c->bw * 2));
|
|
+ else
|
|
+ resizeclient(c, x - c->bw, y - c->bw, w, h);
|
|
+ drawbar(c->mon);
|
|
+ arrange(c->mon);
|
|
+
|
|
+ riodimensions[3] = -1;
|
|
+ riopid = 0;
|
|
+}
|
|
+
|
|
+/* drag out an area using slop and resize the selected window to it */
|
|
+void
|
|
+rioresize(const Arg *arg)
|
|
+{
|
|
+ Client *c = (arg && arg->v ? (Client*)arg->v : selmon->sel);
|
|
+ if (c)
|
|
+ riodraw(c, slopresizestyle);
|
|
+}
|
|
+
|
|
+/* spawn a new window and drag out an area using slop to postiion it */
|
|
+void
|
|
+riospawn(const Arg *arg)
|
|
+{
|
|
+ if (riodraw_spawnasync) {
|
|
+ riopid = spawncmd(arg);
|
|
+ riodraw(NULL, slopspawnstyle);
|
|
+ } else if (riodraw(NULL, slopspawnstyle))
|
|
+ riopid = spawncmd(arg);
|
|
+}
|
|
+
|
|
void
|
|
run(void)
|
|
{
|
|
@@ -1735,9 +1853,16 @@ sigchld(int unused)
|
|
void
|
|
spawn(const Arg *arg)
|
|
{
|
|
+ spawncmd(arg);
|
|
+}
|
|
+
|
|
+pid_t
|
|
+spawncmd(const Arg *arg)
|
|
+{
|
|
+ pid_t pid;
|
|
if (arg->v == dmenucmd)
|
|
dmenumon[0] = '0' + selmon->num;
|
|
- if (fork() == 0) {
|
|
+ if ((pid = fork()) == 0) {
|
|
if (dpy)
|
|
close(ConnectionNumber(dpy));
|
|
setsid();
|
|
@@ -1746,6 +1871,7 @@ spawn(const Arg *arg)
|
|
perror(" failed");
|
|
exit(EXIT_SUCCESS);
|
|
}
|
|
+ return pid;
|
|
}
|
|
|
|
int
|
|
--
|
|
2.19.1
|
|
|