diff --git a/Makefile b/Makefile index b1352b6..c4cad3f 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,6 @@ all: dwm ${OBJ}: config.h config.mk -config.h: - cp config.def.h $@ - dwm: ${OBJ} ${CC} -o $@ ${OBJ} ${LDFLAGS} diff --git a/config.h b/config.h index 889c21e..7552745 100644 --- a/config.h +++ b/config.h @@ -1,22 +1,23 @@ /* appearance */ -static const unsigned int borderpx = 2; -static const unsigned int snap = 0; -static const unsigned int gappih = 20; -static const unsigned int gappiv = 10; -static const unsigned int gappoh = 10; -static const unsigned int gappov = 10; -static int smartgaps = 1; -static const int showbar = 1; -static const int topbar = 1; -static const char *fonts[] = { "Mononoki Nerd Font:size=12", "Noto Color Emoji:size=11" }; -static const char dmenufont[] = "Mononoki Nerd Font:size=12"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#eeeeee"; -static const char col_accent[] = "#db8402"; -static const unsigned int baralpha = 0xd0; -static const unsigned int borderalpha = OPAQUE; +static const unsigned int borderpx = 2; +static const unsigned int snap = 0; +static const unsigned int swallowfloating = 0; +static const unsigned int gappih = 20; +static const unsigned int gappiv = 10; +static const unsigned int gappoh = 10; +static const unsigned int gappov = 10; +static int smartgaps = 1; +static const int showbar = 1; +static const int topbar = 1; +static const char *fonts[] = { "Mononoki Nerd Font:size=12", "Noto Color Emoji:size=11" }; +static const char dmenufont[] = "Mononoki Nerd Font:size=12"; +static const char col_gray1[] = "#3a3a3a"; +static const char col_gray2[] = "#5c5c5c"; +static const char col_gray3[] = "#bbbbbb"; +static const char col_gray4[] = "#eeeeee"; +static const char col_accent[] = "#db8402"; +static const unsigned int baralpha = 0xd0; +static const unsigned int borderalpha = OPAQUE; static const char *colors[][3] = { /* fg bg border */ @@ -37,9 +38,11 @@ static const Rule rules[] = { * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance name tags mask isfloating monitor */ - { "Firefox", NULL, "Picture-in-Picture", 0, 1, -1 }, - { "copyq", "copyq", NULL, 0, 1, -1 }, + /* class instance title tags_mask isfloating isterminal noswallow monitor */ + { "Firefox", NULL, "Picture-in-Picture", 0, 1, 0, 1, -1 }, + { "copyq", NULL, NULL, 0, 1, 0, 0, -1 }, + { "Alacritty", NULL, NULL, 0, 0, 1, 0, -1 }, + { "floating", NULL, NULL, 0, 1, 0, 0, -1 }, }; @@ -74,66 +77,71 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; -static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_accent, "-sf", col_gray4, NULL }; +// static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_accent, "-sf", col_gray4, NULL }; +static const char *dmenucmd[] = { "dmenu_run", NULL }; static const char *termcmd[] = { "alacritty", NULL }; #include "movestack.c" static const Key keys[] = { /* modifier key function argument */ // movement - { MODKEY, XK_d, spawn, {.v = dmenucmd } }, - { MODKEY, XK_Return, spawn, {.v = termcmd } }, - { MODKEY, XK_b, togglebar, {0} }, - { MODKEY, XK_j, focusstack, {.i = +1 } }, - { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_d, spawn, {.v = dmenucmd } }, + { MODKEY, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, // { MODKEY|ShiftMask, XK_l, incnmaster, {.i = +1 } }, // { MODKEY|ShiftMask, XK_h, incnmaster, {.i = -1 } }, - { MODKEY, XK_n, setmfact, {.f = -0.05} }, - { MODKEY, XK_m, setmfact, {.f = +0.05} }, - { MODKEY, XK_c, zoom, {0} }, - { MODKEY, XK_Tab, view, {0} }, - { MODKEY, XK_q, killclient, {0} }, + { MODKEY, XK_n, setmfact, {.f = -0.05} }, + { MODKEY, XK_m, setmfact, {.f = +0.05} }, + { MODKEY, XK_c, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_q, killclient, {0} }, // layout - { MODKEY, XK_u, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_y, setlayout, {.v = &layouts[1]} }, - { MODKEY|ControlMask, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_f, togglefullscr, {0} }, - { MODKEY|ShiftMask, XK_f, togglefloating, {0} }, - { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, - { MODKEY, XK_0, view, {.ui = ~0 } }, - { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, - { MODKEY, XK_p, invertdir, {0} }, + { MODKEY, XK_u, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_y, setlayout, {.v = &layouts[1]} }, + { MODKEY|ControlMask, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY|ControlMask|ShiftMask, XK_m, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_f, togglefullscr, {0} }, + { MODKEY|ShiftMask, XK_f, togglefloating, {0} }, + { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, + { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ControlMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_p, invertdir, {0} }, // apps - { MODKEY, XK_w, spawn, SHCMD("firefox") }, - { MODKEY, XK_t, spawn, SHCMD("ayugram-desktop") }, - { MODKEY|ShiftMask, XK_s, spawn, SHCMD("flameshot", "gui") }, - { MODKEY, XK_i, spawn, SHCMD("dunstctl", "history-pop") }, - { MODKEY, XK_o, spawn, SHCMD("dunstctl", "close") }, - { MODKEY|ShiftMask, XK_i, spawn, SHCMD("dunstctl", "set-paused", "false") }, - { MODKEY|ShiftMask, XK_o, spawn, SHCMD("dunstctl", "set-paused", "true") }, - { MODKEY|ShiftMask, XK_r, spawn, SHCMD("xr") }, - { MODKEY, XK_x, spawn, SHCMD("discord") }, + { MODKEY, XK_w, spawn, SHCMD("firefox") }, + { MODKEY|ShiftMask, XK_p, spawn, SHCMD("cast") }, + { MODKEY, XK_t, spawn, SHCMD("ayugram-desktop") }, + { MODKEY|ShiftMask, XK_s, spawn, SHCMD("flameshot", "gui") }, + { MODKEY, XK_i, spawn, SHCMD("dunstctl", "history-pop") }, + { MODKEY, XK_o, spawn, SHCMD("dunstctl", "close") }, + { MODKEY|ShiftMask, XK_i, spawn, SHCMD("dunstctl", "set-paused", "false") }, + { MODKEY|ShiftMask, XK_o, spawn, SHCMD("dunstctl", "set-paused", "true") }, + { MODKEY|ShiftMask, XK_r, spawn, SHCMD("xr") }, + { MODKEY, XK_x, spawn, SHCMD("vesktop") }, + { MODKEY, XK_v, spawn, SHCMD("vpn", "-d", "--visual") }, + { MODKEY|ShiftMask, XK_v, spawn, SHCMD("vpn", "--visual") }, // tags - TAGKEYS( XK_1, 0) - TAGKEYS( XK_2, 1) - TAGKEYS( XK_3, 2) - TAGKEYS( XK_4, 3) - TAGKEYS( XK_5, 4) - TAGKEYS( XK_6, 5) - TAGKEYS( XK_7, 6) - TAGKEYS( XK_8, 7) - TAGKEYS( XK_9, 8) - { MODKEY|ShiftMask, XK_q, quit, {0} }, - { MODKEY, XK_h, focusmon, {.i = -1 } }, - { MODKEY, XK_l, focusmon, {.i = +1 } }, - { MODKEY|ControlMask, XK_h, tagmon, {.i = -1 } }, - { MODKEY|ControlMask, XK_l, tagmon, {.i = +1 } }, - { MODKEY|ShiftMask, XK_h, focustagmon, {.i = -1 } }, - { MODKEY|ShiftMask, XK_l, focustagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, + { MODKEY, XK_h, focusmon, {.i = -1 } }, + { MODKEY, XK_l, focusmon, {.i = +1 } }, + { MODKEY|ControlMask, XK_h, tagmon, {.i = -1 } }, + { MODKEY|ControlMask, XK_l, tagmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_h, focustagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_l, focustagmon, {.i = +1 } }, }; /* button definitions */ diff --git a/config.mk b/config.mk index 95819ec..1b50a2e 100644 --- a/config.mk +++ b/config.mk @@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2 # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender -lX11-xcb -lxcb -lxcb-res ${KVMLIB} # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} diff --git a/dwm.c b/dwm.c index 192ade4..a882718 100644 --- a/dwm.c +++ b/dwm.c @@ -20,11 +20,13 @@ * * To understand everything else, start reading main(). */ + #include #include #include #include #include +#include #include #include #include @@ -38,6 +40,12 @@ #include #endif /* XINERAMA */ #include +#include +#include +#ifdef __OpenBSD__ +#include +#include +#endif /* __OpenBSD */ #include "drw.h" #include "util.h" @@ -92,9 +100,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; }; @@ -144,6 +154,8 @@ typedef struct { const char *title; unsigned int tags; int isfloating; + int isterminal; + int noswallow; int monitor; } Rule; @@ -249,6 +261,12 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee); static void xinitvisual(void); 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]; @@ -289,6 +307,8 @@ static Visual *visual; static int depth; static Colormap cmap; +static xcb_connection_t *xcon; + /* configuration, allows nested code to access above variables */ #include "config.h" @@ -318,6 +338,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); @@ -410,8 +432,10 @@ arrange(Monitor *m) if (m) { arrangemon(m); restack(m); - } else for (m = mons; m; m = m->next) + } else for (m = mons; m; m = m->next) { arrangemon(m); + restack(m); + } } void @@ -446,6 +470,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) { @@ -523,7 +594,7 @@ cleanup(void) XDestroyWindow(dpy, wmcheckwin); drw_free(drw); XSync(dpy, False); - XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime); + XSetInputFocus(dpy, PointerRoot, RevertToNone, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]); } @@ -692,6 +763,9 @@ destroynotify(XEvent *e) if ((c = wintoclient(ev->window))) unmanage(c, 1); + + else if ((c = swallowingclient(ev->window))) + unmanage(c->swallowing, 1); } void @@ -707,7 +781,6 @@ void detachstack(Client *c) { Client **tc, *t; - for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext); *tc = c->snext; @@ -845,7 +918,8 @@ focus(Client *c) } setfocus(c); } else { - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + notify("SELMON STACK EMPTY"); + XSetInputFocus(dpy, root, RevertToNone, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]); } selmon->sel = c; @@ -871,7 +945,7 @@ focusmon(const Arg *arg) return; if ((m = dirtomon(arg->i)) == selmon) return; - unfocus(selmon->sel, 0); + unfocus(selmon->sel, 1); selmon = m; focus(NULL); } @@ -905,8 +979,11 @@ focusstack(const Arg *arg) void focustagmon(const Arg *arg) { + Monitor *m = dirtomon(arg->i); + if (m && m->sel && m->sel->isfullscreen) + return; + tagmon(arg); - // for (Monitor *m = selmon; m == selmon; focusmon(arg)); // ffs it just doesn't work properly... focusmon(arg); } @@ -1093,12 +1170,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; @@ -1114,6 +1192,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) @@ -1158,6 +1237,8 @@ manage(Window w, XWindowAttributes *wa) c->mon->sel = c; arrange(c->mon); XMapWindow(dpy, c->win); + if (term) + swallow(term, c); focus(old_sel); } @@ -1501,9 +1582,13 @@ sendmon(Client *c, Monitor *m) { if (c->mon == m) return; - unfocus(c, 0); + + unfocus(c, 1); detach(c); detachstack(c); + + Client *pc = selmon->stack; + c->mon = m; c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ @@ -1513,8 +1598,11 @@ sendmon(Client *c, Monitor *m) attachbottom(c); attachstack(c); - focus(NULL); - arrange(NULL); + + focus(pc); + + arrange(m); + arrange(selmon); } void @@ -1555,7 +1643,7 @@ void setfocus(Client *c) { if (!c->neverfocus) { - XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime); + XSetInputFocus(dpy, c->win, RevertToNone, CurrentTime); XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32, PropModeReplace, (unsigned char *) &(c->win), 1); @@ -1781,6 +1869,7 @@ spawn(const Arg *arg) if (arg->v == dmenucmd) dmenumon[0] = '0' + selmon->num; + if (fork() == 0) { if (dpy) close(ConnectionNumber(dpy)); @@ -1812,18 +1901,21 @@ tagmon(const Arg *arg) if (!selmon->sel || !mons->next) return; - int restore_fullscreen = 0; - Client *window = selmon->sel; + Monitor *m = dirtomon(arg->i); - if (window->isfullscreen) { - setfullscreen(window, 0); - restore_fullscreen = 1; - } + if ((m->sel && m->sel->isfullscreen)) + return; - sendmon(window, dirtomon(arg->i)); + Client *c = selmon->sel; + int restore = c->isfullscreen; - if (restore_fullscreen) - setfullscreen(window, 1); + if (restore) + setfullscreen(c, 0); + + sendmon(c, m); + + if (restore) + setfullscreen(c, 1); } void @@ -1898,7 +1990,7 @@ unfocus(Client *c, int setfocus) grabbuttons(c, 0); XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel); if (setfocus) { - XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime); + XSetInputFocus(dpy, root, RevertToNone, CurrentTime); XDeleteProperty(dpy, root, netatom[NetActiveWindow]); } } @@ -1909,6 +2001,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) { @@ -1924,9 +2030,12 @@ unmanage(Client *c, int destroyed) XUngrabServer(dpy); } free(c); - focus(NULL); - updateclientlist(); - arrange(m); + + if (!s) { + arrange(m); + focus(NULL); + updateclientlist(); + } } void @@ -2197,6 +2306,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) { @@ -2323,10 +2562,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(); diff --git a/util.c b/util.c index 96b82c9..6f28e1f 100644 --- a/util.c +++ b/util.c @@ -34,3 +34,15 @@ ecalloc(size_t nmemb, size_t size) die("calloc:"); return p; } + +void +notify(const char *fmt, ...) { + va_list ap; + char cmd[1024] = "notify-send "; + + va_start(ap, fmt); + sprintf(cmd+12, fmt, ap); + va_end(ap); + + system(cmd); +} diff --git a/util.h b/util.h index f633b51..de41f08 100644 --- a/util.h +++ b/util.h @@ -6,3 +6,4 @@ void die(const char *fmt, ...); void *ecalloc(size_t nmemb, size_t size); +void notify(const char *fmt, ...); diff --git a/vanitygaps.c b/vanitygaps.c index 1a816b6..5ab6f30 100644 --- a/vanitygaps.c +++ b/vanitygaps.c @@ -819,4 +819,4 @@ tile(Monitor *m) resize(c, sx, sy, sw - (2*c->bw), sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0); sy += HEIGHT(c) + ih; } -} \ No newline at end of file +}