@@ -4,6 +4,7 @@ | |||||
static const unsigned int borderpx = 2; /* border pixel of windows */ | static const unsigned int borderpx = 2; /* border pixel of windows */ | ||||
static const unsigned int gappx = 15; | static const unsigned int gappx = 15; | ||||
static const unsigned int snap = 32; /* snap pixel */ | 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 showbar = 1; /* 0 means no bar */ | ||||
static const int topbar = 1; /* 0 means bottom bar */ | static const int topbar = 1; /* 0 means bottom bar */ | ||||
static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | ||||
@@ -37,6 +38,11 @@ static const Rule rules[] = { | |||||
/* class instance title tags mask iscentered isfloating monitor */ | /* class instance title tags mask iscentered isfloating monitor */ | ||||
{ "Gimp", NULL, NULL, 0, 0, 1, -1 }, | { "Gimp", NULL, NULL, 0, 0, 1, -1 }, | ||||
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | ||||
/* class instance title tags mask iscentered isfloating isterminal noswallow monitor */ | |||||
{ "Gimp", NULL, NULL, 0,0, 1, 0, 0, -1 }, | |||||
{ "Firefox", NULL, NULL, 1 << 8,0, 0, 0, -1, -1 }, | |||||
{ "St", NULL, NULL, 0,0, 0, 1, 0, -1 }, | |||||
{ NULL, NULL, "Event Tester", 0,0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | }; | ||||
/* layout(s) */ | /* layout(s) */ | ||||
@@ -85,10 +91,10 @@ static Key keys[] = { | |||||
{ 0, XF86XK_AudioForward, spawn, SHCMD("cmus-remote --seek +10") }, | { 0, XF86XK_AudioForward, spawn, SHCMD("cmus-remote --seek +10") }, | ||||
{ MODKEY|ShiftMask, XK_space, togglealwaysontop, {0} }, | { MODKEY|ShiftMask, XK_space, togglealwaysontop, {0} }, | ||||
{ MODKEY, XK_w, spawn, SHCMD("firefox") }, | { MODKEY, XK_w, spawn, SHCMD("firefox") }, | ||||
{ MODKEY|ShiftMask, XK_l, spawn, SHCMD("xsecurelock") }, | |||||
{ MODKEY|ShiftMask, XK_l, spawn, SHCMD("slock") }, | |||||
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("st ~/scripts/autostart.sh") }, | { MODKEY|ShiftMask, XK_m, spawn, SHCMD("st ~/scripts/autostart.sh") }, | ||||
{ MODKEY|ShiftMask, XK_j, spawn, SHCMD("joplin-desktop") }, | { MODKEY|ShiftMask, XK_j, spawn, SHCMD("joplin-desktop") }, | ||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("spectacle -r") }, | |||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("~/scripts/screenshot.sh 1") }, | |||||
{ MODKEY|ShiftMask, XK_n, spawn, SHCMD("connman-gtk") }, | { MODKEY|ShiftMask, XK_n, spawn, SHCMD("connman-gtk") }, | ||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, | { MODKEY, XK_p, spawn, {.v = dmenucmd } }, | ||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | ||||
@@ -2,10 +2,11 @@ | |||||
/* appearance */ | /* appearance */ | ||||
static const unsigned int borderpx = 2; /* border pixel of windows */ | static const unsigned int borderpx = 2; /* border pixel of windows */ | ||||
static const unsigned int gappx = 15; | |||||
static const unsigned int snap = 32; /* snap pixel */ | static const unsigned int snap = 32; /* snap pixel */ | ||||
static const int showbar = 1; /* 0 means no bar */ | static const int showbar = 1; /* 0 means no bar */ | ||||
static const int topbar = 1; /* 0 means bottom bar */ | static const int topbar = 1; /* 0 means bottom bar */ | ||||
static const char *fonts[] = { "monospace:size=13", "fontawesome:size=13"}; | |||||
static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | |||||
static const char dmenufont[] = "monospace:size=13"; | static const char dmenufont[] = "monospace:size=13"; | ||||
static const char col_gray1[] = "#222222"; | static const char col_gray1[] = "#222222"; | ||||
static const char col_gray2[] = "#444444"; | static const char col_gray2[] = "#444444"; | ||||
@@ -19,12 +20,14 @@ static const char *colors[][3] = { | |||||
}; | }; | ||||
static const char *const autostart[] = { | static const char *const autostart[] = { | ||||
"st", NULL, | |||||
"sh", "-c", "sh ~/scripts/xinit.sh", NULL, | |||||
"dunst", NULL, | |||||
"slstatus", NULL, | |||||
NULL /* terminate */ | NULL /* terminate */ | ||||
}; | }; | ||||
/* tagging */ | /* tagging */ | ||||
static const char *tags[] = { "", "", "", "", "", "6", "7", "8", "9" }; | |||||
static const char *tags[] = { "", "", "", "", "", "", "" }; | |||||
static const Rule rules[] = { | static const Rule rules[] = { | ||||
/* xprop(1): | /* xprop(1): | ||||
@@ -49,7 +52,7 @@ static const Layout layouts[] = { | |||||
}; | }; | ||||
/* key definitions */ | /* key definitions */ | ||||
#define MODKEY Mod1Mask | |||||
#define MODKEY Mod4Mask | |||||
#define TAGKEYS(KEY,TAG) \ | #define TAGKEYS(KEY,TAG) \ | ||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ | { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ | ||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ | { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ | ||||
@@ -64,9 +67,30 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() | |||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; | static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; | ||||
static const char *termcmd[] = { "st", NULL }; | static const char *termcmd[] = { "st", NULL }; | ||||
#include <X11/XF86keysym.h> | |||||
static Key keys[] = { | static Key keys[] = { | ||||
/* modifier key function argument */ | /* modifier key function argument */ | ||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, | |||||
{ 0, XK_Print, spawn, SHCMD("scrot -e 'mv $f ~/Screenshots'") }, | |||||
{ 0, XF86XK_PowerOff, spawn, SHCMD("~/scripts/poweroff.sh") }, | |||||
{ 0, XF86XK_AudioMute, spawn, SHCMD("pulsemixer --toggle-mute") }, | |||||
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pulsemixer --change-volume +1") }, | |||||
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pulsemixer --change-volume -1") }, | |||||
{ 0, XF86XK_AudioPrev, spawn, SHCMD("cmus-remote --prev") }, | |||||
{ 0, XF86XK_AudioNext, spawn, SHCMD("cmus-remote --next") }, | |||||
{ 0, XF86XK_AudioPause, spawn, SHCMD("cmus-remote --pause") }, | |||||
{ 0, XF86XK_AudioPlay, spawn, SHCMD("cmus-remote --pause") }, | |||||
{ 0, XF86XK_AudioStop, spawn, SHCMD("cmus-remote --stop") }, | |||||
{ 0, XF86XK_AudioRewind, spawn, SHCMD("cmus-remote --seek -10") }, | |||||
{ 0, XF86XK_AudioForward, spawn, SHCMD("cmus-remote --seek +10") }, | |||||
{ MODKEY|ShiftMask, XK_space, togglealwaysontop, {0} }, | |||||
{ MODKEY, XK_w, spawn, SHCMD("firefox") }, | |||||
{ MODKEY|ShiftMask, XK_l, spawn, SHCMD("slock") }, | |||||
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("st ~/scripts/autostart.sh") }, | |||||
{ MODKEY|ShiftMask, XK_j, spawn, SHCMD("joplin-desktop") }, | |||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("~/scripts/screenshot.sh 1") }, | |||||
{ MODKEY|ShiftMask, XK_n, spawn, SHCMD("connman-gtk") }, | |||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, | |||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | ||||
{ MODKEY, XK_b, togglebar, {0} }, | { MODKEY, XK_b, togglebar, {0} }, | ||||
{ MODKEY, XK_j, focusstack, {.i = +1 } }, | { MODKEY, XK_j, focusstack, {.i = +1 } }, | ||||
@@ -89,6 +113,9 @@ static Key keys[] = { | |||||
{ MODKEY, XK_period, focusmon, {.i = +1 } }, | { MODKEY, XK_period, focusmon, {.i = +1 } }, | ||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, | { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, | ||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, | { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, | ||||
{ MODKEY, XK_minus, setgaps, {.i = -5 } }, | |||||
{ MODKEY, XK_equal, setgaps, {.i = +5 } }, | |||||
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, | |||||
TAGKEYS( XK_1, 0) | TAGKEYS( XK_1, 0) | ||||
TAGKEYS( XK_2, 1) | TAGKEYS( XK_2, 1) | ||||
TAGKEYS( XK_3, 2) | TAGKEYS( XK_3, 2) | ||||
@@ -1,10 +1,17 @@ | |||||
--- config.def.h | --- config.def.h | ||||
+++ config.def.h | +++ config.def.h | ||||
@@ -2,6 +2,7 @@ | |||||
@@ -27,9 +28,11 @@ static const Rule rules[] = { | |||||
* WM_CLASS(STRING) = instance, class | |||||
* WM_NAME(STRING) = title | |||||
*/ | |||||
- /* class instance title tags mask isfloating monitor */ | |||||
- { "Gimp", NULL, NULL, 0, 1, -1 }, | |||||
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, | |||||
+ /* class instance title tags mask isfloating isterminal noswallow monitor */ | |||||
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, | |||||
+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, | |||||
+ { "St", NULL, NULL, 0, 0, 1, 0, -1 }, | |||||
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | |||||
/* appearance */ | |||||
static const unsigned int borderpx = 1; /* border pixel of windows */ | |||||
+static const unsigned int gappx = 5; /* gaps between windows */ | |||||
static const unsigned int snap = 32; /* snap pixel */ | |||||
static const int showbar = 1; /* 0 means no bar */ | |||||
static const int topbar = 1; /* 0 means bottom bar */ | |||||
/* layout(s) */ |
@@ -4,6 +4,7 @@ | |||||
static const unsigned int borderpx = 2; /* border pixel of windows */ | static const unsigned int borderpx = 2; /* border pixel of windows */ | ||||
static const unsigned int gappx = 15; | static const unsigned int gappx = 15; | ||||
static const unsigned int snap = 32; /* snap pixel */ | 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 showbar = 1; /* 0 means no bar */ | ||||
static const int topbar = 1; /* 0 means bottom bar */ | static const int topbar = 1; /* 0 means bottom bar */ | ||||
static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | static const char *fonts[] = { "monospace:size=13", "fontawesome:size=15"}; | ||||
@@ -37,6 +38,11 @@ static const Rule rules[] = { | |||||
/* class instance title tags mask iscentered isfloating monitor */ | /* class instance title tags mask iscentered isfloating monitor */ | ||||
{ "Gimp", NULL, NULL, 0, 0, 1, -1 }, | { "Gimp", NULL, NULL, 0, 0, 1, -1 }, | ||||
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 }, | ||||
/* class instance title tags mask iscentered isfloating isterminal noswallow monitor */ | |||||
{ "Gimp", NULL, NULL, 0,0, 1, 0, 0, -1 }, | |||||
{ "Firefox", NULL, NULL, 1 << 8,0, 0, 0, -1, -1 }, | |||||
{ "St", NULL, NULL, 0,0, 0, 1, 0, -1 }, | |||||
{ NULL, NULL, "Event Tester", 0,0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | }; | ||||
/* layout(s) */ | /* layout(s) */ | ||||
@@ -85,10 +91,10 @@ static Key keys[] = { | |||||
{ 0, XF86XK_AudioForward, spawn, SHCMD("cmus-remote --seek +10") }, | { 0, XF86XK_AudioForward, spawn, SHCMD("cmus-remote --seek +10") }, | ||||
{ MODKEY|ShiftMask, XK_space, togglealwaysontop, {0} }, | { MODKEY|ShiftMask, XK_space, togglealwaysontop, {0} }, | ||||
{ MODKEY, XK_w, spawn, SHCMD("firefox") }, | { MODKEY, XK_w, spawn, SHCMD("firefox") }, | ||||
{ MODKEY|ShiftMask, XK_l, spawn, SHCMD("xsecurelock") }, | |||||
{ MODKEY|ShiftMask, XK_l, spawn, SHCMD("slock") }, | |||||
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("st ~/scripts/autostart.sh") }, | { MODKEY|ShiftMask, XK_m, spawn, SHCMD("st ~/scripts/autostart.sh") }, | ||||
{ MODKEY|ShiftMask, XK_j, spawn, SHCMD("joplin-desktop") }, | { MODKEY|ShiftMask, XK_j, spawn, SHCMD("joplin-desktop") }, | ||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("spectacle -r") }, | |||||
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("~/scripts/screenshot.sh 1") }, | |||||
{ MODKEY|ShiftMask, XK_n, spawn, SHCMD("connman-gtk") }, | { MODKEY|ShiftMask, XK_n, spawn, SHCMD("connman-gtk") }, | ||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, | { MODKEY, XK_p, spawn, {.v = dmenucmd } }, | ||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, | ||||
@@ -19,10 +19,11 @@ FREETYPELIBS = -lfontconfig -lXft | |||||
FREETYPEINC = /usr/include/freetype2 | FREETYPEINC = /usr/include/freetype2 | ||||
# OpenBSD (uncomment) | # OpenBSD (uncomment) | ||||
#FREETYPEINC = ${X11INC}/freetype2 | #FREETYPEINC = ${X11INC}/freetype2 | ||||
#KVMLIB = -lkvm | |||||
# includes and libs | # includes and libs | ||||
INCS = -I${X11INC} -I${FREETYPEINC} | INCS = -I${X11INC} -I${FREETYPEINC} | ||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} | |||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB} | |||||
# flags | # flags | ||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} | CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} | ||||
@@ -0,0 +1,38 @@ | |||||
# dwm version | |||||
VERSION = 6.2 | |||||
# Customize below to fit your system | |||||
# paths | |||||
PREFIX = /usr/local | |||||
MANPREFIX = ${PREFIX}/share/man | |||||
X11INC = /usr/X11R6/include | |||||
X11LIB = /usr/X11R6/lib | |||||
# Xinerama, comment if you don't want it | |||||
XINERAMALIBS = -lXinerama | |||||
XINERAMAFLAGS = -DXINERAMA | |||||
# freetype | |||||
FREETYPELIBS = -lfontconfig -lXft | |||||
FREETYPEINC = /usr/include/freetype2 | |||||
# OpenBSD (uncomment) | |||||
#FREETYPEINC = ${X11INC}/freetype2 | |||||
# includes and libs | |||||
INCS = -I${X11INC} -I${FREETYPEINC} | |||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} | |||||
# flags | |||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} | |||||
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} | |||||
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} | |||||
LDFLAGS = ${LIBS} | |||||
# Solaris | |||||
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" | |||||
#LDFLAGS = ${LIBS} | |||||
# compiler and linker | |||||
CC = cc |
@@ -0,0 +1,412 @@ | |||||
From b2de9b0fd7988241db516a8f032f26cb9cf32be1 Mon Sep 17 00:00:00 2001 | |||||
From: Ben <ben@0x1bi.net> | |||||
Date: Fri, 7 Aug 2020 20:14:29 -0400 | |||||
Subject: [PATCH] added openbsd support for swallowing | |||||
--- | |||||
config.def.h | 9 +- | |||||
config.mk | 3 +- | |||||
dwm.c | 235 +++++++++++++++++++++++++++++++++++++++++++++++++-- | |||||
3 files changed, 237 insertions(+), 10 deletions(-) | |||||
diff --git a/config.def.h b/config.def.h | |||||
index 1c0b587..fe51476 100644 | |||||
--- a/config.def.h | |||||
+++ b/config.def.h | |||||
@@ -3,6 +3,7 @@ | |||||
/* appearance */ | |||||
static const unsigned int borderpx = 1; /* border pixel of windows */ | |||||
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 *fonts[] = { "monospace:size=10" }; | |||||
@@ -26,9 +27,11 @@ static const Rule rules[] = { | |||||
* WM_CLASS(STRING) = instance, class | |||||
* WM_NAME(STRING) = title | |||||
*/ | |||||
- /* class instance title tags mask isfloating monitor */ | |||||
- { "Gimp", NULL, NULL, 0, 1, -1 }, | |||||
- { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, | |||||
+ /* class instance title tags mask isfloating isterminal noswallow monitor */ | |||||
+ { "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, | |||||
+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1, -1 }, | |||||
+ { "St", NULL, NULL, 0, 0, 1, 0, -1 }, | |||||
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, /* xev */ | |||||
}; | |||||
/* layout(s) */ | |||||
diff --git a/config.mk b/config.mk | |||||
index 7084c33..ff9e508 100644 | |||||
--- a/config.mk | |||||
+++ b/config.mk | |||||
@@ -19,10 +19,11 @@ FREETYPELIBS = -lfontconfig -lXft | |||||
FREETYPEINC = /usr/include/freetype2 | |||||
# OpenBSD (uncomment) | |||||
#FREETYPEINC = ${X11INC}/freetype2 | |||||
+#KVMLIB = -lkvm | |||||
# includes and libs | |||||
INCS = -I${X11INC} -I${FREETYPEINC} | |||||
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} | |||||
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res ${KVMLIB} | |||||
# flags | |||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} | |||||
diff --git a/dwm.c b/dwm.c | |||||
index 9fd0286..e9f08f7 100644 | |||||
--- a/dwm.c | |||||
+++ b/dwm.c | |||||
@@ -40,6 +40,12 @@ | |||||
#include <X11/extensions/Xinerama.h> | |||||
#endif /* XINERAMA */ | |||||
#include <X11/Xft/Xft.h> | |||||
+#include <X11/Xlib-xcb.h> | |||||
+#include <xcb/res.h> | |||||
+#ifdef __OpenBSD__ | |||||
+#include <sys/sysctl.h> | |||||
+#include <kvm.h> | |||||
+#endif /* __OpenBSD */ | |||||
#include "drw.h" | |||||
#include "util.h" | |||||
@@ -92,9 +98,11 @@ struct Client { | |||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | |||||
int bw, oldbw; | |||||
unsigned int tags; | |||||
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; | |||||
+ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; | |||||
+ pid_t pid; | |||||
Client *next; | |||||
Client *snext; | |||||
+ Client *swallowing; | |||||
Monitor *mon; | |||||
Window win; | |||||
}; | |||||
@@ -138,6 +146,8 @@ typedef struct { | |||||
const char *title; | |||||
unsigned int tags; | |||||
int isfloating; | |||||
+ int isterminal; | |||||
+ int noswallow; | |||||
int monitor; | |||||
} Rule; | |||||
@@ -235,6 +245,12 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee); | |||||
static int xerrorstart(Display *dpy, XErrorEvent *ee); | |||||
static void zoom(const Arg *arg); | |||||
+static pid_t getparentprocess(pid_t p); | |||||
+static int isdescprocess(pid_t p, pid_t c); | |||||
+static Client *swallowingclient(Window w); | |||||
+static Client *termforwin(const Client *c); | |||||
+static pid_t winpid(Window w); | |||||
+ | |||||
/* variables */ | |||||
static const char broken[] = "broken"; | |||||
static char stext[256]; | |||||
@@ -269,6 +285,8 @@ static Drw *drw; | |||||
static Monitor *mons, *selmon; | |||||
static Window root, wmcheckwin; | |||||
+static xcb_connection_t *xcon; | |||||
+ | |||||
/* configuration, allows nested code to access above variables */ | |||||
#include "config.h" | |||||
@@ -298,6 +316,8 @@ applyrules(Client *c) | |||||
&& (!r->class || strstr(class, r->class)) | |||||
&& (!r->instance || strstr(instance, r->instance))) | |||||
{ | |||||
+ c->isterminal = r->isterminal; | |||||
+ c->noswallow = r->noswallow; | |||||
c->isfloating = r->isfloating; | |||||
c->tags |= r->tags; | |||||
for (m = mons; m && m->num != r->monitor; m = m->next); | |||||
@@ -414,6 +434,53 @@ attachstack(Client *c) | |||||
c->mon->stack = c; | |||||
} | |||||
+void | |||||
+swallow(Client *p, Client *c) | |||||
+{ | |||||
+ | |||||
+ if (c->noswallow || c->isterminal) | |||||
+ return; | |||||
+ if (c->noswallow && !swallowfloating && c->isfloating) | |||||
+ return; | |||||
+ | |||||
+ detach(c); | |||||
+ detachstack(c); | |||||
+ | |||||
+ setclientstate(c, WithdrawnState); | |||||
+ XUnmapWindow(dpy, p->win); | |||||
+ | |||||
+ p->swallowing = c; | |||||
+ c->mon = p->mon; | |||||
+ | |||||
+ Window w = p->win; | |||||
+ p->win = c->win; | |||||
+ c->win = w; | |||||
+ updatetitle(p); | |||||
+ XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h); | |||||
+ arrange(p->mon); | |||||
+ configure(p); | |||||
+ updateclientlist(); | |||||
+} | |||||
+ | |||||
+void | |||||
+unswallow(Client *c) | |||||
+{ | |||||
+ c->win = c->swallowing->win; | |||||
+ | |||||
+ free(c->swallowing); | |||||
+ c->swallowing = NULL; | |||||
+ | |||||
+ /* unfullscreen the client */ | |||||
+ setfullscreen(c, 0); | |||||
+ updatetitle(c); | |||||
+ arrange(c->mon); | |||||
+ XMapWindow(dpy, c->win); | |||||
+ XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); | |||||
+ setclientstate(c, NormalState); | |||||
+ focus(NULL); | |||||
+ arrange(c->mon); | |||||
+} | |||||
+ | |||||
void | |||||
buttonpress(XEvent *e) | |||||
{ | |||||
@@ -653,6 +720,9 @@ destroynotify(XEvent *e) | |||||
if ((c = wintoclient(ev->window))) | |||||
unmanage(c, 1); | |||||
+ | |||||
+ else if ((c = swallowingclient(ev->window))) | |||||
+ unmanage(c->swallowing, 1); | |||||
} | |||||
void | |||||
@@ -1018,12 +1088,13 @@ killclient(const Arg *arg) | |||||
void | |||||
manage(Window w, XWindowAttributes *wa) | |||||
{ | |||||
- Client *c, *t = NULL; | |||||
+ Client *c, *t = NULL, *term = NULL; | |||||
Window trans = None; | |||||
XWindowChanges wc; | |||||
c = ecalloc(1, sizeof(Client)); | |||||
c->win = w; | |||||
+ c->pid = winpid(w); | |||||
/* geometry */ | |||||
c->x = c->oldx = wa->x; | |||||
c->y = c->oldy = wa->y; | |||||
@@ -1038,6 +1109,7 @@ manage(Window w, XWindowAttributes *wa) | |||||
} else { | |||||
c->mon = selmon; | |||||
applyrules(c); | |||||
+ term = termforwin(c); | |||||
} | |||||
if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw) | |||||
@@ -1074,6 +1146,8 @@ manage(Window w, XWindowAttributes *wa) | |||||
c->mon->sel = c; | |||||
arrange(c->mon); | |||||
XMapWindow(dpy, c->win); | |||||
+ if (term) | |||||
+ swallow(term, c); | |||||
focus(NULL); | |||||
} | |||||
@@ -1768,6 +1842,20 @@ unmanage(Client *c, int destroyed) | |||||
Monitor *m = c->mon; | |||||
XWindowChanges wc; | |||||
+ if (c->swallowing) { | |||||
+ unswallow(c); | |||||
+ return; | |||||
+ } | |||||
+ | |||||
+ Client *s = swallowingclient(c->win); | |||||
+ if (s) { | |||||
+ free(s->swallowing); | |||||
+ s->swallowing = NULL; | |||||
+ arrange(m); | |||||
+ focus(NULL); | |||||
+ return; | |||||
+ } | |||||
+ | |||||
detach(c); | |||||
detachstack(c); | |||||
if (!destroyed) { | |||||
@@ -1782,9 +1870,12 @@ unmanage(Client *c, int destroyed) | |||||
XUngrabServer(dpy); | |||||
} | |||||
free(c); | |||||
- focus(NULL); | |||||
- updateclientlist(); | |||||
- arrange(m); | |||||
+ | |||||
+ if (!s) { | |||||
+ arrange(m); | |||||
+ focus(NULL); | |||||
+ updateclientlist(); | |||||
+ } | |||||
} | |||||
void | |||||
@@ -2047,6 +2138,136 @@ view(const Arg *arg) | |||||
arrange(selmon); | |||||
} | |||||
+pid_t | |||||
+winpid(Window w) | |||||
+{ | |||||
+ | |||||
+ pid_t result = 0; | |||||
+ | |||||
+ #ifdef __linux__ | |||||
+ xcb_res_client_id_spec_t spec = {0}; | |||||
+ spec.client = w; | |||||
+ spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID; | |||||
+ | |||||
+ xcb_generic_error_t *e = NULL; | |||||
+ xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec); | |||||
+ xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e); | |||||
+ | |||||
+ if (!r) | |||||
+ return (pid_t)0; | |||||
+ | |||||
+ xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r); | |||||
+ for (; i.rem; xcb_res_client_id_value_next(&i)) { | |||||
+ spec = i.data->spec; | |||||
+ if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) { | |||||
+ uint32_t *t = xcb_res_client_id_value_value(i.data); | |||||
+ result = *t; | |||||
+ break; | |||||
+ } | |||||
+ } | |||||
+ | |||||
+ free(r); | |||||
+ | |||||
+ if (result == (pid_t)-1) | |||||
+ result = 0; | |||||
+ | |||||
+ #endif /* __linux__ */ | |||||
+ | |||||
+ #ifdef __OpenBSD__ | |||||
+ Atom type; | |||||
+ int format; | |||||
+ unsigned long len, bytes; | |||||
+ unsigned char *prop; | |||||
+ pid_t ret; | |||||
+ | |||||
+ if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 1), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop) | |||||
+ return 0; | |||||
+ | |||||
+ ret = *(pid_t*)prop; | |||||
+ XFree(prop); | |||||
+ result = ret; | |||||
+ | |||||
+ #endif /* __OpenBSD__ */ | |||||
+ return result; | |||||
+} | |||||
+ | |||||
+pid_t | |||||
+getparentprocess(pid_t p) | |||||
+{ | |||||
+ unsigned int v = 0; | |||||
+ | |||||
+#ifdef __linux__ | |||||
+ FILE *f; | |||||
+ char buf[256]; | |||||
+ snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p); | |||||
+ | |||||
+ if (!(f = fopen(buf, "r"))) | |||||
+ return 0; | |||||
+ | |||||
+ fscanf(f, "%*u %*s %*c %u", &v); | |||||
+ fclose(f); | |||||
+#endif /* __linux__*/ | |||||
+ | |||||
+#ifdef __OpenBSD__ | |||||
+ int n; | |||||
+ kvm_t *kd; | |||||
+ struct kinfo_proc *kp; | |||||
+ | |||||
+ kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL); | |||||
+ if (!kd) | |||||
+ return 0; | |||||
+ | |||||
+ kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n); | |||||
+ v = kp->p_ppid; | |||||
+#endif /* __OpenBSD__ */ | |||||
+ | |||||
+ return (pid_t)v; | |||||
+} | |||||
+ | |||||
+int | |||||
+isdescprocess(pid_t p, pid_t c) | |||||
+{ | |||||
+ while (p != c && c != 0) | |||||
+ c = getparentprocess(c); | |||||
+ | |||||
+ return (int)c; | |||||
+} | |||||
+ | |||||
+Client * | |||||
+termforwin(const Client *w) | |||||
+{ | |||||
+ Client *c; | |||||
+ Monitor *m; | |||||
+ | |||||
+ if (!w->pid || w->isterminal) | |||||
+ return NULL; | |||||
+ | |||||
+ for (m = mons; m; m = m->next) { | |||||
+ for (c = m->clients; c; c = c->next) { | |||||
+ if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid)) | |||||
+ return c; | |||||
+ } | |||||
+ } | |||||
+ | |||||
+ return NULL; | |||||
+} | |||||
+ | |||||
+Client * | |||||
+swallowingclient(Window w) | |||||
+{ | |||||
+ Client *c; | |||||
+ Monitor *m; | |||||
+ | |||||
+ for (m = mons; m; m = m->next) { | |||||
+ for (c = m->clients; c; c = c->next) { | |||||
+ if (c->swallowing && c->swallowing->win == w) | |||||
+ return c; | |||||
+ } | |||||
+ } | |||||
+ | |||||
+ return NULL; | |||||
+} | |||||
+ | |||||
Client * | |||||
wintoclient(Window w) | |||||
{ | |||||
@@ -2138,10 +2359,12 @@ main(int argc, char *argv[]) | |||||
fputs("warning: no locale support\n", stderr); | |||||
if (!(dpy = XOpenDisplay(NULL))) | |||||
die("dwm: cannot open display"); | |||||
+ if (!(xcon = XGetXCBConnection(dpy))) | |||||
+ die("dwm: cannot get xcb connection\n"); | |||||
checkotherwm(); | |||||
setup(); | |||||
#ifdef __OpenBSD__ | |||||
- if (pledge("stdio rpath proc exec", NULL) == -1) | |||||
+ if (pledge("stdio rpath proc exec ps", NULL) == -1) | |||||
die("pledge"); | |||||
#endif /* __OpenBSD__ */ | |||||
scan(); | |||||
-- | |||||
2.26.2 | |||||
@@ -40,6 +40,12 @@ | |||||
#include <X11/extensions/Xinerama.h> | #include <X11/extensions/Xinerama.h> | ||||
#endif /* XINERAMA */ | #endif /* XINERAMA */ | ||||
#include <X11/Xft/Xft.h> | #include <X11/Xft/Xft.h> | ||||
#include <X11/Xlib-xcb.h> | |||||
#include <xcb/res.h> | |||||
#ifdef __OpenBSD__ | |||||
#include <sys/sysctl.h> | |||||
#include <kvm.h> | |||||
#endif /* __OpenBSD */ | |||||
#include "drw.h" | #include "drw.h" | ||||
#include "util.h" | #include "util.h" | ||||
@@ -92,9 +98,11 @@ struct Client { | |||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | int basew, baseh, incw, inch, maxw, maxh, minw, minh; | ||||
int bw, oldbw; | int bw, oldbw; | ||||
unsigned int tags; | unsigned int tags; | ||||
int isfixed, iscentered, isfloating, isalwaysontop, isurgent, neverfocus, oldstate, isfullscreen; | |||||
int isfixed, iscentered, isfloating, isalwaysontop, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; | |||||
pid_t pid; | |||||
Client *next; | Client *next; | ||||
Client *snext; | Client *snext; | ||||
Client *swallowing; | |||||
Monitor *mon; | Monitor *mon; | ||||
Window win; | Window win; | ||||
}; | }; | ||||
@@ -140,6 +148,8 @@ typedef struct { | |||||
unsigned int tags; | unsigned int tags; | ||||
int iscentered; | int iscentered; | ||||
int isfloating; | int isfloating; | ||||
int isterminal; | |||||
int noswallow; | |||||
int monitor; | int monitor; | ||||
} Rule; | } Rule; | ||||
@@ -239,6 +249,12 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee); | |||||
static void zoom(const Arg *arg); | static void zoom(const Arg *arg); | ||||
static void autostart_exec(void); | static void autostart_exec(void); | ||||
static pid_t getparentprocess(pid_t p); | |||||
static int isdescprocess(pid_t p, pid_t c); | |||||
static Client *swallowingclient(Window w); | |||||
static Client *termforwin(const Client *c); | |||||
static pid_t winpid(Window w); | |||||
/* variables */ | /* variables */ | ||||
static const char broken[] = "broken"; | static const char broken[] = "broken"; | ||||
static char stext[256]; | static char stext[256]; | ||||
@@ -273,6 +289,8 @@ static Drw *drw; | |||||
static Monitor *mons, *selmon; | static Monitor *mons, *selmon; | ||||
static Window root, wmcheckwin; | static Window root, wmcheckwin; | ||||
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" | ||||
@@ -331,6 +349,8 @@ applyrules(Client *c) | |||||
&& (!r->class || strstr(class, r->class)) | && (!r->class || strstr(class, r->class)) | ||||
&& (!r->instance || strstr(instance, r->instance))) | && (!r->instance || strstr(instance, r->instance))) | ||||
{ | { | ||||
c->isterminal = r->isterminal; | |||||
c->noswallow = r->noswallow; | |||||
c->iscentered = r->iscentered; | c->iscentered = r->iscentered; | ||||
c->isfloating = r->isfloating; | c->isfloating = r->isfloating; | ||||
c->tags |= r->tags; | c->tags |= r->tags; | ||||
@@ -448,6 +468,53 @@ attachstack(Client *c) | |||||
c->mon->stack = c; | c->mon->stack = c; | ||||
} | } | ||||
void | |||||
swallow(Client *p, Client *c) | |||||
{ | |||||
if (c->noswallow || c->isterminal) | |||||
return; | |||||
if (c->noswallow && !swallowfloating && c->isfloating) | |||||
return; | |||||
detach(c); | |||||
detachstack(c); | |||||
setclientstate(c, WithdrawnState); | |||||
XUnmapWindow(dpy, p->win); | |||||
p->swallowing = c; | |||||
c->mon = p->mon; | |||||
Window w = p->win; | |||||
p->win = c->win; | |||||
c->win = w; | |||||
updatetitle(p); | |||||
XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h); | |||||
arrange(p->mon); | |||||
configure(p); | |||||
updateclientlist(); | |||||
} | |||||
void | |||||
unswallow(Client *c) | |||||
{ | |||||
c->win = c->swallowing->win; | |||||
free(c->swallowing); | |||||
c->swallowing = NULL; | |||||
/* unfullscreen the client */ | |||||
setfullscreen(c, 0); | |||||
updatetitle(c); | |||||
arrange(c->mon); | |||||
XMapWindow(dpy, c->win); | |||||
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); | |||||
setclientstate(c, NormalState); | |||||
focus(NULL); | |||||
arrange(c->mon); | |||||
} | |||||
void | void | ||||
buttonpress(XEvent *e) | buttonpress(XEvent *e) | ||||
{ | { | ||||
@@ -688,6 +755,9 @@ destroynotify(XEvent *e) | |||||
if ((c = wintoclient(ev->window))) | if ((c = wintoclient(ev->window))) | ||||
unmanage(c, 1); | unmanage(c, 1); | ||||
else if ((c = swallowingclient(ev->window))) | |||||
unmanage(c->swallowing, 1); | |||||
} | } | ||||
void | void | ||||
@@ -1056,12 +1126,13 @@ killclient(const Arg *arg) | |||||
void | void | ||||
manage(Window w, XWindowAttributes *wa) | manage(Window w, XWindowAttributes *wa) | ||||
{ | { | ||||
Client *c, *t = NULL; | |||||
Client *c, *t = NULL, *term = NULL; | |||||
Window trans = None; | Window trans = None; | ||||
XWindowChanges wc; | XWindowChanges wc; | ||||
c = ecalloc(1, sizeof(Client)); | c = ecalloc(1, sizeof(Client)); | ||||
c->win = w; | c->win = w; | ||||
c->pid = winpid(w); | |||||
/* geometry */ | /* geometry */ | ||||
c->x = c->oldx = wa->x; | c->x = c->oldx = wa->x; | ||||
c->y = c->oldy = wa->y; | c->y = c->oldy = wa->y; | ||||
@@ -1076,6 +1147,7 @@ manage(Window w, XWindowAttributes *wa) | |||||
} else { | } else { | ||||
c->mon = selmon; | c->mon = selmon; | ||||
applyrules(c); | applyrules(c); | ||||
term = termforwin(c); | |||||
} | } | ||||
if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw) | if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw) | ||||
@@ -1116,6 +1188,8 @@ manage(Window w, XWindowAttributes *wa) | |||||
c->mon->sel = c; | c->mon->sel = c; | ||||
arrange(c->mon); | arrange(c->mon); | ||||
XMapWindow(dpy, c->win); | XMapWindow(dpy, c->win); | ||||
if (term) | |||||
swallow(term, c); | |||||
focus(NULL); | focus(NULL); | ||||
} | } | ||||
@@ -1881,6 +1955,20 @@ unmanage(Client *c, int destroyed) | |||||
Monitor *m = c->mon; | Monitor *m = c->mon; | ||||
XWindowChanges wc; | XWindowChanges wc; | ||||
if (c->swallowing) { | |||||
unswallow(c); | |||||
return; | |||||
} | |||||
Client *s = swallowingclient(c->win); | |||||
if (s) { | |||||
free(s->swallowing); | |||||
s->swallowing = NULL; | |||||
arrange(m); | |||||
focus(NULL); | |||||
return; | |||||
} | |||||
detach(c); | detach(c); | ||||
detachstack(c); | detachstack(c); | ||||
if (!destroyed) { | if (!destroyed) { | ||||
@@ -1895,9 +1983,12 @@ unmanage(Client *c, int destroyed) | |||||
XUngrabServer(dpy); | XUngrabServer(dpy); | ||||
} | } | ||||
free(c); | free(c); | ||||
focus(NULL); | |||||
updateclientlist(); | |||||
arrange(m); | |||||
if (!s) { | |||||
arrange(m); | |||||
focus(NULL); | |||||
updateclientlist(); | |||||
} | |||||
} | } | ||||
void | void | ||||
@@ -2162,6 +2253,136 @@ view(const Arg *arg) | |||||
arrange(selmon); | arrange(selmon); | ||||
} | } | ||||
pid_t | |||||
winpid(Window w) | |||||
{ | |||||
pid_t result = 0; | |||||
#ifdef __linux__ | |||||
xcb_res_client_id_spec_t spec = {0}; | |||||
spec.client = w; | |||||
spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID; | |||||
xcb_generic_error_t *e = NULL; | |||||
xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec); | |||||
xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e); | |||||
if (!r) | |||||
return (pid_t)0; | |||||
xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r); | |||||
for (; i.rem; xcb_res_client_id_value_next(&i)) { | |||||
spec = i.data->spec; | |||||
if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) { | |||||
uint32_t *t = xcb_res_client_id_value_value(i.data); | |||||
result = *t; | |||||
break; | |||||
} | |||||
} | |||||
free(r); | |||||
if (result == (pid_t)-1) | |||||
result = 0; | |||||
#endif /* __linux__ */ | |||||
#ifdef __OpenBSD__ | |||||
Atom type; | |||||
int format; | |||||
unsigned long len, bytes; | |||||
unsigned char *prop; | |||||
pid_t ret; | |||||
if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 1), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop) | |||||
return 0; | |||||
ret = *(pid_t*)prop; | |||||
XFree(prop); | |||||
result = ret; | |||||
#endif /* __OpenBSD__ */ | |||||
return result; | |||||
} | |||||
pid_t | |||||
getparentprocess(pid_t p) | |||||
{ | |||||
unsigned int v = 0; | |||||
#ifdef __linux__ | |||||
FILE *f; | |||||
char buf[256]; | |||||
snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p); | |||||
if (!(f = fopen(buf, "r"))) | |||||
return 0; | |||||
fscanf(f, "%*u %*s %*c %u", &v); | |||||
fclose(f); | |||||
#endif /* __linux__*/ | |||||
#ifdef __OpenBSD__ | |||||
int n; | |||||
kvm_t *kd; | |||||
struct kinfo_proc *kp; | |||||
kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL); | |||||
if (!kd) | |||||
return 0; | |||||
kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n); | |||||
v = kp->p_ppid; | |||||
#endif /* __OpenBSD__ */ | |||||
return (pid_t)v; | |||||
} | |||||
int | |||||
isdescprocess(pid_t p, pid_t c) | |||||
{ | |||||
while (p != c && c != 0) | |||||
c = getparentprocess(c); | |||||
return (int)c; | |||||
} | |||||
Client * | |||||
termforwin(const Client *w) | |||||
{ | |||||
Client *c; | |||||
Monitor *m; | |||||
if (!w->pid || w->isterminal) | |||||
return NULL; | |||||
for (m = mons; m; m = m->next) { | |||||
for (c = m->clients; c; c = c->next) { | |||||
if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid)) | |||||
return c; | |||||
} | |||||
} | |||||
return NULL; | |||||
} | |||||
Client * | |||||
swallowingclient(Window w) | |||||
{ | |||||
Client *c; | |||||
Monitor *m; | |||||
for (m = mons; m; m = m->next) { | |||||
for (c = m->clients; c; c = c->next) { | |||||
if (c->swallowing && c->swallowing->win == w) | |||||
return c; | |||||
} | |||||
} | |||||
return NULL; | |||||
} | |||||
Client * | Client * | ||||
wintoclient(Window w) | wintoclient(Window w) | ||||
{ | { | ||||
@@ -2253,11 +2474,13 @@ main(int argc, char *argv[]) | |||||
fputs("warning: no locale support\n", stderr); | fputs("warning: no locale support\n", stderr); | ||||
if (!(dpy = XOpenDisplay(NULL))) | if (!(dpy = XOpenDisplay(NULL))) | ||||
die("dwm: cannot open display"); | die("dwm: cannot open display"); | ||||
if (!(xcon = XGetXCBConnection(dpy))) | |||||
die("dwm: cannot get xcb connection\n"); | |||||
checkotherwm(); | checkotherwm(); | ||||
autostart_exec(); | autostart_exec(); | ||||
setup(); | setup(); | ||||
#ifdef __OpenBSD__ | #ifdef __OpenBSD__ | ||||
if (pledge("stdio rpath proc exec", NULL) == -1) | |||||
if (pledge("stdio rpath proc exec ps", NULL) == -1) | |||||
die("pledge"); | die("pledge"); | ||||
#endif /* __OpenBSD__ */ | #endif /* __OpenBSD__ */ | ||||
scan(); | scan(); | ||||
@@ -92,7 +92,7 @@ struct Client { | |||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | int basew, baseh, incw, inch, maxw, maxh, minw, minh; | ||||
int bw, oldbw; | int bw, oldbw; | ||||
unsigned int tags; | unsigned int tags; | ||||
int isfixed, iscentered, isfloating, isurgent, neverfocus, oldstate, isfullscreen; | |||||
int isfixed, iscentered, isfloating, isalwaysontop, isurgent, neverfocus, oldstate, isfullscreen; | |||||
Client *next; | Client *next; | ||||
Client *snext; | Client *snext; | ||||
Monitor *mon; | Monitor *mon; | ||||
@@ -214,6 +214,7 @@ static void tagmon(const Arg *arg); | |||||
static void tile(Monitor *); | static void tile(Monitor *); | ||||
static void togglebar(const Arg *arg); | static void togglebar(const Arg *arg); | ||||
static void togglefloating(const Arg *arg); | static void togglefloating(const Arg *arg); | ||||
static void togglealwaysontop(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); | ||||
@@ -767,8 +768,11 @@ drawbar(Monitor *m) | |||||
if (m->sel) { | if (m->sel) { | ||||
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); | drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); | ||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); | drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); | ||||
if (m->sel->isfloating) | |||||
if (m->sel->isfloating) { | |||||
drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); | drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); | ||||
if (m->sel->isalwaysontop) | |||||
drw_rect(drw, x + boxs, bh - boxw, boxw, boxw, 0, 0); | |||||
} | |||||
} else { | } 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); | ||||
@@ -1405,6 +1409,17 @@ restack(Monitor *m) | |||||
return; | return; | ||||
if (m->sel->isfloating || !m->lt[m->sellt]->arrange) | if (m->sel->isfloating || !m->lt[m->sellt]->arrange) | ||||
XRaiseWindow(dpy, m->sel->win); | XRaiseWindow(dpy, m->sel->win); | ||||
/* raise the aot window */ | |||||
for(Monitor *m_search = mons; m_search; m_search = m_search->next){ | |||||
for(c = m_search->clients; c; c = c->next){ | |||||
if(c->isalwaysontop){ | |||||
XRaiseWindow(dpy, c->win); | |||||
break; | |||||
} | |||||
} | |||||
} | |||||
if (m->lt[m->sellt]->arrange) { | if (m->lt[m->sellt]->arrange) { | ||||
wc.stack_mode = Below; | wc.stack_mode = Below; | ||||
wc.sibling = m->barwin; | wc.sibling = m->barwin; | ||||
@@ -1791,6 +1806,32 @@ togglefloating(const Arg *arg) | |||||
if (selmon->sel->isfloating) | if (selmon->sel->isfloating) | ||||
resize(selmon->sel, selmon->sel->x, selmon->sel->y, | resize(selmon->sel, selmon->sel->x, selmon->sel->y, | ||||
selmon->sel->w, selmon->sel->h, 0); | selmon->sel->w, selmon->sel->h, 0); | ||||
else | |||||
selmon->sel->isalwaysontop = 0; /* disabled, turn this off too */ | |||||
arrange(selmon); | |||||
} | |||||
void | |||||
togglealwaysontop(const Arg *arg) | |||||
{ | |||||
if (!selmon->sel) | |||||
return; | |||||
if (selmon->sel->isfullscreen) | |||||
return; | |||||
if(selmon->sel->isalwaysontop){ | |||||
selmon->sel->isalwaysontop = 0; | |||||
}else{ | |||||
/* disable others */ | |||||
for(Monitor *m = mons; m; m = m->next) | |||||
for(Client *c = m->clients; c; c = c->next) | |||||
c->isalwaysontop = 0; | |||||
/* turn on, make it float too */ | |||||
selmon->sel->isfloating = 1; | |||||
selmon->sel->isalwaysontop = 1; | |||||
} | |||||
arrange(selmon); | arrange(selmon); | ||||
} | } | ||||
@@ -0,0 +1,38 @@ | |||||
--- dwm.c | |||||
+++ dwm.c | |||||
@@ -98,9 +104,11 @@ struct Client { | |||||
int basew, baseh, incw, inch, maxw, maxh, minw, minh; | |||||
int bw, oldbw; | |||||
unsigned int tags; | |||||
- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; | |||||
+ int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; | |||||
+ pid_t pid; | |||||
Client *next; | |||||
Client *snext; | |||||
+ Client *swallowing; | |||||
Monitor *mon; | |||||
Window win; | |||||
}; | |||||
@@ -314,6 +332,8 @@ applyrules(Client *c) | |||||
&& (!r->class || strstr(class, r->class)) | |||||
&& (!r->instance || strstr(instance, r->instance))) | |||||
{ | |||||
+ c->isterminal = r->isterminal; | |||||
+ c->noswallow = r->noswallow; | |||||
c->isfloating = r->isfloating; | |||||
c->tags |= r->tags; | |||||
for (m = mons; m && m->num != r->monitor; m = m->next); | |||||
@@ -2355,10 +2576,12 @@ main(int argc, char *argv[]) | |||||
fputs("warning: no locale support\n", stderr); | |||||
if (!(dpy = XOpenDisplay(NULL))) | |||||
die("dwm: cannot open display"); | |||||
+ if (!(xcon = XGetXCBConnection(dpy))) | |||||
+ die("dwm: cannot get xcb connection\n"); | |||||
checkotherwm(); | |||||
setup(); | |||||
#ifdef __OpenBSD__ | |||||
- if (pledge("stdio rpath proc exec", NULL) == -1) | |||||
+ if (pledge("stdio rpath proc exec ps", NULL) == -1) | |||||
die("pledge"); | |||||
#endif /* __OpenBSD__ */ | |||||
scan(); |