From f0f5201e13b5fca00307c2716cf735da376d42e9 Mon Sep 17 00:00:00 2001 From: ProsperousPotato Date: Sun, 11 Aug 2024 12:18:01 +0000 Subject: Add files via upload --- config.def.h | 99 +++++++++++++----------- config.h | 99 +++++++++++++----------- dwm.c | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 343 insertions(+), 102 deletions(-) diff --git a/config.def.h b/config.def.h index c8635bc..0ee1625 100644 --- a/config.def.h +++ b/config.def.h @@ -2,22 +2,22 @@ /* See LICENSE file for copyright and license details. */ /* Constants */ -#define TERMINAL "st" +#define TERMINAL "urxvtc" #define BROWSER "librewolf-bin" -#define FILE_EXPLORER "dolphin" /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ +static const unsigned int snap = 16; /* 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[] = { "inconsolata-mono-nerd:size=12" }; -static const char dmenufont[] = "inconsolata-mono-nerd:size=12"; -static const char col_gray1[] = "#000000"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#000000"; -static const char col_cyan[] = "#bbbbbb"; +static const char *fonts[] = { "cozette:size=12:autohint=true" }; +static const char dmenufont[] = "cozette:size=12:autohint=true"; +static const char col_gray1[] = "#000000"; // Colour of the background of the bar +static const char col_gray2[] = "#444444"; // Colour of the border of the inactive window +static const char col_gray3[] = "#bbbbbb"; // Colour of the foreground of the bar +static const char col_gray4[] = "#000000"; // Colour of the wallpaper by default +static const char col_cyan[] = "#bbbbbb"; // Colour of the border of the active window static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, @@ -25,22 +25,27 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; // These are what is visually displayed in the bar, you can change them to whatever. static const Rule rules[] = { /* xprop(1): * 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 */ + { NULL, "steamwebhelper", NULL, 0, 1, 0, 0, -1 }, + { "qBittorrent", NULL, NULL, 0, 1, 0, -1, -1 }, + { "St", NULL, NULL, 0, 0, 1, 0, -1 }, + { "URxvt", NULL, NULL, 0, 1, 1, 0, -1 }, + { "Nsxiv", NULL, NULL, 0, 1, 0, 0, -1 }, + { "mpv", NULL, NULL, 0, 1, 0, 0, -1 }, + { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, }; /* layout(s) */ static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const Layout layouts[] = { @@ -55,7 +60,7 @@ static const Layout layouts[] = { #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ @@ -76,7 +81,6 @@ static const char *fasterbrightnessup[] = { "xbacklight", "-inc", "10", NULL }; static const char *fasterbrightnessdown[] = { "xbacklight", "-dec", "10", NULL }; static const char *slock[] = { "slock", NULL }; static const char *browser[] = { BROWSER, NULL }; -static const char *files[] = { FILE_EXPLORER, NULL }; static const char *steam[] = { "steam", NULL }; static const char *discord[] = { "discord", NULL }; @@ -84,24 +88,22 @@ static const char *discord[] = { "discord", NULL }; static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Tab, spawn, {.v = termcmd } }, + { MODKEY, XK_space, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, { MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_u, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_space, zoom, {0} }, - { MODKEY|ShiftMask, XK_space, view, {0} }, + { Mod1Mask, XK_Tab, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_Return, setlayout, {0} }, - { MODKEY|ShiftMask, XK_Return, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_Return, setlayout, {0} }, + { MODKEY, XK_Return, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, @@ -118,28 +120,33 @@ static const Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_q, quit, {0} }, - { MODKEY, XK_Print, spawn, {.v = cmdprintscreen } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volumeup } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = volumedown } }, - { MODKEY, XK_Up, spawn, {.v = volumeup } }, - { MODKEY, XK_Down, spawn, {.v = volumedown } }, - { MODKEY, XK_Right, spawn, {.v = fasterbrightnessup } }, - { MODKEY, XK_Left, spawn, {.v = fasterbrightnessdown } }, - { MODKEY|ControlMask, XK_Right, spawn, {.v = brightnessup } }, - { MODKEY|ControlMask, XK_Left, spawn, {.v = brightnessdown } }, - { 0, XF86XK_AudioMute, spawn, {.v = volumetoggle } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = fasterbrightnessup } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = fasterbrightnessdown } }, - { 0|ControlMask, XF86XK_MonBrightnessUp, spawn, {.v = brightnessup } }, - { 0|ControlMask, XF86XK_MonBrightnessDown, spawn, {.v = brightnessdown } }, - { 0, XF86XK_AudioMicMute, spawn, {.v = mictoggle } }, - { MODKEY|ShiftMask, XK_w, spawn, {.v = browser } }, - { MODKEY|ShiftMask, XK_e, spawn, {.v = files } }, - { MODKEY|ShiftMask, XK_s, spawn, {.v = steam } }, - { MODKEY|ShiftMask, XK_d, spawn, {.v = discord } }, - { Mod1Mask|ControlMask, XK_Delete, spawn, {.v = slock } }, - { MODKEY|ShiftMask, XK_v, spawn, SHCMD("~/.local/bin/./bookmarkthis.sh") }, - { MODKEY, XK_v, spawn, SHCMD("setxkbmap gb && xdotool type $(grep -v '^#' ~/.local/share/bookmarks/bookmarksfile | dmenu -i -l 50)") }, + /* Non-default commands i.e. commands added in by me and patches */ + { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "neomutt", NULL } }}, + { ControlMask|ShiftMask, XK_Escape, spawn, {.v = (const char*[]){ TERMINAL, "-e", "btop", NULL } }}, + { ControlMask|ShiftMask, XK_Escape, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfcd", NULL } }}, + { MODKEY, XK_Print, spawn, {.v = cmdprintscreen } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volumeup } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = volumedown } }, + { MODKEY, XK_Up, spawn, {.v = volumeup } }, + { MODKEY, XK_Down, spawn, {.v = volumedown } }, + { MODKEY, XK_Right, spawn, {.v = fasterbrightnessup } }, + { MODKEY, XK_Left, spawn, {.v = fasterbrightnessdown } }, + { MODKEY|ControlMask, XK_Right, spawn, {.v = brightnessup } }, + { MODKEY|ControlMask, XK_Left, spawn, {.v = brightnessdown } }, + { 0, XF86XK_AudioMute, spawn, {.v = volumetoggle } }, + { 0, XF86XK_MonBrightnessUp, spawn, {.v = fasterbrightnessup } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = fasterbrightnessdown } }, + { 0|ControlMask, XF86XK_MonBrightnessUp, spawn, {.v = brightnessup } }, + { 0|ControlMask, XF86XK_MonBrightnessDown, spawn, {.v = brightnessdown } }, + { 0, XF86XK_AudioMicMute, spawn, {.v = mictoggle } }, + { MODKEY|ShiftMask, XK_w, spawn, {.v = browser } }, + { MODKEY|ShiftMask, XK_s, spawn, {.v = steam } }, + { MODKEY|ShiftMask, XK_d, spawn, {.v = discord } }, + { Mod1Mask|ControlMask, XK_Delete, spawn, {.v = slock } }, + { MODKEY|ShiftMask, XK_v, spawn, SHCMD("~/.local/bin/./bookmarkthis") }, + { MODKEY, XK_v, spawn, SHCMD("setxkbmap gb && xdotool type $(grep -v '^#' ~/.local/bin/bookmarksfile | dmenu -i -l 50)") }, }; /* button definitions */ diff --git a/config.h b/config.h index c8635bc..e502dfd 100644 --- a/config.h +++ b/config.h @@ -2,22 +2,22 @@ /* See LICENSE file for copyright and license details. */ /* Constants */ -#define TERMINAL "st" +#define TERMINAL "urxvtc" #define BROWSER "librewolf-bin" -#define FILE_EXPLORER "dolphin" /* appearance */ static const unsigned int borderpx = 1; /* border pixel of windows */ -static const unsigned int snap = 32; /* snap pixel */ +static const unsigned int snap = 16; /* 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[] = { "inconsolata-mono-nerd:size=12" }; -static const char dmenufont[] = "inconsolata-mono-nerd:size=12"; -static const char col_gray1[] = "#000000"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#000000"; -static const char col_cyan[] = "#bbbbbb"; +static const char *fonts[] = { "cozette:size=12:autohint=true" }; +static const char dmenufont[] = "cozette:size=12:autohint=true"; +static const char col_gray1[] = "#000000"; // Colour of the background of the bar +static const char col_gray2[] = "#444444"; // Colour of the border of the inactive window +static const char col_gray3[] = "#bbbbbb"; // Colour of the foreground of the bar +static const char col_gray4[] = "#000000"; // Colour of the wallpaper by default +static const char col_cyan[] = "#bbbbbb"; // Colour of the border of the active window static const char *colors[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, @@ -25,22 +25,27 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; // These are what is visually displayed in the bar, you can change them to whatever. static const Rule rules[] = { /* xprop(1): * 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 */ + { NULL, "steamwebhelper", NULL, 0, 1, 0, 0, -1 }, + { "qBittorrent", NULL, NULL, 0, 1, 0, -1, -1 }, + { "St", NULL, NULL, 0, 0, 1, 0, -1 }, + { "URxvt", NULL, NULL, 0, 1, 1, 0, -1 }, + { "Nsxiv", NULL, NULL, 0, 1, 0, 0, -1 }, + { "mpv", NULL, NULL, 0, 1, 0, 0, -1 }, + { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 }, }; /* layout(s) */ static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ static const int nmaster = 1; /* number of clients in master area */ -static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const Layout layouts[] = { @@ -55,7 +60,7 @@ static const Layout layouts[] = { #define TAGKEYS(KEY,TAG) \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, /* helper for spawning shell commands in the pre dwm-5.0 fashion */ @@ -76,7 +81,6 @@ static const char *fasterbrightnessup[] = { "xbacklight", "-inc", "10", NULL }; static const char *fasterbrightnessdown[] = { "xbacklight", "-dec", "10", NULL }; static const char *slock[] = { "slock", NULL }; static const char *browser[] = { BROWSER, NULL }; -static const char *files[] = { FILE_EXPLORER, NULL }; static const char *steam[] = { "steam", NULL }; static const char *discord[] = { "discord", NULL }; @@ -84,24 +88,22 @@ static const char *discord[] = { "discord", NULL }; static const Key keys[] = { /* modifier key function argument */ { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Tab, spawn, {.v = termcmd } }, + { MODKEY, XK_space, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } }, - { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, { MODKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_u, incnmaster, {.i = -1 } }, { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, - { MODKEY, XK_space, zoom, {0} }, - { MODKEY|ShiftMask, XK_space, view, {0} }, + { Mod1Mask, XK_Tab, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_q, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_Return, setlayout, {0} }, - { MODKEY|ShiftMask, XK_Return, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_Return, setlayout, {0} }, + { MODKEY, XK_Return, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, @@ -118,28 +120,33 @@ static const Key keys[] = { TAGKEYS( XK_8, 7) TAGKEYS( XK_9, 8) { MODKEY|ShiftMask, XK_q, quit, {0} }, - { MODKEY, XK_Print, spawn, {.v = cmdprintscreen } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volumeup } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = volumedown } }, - { MODKEY, XK_Up, spawn, {.v = volumeup } }, - { MODKEY, XK_Down, spawn, {.v = volumedown } }, - { MODKEY, XK_Right, spawn, {.v = fasterbrightnessup } }, - { MODKEY, XK_Left, spawn, {.v = fasterbrightnessdown } }, - { MODKEY|ControlMask, XK_Right, spawn, {.v = brightnessup } }, - { MODKEY|ControlMask, XK_Left, spawn, {.v = brightnessdown } }, - { 0, XF86XK_AudioMute, spawn, {.v = volumetoggle } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = fasterbrightnessup } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = fasterbrightnessdown } }, - { 0|ControlMask, XF86XK_MonBrightnessUp, spawn, {.v = brightnessup } }, - { 0|ControlMask, XF86XK_MonBrightnessDown, spawn, {.v = brightnessdown } }, - { 0, XF86XK_AudioMicMute, spawn, {.v = mictoggle } }, - { MODKEY|ShiftMask, XK_w, spawn, {.v = browser } }, - { MODKEY|ShiftMask, XK_e, spawn, {.v = files } }, - { MODKEY|ShiftMask, XK_s, spawn, {.v = steam } }, - { MODKEY|ShiftMask, XK_d, spawn, {.v = discord } }, - { Mod1Mask|ControlMask, XK_Delete, spawn, {.v = slock } }, - { MODKEY|ShiftMask, XK_v, spawn, SHCMD("~/.local/bin/./bookmarkthis.sh") }, - { MODKEY, XK_v, spawn, SHCMD("setxkbmap gb && xdotool type $(grep -v '^#' ~/.local/share/bookmarks/bookmarksfile | dmenu -i -l 50)") }, + /* Non-default commands i.e. commands added in by me and patches */ + { MODKEY|ShiftMask, XK_j, rotatestack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_k, rotatestack, {.i = -1 } }, + { MODKEY|ShiftMask, XK_m, spawn, {.v = (const char*[]){ TERMINAL, "-e", "neomutt", NULL } }}, + { ControlMask|ShiftMask, XK_Escape, spawn, {.v = (const char*[]){ TERMINAL, "-e", "btop", NULL } }}, + { MODKEY|ShiftMask, XK_e, spawn, {.v = (const char*[]){ TERMINAL, "-e", "lfcd", NULL } }}, + { MODKEY, XK_Print, spawn, {.v = cmdprintscreen } }, + { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volumeup } }, + { 0, XF86XK_AudioLowerVolume, spawn, {.v = volumedown } }, + { MODKEY, XK_Up, spawn, {.v = volumeup } }, + { MODKEY, XK_Down, spawn, {.v = volumedown } }, + { MODKEY, XK_Right, spawn, {.v = fasterbrightnessup } }, + { MODKEY, XK_Left, spawn, {.v = fasterbrightnessdown } }, + { MODKEY|ControlMask, XK_Right, spawn, {.v = brightnessup } }, + { MODKEY|ControlMask, XK_Left, spawn, {.v = brightnessdown } }, + { 0, XF86XK_AudioMute, spawn, {.v = volumetoggle } }, + { 0, XF86XK_MonBrightnessUp, spawn, {.v = fasterbrightnessup } }, + { 0, XF86XK_MonBrightnessDown, spawn, {.v = fasterbrightnessdown } }, + { 0|ControlMask, XF86XK_MonBrightnessUp, spawn, {.v = brightnessup } }, + { 0|ControlMask, XF86XK_MonBrightnessDown, spawn, {.v = brightnessdown } }, + { 0, XF86XK_AudioMicMute, spawn, {.v = mictoggle } }, + { MODKEY|ShiftMask, XK_w, spawn, {.v = browser } }, + { MODKEY|ShiftMask, XK_s, spawn, {.v = steam } }, + { MODKEY|ShiftMask, XK_d, spawn, {.v = discord } }, + { Mod1Mask|ControlMask, XK_Delete, spawn, {.v = slock } }, + { MODKEY|ShiftMask, XK_v, spawn, SHCMD("~/.local/bin/./bookmarkthis") }, + { MODKEY, XK_v, spawn, SHCMD("setxkbmap gb && xdotool type $(grep -v '^#' ~/.local/bin/bookmarksfile | dmenu -i -l 50)") }, }; /* button definitions */ diff --git a/dwm.c b/dwm.c index d5859c2..4c65301 100644 --- a/dwm.c +++ b/dwm.c @@ -40,6 +40,12 @@ #include #endif /* XINERAMA */ #include +#include +#include +#ifdef __OpenBSD__ +#include +#include +#endif /* __OpenBSD */ #include "drw.h" #include "util.h" @@ -92,9 +98,11 @@ struct Client { int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; 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; @@ -238,6 +248,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]; @@ -272,6 +288,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" @@ -301,6 +319,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); @@ -415,12 +435,14 @@ attach(Client *c) void attachbottom(Client *c) { - Client **tc; + Client *below = c->mon->clients; + for (; below && below->next; below = below->next); c->next = NULL; - for (tc = &c->mon->clients; *tc; tc = &(*tc)->next); - *tc = c; + if (below) + below->next = c; + else + c->mon->clients = c; } - void attachstack(Client *c) { @@ -428,6 +450,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) { @@ -668,6 +737,9 @@ destroynotify(XEvent *e) if ((c = wintoclient(ev->window))) unmanage(c, 1); + + else if ((c = swallowingclient(ev->window))) + unmanage(c->swallowing, 1); } void @@ -1067,12 +1139,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; @@ -1087,6 +1160,7 @@ manage(Window w, XWindowAttributes *wa) } else { c->mon = selmon; applyrules(c); + term = termforwin(c); } if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww) @@ -1104,6 +1178,8 @@ manage(Window w, XWindowAttributes *wa) updatewindowtype(c); updatesizehints(c); updatewmhints(c); + c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2; + c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2; XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask); grabbuttons(c, 0); if (!c->isfloating) @@ -1121,6 +1197,8 @@ manage(Window w, XWindowAttributes *wa) c->mon->sel = c; arrange(c->mon); XMapWindow(dpy, c->win); + if (term) + swallow(term, c); focus(NULL); } @@ -1849,6 +1927,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) { @@ -1864,9 +1956,12 @@ unmanage(Client *c, int destroyed) XUngrabServer(dpy); } free(c); - focus(NULL); - updateclientlist(); - arrange(m); + + if (!s) { + arrange(m); + focus(NULL); + updateclientlist(); + } } void @@ -2130,6 +2225,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", 0), 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) { @@ -2219,10 +2444,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(); -- cgit v1.2.3