Compare commits
No commits in common. "56e680217022fefcd3febc955b59ef8b3b42e263" and "6dbb4199457d6022e9221628452a9e6f43c0ada0" have entirely different histories.
56e6802170
...
6dbb419945
37
config.def.h
37
config.def.h
@ -3,18 +3,6 @@
|
|||||||
/* appearance */
|
/* appearance */
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
static const unsigned int snap = 32; /* snap pixel */
|
||||||
static const unsigned int gappih = 20; /* horiz inner gap between windows */
|
|
||||||
static const unsigned int gappiv = 10; /* vert inner gap between windows */
|
|
||||||
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
|
|
||||||
static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */
|
|
||||||
static int smartgaps = 0; /* 1 means no outer gap when there is only one window */
|
|
||||||
static const int scalepreview = 4; /* preview scaling (display w and h / scalepreview) */
|
|
||||||
static const int previewbar = 1; /* show the bar in the preview window */
|
|
||||||
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
|
||||||
static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
|
|
||||||
static const unsigned int systrayspacing = 2; /* systray spacing */
|
|
||||||
static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
|
||||||
static const int showsystray = 1; /* 0 means no systray */
|
|
||||||
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 Bool viewontag = True;
|
static const Bool viewontag = True;
|
||||||
@ -55,26 +43,11 @@ static const int nmaster = 1; /* number of clients in master area */
|
|||||||
static const int resizehints = 1; /* 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 int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
|
||||||
|
|
||||||
#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */
|
|
||||||
#include "vanitygaps.c"
|
|
||||||
|
|
||||||
static const Layout layouts[] = {
|
static const Layout layouts[] = {
|
||||||
/* symbol arrange function */
|
/* symbol arrange function */
|
||||||
{ "[]=", tile }, /* first entry is default */
|
{ "[]=", tile }, /* first entry is default */
|
||||||
{ "[M]", monocle },
|
|
||||||
{ "[@]", spiral },
|
|
||||||
{ "[\\]", dwindle },
|
|
||||||
{ "H[]", deck },
|
|
||||||
{ "TTT", bstack },
|
|
||||||
{ "===", bstackhoriz },
|
|
||||||
{ "HHH", grid },
|
|
||||||
{ "###", nrowgrid },
|
|
||||||
{ "---", horizgrid },
|
|
||||||
{ ":::", gaplessgrid },
|
|
||||||
{ "|M|", centeredmaster },
|
|
||||||
{ ">M>", centeredfloatingmaster },
|
|
||||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||||
{ NULL, NULL },
|
{ "[M]", monocle },
|
||||||
};
|
};
|
||||||
|
|
||||||
/* key definitions */
|
/* key definitions */
|
||||||
@ -83,7 +56,7 @@ static const Layout layouts[] = {
|
|||||||
{ 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} }, \
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
||||||
{ MODKEY|ControlMask|ShiftMask, KEY, previewtag, {.ui = TAG } }, \
|
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
||||||
@ -128,8 +101,6 @@ static const Key keys[] = {
|
|||||||
|
|
||||||
// 全屏
|
// 全屏
|
||||||
{ MODKEY|ShiftMask, XK_f, fullscreen, {0} },
|
{ MODKEY|ShiftMask, XK_f, fullscreen, {0} },
|
||||||
// 关闭间隙
|
|
||||||
{ MODKEY|Mod1Mask, XK_0, togglegaps, {0} },
|
|
||||||
|
|
||||||
TAGKEYS( XK_1, 0)
|
TAGKEYS( XK_1, 0)
|
||||||
TAGKEYS( XK_2, 1)
|
TAGKEYS( XK_2, 1)
|
||||||
@ -146,8 +117,8 @@ static const Key keys[] = {
|
|||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||||
static const Button buttons[] = {
|
static const Button buttons[] = {
|
||||||
/* click event mask button function argument */
|
/* click event mask button function argument */
|
||||||
{ ClkTagBar, MODKEY, Button1, tag, {0} },
|
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||||
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||||
{ ClkWinTitle, 0, Button1, togglewin, {0} },
|
{ ClkWinTitle, 0, Button1, togglewin, {0} },
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||||
|
@ -21,12 +21,9 @@ FREETYPEINC = /usr/include/freetype2
|
|||||||
#FREETYPEINC = ${X11INC}/freetype2
|
#FREETYPEINC = ${X11INC}/freetype2
|
||||||
#MANPREFIX = ${PREFIX}/man
|
#MANPREFIX = ${PREFIX}/man
|
||||||
|
|
||||||
# Imlib2 (tag previews)
|
|
||||||
IMLIB2LIBS = -lImlib2
|
|
||||||
|
|
||||||
# includes and libs
|
# includes and libs
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
INCS = -I${X11INC} -I${FREETYPEINC}
|
||||||
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${IMLIB2LIBS}
|
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
||||||
|
|
||||||
# flags
|
# flags
|
||||||
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
||||||
|
583
dwm.c
583
dwm.c
@ -41,7 +41,6 @@
|
|||||||
#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 <Imlib2.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
#include "drw.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
@ -60,27 +59,12 @@
|
|||||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
||||||
|
|
||||||
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
|
||||||
/* XEMBED messages */
|
|
||||||
#define XEMBED_EMBEDDED_NOTIFY 0
|
|
||||||
#define XEMBED_WINDOW_ACTIVATE 1
|
|
||||||
#define XEMBED_FOCUS_IN 4
|
|
||||||
#define XEMBED_MODALITY_ON 10
|
|
||||||
#define XEMBED_MAPPED (1 << 0)
|
|
||||||
#define XEMBED_WINDOW_ACTIVATE 1
|
|
||||||
#define XEMBED_WINDOW_DEACTIVATE 2
|
|
||||||
#define VERSION_MAJOR 0
|
|
||||||
#define VERSION_MINOR 0
|
|
||||||
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
|
||||||
|
|
||||||
/* enums */
|
/* enums */
|
||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
||||||
enum { SchemeNorm, SchemeSel, SchemeHov, SchemeHid }; /* color schemes */
|
enum { SchemeNorm, SchemeSel, SchemeHov, SchemeHid }; /* color schemes */
|
||||||
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
||||||
NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
|
|
||||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
||||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
||||||
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
|
||||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
||||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
||||||
@ -131,9 +115,6 @@ typedef struct {
|
|||||||
|
|
||||||
typedef struct Pertag Pertag;
|
typedef struct Pertag Pertag;
|
||||||
struct Monitor {
|
struct Monitor {
|
||||||
int previewshow;
|
|
||||||
Window tagwin;
|
|
||||||
Pixmap *tagmap;
|
|
||||||
char ltsymbol[16];
|
char ltsymbol[16];
|
||||||
float mfact;
|
float mfact;
|
||||||
int nmaster;
|
int nmaster;
|
||||||
@ -143,10 +124,6 @@ struct Monitor {
|
|||||||
int bt; /* number of tasks */
|
int bt; /* number of tasks */
|
||||||
int mx, my, mw, mh; /* screen size */
|
int mx, my, mw, mh; /* screen size */
|
||||||
int wx, wy, ww, wh; /* window area */
|
int wx, wy, ww, wh; /* window area */
|
||||||
int gappih; /* horizontal gap between windows */
|
|
||||||
int gappiv; /* vertical gap between windows */
|
|
||||||
int gappoh; /* horizontal outer gaps */
|
|
||||||
int gappov; /* vertical outer gaps */
|
|
||||||
unsigned int seltags;
|
unsigned int seltags;
|
||||||
unsigned int sellt;
|
unsigned int sellt;
|
||||||
unsigned int tagset[2];
|
unsigned int tagset[2];
|
||||||
@ -172,12 +149,6 @@ typedef struct {
|
|||||||
int monitor;
|
int monitor;
|
||||||
} Rule;
|
} Rule;
|
||||||
|
|
||||||
typedef struct Systray Systray;
|
|
||||||
struct Systray {
|
|
||||||
Window win;
|
|
||||||
Client *icons;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* function declarations */
|
/* function declarations */
|
||||||
static void applyrules(Client *c);
|
static void applyrules(Client *c);
|
||||||
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
||||||
@ -213,7 +184,6 @@ static void focusstack(int inc, int vis);
|
|||||||
static Atom getatomprop(Client *c, Atom prop);
|
static Atom getatomprop(Client *c, Atom prop);
|
||||||
static int getrootptr(int *x, int *y);
|
static int getrootptr(int *x, int *y);
|
||||||
static long getstate(Window w);
|
static long getstate(Window w);
|
||||||
static unsigned int getsystraywidth();
|
|
||||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
||||||
static void grabbuttons(Client *c, int focused);
|
static void grabbuttons(Client *c, int focused);
|
||||||
static void grabkeys(void);
|
static void grabkeys(void);
|
||||||
@ -233,18 +203,15 @@ static void pop(Client *c);
|
|||||||
static void propertynotify(XEvent *e);
|
static void propertynotify(XEvent *e);
|
||||||
static void quit(const Arg *arg);
|
static void quit(const Arg *arg);
|
||||||
static Monitor *recttomon(int x, int y, int w, int h);
|
static Monitor *recttomon(int x, int y, int w, int h);
|
||||||
static void removesystrayicon(Client *i);
|
|
||||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
||||||
static void resizebarwin(Monitor *m);
|
|
||||||
static void resizeclient(Client *c, int x, int y, int w, int h);
|
static void resizeclient(Client *c, int x, int y, int w, int h);
|
||||||
static void resizemouse(const Arg *arg);
|
static void resizemouse(const Arg *arg);
|
||||||
static void resizerequest(XEvent *e);
|
|
||||||
static void restack(Monitor *m);
|
static void restack(Monitor *m);
|
||||||
static void rotatestack(const Arg *arg);
|
static void rotatestack(const Arg *arg);
|
||||||
static void run(void);
|
static void run(void);
|
||||||
static void runautostart(void);
|
static void runautostart(void);
|
||||||
static void scan(void);
|
static void scan(void);
|
||||||
static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
static int sendevent(Client *c, Atom proto);
|
||||||
static void sendmon(Client *c, Monitor *m);
|
static void sendmon(Client *c, Monitor *m);
|
||||||
static void setclientstate(Client *c, long state);
|
static void setclientstate(Client *c, long state);
|
||||||
static void setfocus(Client *c);
|
static void setfocus(Client *c);
|
||||||
@ -260,9 +227,9 @@ static void showwin(Client *c);
|
|||||||
static void showhide(Client *c);
|
static void showhide(Client *c);
|
||||||
static int solitary(Client *c);
|
static int solitary(Client *c);
|
||||||
static void spawn(const Arg *arg);
|
static void spawn(const Arg *arg);
|
||||||
static Monitor *systraytomon(Monitor *m);
|
|
||||||
static void tag(const Arg *arg);
|
static void tag(const Arg *arg);
|
||||||
static void tagmon(const Arg *arg);
|
static void tagmon(const Arg *arg);
|
||||||
|
static void tile(Monitor *m);
|
||||||
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 togglescratch(const Arg *arg);
|
static void togglescratch(const Arg *arg);
|
||||||
@ -279,27 +246,18 @@ static int updategeom(void);
|
|||||||
static void updatenumlockmask(void);
|
static void updatenumlockmask(void);
|
||||||
static void updatesizehints(Client *c);
|
static void updatesizehints(Client *c);
|
||||||
static void updatestatus(void);
|
static void updatestatus(void);
|
||||||
static void updatesystray(void);
|
|
||||||
static void updatesystrayicongeom(Client *i, int w, int h);
|
|
||||||
static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
|
||||||
static void updatetitle(Client *c);
|
static void updatetitle(Client *c);
|
||||||
static void updatewindowtype(Client *c);
|
static void updatewindowtype(Client *c);
|
||||||
static void updatewmhints(Client *c);
|
static void updatewmhints(Client *c);
|
||||||
static void view(const Arg *arg);
|
static void view(const Arg *arg);
|
||||||
static Client *wintoclient(Window w);
|
static Client *wintoclient(Window w);
|
||||||
static Monitor *wintomon(Window w);
|
static Monitor *wintomon(Window w);
|
||||||
static Client *wintosystrayicon(Window w);
|
|
||||||
static int xerror(Display *dpy, XErrorEvent *ee);
|
static int xerror(Display *dpy, XErrorEvent *ee);
|
||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
||||||
static void zoom(const Arg *arg);
|
static void zoom(const Arg *arg);
|
||||||
|
|
||||||
static void showtagpreview(unsigned int i);
|
|
||||||
static void takepreview(void);
|
|
||||||
static void previewtag(const Arg *arg);
|
|
||||||
|
|
||||||
/* variables */
|
/* variables */
|
||||||
static Systray *systray = NULL;
|
|
||||||
static const char autostartblocksh[] = "autostart_blocking.sh";
|
static const char autostartblocksh[] = "autostart_blocking.sh";
|
||||||
static const char autostartsh[] = "autostart.sh";
|
static const char autostartsh[] = "autostart.sh";
|
||||||
static const char broken[] = "broken";
|
static const char broken[] = "broken";
|
||||||
@ -326,10 +284,9 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|||||||
[MapRequest] = maprequest,
|
[MapRequest] = maprequest,
|
||||||
[MotionNotify] = motionnotify,
|
[MotionNotify] = motionnotify,
|
||||||
[PropertyNotify] = propertynotify,
|
[PropertyNotify] = propertynotify,
|
||||||
[ResizeRequest] = resizerequest,
|
|
||||||
[UnmapNotify] = unmapnotify
|
[UnmapNotify] = unmapnotify
|
||||||
};
|
};
|
||||||
static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
static Atom wmatom[WMLast], netatom[NetLast];
|
||||||
static int running = 1;
|
static int running = 1;
|
||||||
static Cur *cursor[CurLast];
|
static Cur *cursor[CurLast];
|
||||||
static Clr **scheme;
|
static Clr **scheme;
|
||||||
@ -526,15 +483,10 @@ buttonpress(XEvent *e)
|
|||||||
if (i < LENGTH(tags)) {
|
if (i < LENGTH(tags)) {
|
||||||
click = ClkTagBar;
|
click = ClkTagBar;
|
||||||
arg.ui = 1 << i;
|
arg.ui = 1 << i;
|
||||||
/* hide preview if we click the bar */
|
|
||||||
if (selmon->previewshow) {
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
}
|
|
||||||
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
||||||
click = ClkLtSymbol;
|
click = ClkLtSymbol;
|
||||||
/* 2px right padding */
|
/* 2px right padding */
|
||||||
else if (ev->x > selmon->ww - (int)TEXTW(stext) + (lrpad - 2) - getsystraywidth())
|
else if (ev->x > selmon->ww - TEXTW(stext) + lrpad - 2)
|
||||||
click = ClkStatusText;
|
click = ClkStatusText;
|
||||||
else {
|
else {
|
||||||
x += TEXTW(selmon->ltsymbol);
|
x += TEXTW(selmon->ltsymbol);
|
||||||
@ -591,13 +543,6 @@ cleanup(void)
|
|||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
||||||
while (mons)
|
while (mons)
|
||||||
cleanupmon(mons);
|
cleanupmon(mons);
|
||||||
|
|
||||||
if (showsystray) {
|
|
||||||
XUnmapWindow(dpy, systray->win);
|
|
||||||
XDestroyWindow(dpy, systray->win);
|
|
||||||
free(systray);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < CurLast; i++)
|
for (i = 0; i < CurLast; i++)
|
||||||
drw_cur_free(drw, cursor[i]);
|
drw_cur_free(drw, cursor[i]);
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
@ -614,7 +559,6 @@ void
|
|||||||
cleanupmon(Monitor *mon)
|
cleanupmon(Monitor *mon)
|
||||||
{
|
{
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (mon == mons)
|
if (mon == mons)
|
||||||
mons = mons->next;
|
mons = mons->next;
|
||||||
@ -622,72 +566,17 @@ cleanupmon(Monitor *mon)
|
|||||||
for (m = mons; m && m->next != mon; m = m->next);
|
for (m = mons; m && m->next != mon; m = m->next);
|
||||||
m->next = mon->next;
|
m->next = mon->next;
|
||||||
}
|
}
|
||||||
for (i = 0; i < LENGTH(tags); i++)
|
|
||||||
if (mon->tagmap[i])
|
|
||||||
XFreePixmap(dpy, mon->tagmap[i]);
|
|
||||||
free(mon->tagmap);
|
|
||||||
XUnmapWindow(dpy, mon->barwin);
|
XUnmapWindow(dpy, mon->barwin);
|
||||||
XDestroyWindow(dpy, mon->barwin);
|
XDestroyWindow(dpy, mon->barwin);
|
||||||
XUnmapWindow(dpy, mon->tagwin);
|
|
||||||
XDestroyWindow(dpy, mon->tagwin);
|
|
||||||
free(mon);
|
free(mon);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
clientmessage(XEvent *e)
|
clientmessage(XEvent *e)
|
||||||
{
|
{
|
||||||
XWindowAttributes wa;
|
|
||||||
XSetWindowAttributes swa;
|
|
||||||
XClientMessageEvent *cme = &e->xclient;
|
XClientMessageEvent *cme = &e->xclient;
|
||||||
Client *c = wintoclient(cme->window);
|
Client *c = wintoclient(cme->window);
|
||||||
|
|
||||||
if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
|
||||||
/* add systray icons */
|
|
||||||
if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
|
||||||
if (!(c = (Client *)calloc(1, sizeof(Client))))
|
|
||||||
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
|
||||||
if (!(c->win = cme->data.l[2])) {
|
|
||||||
free(c);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
c->mon = selmon;
|
|
||||||
c->next = systray->icons;
|
|
||||||
systray->icons = c;
|
|
||||||
if (!XGetWindowAttributes(dpy, c->win, &wa)) {
|
|
||||||
/* use sane defaults */
|
|
||||||
wa.width = bh;
|
|
||||||
wa.height = bh;
|
|
||||||
wa.border_width = 0;
|
|
||||||
}
|
|
||||||
c->x = c->oldx = c->y = c->oldy = 0;
|
|
||||||
c->w = c->oldw = wa.width;
|
|
||||||
c->h = c->oldh = wa.height;
|
|
||||||
c->oldbw = wa.border_width;
|
|
||||||
c->bw = 0;
|
|
||||||
c->isfloating = True;
|
|
||||||
/* reuse tags field as mapped status */
|
|
||||||
c->tags = 1;
|
|
||||||
updatesizehints(c);
|
|
||||||
updatesystrayicongeom(c, wa.width, wa.height);
|
|
||||||
XAddToSaveSet(dpy, c->win);
|
|
||||||
XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
|
||||||
XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
|
||||||
/* use parents background color */
|
|
||||||
swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
|
||||||
sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
/* FIXME not sure if I have to send these events, too */
|
|
||||||
sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
XSync(dpy, False);
|
|
||||||
resizebarwin(selmon);
|
|
||||||
updatesystray();
|
|
||||||
setclientstate(c, NormalState);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!c)
|
if (!c)
|
||||||
return;
|
return;
|
||||||
if (cme->message_type == netatom[NetWMState]) {
|
if (cme->message_type == netatom[NetWMState]) {
|
||||||
@ -740,7 +629,7 @@ configurenotify(XEvent *e)
|
|||||||
for (c = m->clients; c; c = c->next)
|
for (c = m->clients; c; c = c->next)
|
||||||
if (c->isfullscreen)
|
if (c->isfullscreen)
|
||||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||||
resizebarwin(m);
|
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||||
}
|
}
|
||||||
focus(NULL);
|
focus(NULL);
|
||||||
arrange(NULL);
|
arrange(NULL);
|
||||||
@ -812,13 +701,8 @@ createmon(void)
|
|||||||
m->nmaster = nmaster;
|
m->nmaster = nmaster;
|
||||||
m->showbar = showbar;
|
m->showbar = showbar;
|
||||||
m->topbar = topbar;
|
m->topbar = topbar;
|
||||||
m->gappih = gappih;
|
|
||||||
m->gappiv = gappiv;
|
|
||||||
m->gappoh = gappoh;
|
|
||||||
m->gappov = gappov;
|
|
||||||
m->lt[0] = &layouts[0];
|
m->lt[0] = &layouts[0];
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
||||||
m->tagmap = ecalloc(LENGTH(tags), sizeof(Pixmap));
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
||||||
m->pertag = ecalloc(1, sizeof(Pertag));
|
m->pertag = ecalloc(1, sizeof(Pertag));
|
||||||
m->pertag->curtag = m->pertag->prevtag = 1;
|
m->pertag->curtag = m->pertag->prevtag = 1;
|
||||||
@ -845,11 +729,6 @@ destroynotify(XEvent *e)
|
|||||||
|
|
||||||
if ((c = wintoclient(ev->window)))
|
if ((c = wintoclient(ev->window)))
|
||||||
unmanage(c, 1);
|
unmanage(c, 1);
|
||||||
else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
removesystrayicon(c);
|
|
||||||
resizebarwin(selmon);
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -893,7 +772,7 @@ dirtomon(int dir)
|
|||||||
void
|
void
|
||||||
drawbar(Monitor *m)
|
drawbar(Monitor *m)
|
||||||
{
|
{
|
||||||
int x, w, scm, tw = 0, n = 0, stw = 0;
|
int x, w, tw = 0, n = 0, scm;
|
||||||
int boxs = drw->fonts->h / 9;
|
int boxs = drw->fonts->h / 9;
|
||||||
int boxw = drw->fonts->h / 6 + 2;
|
int boxw = drw->fonts->h / 6 + 2;
|
||||||
unsigned int i, occ = 0, urg = 0;
|
unsigned int i, occ = 0, urg = 0;
|
||||||
@ -902,17 +781,13 @@ drawbar(Monitor *m)
|
|||||||
if (!m->showbar)
|
if (!m->showbar)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(showsystray && m == systraytomon(m) && !systrayonleft)
|
|
||||||
stw = getsystraywidth();
|
|
||||||
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
/* draw status first so it can be overdrawn by tags later */
|
||||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */
|
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||||
drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0);
|
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
resizebarwin(m);
|
|
||||||
for (c = m->clients; c; c = c->next) {
|
for (c = m->clients; c; c = c->next) {
|
||||||
if (ISVISIBLE(c))
|
if (ISVISIBLE(c))
|
||||||
n++;
|
n++;
|
||||||
@ -934,7 +809,7 @@ drawbar(Monitor *m)
|
|||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
||||||
|
|
||||||
if ((w = m->ww - tw - stw - x) > bh) {
|
if ((w = m->ww - tw - x) > bh) {
|
||||||
if (n > 0) {
|
if (n > 0) {
|
||||||
int remainder = w % n;
|
int remainder = w % n;
|
||||||
int tabw = (1.0 / (double)n) * w + 1;
|
int tabw = (1.0 / (double)n) * w + 1;
|
||||||
@ -967,7 +842,7 @@ drawbar(Monitor *m)
|
|||||||
}
|
}
|
||||||
m->bt = n;
|
m->bt = n;
|
||||||
m->btw = w;
|
m->btw = w;
|
||||||
drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
|
drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -1026,11 +901,8 @@ expose(XEvent *e)
|
|||||||
Monitor *m;
|
Monitor *m;
|
||||||
XExposeEvent *ev = &e->xexpose;
|
XExposeEvent *ev = &e->xexpose;
|
||||||
|
|
||||||
if (ev->count == 0 && (m = wintomon(ev->window))) {
|
if (ev->count == 0 && (m = wintomon(ev->window)))
|
||||||
drawbar(m);
|
drawbar(m);
|
||||||
if (m == selmon)
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -1152,32 +1024,14 @@ getatomprop(Client *c, Atom prop)
|
|||||||
unsigned char *p = NULL;
|
unsigned char *p = NULL;
|
||||||
Atom da, atom = None;
|
Atom da, atom = None;
|
||||||
|
|
||||||
/* FIXME getatomprop should return the number of items and a pointer to
|
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
||||||
* the stored data instead of this workaround */
|
|
||||||
Atom req = XA_ATOM;
|
|
||||||
if (prop == xatom[XembedInfo])
|
|
||||||
req = xatom[XembedInfo];
|
|
||||||
|
|
||||||
if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
|
|
||||||
&da, &di, &dl, &dl, &p) == Success && p) {
|
&da, &di, &dl, &dl, &p) == Success && p) {
|
||||||
atom = *(Atom *)p;
|
atom = *(Atom *)p;
|
||||||
if (da == xatom[XembedInfo] && dl == 2)
|
|
||||||
atom = ((Atom *)p)[1];
|
|
||||||
XFree(p);
|
XFree(p);
|
||||||
}
|
}
|
||||||
return atom;
|
return atom;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int
|
|
||||||
getsystraywidth()
|
|
||||||
{
|
|
||||||
unsigned int w = 0;
|
|
||||||
Client *i;
|
|
||||||
if(showsystray)
|
|
||||||
for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
|
|
||||||
return w ? w + systrayspacing : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
getrootptr(int *x, int *y)
|
getrootptr(int *x, int *y)
|
||||||
{
|
{
|
||||||
@ -1348,8 +1202,7 @@ killclient(const Arg *arg)
|
|||||||
{
|
{
|
||||||
if (!selmon->sel)
|
if (!selmon->sel)
|
||||||
return;
|
return;
|
||||||
|
if (!sendevent(selmon->sel, wmatom[WMDelete])) {
|
||||||
if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
|
|
||||||
XGrabServer(dpy);
|
XGrabServer(dpy);
|
||||||
XSetErrorHandler(xerrordummy);
|
XSetErrorHandler(xerrordummy);
|
||||||
XSetCloseDownMode(dpy, DestroyAll);
|
XSetCloseDownMode(dpy, DestroyAll);
|
||||||
@ -1446,13 +1299,6 @@ maprequest(XEvent *e)
|
|||||||
static XWindowAttributes wa;
|
static XWindowAttributes wa;
|
||||||
XMapRequestEvent *ev = &e->xmaprequest;
|
XMapRequestEvent *ev = &e->xmaprequest;
|
||||||
|
|
||||||
Client *i;
|
|
||||||
if ((i = wintosystrayicon(ev->window))) {
|
|
||||||
sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
resizebarwin(selmon);
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
|
if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
|
||||||
return;
|
return;
|
||||||
if (!wintoclient(ev->window))
|
if (!wintoclient(ev->window))
|
||||||
@ -1477,41 +1323,11 @@ monocle(Monitor *m)
|
|||||||
void
|
void
|
||||||
motionnotify(XEvent *e)
|
motionnotify(XEvent *e)
|
||||||
{
|
{
|
||||||
// int x, i;
|
int x, i;
|
||||||
static Monitor *mon = NULL;
|
static Monitor *mon = NULL;
|
||||||
Client *c;
|
Client *c;
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
XMotionEvent *ev = &e->xmotion;
|
XMotionEvent *ev = &e->xmotion;
|
||||||
unsigned int i, x;
|
|
||||||
|
|
||||||
if (ev->window == selmon->barwin) {
|
|
||||||
i = x = 0;
|
|
||||||
do
|
|
||||||
x += TEXTW(tags[i]);
|
|
||||||
while (ev->x >= x && ++i < LENGTH(tags));
|
|
||||||
/* FIXME when hovering the mouse over the tags and we view the tag,
|
|
||||||
* the preview window get's in the preview shot */
|
|
||||||
|
|
||||||
if (i < LENGTH(tags)) {
|
|
||||||
if (selmon->previewshow != (i + 1)
|
|
||||||
&& !(selmon->tagset[selmon->seltags] & 1 << i)) {
|
|
||||||
selmon->previewshow = i + 1;
|
|
||||||
showtagpreview(i);
|
|
||||||
} else if (selmon->tagset[selmon->seltags] & 1 << i) {
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
}
|
|
||||||
} else if (selmon->previewshow) {
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
}
|
|
||||||
} else if (ev->window == selmon->tagwin) {
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
} else if (selmon->previewshow) {
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ev->window != selmon->barwin) {
|
if (ev->window != selmon->barwin) {
|
||||||
if (selmon->hov) {
|
if (selmon->hov) {
|
||||||
@ -1662,17 +1478,6 @@ propertynotify(XEvent *e)
|
|||||||
Window trans;
|
Window trans;
|
||||||
XPropertyEvent *ev = &e->xproperty;
|
XPropertyEvent *ev = &e->xproperty;
|
||||||
|
|
||||||
if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
if (ev->atom == XA_WM_NORMAL_HINTS) {
|
|
||||||
updatesizehints(c);
|
|
||||||
updatesystrayicongeom(c, c->w, c->h);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
updatesystrayiconstate(c, ev);
|
|
||||||
resizebarwin(selmon);
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||||
updatestatus();
|
updatestatus();
|
||||||
else if (ev->state == PropertyDelete)
|
else if (ev->state == PropertyDelete)
|
||||||
@ -1733,19 +1538,6 @@ recttomon(int x, int y, int w, int h)
|
|||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
removesystrayicon(Client *i)
|
|
||||||
{
|
|
||||||
Client **ii;
|
|
||||||
|
|
||||||
if (!showsystray || !i)
|
|
||||||
return;
|
|
||||||
for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
|
|
||||||
if (ii)
|
|
||||||
*ii = i->next;
|
|
||||||
free(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
resize(Client *c, int x, int y, int w, int h, int interact)
|
resize(Client *c, int x, int y, int w, int h, int interact)
|
||||||
{
|
{
|
||||||
@ -1753,14 +1545,6 @@ resize(Client *c, int x, int y, int w, int h, int interact)
|
|||||||
resizeclient(c, x, y, w, h);
|
resizeclient(c, x, y, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
resizebarwin(Monitor *m) {
|
|
||||||
unsigned int w = m->ww;
|
|
||||||
if (showsystray && m == systraytomon(m) && !systrayonleft)
|
|
||||||
w -= getsystraywidth();
|
|
||||||
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
resizeclient(Client *c, int x, int y, int w, int h)
|
resizeclient(Client *c, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
@ -1781,19 +1565,6 @@ resizeclient(Client *c, int x, int y, int w, int h)
|
|||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
resizerequest(XEvent *e)
|
|
||||||
{
|
|
||||||
XResizeRequestEvent *ev = &e->xresizerequest;
|
|
||||||
Client *i;
|
|
||||||
|
|
||||||
if ((i = wintosystrayicon(ev->window))) {
|
|
||||||
updatesystrayicongeom(i, ev->width, ev->height);
|
|
||||||
resizebarwin(selmon);
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
resizemouse(const Arg *arg)
|
resizemouse(const Arg *arg)
|
||||||
{
|
{
|
||||||
@ -2049,37 +1820,26 @@ setclientstate(Client *c, long state)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
sendevent(Client *c, Atom proto)
|
||||||
{
|
{
|
||||||
int n;
|
int n;
|
||||||
Atom *protocols, mt;
|
Atom *protocols;
|
||||||
int exists = 0;
|
int exists = 0;
|
||||||
XEvent ev;
|
XEvent ev;
|
||||||
|
|
||||||
if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
|
if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
|
||||||
mt = wmatom[WMProtocols];
|
|
||||||
if (XGetWMProtocols(dpy, w, &protocols, &n)) {
|
|
||||||
while (!exists && n--)
|
while (!exists && n--)
|
||||||
exists = protocols[n] == proto;
|
exists = protocols[n] == proto;
|
||||||
XFree(protocols);
|
XFree(protocols);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else {
|
|
||||||
exists = True;
|
|
||||||
mt = proto;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (exists) {
|
if (exists) {
|
||||||
ev.type = ClientMessage;
|
ev.type = ClientMessage;
|
||||||
ev.xclient.window = w;
|
ev.xclient.window = c->win;
|
||||||
ev.xclient.message_type = mt;
|
ev.xclient.message_type = wmatom[WMProtocols];
|
||||||
ev.xclient.format = 32;
|
ev.xclient.format = 32;
|
||||||
ev.xclient.data.l[0] = d0;
|
ev.xclient.data.l[0] = proto;
|
||||||
ev.xclient.data.l[1] = d1;
|
ev.xclient.data.l[1] = CurrentTime;
|
||||||
ev.xclient.data.l[2] = d2;
|
XSendEvent(dpy, c->win, False, NoEventMask, &ev);
|
||||||
ev.xclient.data.l[3] = d3;
|
|
||||||
ev.xclient.data.l[4] = d4;
|
|
||||||
XSendEvent(dpy, w, False, mask, &ev);
|
|
||||||
}
|
}
|
||||||
return exists;
|
return exists;
|
||||||
}
|
}
|
||||||
@ -2093,7 +1853,7 @@ setfocus(Client *c)
|
|||||||
XA_WINDOW, 32, PropModeReplace,
|
XA_WINDOW, 32, PropModeReplace,
|
||||||
(unsigned char *) &(c->win), 1);
|
(unsigned char *) &(c->win), 1);
|
||||||
}
|
}
|
||||||
sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
|
sendevent(c, wmatom[WMTakeFocus]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -2166,82 +1926,6 @@ setmfact(const Arg *arg)
|
|||||||
arrange(selmon);
|
arrange(selmon);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
showtagpreview(unsigned int i)
|
|
||||||
{
|
|
||||||
if (!selmon->previewshow || !selmon->tagmap[i]) {
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
XSetWindowBackgroundPixmap(dpy, selmon->tagwin, selmon->tagmap[i]);
|
|
||||||
XCopyArea(dpy, selmon->tagmap[i], selmon->tagwin, drw->gc, 0, 0,
|
|
||||||
selmon->mw / scalepreview, selmon->mh / scalepreview,
|
|
||||||
0, 0);
|
|
||||||
XSync(dpy, False);
|
|
||||||
XMapRaised(dpy, selmon->tagwin);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
takepreview(void)
|
|
||||||
{
|
|
||||||
Client *c;
|
|
||||||
Imlib_Image image;
|
|
||||||
unsigned int occ = 0, i;
|
|
||||||
|
|
||||||
for (c = selmon->clients; c; c = c->next)
|
|
||||||
occ |= c->tags;
|
|
||||||
//occ |= c->tags == 255 ? 0 : c->tags; /* hide vacants */
|
|
||||||
|
|
||||||
for (i = 0; i < LENGTH(tags); i++) {
|
|
||||||
/* searching for tags that are occupied && selected */
|
|
||||||
if (!(occ & 1 << i) || !(selmon->tagset[selmon->seltags] & 1 << i))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (selmon->tagmap[i]) { /* tagmap exist, clean it */
|
|
||||||
XFreePixmap(dpy, selmon->tagmap[i]);
|
|
||||||
selmon->tagmap[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* try to unmap the window so it doesn't show the preview on the preview */
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
XSync(dpy, False);
|
|
||||||
|
|
||||||
if (!(image = imlib_create_image(sw, sh))) {
|
|
||||||
fprintf(stderr, "dwm: imlib: failed to create image, skipping.");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
imlib_context_set_image(image);
|
|
||||||
imlib_context_set_display(dpy);
|
|
||||||
/* uncomment if using alpha patch */
|
|
||||||
//imlib_image_set_has_alpha(1);
|
|
||||||
//imlib_context_set_blend(0);
|
|
||||||
//imlib_context_set_visual(visual);
|
|
||||||
imlib_context_set_visual(DefaultVisual(dpy, screen));
|
|
||||||
imlib_context_set_drawable(root);
|
|
||||||
|
|
||||||
if (previewbar)
|
|
||||||
imlib_copy_drawable_to_image(0, selmon->wx, selmon->wy, selmon->ww, selmon->wh, 0, 0, 1);
|
|
||||||
else
|
|
||||||
imlib_copy_drawable_to_image(0, selmon->mx, selmon->my, selmon->mw ,selmon->mh, 0, 0, 1);
|
|
||||||
selmon->tagmap[i] = XCreatePixmap(dpy, selmon->tagwin, selmon->mw / scalepreview, selmon->mh / scalepreview, DefaultDepth(dpy, screen));
|
|
||||||
imlib_context_set_drawable(selmon->tagmap[i]);
|
|
||||||
imlib_render_image_part_on_drawable_at_size(0, 0, selmon->mw, selmon->mh, 0, 0, selmon->mw / scalepreview, selmon->mh / scalepreview);
|
|
||||||
imlib_free_image();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
previewtag(const Arg *arg)
|
|
||||||
{
|
|
||||||
if (selmon->previewshow != (arg->ui + 1))
|
|
||||||
selmon->previewshow = arg->ui + 1;
|
|
||||||
else
|
|
||||||
selmon->previewshow = 0;
|
|
||||||
showtagpreview(arg->ui);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
setup(void)
|
setup(void)
|
||||||
{
|
{
|
||||||
@ -2278,10 +1962,6 @@ setup(void)
|
|||||||
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
||||||
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
||||||
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
||||||
netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
|
|
||||||
netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
|
|
||||||
netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
|
||||||
netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
|
|
||||||
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
||||||
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
||||||
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
||||||
@ -2289,9 +1969,6 @@ setup(void)
|
|||||||
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
||||||
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
||||||
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
||||||
xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
|
||||||
xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
|
||||||
xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
|
||||||
/* init cursors */
|
/* init cursors */
|
||||||
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
||||||
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
||||||
@ -2300,8 +1977,6 @@ setup(void)
|
|||||||
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
for (i = 0; i < LENGTH(colors); i++)
|
||||||
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
||||||
/* init system tray */
|
|
||||||
updatesystray();
|
|
||||||
/* init bars */
|
/* init bars */
|
||||||
updatebars();
|
updatebars();
|
||||||
updatestatus();
|
updatestatus();
|
||||||
@ -2447,23 +2122,40 @@ tagmon(const Arg *arg)
|
|||||||
sendmon(selmon->sel, dirtomon(arg->i));
|
sendmon(selmon->sel, dirtomon(arg->i));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
tile(Monitor *m)
|
||||||
|
{
|
||||||
|
unsigned int i, n, h, mw, my, ty;
|
||||||
|
Client *c;
|
||||||
|
|
||||||
|
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
||||||
|
if (n == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (n > m->nmaster)
|
||||||
|
mw = m->nmaster ? m->ww * m->mfact : 0;
|
||||||
|
else
|
||||||
|
mw = m->ww;
|
||||||
|
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
||||||
|
if (i < m->nmaster) {
|
||||||
|
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
||||||
|
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
||||||
|
if (my + HEIGHT(c) < m->wh)
|
||||||
|
my += HEIGHT(c);
|
||||||
|
} else {
|
||||||
|
h = (m->wh - ty) / (n - i);
|
||||||
|
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
||||||
|
if (ty + HEIGHT(c) < m->wh)
|
||||||
|
ty += HEIGHT(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
togglebar(const Arg *arg)
|
togglebar(const Arg *arg)
|
||||||
{
|
{
|
||||||
selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
|
selmon->showbar = selmon->pertag->showbars[selmon->pertag->curtag] = !selmon->showbar;
|
||||||
updatebarpos(selmon);
|
updatebarpos(selmon);
|
||||||
resizebarwin(selmon);
|
XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
||||||
if (showsystray) {
|
|
||||||
XWindowChanges wc;
|
|
||||||
if (!selmon->showbar)
|
|
||||||
wc.y = -bh;
|
|
||||||
else if (selmon->showbar) {
|
|
||||||
wc.y = 0;
|
|
||||||
if (!selmon->topbar)
|
|
||||||
wc.y = selmon->mh - bh;
|
|
||||||
}
|
|
||||||
XConfigureWindow(dpy, systray->win, CWY, &wc);
|
|
||||||
}
|
|
||||||
arrange(selmon);
|
arrange(selmon);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2525,7 +2217,6 @@ toggleview(const Arg *arg)
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (newtagset) {
|
if (newtagset) {
|
||||||
takepreview();
|
|
||||||
selmon->tagset[selmon->seltags] = newtagset;
|
selmon->tagset[selmon->seltags] = newtagset;
|
||||||
|
|
||||||
if (newtagset == ~0) {
|
if (newtagset == ~0) {
|
||||||
@ -2623,45 +2314,25 @@ unmapnotify(XEvent *e)
|
|||||||
else
|
else
|
||||||
unmanage(c, 0);
|
unmanage(c, 0);
|
||||||
}
|
}
|
||||||
else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
/* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
|
||||||
* _not_ destroy them. We map those windows back */
|
|
||||||
XMapRaised(dpy, c->win);
|
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
updatebars(void)
|
updatebars(void)
|
||||||
{
|
{
|
||||||
unsigned int w;
|
|
||||||
Monitor *m;
|
Monitor *m;
|
||||||
XSetWindowAttributes wa = {
|
XSetWindowAttributes wa = {
|
||||||
.override_redirect = True,
|
.override_redirect = True,
|
||||||
.background_pixmap = ParentRelative,
|
.background_pixmap = ParentRelative,
|
||||||
.event_mask = ButtonPressMask|ExposureMask|PointerMotionMask
|
.event_mask = ButtonPressMask|ExposureMask
|
||||||
};
|
};
|
||||||
|
|
||||||
XClassHint ch = {"dwm", "dwm"};
|
XClassHint ch = {"dwm", "dwm"};
|
||||||
for (m = mons; m; m = m->next) {
|
for (m = mons; m; m = m->next) {
|
||||||
if (!m->tagwin) {
|
|
||||||
m->tagwin = XCreateWindow(dpy, root, m->wx, m->by + bh, m->mw / scalepreview,
|
|
||||||
m->mh / scalepreview, 0, DefaultDepth(dpy, screen), CopyFromParent,
|
|
||||||
DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
|
||||||
XDefineCursor(dpy, m->tagwin, cursor[CurNormal]->cursor);
|
|
||||||
XUnmapWindow(dpy, m->tagwin);
|
|
||||||
}
|
|
||||||
if (m->barwin)
|
if (m->barwin)
|
||||||
continue;
|
continue;
|
||||||
w = m->ww;
|
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
||||||
if (showsystray && m == systraytomon(m))
|
|
||||||
w -= getsystraywidth();
|
|
||||||
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
|
|
||||||
CopyFromParent, DefaultVisual(dpy, screen),
|
CopyFromParent, DefaultVisual(dpy, screen),
|
||||||
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
||||||
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
||||||
if (showsystray && m == systraytomon(m))
|
|
||||||
XMapRaised(dpy, systray->win);
|
|
||||||
XMapRaised(dpy, m->barwin);
|
XMapRaised(dpy, m->barwin);
|
||||||
XSelectInput(dpy, m->barwin, ButtonPressMask|PointerMotionMask);
|
XSelectInput(dpy, m->barwin, ButtonPressMask|PointerMotionMask);
|
||||||
XSetClassHint(dpy, m->barwin, &ch);
|
XSetClassHint(dpy, m->barwin, &ch);
|
||||||
@ -2839,125 +2510,6 @@ updatestatus(void)
|
|||||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
||||||
strcpy(stext, "dwm-"VERSION);
|
strcpy(stext, "dwm-"VERSION);
|
||||||
drawbar(selmon);
|
drawbar(selmon);
|
||||||
updatesystray();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
updatesystrayicongeom(Client *i, int w, int h)
|
|
||||||
{
|
|
||||||
if (i) {
|
|
||||||
i->h = bh;
|
|
||||||
if (w == h)
|
|
||||||
i->w = bh;
|
|
||||||
else if (h == bh)
|
|
||||||
i->w = w;
|
|
||||||
else
|
|
||||||
i->w = (int) ((float)bh * ((float)w / (float)h));
|
|
||||||
applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
|
|
||||||
/* force icons into the systray dimensions if they don't want to */
|
|
||||||
if (i->h > bh) {
|
|
||||||
if (i->w == i->h)
|
|
||||||
i->w = bh;
|
|
||||||
else
|
|
||||||
i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
|
|
||||||
i->h = bh;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
updatesystrayiconstate(Client *i, XPropertyEvent *ev)
|
|
||||||
{
|
|
||||||
long flags;
|
|
||||||
int code = 0;
|
|
||||||
|
|
||||||
if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
|
|
||||||
!(flags = getatomprop(i, xatom[XembedInfo])))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (flags & XEMBED_MAPPED && !i->tags) {
|
|
||||||
i->tags = 1;
|
|
||||||
code = XEMBED_WINDOW_ACTIVATE;
|
|
||||||
XMapRaised(dpy, i->win);
|
|
||||||
setclientstate(i, NormalState);
|
|
||||||
}
|
|
||||||
else if (!(flags & XEMBED_MAPPED) && i->tags) {
|
|
||||||
i->tags = 0;
|
|
||||||
code = XEMBED_WINDOW_DEACTIVATE;
|
|
||||||
XUnmapWindow(dpy, i->win);
|
|
||||||
setclientstate(i, WithdrawnState);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
return;
|
|
||||||
sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
|
|
||||||
systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
updatesystray(void)
|
|
||||||
{
|
|
||||||
XSetWindowAttributes wa;
|
|
||||||
XWindowChanges wc;
|
|
||||||
Client *i;
|
|
||||||
Monitor *m = systraytomon(NULL);
|
|
||||||
unsigned int x = m->mx + m->mw;
|
|
||||||
unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
|
|
||||||
unsigned int w = 1;
|
|
||||||
|
|
||||||
if (!showsystray)
|
|
||||||
return;
|
|
||||||
if (systrayonleft)
|
|
||||||
x -= sw + lrpad / 2;
|
|
||||||
if (!systray) {
|
|
||||||
/* init systray */
|
|
||||||
if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
|
|
||||||
die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
|
|
||||||
systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
wa.event_mask = ButtonPressMask | ExposureMask;
|
|
||||||
wa.override_redirect = True;
|
|
||||||
wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
XSelectInput(dpy, systray->win, SubstructureNotifyMask);
|
|
||||||
XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
|
|
||||||
PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
|
|
||||||
XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
|
|
||||||
XMapRaised(dpy, systray->win);
|
|
||||||
XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
|
|
||||||
if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
|
|
||||||
sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
|
|
||||||
XSync(dpy, False);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
fprintf(stderr, "dwm: unable to obtain system tray.\n");
|
|
||||||
free(systray);
|
|
||||||
systray = NULL;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (w = 0, i = systray->icons; i; i = i->next) {
|
|
||||||
/* make sure the background color stays the same */
|
|
||||||
wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
|
|
||||||
XMapRaised(dpy, i->win);
|
|
||||||
w += systrayspacing;
|
|
||||||
i->x = w;
|
|
||||||
XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
|
|
||||||
w += i->w;
|
|
||||||
if (i->mon != m)
|
|
||||||
i->mon = m;
|
|
||||||
}
|
|
||||||
w = w ? w + systrayspacing : 1;
|
|
||||||
x -= w;
|
|
||||||
XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
|
|
||||||
wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
|
|
||||||
wc.stack_mode = Above; wc.sibling = m->barwin;
|
|
||||||
XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
|
|
||||||
XMapWindow(dpy, systray->win);
|
|
||||||
XMapSubwindows(dpy, systray->win);
|
|
||||||
/* redraw background */
|
|
||||||
XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
|
|
||||||
XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
|
||||||
XSync(dpy, False);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -3008,7 +2560,6 @@ view(const Arg *arg)
|
|||||||
|
|
||||||
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
||||||
return;
|
return;
|
||||||
takepreview();
|
|
||||||
selmon->seltags ^= 1; /* toggle sel tagset */
|
selmon->seltags ^= 1; /* toggle sel tagset */
|
||||||
if (arg->ui & TAGMASK) {
|
if (arg->ui & TAGMASK) {
|
||||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
||||||
@ -3052,16 +2603,6 @@ wintoclient(Window w)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
Client *
|
|
||||||
wintosystrayicon(Window w) {
|
|
||||||
Client *i = NULL;
|
|
||||||
|
|
||||||
if (!showsystray || !w)
|
|
||||||
return i;
|
|
||||||
for (i = systray->icons; i && i->win != w; i = i->next) ;
|
|
||||||
return i;
|
|
||||||
}
|
|
||||||
|
|
||||||
Monitor *
|
Monitor *
|
||||||
wintomon(Window w)
|
wintomon(Window w)
|
||||||
{
|
{
|
||||||
@ -3115,22 +2656,6 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
Monitor *
|
|
||||||
systraytomon(Monitor *m) {
|
|
||||||
Monitor *t;
|
|
||||||
int i, n;
|
|
||||||
if(!systraypinning) {
|
|
||||||
if(!m)
|
|
||||||
return selmon;
|
|
||||||
return m == selmon ? m : NULL;
|
|
||||||
}
|
|
||||||
for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
|
|
||||||
for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
|
|
||||||
if(systraypinningfailfirst && n < systraypinning)
|
|
||||||
return mons;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
zoom(const Arg *arg)
|
zoom(const Arg *arg)
|
||||||
{
|
{
|
||||||
|
@ -1,746 +0,0 @@
|
|||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 9efa774..750529d 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -3,6 +3,11 @@
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
+static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
|
|
||||||
+static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
|
|
||||||
+static const unsigned int systrayspacing = 2; /* systray spacing */
|
|
||||||
+static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
|
|
||||||
+static const int showsystray = 1; /* 0 means no systray */
|
|
||||||
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" };
|
|
||||||
@@ -101,8 +106,8 @@ static const Key keys[] = {
|
|
||||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
|
||||||
static const Button buttons[] = {
|
|
||||||
/* click event mask button function argument */
|
|
||||||
- { ClkLtSymbol, 0, Button1, setlayout, {0} },
|
|
||||||
- { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
|
||||||
+ { ClkTagBar, MODKEY, Button1, tag, {0} },
|
|
||||||
+ { ClkTagBar, MODKEY, Button3, toggletag, {0} },
|
|
||||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
|
||||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
|
||||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 03baf42..4611a03 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -57,12 +57,27 @@
|
|
||||||
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
||||||
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
||||||
|
|
||||||
+#define SYSTEM_TRAY_REQUEST_DOCK 0
|
|
||||||
+/* XEMBED messages */
|
|
||||||
+#define XEMBED_EMBEDDED_NOTIFY 0
|
|
||||||
+#define XEMBED_WINDOW_ACTIVATE 1
|
|
||||||
+#define XEMBED_FOCUS_IN 4
|
|
||||||
+#define XEMBED_MODALITY_ON 10
|
|
||||||
+#define XEMBED_MAPPED (1 << 0)
|
|
||||||
+#define XEMBED_WINDOW_ACTIVATE 1
|
|
||||||
+#define XEMBED_WINDOW_DEACTIVATE 2
|
|
||||||
+#define VERSION_MAJOR 0
|
|
||||||
+#define VERSION_MINOR 0
|
|
||||||
+#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
|
||||||
+
|
|
||||||
/* enums */
|
|
||||||
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
||||||
enum { SchemeNorm, SchemeSel }; /* color schemes */
|
|
||||||
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
|
|
||||||
+ NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
|
|
||||||
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
|
|
||||||
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
||||||
+enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
|
|
||||||
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
|
|
||||||
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
|
|
||||||
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
|
|
||||||
@@ -141,6 +156,12 @@ typedef struct {
|
|
||||||
int monitor;
|
|
||||||
} Rule;
|
|
||||||
|
|
||||||
+typedef struct Systray Systray;
|
|
||||||
+struct Systray {
|
|
||||||
+ Window win;
|
|
||||||
+ Client *icons;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
/* function declarations */
|
|
||||||
static void applyrules(Client *c);
|
|
||||||
static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
|
|
||||||
@@ -172,6 +193,7 @@ static void focusstack(const Arg *arg);
|
|
||||||
static Atom getatomprop(Client *c, Atom prop);
|
|
||||||
static int getrootptr(int *x, int *y);
|
|
||||||
static long getstate(Window w);
|
|
||||||
+static unsigned int getsystraywidth();
|
|
||||||
static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
|
|
||||||
static void grabbuttons(Client *c, int focused);
|
|
||||||
static void grabkeys(void);
|
|
||||||
@@ -189,13 +211,16 @@ static void pop(Client *c);
|
|
||||||
static void propertynotify(XEvent *e);
|
|
||||||
static void quit(const Arg *arg);
|
|
||||||
static Monitor *recttomon(int x, int y, int w, int h);
|
|
||||||
+static void removesystrayicon(Client *i);
|
|
||||||
static void resize(Client *c, int x, int y, int w, int h, int interact);
|
|
||||||
+static void resizebarwin(Monitor *m);
|
|
||||||
static void resizeclient(Client *c, int x, int y, int w, int h);
|
|
||||||
static void resizemouse(const Arg *arg);
|
|
||||||
+static void resizerequest(XEvent *e);
|
|
||||||
static void restack(Monitor *m);
|
|
||||||
static void run(void);
|
|
||||||
static void scan(void);
|
|
||||||
-static int sendevent(Client *c, Atom proto);
|
|
||||||
+static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4);
|
|
||||||
static void sendmon(Client *c, Monitor *m);
|
|
||||||
static void setclientstate(Client *c, long state);
|
|
||||||
static void setfocus(Client *c);
|
|
||||||
@@ -207,6 +232,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 Monitor *systraytomon(Monitor *m);
|
|
||||||
static void tag(const Arg *arg);
|
|
||||||
static void tagmon(const Arg *arg);
|
|
||||||
static void tile(Monitor *m);
|
|
||||||
@@ -224,18 +250,23 @@ static int updategeom(void);
|
|
||||||
static void updatenumlockmask(void);
|
|
||||||
static void updatesizehints(Client *c);
|
|
||||||
static void updatestatus(void);
|
|
||||||
+static void updatesystray(void);
|
|
||||||
+static void updatesystrayicongeom(Client *i, int w, int h);
|
|
||||||
+static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
|
|
||||||
static void updatetitle(Client *c);
|
|
||||||
static void updatewindowtype(Client *c);
|
|
||||||
static void updatewmhints(Client *c);
|
|
||||||
static void view(const Arg *arg);
|
|
||||||
static Client *wintoclient(Window w);
|
|
||||||
static Monitor *wintomon(Window w);
|
|
||||||
+static Client *wintosystrayicon(Window w);
|
|
||||||
static int xerror(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
|
|
||||||
/* variables */
|
|
||||||
+static Systray *systray = NULL;
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
static char stext[256];
|
|
||||||
static int screen;
|
|
||||||
@@ -258,9 +289,10 @@ static void (*handler[LASTEvent]) (XEvent *) = {
|
|
||||||
[MapRequest] = maprequest,
|
|
||||||
[MotionNotify] = motionnotify,
|
|
||||||
[PropertyNotify] = propertynotify,
|
|
||||||
+ [ResizeRequest] = resizerequest,
|
|
||||||
[UnmapNotify] = unmapnotify
|
|
||||||
};
|
|
||||||
-static Atom wmatom[WMLast], netatom[NetLast];
|
|
||||||
+static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
|
|
||||||
static int running = 1;
|
|
||||||
static Cur *cursor[CurLast];
|
|
||||||
static Clr **scheme;
|
|
||||||
@@ -442,7 +474,7 @@ buttonpress(XEvent *e)
|
|
||||||
arg.ui = 1 << i;
|
|
||||||
} else if (ev->x < x + TEXTW(selmon->ltsymbol))
|
|
||||||
click = ClkLtSymbol;
|
|
||||||
- else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
|
||||||
+ else if (ev->x > selmon->ww - (int)TEXTW(stext) - getsystraywidth())
|
|
||||||
click = ClkStatusText;
|
|
||||||
else
|
|
||||||
click = ClkWinTitle;
|
|
||||||
@@ -485,6 +517,13 @@ cleanup(void)
|
|
||||||
XUngrabKey(dpy, AnyKey, AnyModifier, root);
|
|
||||||
while (mons)
|
|
||||||
cleanupmon(mons);
|
|
||||||
+
|
|
||||||
+ if (showsystray) {
|
|
||||||
+ XUnmapWindow(dpy, systray->win);
|
|
||||||
+ XDestroyWindow(dpy, systray->win);
|
|
||||||
+ free(systray);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
for (i = 0; i < CurLast; i++)
|
|
||||||
drw_cur_free(drw, cursor[i]);
|
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
|
||||||
@@ -516,9 +555,58 @@ cleanupmon(Monitor *mon)
|
|
||||||
void
|
|
||||||
clientmessage(XEvent *e)
|
|
||||||
{
|
|
||||||
+ XWindowAttributes wa;
|
|
||||||
+ XSetWindowAttributes swa;
|
|
||||||
XClientMessageEvent *cme = &e->xclient;
|
|
||||||
Client *c = wintoclient(cme->window);
|
|
||||||
|
|
||||||
+ if (showsystray && cme->window == systray->win && cme->message_type == netatom[NetSystemTrayOP]) {
|
|
||||||
+ /* add systray icons */
|
|
||||||
+ if (cme->data.l[1] == SYSTEM_TRAY_REQUEST_DOCK) {
|
|
||||||
+ if (!(c = (Client *)calloc(1, sizeof(Client))))
|
|
||||||
+ die("fatal: could not malloc() %u bytes\n", sizeof(Client));
|
|
||||||
+ if (!(c->win = cme->data.l[2])) {
|
|
||||||
+ free(c);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ c->mon = selmon;
|
|
||||||
+ c->next = systray->icons;
|
|
||||||
+ systray->icons = c;
|
|
||||||
+ if (!XGetWindowAttributes(dpy, c->win, &wa)) {
|
|
||||||
+ /* use sane defaults */
|
|
||||||
+ wa.width = bh;
|
|
||||||
+ wa.height = bh;
|
|
||||||
+ wa.border_width = 0;
|
|
||||||
+ }
|
|
||||||
+ c->x = c->oldx = c->y = c->oldy = 0;
|
|
||||||
+ c->w = c->oldw = wa.width;
|
|
||||||
+ c->h = c->oldh = wa.height;
|
|
||||||
+ c->oldbw = wa.border_width;
|
|
||||||
+ c->bw = 0;
|
|
||||||
+ c->isfloating = True;
|
|
||||||
+ /* reuse tags field as mapped status */
|
|
||||||
+ c->tags = 1;
|
|
||||||
+ updatesizehints(c);
|
|
||||||
+ updatesystrayicongeom(c, wa.width, wa.height);
|
|
||||||
+ XAddToSaveSet(dpy, c->win);
|
|
||||||
+ XSelectInput(dpy, c->win, StructureNotifyMask | PropertyChangeMask | ResizeRedirectMask);
|
|
||||||
+ XReparentWindow(dpy, c->win, systray->win, 0, 0);
|
|
||||||
+ /* use parents background color */
|
|
||||||
+ swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
+ XChangeWindowAttributes(dpy, c->win, CWBackPixel, &swa);
|
|
||||||
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_EMBEDDED_NOTIFY, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+ /* FIXME not sure if I have to send these events, too */
|
|
||||||
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_FOCUS_IN, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+ sendevent(c->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_MODALITY_ON, 0 , systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+ XSync(dpy, False);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ setclientstate(c, NormalState);
|
|
||||||
+ }
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!c)
|
|
||||||
return;
|
|
||||||
if (cme->message_type == netatom[NetWMState]) {
|
|
||||||
@@ -571,7 +659,7 @@ configurenotify(XEvent *e)
|
|
||||||
for (c = m->clients; c; c = c->next)
|
|
||||||
if (c->isfullscreen)
|
|
||||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
|
||||||
- XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
|
||||||
+ resizebarwin(m);
|
|
||||||
}
|
|
||||||
focus(NULL);
|
|
||||||
arrange(NULL);
|
|
||||||
@@ -656,6 +744,11 @@ destroynotify(XEvent *e)
|
|
||||||
|
|
||||||
if ((c = wintoclient(ev->window)))
|
|
||||||
unmanage(c, 1);
|
|
||||||
+ else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
+ removesystrayicon(c);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -699,7 +792,7 @@ dirtomon(int dir)
|
|
||||||
void
|
|
||||||
drawbar(Monitor *m)
|
|
||||||
{
|
|
||||||
- int x, w, tw = 0;
|
|
||||||
+ int x, w, tw = 0, stw = 0;
|
|
||||||
int boxs = drw->fonts->h / 9;
|
|
||||||
int boxw = drw->fonts->h / 6 + 2;
|
|
||||||
unsigned int i, occ = 0, urg = 0;
|
|
||||||
@@ -708,13 +801,17 @@ drawbar(Monitor *m)
|
|
||||||
if (!m->showbar)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ if(showsystray && m == systraytomon(m) && !systrayonleft)
|
|
||||||
+ stw = getsystraywidth();
|
|
||||||
+
|
|
||||||
/* draw status first so it can be overdrawn by tags later */
|
|
||||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
- tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
|
||||||
- drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
|
||||||
+ tw = TEXTW(stext) - lrpad / 2 + 2; /* 2px extra right padding */
|
|
||||||
+ drw_text(drw, m->ww - tw - stw, 0, tw, bh, lrpad / 2 - 2, stext, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ resizebarwin(m);
|
|
||||||
for (c = m->clients; c; c = c->next) {
|
|
||||||
occ |= c->tags;
|
|
||||||
if (c->isurgent)
|
|
||||||
@@ -735,7 +832,7 @@ drawbar(Monitor *m)
|
|
||||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
||||||
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
||||||
|
|
||||||
- if ((w = m->ww - tw - x) > bh) {
|
|
||||||
+ if ((w = m->ww - tw - stw - x) > bh) {
|
|
||||||
if (m->sel) {
|
|
||||||
drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
|
|
||||||
drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
|
|
||||||
@@ -746,7 +843,7 @@ drawbar(Monitor *m)
|
|
||||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- drw_map(drw, m->barwin, 0, 0, m->ww, bh);
|
|
||||||
+ drw_map(drw, m->barwin, 0, 0, m->ww - stw, bh);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -783,8 +880,11 @@ expose(XEvent *e)
|
|
||||||
Monitor *m;
|
|
||||||
XExposeEvent *ev = &e->xexpose;
|
|
||||||
|
|
||||||
- if (ev->count == 0 && (m = wintomon(ev->window)))
|
|
||||||
+ if (ev->count == 0 && (m = wintomon(ev->window))) {
|
|
||||||
drawbar(m);
|
|
||||||
+ if (m == selmon)
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -870,14 +970,32 @@ getatomprop(Client *c, Atom prop)
|
|
||||||
unsigned char *p = NULL;
|
|
||||||
Atom da, atom = None;
|
|
||||||
|
|
||||||
- if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
|
|
||||||
+ /* FIXME getatomprop should return the number of items and a pointer to
|
|
||||||
+ * the stored data instead of this workaround */
|
|
||||||
+ Atom req = XA_ATOM;
|
|
||||||
+ if (prop == xatom[XembedInfo])
|
|
||||||
+ req = xatom[XembedInfo];
|
|
||||||
+
|
|
||||||
+ if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, req,
|
|
||||||
&da, &di, &dl, &dl, &p) == Success && p) {
|
|
||||||
atom = *(Atom *)p;
|
|
||||||
+ if (da == xatom[XembedInfo] && dl == 2)
|
|
||||||
+ atom = ((Atom *)p)[1];
|
|
||||||
XFree(p);
|
|
||||||
}
|
|
||||||
return atom;
|
|
||||||
}
|
|
||||||
|
|
||||||
+unsigned int
|
|
||||||
+getsystraywidth()
|
|
||||||
+{
|
|
||||||
+ unsigned int w = 0;
|
|
||||||
+ Client *i;
|
|
||||||
+ if(showsystray)
|
|
||||||
+ for(i = systray->icons; i; w += i->w + systrayspacing, i = i->next) ;
|
|
||||||
+ return w ? w + systrayspacing : 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int
|
|
||||||
getrootptr(int *x, int *y)
|
|
||||||
{
|
|
||||||
@@ -1018,7 +1136,8 @@ killclient(const Arg *arg)
|
|
||||||
{
|
|
||||||
if (!selmon->sel)
|
|
||||||
return;
|
|
||||||
- if (!sendevent(selmon->sel, wmatom[WMDelete])) {
|
|
||||||
+
|
|
||||||
+ if (!sendevent(selmon->sel->win, wmatom[WMDelete], NoEventMask, wmatom[WMDelete], CurrentTime, 0 , 0, 0)) {
|
|
||||||
XGrabServer(dpy);
|
|
||||||
XSetErrorHandler(xerrordummy);
|
|
||||||
XSetCloseDownMode(dpy, DestroyAll);
|
|
||||||
@@ -1105,6 +1224,13 @@ maprequest(XEvent *e)
|
|
||||||
static XWindowAttributes wa;
|
|
||||||
XMapRequestEvent *ev = &e->xmaprequest;
|
|
||||||
|
|
||||||
+ Client *i;
|
|
||||||
+ if ((i = wintosystrayicon(ev->window))) {
|
|
||||||
+ sendevent(i->win, netatom[Xembed], StructureNotifyMask, CurrentTime, XEMBED_WINDOW_ACTIVATE, 0, systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
|
|
||||||
return;
|
|
||||||
if (!wintoclient(ev->window))
|
|
||||||
@@ -1226,6 +1352,17 @@ propertynotify(XEvent *e)
|
|
||||||
Window trans;
|
|
||||||
XPropertyEvent *ev = &e->xproperty;
|
|
||||||
|
|
||||||
+ if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
+ if (ev->atom == XA_WM_NORMAL_HINTS) {
|
|
||||||
+ updatesizehints(c);
|
|
||||||
+ updatesystrayicongeom(c, c->w, c->h);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ updatesystrayiconstate(c, ev);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
|
||||||
updatestatus();
|
|
||||||
else if (ev->state == PropertyDelete)
|
|
||||||
@@ -1276,6 +1413,19 @@ recttomon(int x, int y, int w, int h)
|
|
||||||
return r;
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+removesystrayicon(Client *i)
|
|
||||||
+{
|
|
||||||
+ Client **ii;
|
|
||||||
+
|
|
||||||
+ if (!showsystray || !i)
|
|
||||||
+ return;
|
|
||||||
+ for (ii = &systray->icons; *ii && *ii != i; ii = &(*ii)->next);
|
|
||||||
+ if (ii)
|
|
||||||
+ *ii = i->next;
|
|
||||||
+ free(i);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
resize(Client *c, int x, int y, int w, int h, int interact)
|
|
||||||
{
|
|
||||||
@@ -1283,6 +1433,14 @@ resize(Client *c, int x, int y, int w, int h, int interact)
|
|
||||||
resizeclient(c, x, y, w, h);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+resizebarwin(Monitor *m) {
|
|
||||||
+ unsigned int w = m->ww;
|
|
||||||
+ if (showsystray && m == systraytomon(m) && !systrayonleft)
|
|
||||||
+ w -= getsystraywidth();
|
|
||||||
+ XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, w, bh);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
resizeclient(Client *c, int x, int y, int w, int h)
|
|
||||||
{
|
|
||||||
@@ -1298,6 +1456,19 @@ resizeclient(Client *c, int x, int y, int w, int h)
|
|
||||||
XSync(dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+resizerequest(XEvent *e)
|
|
||||||
+{
|
|
||||||
+ XResizeRequestEvent *ev = &e->xresizerequest;
|
|
||||||
+ Client *i;
|
|
||||||
+
|
|
||||||
+ if ((i = wintosystrayicon(ev->window))) {
|
|
||||||
+ updatesystrayicongeom(i, ev->width, ev->height);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
resizemouse(const Arg *arg)
|
|
||||||
{
|
|
||||||
@@ -1444,26 +1615,37 @@ setclientstate(Client *c, long state)
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
-sendevent(Client *c, Atom proto)
|
|
||||||
+sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4)
|
|
||||||
{
|
|
||||||
int n;
|
|
||||||
- Atom *protocols;
|
|
||||||
+ Atom *protocols, mt;
|
|
||||||
int exists = 0;
|
|
||||||
XEvent ev;
|
|
||||||
|
|
||||||
- if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
|
|
||||||
- while (!exists && n--)
|
|
||||||
- exists = protocols[n] == proto;
|
|
||||||
- XFree(protocols);
|
|
||||||
+ if (proto == wmatom[WMTakeFocus] || proto == wmatom[WMDelete]) {
|
|
||||||
+ mt = wmatom[WMProtocols];
|
|
||||||
+ if (XGetWMProtocols(dpy, w, &protocols, &n)) {
|
|
||||||
+ while (!exists && n--)
|
|
||||||
+ exists = protocols[n] == proto;
|
|
||||||
+ XFree(protocols);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ exists = True;
|
|
||||||
+ mt = proto;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
if (exists) {
|
|
||||||
ev.type = ClientMessage;
|
|
||||||
- ev.xclient.window = c->win;
|
|
||||||
- ev.xclient.message_type = wmatom[WMProtocols];
|
|
||||||
+ ev.xclient.window = w;
|
|
||||||
+ ev.xclient.message_type = mt;
|
|
||||||
ev.xclient.format = 32;
|
|
||||||
- ev.xclient.data.l[0] = proto;
|
|
||||||
- ev.xclient.data.l[1] = CurrentTime;
|
|
||||||
- XSendEvent(dpy, c->win, False, NoEventMask, &ev);
|
|
||||||
+ ev.xclient.data.l[0] = d0;
|
|
||||||
+ ev.xclient.data.l[1] = d1;
|
|
||||||
+ ev.xclient.data.l[2] = d2;
|
|
||||||
+ ev.xclient.data.l[3] = d3;
|
|
||||||
+ ev.xclient.data.l[4] = d4;
|
|
||||||
+ XSendEvent(dpy, w, False, mask, &ev);
|
|
||||||
}
|
|
||||||
return exists;
|
|
||||||
}
|
|
||||||
@@ -1477,7 +1659,7 @@ setfocus(Client *c)
|
|
||||||
XA_WINDOW, 32, PropModeReplace,
|
|
||||||
(unsigned char *) &(c->win), 1);
|
|
||||||
}
|
|
||||||
- sendevent(c, wmatom[WMTakeFocus]);
|
|
||||||
+ sendevent(c->win, wmatom[WMTakeFocus], NoEventMask, wmatom[WMTakeFocus], CurrentTime, 0, 0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -1566,6 +1748,10 @@ setup(void)
|
|
||||||
wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
|
|
||||||
netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
|
|
||||||
netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
|
|
||||||
+ netatom[NetSystemTray] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_S0", False);
|
|
||||||
+ netatom[NetSystemTrayOP] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_OPCODE", False);
|
|
||||||
+ netatom[NetSystemTrayOrientation] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION", False);
|
|
||||||
+ netatom[NetSystemTrayOrientationHorz] = XInternAtom(dpy, "_NET_SYSTEM_TRAY_ORIENTATION_HORZ", False);
|
|
||||||
netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
|
|
||||||
netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
|
|
||||||
netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
|
|
||||||
@@ -1573,6 +1759,9 @@ setup(void)
|
|
||||||
netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
|
|
||||||
netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
|
|
||||||
netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
|
|
||||||
+ xatom[Manager] = XInternAtom(dpy, "MANAGER", False);
|
|
||||||
+ xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False);
|
|
||||||
+ xatom[XembedInfo] = XInternAtom(dpy, "_XEMBED_INFO", False);
|
|
||||||
/* init cursors */
|
|
||||||
cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
|
|
||||||
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
|
||||||
@@ -1581,6 +1770,8 @@ setup(void)
|
|
||||||
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
|
||||||
for (i = 0; i < LENGTH(colors); i++)
|
|
||||||
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
|
||||||
+ /* init system tray */
|
|
||||||
+ updatesystray();
|
|
||||||
/* init bars */
|
|
||||||
updatebars();
|
|
||||||
updatestatus();
|
|
||||||
@@ -1711,7 +1902,18 @@ togglebar(const Arg *arg)
|
|
||||||
{
|
|
||||||
selmon->showbar = !selmon->showbar;
|
|
||||||
updatebarpos(selmon);
|
|
||||||
- XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
|
|
||||||
+ resizebarwin(selmon);
|
|
||||||
+ if (showsystray) {
|
|
||||||
+ XWindowChanges wc;
|
|
||||||
+ if (!selmon->showbar)
|
|
||||||
+ wc.y = -bh;
|
|
||||||
+ else if (selmon->showbar) {
|
|
||||||
+ wc.y = 0;
|
|
||||||
+ if (!selmon->topbar)
|
|
||||||
+ wc.y = selmon->mh - bh;
|
|
||||||
+ }
|
|
||||||
+ XConfigureWindow(dpy, systray->win, CWY, &wc);
|
|
||||||
+ }
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1807,11 +2009,18 @@ unmapnotify(XEvent *e)
|
|
||||||
else
|
|
||||||
unmanage(c, 0);
|
|
||||||
}
|
|
||||||
+ else if ((c = wintosystrayicon(ev->window))) {
|
|
||||||
+ /* KLUDGE! sometimes icons occasionally unmap their windows, but do
|
|
||||||
+ * _not_ destroy them. We map those windows back */
|
|
||||||
+ XMapRaised(dpy, c->win);
|
|
||||||
+ updatesystray();
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
updatebars(void)
|
|
||||||
{
|
|
||||||
+ unsigned int w;
|
|
||||||
Monitor *m;
|
|
||||||
XSetWindowAttributes wa = {
|
|
||||||
.override_redirect = True,
|
|
||||||
@@ -1822,10 +2031,15 @@ updatebars(void)
|
|
||||||
for (m = mons; m; m = m->next) {
|
|
||||||
if (m->barwin)
|
|
||||||
continue;
|
|
||||||
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
|
||||||
+ w = m->ww;
|
|
||||||
+ if (showsystray && m == systraytomon(m))
|
|
||||||
+ w -= getsystraywidth();
|
|
||||||
+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, bh, 0, DefaultDepth(dpy, screen),
|
|
||||||
CopyFromParent, DefaultVisual(dpy, screen),
|
|
||||||
CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
|
||||||
XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
|
|
||||||
+ if (showsystray && m == systraytomon(m))
|
|
||||||
+ XMapRaised(dpy, systray->win);
|
|
||||||
XMapRaised(dpy, m->barwin);
|
|
||||||
XSetClassHint(dpy, m->barwin, &ch);
|
|
||||||
}
|
|
||||||
@@ -2002,6 +2216,125 @@ updatestatus(void)
|
|
||||||
if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
|
|
||||||
strcpy(stext, "dwm-"VERSION);
|
|
||||||
drawbar(selmon);
|
|
||||||
+ updatesystray();
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+updatesystrayicongeom(Client *i, int w, int h)
|
|
||||||
+{
|
|
||||||
+ if (i) {
|
|
||||||
+ i->h = bh;
|
|
||||||
+ if (w == h)
|
|
||||||
+ i->w = bh;
|
|
||||||
+ else if (h == bh)
|
|
||||||
+ i->w = w;
|
|
||||||
+ else
|
|
||||||
+ i->w = (int) ((float)bh * ((float)w / (float)h));
|
|
||||||
+ applysizehints(i, &(i->x), &(i->y), &(i->w), &(i->h), False);
|
|
||||||
+ /* force icons into the systray dimensions if they don't want to */
|
|
||||||
+ if (i->h > bh) {
|
|
||||||
+ if (i->w == i->h)
|
|
||||||
+ i->w = bh;
|
|
||||||
+ else
|
|
||||||
+ i->w = (int) ((float)bh * ((float)i->w / (float)i->h));
|
|
||||||
+ i->h = bh;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+updatesystrayiconstate(Client *i, XPropertyEvent *ev)
|
|
||||||
+{
|
|
||||||
+ long flags;
|
|
||||||
+ int code = 0;
|
|
||||||
+
|
|
||||||
+ if (!showsystray || !i || ev->atom != xatom[XembedInfo] ||
|
|
||||||
+ !(flags = getatomprop(i, xatom[XembedInfo])))
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (flags & XEMBED_MAPPED && !i->tags) {
|
|
||||||
+ i->tags = 1;
|
|
||||||
+ code = XEMBED_WINDOW_ACTIVATE;
|
|
||||||
+ XMapRaised(dpy, i->win);
|
|
||||||
+ setclientstate(i, NormalState);
|
|
||||||
+ }
|
|
||||||
+ else if (!(flags & XEMBED_MAPPED) && i->tags) {
|
|
||||||
+ i->tags = 0;
|
|
||||||
+ code = XEMBED_WINDOW_DEACTIVATE;
|
|
||||||
+ XUnmapWindow(dpy, i->win);
|
|
||||||
+ setclientstate(i, WithdrawnState);
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ return;
|
|
||||||
+ sendevent(i->win, xatom[Xembed], StructureNotifyMask, CurrentTime, code, 0,
|
|
||||||
+ systray->win, XEMBED_EMBEDDED_VERSION);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+updatesystray(void)
|
|
||||||
+{
|
|
||||||
+ XSetWindowAttributes wa;
|
|
||||||
+ XWindowChanges wc;
|
|
||||||
+ Client *i;
|
|
||||||
+ Monitor *m = systraytomon(NULL);
|
|
||||||
+ unsigned int x = m->mx + m->mw;
|
|
||||||
+ unsigned int sw = TEXTW(stext) - lrpad + systrayspacing;
|
|
||||||
+ unsigned int w = 1;
|
|
||||||
+
|
|
||||||
+ if (!showsystray)
|
|
||||||
+ return;
|
|
||||||
+ if (systrayonleft)
|
|
||||||
+ x -= sw + lrpad / 2;
|
|
||||||
+ if (!systray) {
|
|
||||||
+ /* init systray */
|
|
||||||
+ if (!(systray = (Systray *)calloc(1, sizeof(Systray))))
|
|
||||||
+ die("fatal: could not malloc() %u bytes\n", sizeof(Systray));
|
|
||||||
+ systray->win = XCreateSimpleWindow(dpy, root, x, m->by, w, bh, 0, 0, scheme[SchemeSel][ColBg].pixel);
|
|
||||||
+ wa.event_mask = ButtonPressMask | ExposureMask;
|
|
||||||
+ wa.override_redirect = True;
|
|
||||||
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
+ XSelectInput(dpy, systray->win, SubstructureNotifyMask);
|
|
||||||
+ XChangeProperty(dpy, systray->win, netatom[NetSystemTrayOrientation], XA_CARDINAL, 32,
|
|
||||||
+ PropModeReplace, (unsigned char *)&netatom[NetSystemTrayOrientationHorz], 1);
|
|
||||||
+ XChangeWindowAttributes(dpy, systray->win, CWEventMask|CWOverrideRedirect|CWBackPixel, &wa);
|
|
||||||
+ XMapRaised(dpy, systray->win);
|
|
||||||
+ XSetSelectionOwner(dpy, netatom[NetSystemTray], systray->win, CurrentTime);
|
|
||||||
+ if (XGetSelectionOwner(dpy, netatom[NetSystemTray]) == systray->win) {
|
|
||||||
+ sendevent(root, xatom[Manager], StructureNotifyMask, CurrentTime, netatom[NetSystemTray], systray->win, 0, 0);
|
|
||||||
+ XSync(dpy, False);
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ fprintf(stderr, "dwm: unable to obtain system tray.\n");
|
|
||||||
+ free(systray);
|
|
||||||
+ systray = NULL;
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ for (w = 0, i = systray->icons; i; i = i->next) {
|
|
||||||
+ /* make sure the background color stays the same */
|
|
||||||
+ wa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
|
|
||||||
+ XChangeWindowAttributes(dpy, i->win, CWBackPixel, &wa);
|
|
||||||
+ XMapRaised(dpy, i->win);
|
|
||||||
+ w += systrayspacing;
|
|
||||||
+ i->x = w;
|
|
||||||
+ XMoveResizeWindow(dpy, i->win, i->x, 0, i->w, i->h);
|
|
||||||
+ w += i->w;
|
|
||||||
+ if (i->mon != m)
|
|
||||||
+ i->mon = m;
|
|
||||||
+ }
|
|
||||||
+ w = w ? w + systrayspacing : 1;
|
|
||||||
+ x -= w;
|
|
||||||
+ XMoveResizeWindow(dpy, systray->win, x, m->by, w, bh);
|
|
||||||
+ wc.x = x; wc.y = m->by; wc.width = w; wc.height = bh;
|
|
||||||
+ wc.stack_mode = Above; wc.sibling = m->barwin;
|
|
||||||
+ XConfigureWindow(dpy, systray->win, CWX|CWY|CWWidth|CWHeight|CWSibling|CWStackMode, &wc);
|
|
||||||
+ XMapWindow(dpy, systray->win);
|
|
||||||
+ XMapSubwindows(dpy, systray->win);
|
|
||||||
+ /* redraw background */
|
|
||||||
+ XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
|
|
||||||
+ XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
|
||||||
+ XSync(dpy, False);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
@@ -2069,6 +2402,16 @@ wintoclient(Window w)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+Client *
|
|
||||||
+wintosystrayicon(Window w) {
|
|
||||||
+ Client *i = NULL;
|
|
||||||
+
|
|
||||||
+ if (!showsystray || !w)
|
|
||||||
+ return i;
|
|
||||||
+ for (i = systray->icons; i && i->win != w; i = i->next) ;
|
|
||||||
+ return i;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
Monitor *
|
|
||||||
wintomon(Window w)
|
|
||||||
{
|
|
||||||
@@ -2122,6 +2465,22 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+Monitor *
|
|
||||||
+systraytomon(Monitor *m) {
|
|
||||||
+ Monitor *t;
|
|
||||||
+ int i, n;
|
|
||||||
+ if(!systraypinning) {
|
|
||||||
+ if(!m)
|
|
||||||
+ return selmon;
|
|
||||||
+ return m == selmon ? m : NULL;
|
|
||||||
+ }
|
|
||||||
+ for(n = 1, t = mons; t && t->next; n++, t = t->next) ;
|
|
||||||
+ for(i = 1, t = mons; t && t->next && i < systraypinning; i++, t = t->next) ;
|
|
||||||
+ if(systraypinningfailfirst && n < systraypinning)
|
|
||||||
+ return mons;
|
|
||||||
+ return t;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
zoom(const Arg *arg)
|
|
||||||
{
|
|
@ -1,315 +0,0 @@
|
|||||||
From 841ad7d5767f945ee9da6c5afc8cff98ca2f8231 Mon Sep 17 00:00:00 2001
|
|
||||||
From: explosion-mental <explosion0mental@gmail.com>
|
|
||||||
Date: Thu, 1 Sep 2022 16:21:58 -0500
|
|
||||||
Subject: [PATCH] [PATCH] tag previews: free() tagmap and add previewtag func
|
|
||||||
|
|
||||||
Allows you to see the contents of an already viewed tag. So a more
|
|
||||||
accurate description would be to re-view a tag.
|
|
||||||
|
|
||||||
Allows you to see the contents of an already viewed tag. So a more
|
|
||||||
accurate description would be to re-view a tag.
|
|
||||||
|
|
||||||
Compatibility with the alpha patch (replacing DefaultDepth() and
|
|
||||||
DefaultVisual() with depth and visual + window masks) and hide vacants can be
|
|
||||||
achieved, I left some lines to uncomment.
|
|
||||||
|
|
||||||
added:
|
|
||||||
* more compact structure, more probable to patch on top of other patches
|
|
||||||
or easier to patch manually (like not moving the Monitor struct..)
|
|
||||||
* create the window preview in updatebars()
|
|
||||||
* renamed switchtag() -> takepreview(), makes more sense since it's
|
|
||||||
"taking" the preview (basically a screenshot).
|
|
||||||
* option previewbar, whether to show the bar in the preview or not.
|
|
||||||
* previewtag which takes a tag (unsigned int from 0 to the last tag) and
|
|
||||||
previews it. This allows to preview tags without using the
|
|
||||||
cursor/mouse (which avoids a recursive previews preview).
|
|
||||||
adding it to the TAGKEYS macro makes more sense so I've added it
|
|
||||||
replacing (keybinding wise, not functionality) toggletag.
|
|
||||||
```
|
|
||||||
\#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|ControlMask|ShiftMask, KEY, previewtag, {.ui = TAG } },
|
|
||||||
```
|
|
||||||
---
|
|
||||||
config.def.h | 4 +-
|
|
||||||
config.mk | 5 +-
|
|
||||||
dwm.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++-
|
|
||||||
3 files changed, 145 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index a2ac963..eb70348 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -3,6 +3,8 @@
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
+static const int scalepreview = 4; /* preview scaling (display w and h / scalepreview) */
|
|
||||||
+static const int previewbar = 1; /* show the bar in the preview window */
|
|
||||||
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" };
|
|
||||||
@@ -50,7 +52,7 @@ static const Layout layouts[] = {
|
|
||||||
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
|
|
||||||
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
|
|
||||||
- { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
|
|
||||||
+ { MODKEY|ControlMask|ShiftMask, KEY, previewtag, {.ui = TAG } }, \
|
|
||||||
|
|
||||||
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
|
|
||||||
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
|
|
||||||
diff --git a/config.mk b/config.mk
|
|
||||||
index b6eb7e0..6f5129e 100644
|
|
||||||
--- a/config.mk
|
|
||||||
+++ b/config.mk
|
|
||||||
@@ -20,9 +20,12 @@ FREETYPEINC = /usr/include/freetype2
|
|
||||||
# OpenBSD (uncomment)
|
|
||||||
#FREETYPEINC = ${X11INC}/freetype2
|
|
||||||
|
|
||||||
+# Imlib2 (tag previews)
|
|
||||||
+IMLIB2LIBS = -lImlib2
|
|
||||||
+
|
|
||||||
# includes and libs
|
|
||||||
INCS = -I${X11INC} -I${FREETYPEINC}
|
|
||||||
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
|
|
||||||
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} ${IMLIB2LIBS}
|
|
||||||
|
|
||||||
# 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 a96f33c..0c0ba12 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -40,6 +40,7 @@
|
|
||||||
#include <X11/extensions/Xinerama.h>
|
|
||||||
#endif /* XINERAMA */
|
|
||||||
#include <X11/Xft/Xft.h>
|
|
||||||
+#include <Imlib2.h>
|
|
||||||
|
|
||||||
#include "drw.h"
|
|
||||||
#include "util.h"
|
|
||||||
@@ -112,6 +113,9 @@ typedef struct {
|
|
||||||
} Layout;
|
|
||||||
|
|
||||||
struct Monitor {
|
|
||||||
+ int previewshow;
|
|
||||||
+ Window tagwin;
|
|
||||||
+ Pixmap *tagmap;
|
|
||||||
char ltsymbol[16];
|
|
||||||
float mfact;
|
|
||||||
int nmaster;
|
|
||||||
@@ -235,6 +239,10 @@ static int xerrordummy(Display *dpy, XErrorEvent *ee);
|
|
||||||
static int xerrorstart(Display *dpy, XErrorEvent *ee);
|
|
||||||
static void zoom(const Arg *arg);
|
|
||||||
|
|
||||||
+static void showtagpreview(unsigned int i);
|
|
||||||
+static void takepreview(void);
|
|
||||||
+static void previewtag(const Arg *arg);
|
|
||||||
+
|
|
||||||
/* variables */
|
|
||||||
static const char broken[] = "broken";
|
|
||||||
static char stext[256];
|
|
||||||
@@ -438,6 +446,11 @@ buttonpress(XEvent *e)
|
|
||||||
if (i < LENGTH(tags)) {
|
|
||||||
click = ClkTagBar;
|
|
||||||
arg.ui = 1 << i;
|
|
||||||
+ /* hide preview if we click the bar */
|
|
||||||
+ if (selmon->previewshow) {
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ }
|
|
||||||
} else if (ev->x < x + blw)
|
|
||||||
click = ClkLtSymbol;
|
|
||||||
else if (ev->x > selmon->ww - (int)TEXTW(stext))
|
|
||||||
@@ -498,6 +511,7 @@ void
|
|
||||||
cleanupmon(Monitor *mon)
|
|
||||||
{
|
|
||||||
Monitor *m;
|
|
||||||
+ size_t i;
|
|
||||||
|
|
||||||
if (mon == mons)
|
|
||||||
mons = mons->next;
|
|
||||||
@@ -505,8 +519,14 @@ cleanupmon(Monitor *mon)
|
|
||||||
for (m = mons; m && m->next != mon; m = m->next);
|
|
||||||
m->next = mon->next;
|
|
||||||
}
|
|
||||||
+ for (i = 0; i < LENGTH(tags); i++)
|
|
||||||
+ if (mon->tagmap[i])
|
|
||||||
+ XFreePixmap(dpy, mon->tagmap[i]);
|
|
||||||
+ free(mon->tagmap);
|
|
||||||
XUnmapWindow(dpy, mon->barwin);
|
|
||||||
XDestroyWindow(dpy, mon->barwin);
|
|
||||||
+ XUnmapWindow(dpy, mon->tagwin);
|
|
||||||
+ XDestroyWindow(dpy, mon->tagwin);
|
|
||||||
free(mon);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -641,6 +661,7 @@ createmon(void)
|
|
||||||
m->topbar = topbar;
|
|
||||||
m->lt[0] = &layouts[0];
|
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
||||||
+ m->tagmap = ecalloc(LENGTH(tags), sizeof(Pixmap));
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
||||||
return m;
|
|
||||||
}
|
|
||||||
@@ -1125,6 +1146,36 @@ motionnotify(XEvent *e)
|
|
||||||
static Monitor *mon = NULL;
|
|
||||||
Monitor *m;
|
|
||||||
XMotionEvent *ev = &e->xmotion;
|
|
||||||
+ unsigned int i, x;
|
|
||||||
+
|
|
||||||
+ if (ev->window == selmon->barwin) {
|
|
||||||
+ i = x = 0;
|
|
||||||
+ do
|
|
||||||
+ x += TEXTW(tags[i]);
|
|
||||||
+ while (ev->x >= x && ++i < LENGTH(tags));
|
|
||||||
+ /* FIXME when hovering the mouse over the tags and we view the tag,
|
|
||||||
+ * the preview window get's in the preview shot */
|
|
||||||
+
|
|
||||||
+ if (i < LENGTH(tags)) {
|
|
||||||
+ if (selmon->previewshow != (i + 1)
|
|
||||||
+ && !(selmon->tagset[selmon->seltags] & 1 << i)) {
|
|
||||||
+ selmon->previewshow = i + 1;
|
|
||||||
+ showtagpreview(i);
|
|
||||||
+ } else if (selmon->tagset[selmon->seltags] & 1 << i) {
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ }
|
|
||||||
+ } else if (selmon->previewshow) {
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ }
|
|
||||||
+ } else if (ev->window == selmon->tagwin) {
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ } else if (selmon->previewshow) {
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (ev->window != root)
|
|
||||||
return;
|
|
||||||
@@ -1530,6 +1581,82 @@ setmfact(const Arg *arg)
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
+void
|
|
||||||
+showtagpreview(unsigned int i)
|
|
||||||
+{
|
|
||||||
+ if (!selmon->previewshow || !selmon->tagmap[i]) {
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ XSetWindowBackgroundPixmap(dpy, selmon->tagwin, selmon->tagmap[i]);
|
|
||||||
+ XCopyArea(dpy, selmon->tagmap[i], selmon->tagwin, drw->gc, 0, 0,
|
|
||||||
+ selmon->mw / scalepreview, selmon->mh / scalepreview,
|
|
||||||
+ 0, 0);
|
|
||||||
+ XSync(dpy, False);
|
|
||||||
+ XMapRaised(dpy, selmon->tagwin);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+takepreview(void)
|
|
||||||
+{
|
|
||||||
+ Client *c;
|
|
||||||
+ Imlib_Image image;
|
|
||||||
+ unsigned int occ = 0, i;
|
|
||||||
+
|
|
||||||
+ for (c = selmon->clients; c; c = c->next)
|
|
||||||
+ occ |= c->tags;
|
|
||||||
+ //occ |= c->tags == 255 ? 0 : c->tags; /* hide vacants */
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < LENGTH(tags); i++) {
|
|
||||||
+ /* searching for tags that are occupied && selected */
|
|
||||||
+ if (!(occ & 1 << i) || !(selmon->tagset[selmon->seltags] & 1 << i))
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ if (selmon->tagmap[i]) { /* tagmap exist, clean it */
|
|
||||||
+ XFreePixmap(dpy, selmon->tagmap[i]);
|
|
||||||
+ selmon->tagmap[i] = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* try to unmap the window so it doesn't show the preview on the preview */
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ XUnmapWindow(dpy, selmon->tagwin);
|
|
||||||
+ XSync(dpy, False);
|
|
||||||
+
|
|
||||||
+ if (!(image = imlib_create_image(sw, sh))) {
|
|
||||||
+ fprintf(stderr, "dwm: imlib: failed to create image, skipping.");
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+ imlib_context_set_image(image);
|
|
||||||
+ imlib_context_set_display(dpy);
|
|
||||||
+ /* uncomment if using alpha patch */
|
|
||||||
+ //imlib_image_set_has_alpha(1);
|
|
||||||
+ //imlib_context_set_blend(0);
|
|
||||||
+ //imlib_context_set_visual(visual);
|
|
||||||
+ imlib_context_set_visual(DefaultVisual(dpy, screen));
|
|
||||||
+ imlib_context_set_drawable(root);
|
|
||||||
+
|
|
||||||
+ if (previewbar)
|
|
||||||
+ imlib_copy_drawable_to_image(0, selmon->wx, selmon->wy, selmon->ww, selmon->wh, 0, 0, 1);
|
|
||||||
+ else
|
|
||||||
+ imlib_copy_drawable_to_image(0, selmon->mx, selmon->my, selmon->mw ,selmon->mh, 0, 0, 1);
|
|
||||||
+ selmon->tagmap[i] = XCreatePixmap(dpy, selmon->tagwin, selmon->mw / scalepreview, selmon->mh / scalepreview, DefaultDepth(dpy, screen));
|
|
||||||
+ imlib_context_set_drawable(selmon->tagmap[i]);
|
|
||||||
+ imlib_render_image_part_on_drawable_at_size(0, 0, selmon->mw, selmon->mh, 0, 0, selmon->mw / scalepreview, selmon->mh / scalepreview);
|
|
||||||
+ imlib_free_image();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+previewtag(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ if (selmon->previewshow != (arg->ui + 1))
|
|
||||||
+ selmon->previewshow = arg->ui + 1;
|
|
||||||
+ else
|
|
||||||
+ selmon->previewshow = 0;
|
|
||||||
+ showtagpreview(arg->ui);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
void
|
|
||||||
setup(void)
|
|
||||||
{
|
|
||||||
@@ -1746,6 +1873,7 @@ toggleview(const Arg *arg)
|
|
||||||
unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
|
|
||||||
|
|
||||||
if (newtagset) {
|
|
||||||
+ takepreview();
|
|
||||||
selmon->tagset[selmon->seltags] = newtagset;
|
|
||||||
focus(NULL);
|
|
||||||
arrange(selmon);
|
|
||||||
@@ -1811,10 +1939,18 @@ updatebars(void)
|
|
||||||
XSetWindowAttributes wa = {
|
|
||||||
.override_redirect = True,
|
|
||||||
.background_pixmap = ParentRelative,
|
|
||||||
- .event_mask = ButtonPressMask|ExposureMask
|
|
||||||
+ .event_mask = ButtonPressMask|ExposureMask|PointerMotionMask
|
|
||||||
};
|
|
||||||
+
|
|
||||||
XClassHint ch = {"dwm", "dwm"};
|
|
||||||
for (m = mons; m; m = m->next) {
|
|
||||||
+ if (!m->tagwin) {
|
|
||||||
+ m->tagwin = XCreateWindow(dpy, root, m->wx, m->by + bh, m->mw / scalepreview,
|
|
||||||
+ m->mh / scalepreview, 0, DefaultDepth(dpy, screen), CopyFromParent,
|
|
||||||
+ DefaultVisual(dpy, screen), CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
|
|
||||||
+ XDefineCursor(dpy, m->tagwin, cursor[CurNormal]->cursor);
|
|
||||||
+ XUnmapWindow(dpy, m->tagwin);
|
|
||||||
+ }
|
|
||||||
if (m->barwin)
|
|
||||||
continue;
|
|
||||||
m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
|
|
||||||
@@ -2043,6 +2179,7 @@ view(const Arg *arg)
|
|
||||||
{
|
|
||||||
if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
|
|
||||||
return;
|
|
||||||
+ takepreview();
|
|
||||||
selmon->seltags ^= 1; /* toggle sel tagset */
|
|
||||||
if (arg->ui & TAGMASK)
|
|
||||||
selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
@ -1,971 +0,0 @@
|
|||||||
From 9709d08daa290c8c7319571cd9e6ef4ec40e7683 Mon Sep 17 00:00:00 2001
|
|
||||||
From: bakkeby <bakkeby@gmail.com>
|
|
||||||
Date: Wed, 6 May 2020 17:21:25 +0200
|
|
||||||
Subject: [PATCH] vanitygaps - adds gaps to layouts
|
|
||||||
|
|
||||||
This patch differentiates between inner and outer gaps as well as
|
|
||||||
horizontal and vertical gaps.
|
|
||||||
|
|
||||||
The logic of these layouts also aims to be pixel perfect by ensuring
|
|
||||||
an even split of the available space and re-distributing the remainder
|
|
||||||
among the available clients.
|
|
||||||
---
|
|
||||||
config.def.h | 38 ++-
|
|
||||||
dwm.c | 35 +--
|
|
||||||
vanitygaps.c | 809 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
|
||||||
3 files changed, 854 insertions(+), 28 deletions(-)
|
|
||||||
create mode 100644 vanitygaps.c
|
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
|
||||||
index 1c0b587..a886863 100644
|
|
||||||
--- a/config.def.h
|
|
||||||
+++ b/config.def.h
|
|
||||||
@@ -3,6 +3,11 @@
|
|
||||||
/* appearance */
|
|
||||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
|
||||||
static const unsigned int snap = 32; /* snap pixel */
|
|
||||||
+static const unsigned int gappih = 20; /* horiz inner gap between windows */
|
|
||||||
+static const unsigned int gappiv = 10; /* vert inner gap between windows */
|
|
||||||
+static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
|
|
||||||
+static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */
|
|
||||||
+static int smartgaps = 0; /* 1 means no outer gap when there is only one window */
|
|
||||||
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" };
|
|
||||||
@@ -36,11 +41,26 @@ static const float mfact = 0.55; /* factor of master area size [0.05..0.95]
|
|
||||||
static const int nmaster = 1; /* number of clients in master area */
|
|
||||||
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
|
|
||||||
|
|
||||||
+#define FORCE_VSPLIT 1 /* nrowgrid layout: force two clients to always split vertically */
|
|
||||||
+#include "vanitygaps.c"
|
|
||||||
+
|
|
||||||
static const Layout layouts[] = {
|
|
||||||
/* symbol arrange function */
|
|
||||||
{ "[]=", tile }, /* first entry is default */
|
|
||||||
- { "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
{ "[M]", monocle },
|
|
||||||
+ { "[@]", spiral },
|
|
||||||
+ { "[\\]", dwindle },
|
|
||||||
+ { "H[]", deck },
|
|
||||||
+ { "TTT", bstack },
|
|
||||||
+ { "===", bstackhoriz },
|
|
||||||
+ { "HHH", grid },
|
|
||||||
+ { "###", nrowgrid },
|
|
||||||
+ { "---", horizgrid },
|
|
||||||
+ { ":::", gaplessgrid },
|
|
||||||
+ { "|M|", centeredmaster },
|
|
||||||
+ { ">M>", centeredfloatingmaster },
|
|
||||||
+ { "><>", NULL }, /* no layout function means floating behavior */
|
|
||||||
+ { NULL, NULL },
|
|
||||||
};
|
|
||||||
|
|
||||||
/* key definitions */
|
|
||||||
@@ -71,6 +91,22 @@ static Key keys[] = {
|
|
||||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
|
||||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
|
||||||
{ MODKEY, XK_Return, zoom, {0} },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_u, incrgaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_u, incrgaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_i, incrigaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_i, incrigaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_o, incrogaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_o, incrogaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_6, incrihgaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_6, incrihgaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_7, incrivgaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_7, incrivgaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_8, incrohgaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_8, incrohgaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_9, incrovgaps, {.i = +1 } },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_9, incrovgaps, {.i = -1 } },
|
|
||||||
+ { MODKEY|Mod4Mask, XK_0, togglegaps, {0} },
|
|
||||||
+ { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} },
|
|
||||||
{ MODKEY, XK_Tab, view, {0} },
|
|
||||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
|
||||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
|
||||||
diff --git a/dwm.c b/dwm.c
|
|
||||||
index 4465af1..c3b2d82 100644
|
|
||||||
--- a/dwm.c
|
|
||||||
+++ b/dwm.c
|
|
||||||
@@ -119,6 +119,10 @@ struct Monitor {
|
|
||||||
int by; /* bar geometry */
|
|
||||||
int mx, my, mw, mh; /* screen size */
|
|
||||||
int wx, wy, ww, wh; /* window area */
|
|
||||||
+ int gappih; /* horizontal gap between windows */
|
|
||||||
+ int gappiv; /* vertical gap between windows */
|
|
||||||
+ int gappoh; /* horizontal outer gaps */
|
|
||||||
+ int gappov; /* vertical outer gaps */
|
|
||||||
unsigned int seltags;
|
|
||||||
unsigned int sellt;
|
|
||||||
unsigned int tagset[2];
|
|
||||||
@@ -208,7 +212,6 @@ static void sigchld(int unused);
|
|
||||||
static void spawn(const Arg *arg);
|
|
||||||
static void tag(const Arg *arg);
|
|
||||||
static void tagmon(const Arg *arg);
|
|
||||||
-static void tile(Monitor *);
|
|
||||||
static void togglebar(const Arg *arg);
|
|
||||||
static void togglefloating(const Arg *arg);
|
|
||||||
static void toggletag(const Arg *arg);
|
|
||||||
@@ -638,6 +641,10 @@ createmon(void)
|
|
||||||
m->nmaster = nmaster;
|
|
||||||
m->showbar = showbar;
|
|
||||||
m->topbar = topbar;
|
|
||||||
+ m->gappih = gappih;
|
|
||||||
+ m->gappiv = gappiv;
|
|
||||||
+ m->gappoh = gappoh;
|
|
||||||
+ m->gappov = gappov;
|
|
||||||
m->lt[0] = &layouts[0];
|
|
||||||
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
||||||
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
||||||
@@ -1670,32 +1677,6 @@ tagmon(const Arg *arg)
|
|
||||||
sendmon(selmon->sel, dirtomon(arg->i));
|
|
||||||
}
|
|
||||||
|
|
||||||
-void
|
|
||||||
-tile(Monitor *m)
|
|
||||||
-{
|
|
||||||
- unsigned int i, n, h, mw, my, ty;
|
|
||||||
- Client *c;
|
|
||||||
-
|
|
||||||
- for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
- if (n == 0)
|
|
||||||
- return;
|
|
||||||
-
|
|
||||||
- if (n > m->nmaster)
|
|
||||||
- mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
||||||
- else
|
|
||||||
- mw = m->ww;
|
|
||||||
- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
- if (i < m->nmaster) {
|
|
||||||
- h = (m->wh - my) / (MIN(n, m->nmaster) - i);
|
|
||||||
- resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- my += HEIGHT(c);
|
|
||||||
- } else {
|
|
||||||
- h = (m->wh - ty) / (n - i);
|
|
||||||
- resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
|
|
||||||
- ty += HEIGHT(c);
|
|
||||||
- }
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
void
|
|
||||||
togglebar(const Arg *arg)
|
|
||||||
{
|
|
||||||
diff --git a/vanitygaps.c b/vanitygaps.c
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..3f31593
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/vanitygaps.c
|
|
||||||
@@ -0,0 +1,809 @@
|
|
||||||
+/* Key binding functions */
|
|
||||||
+static void defaultgaps(const Arg *arg);
|
|
||||||
+static void incrgaps(const Arg *arg);
|
|
||||||
+static void incrigaps(const Arg *arg);
|
|
||||||
+static void incrogaps(const Arg *arg);
|
|
||||||
+static void incrohgaps(const Arg *arg);
|
|
||||||
+static void incrovgaps(const Arg *arg);
|
|
||||||
+static void incrihgaps(const Arg *arg);
|
|
||||||
+static void incrivgaps(const Arg *arg);
|
|
||||||
+static void togglegaps(const Arg *arg);
|
|
||||||
+/* Layouts (delete the ones you do not need) */
|
|
||||||
+static void bstack(Monitor *m);
|
|
||||||
+static void bstackhoriz(Monitor *m);
|
|
||||||
+static void centeredmaster(Monitor *m);
|
|
||||||
+static void centeredfloatingmaster(Monitor *m);
|
|
||||||
+static void deck(Monitor *m);
|
|
||||||
+static void dwindle(Monitor *m);
|
|
||||||
+static void fibonacci(Monitor *m, int s);
|
|
||||||
+static void grid(Monitor *m);
|
|
||||||
+static void nrowgrid(Monitor *m);
|
|
||||||
+static void spiral(Monitor *m);
|
|
||||||
+static void tile(Monitor *m);
|
|
||||||
+/* Internals */
|
|
||||||
+static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc);
|
|
||||||
+static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr);
|
|
||||||
+static void setgaps(int oh, int ov, int ih, int iv);
|
|
||||||
+
|
|
||||||
+/* Settings */
|
|
||||||
+#if !PERTAG_PATCH
|
|
||||||
+static int enablegaps = 1;
|
|
||||||
+#endif // PERTAG_PATCH
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+setgaps(int oh, int ov, int ih, int iv)
|
|
||||||
+{
|
|
||||||
+ if (oh < 0) oh = 0;
|
|
||||||
+ if (ov < 0) ov = 0;
|
|
||||||
+ if (ih < 0) ih = 0;
|
|
||||||
+ if (iv < 0) iv = 0;
|
|
||||||
+
|
|
||||||
+ selmon->gappoh = oh;
|
|
||||||
+ selmon->gappov = ov;
|
|
||||||
+ selmon->gappih = ih;
|
|
||||||
+ selmon->gappiv = iv;
|
|
||||||
+ arrange(selmon);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+togglegaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ #if PERTAG_PATCH
|
|
||||||
+ selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag];
|
|
||||||
+ #else
|
|
||||||
+ enablegaps = !enablegaps;
|
|
||||||
+ #endif // PERTAG_PATCH
|
|
||||||
+ arrange(NULL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+defaultgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(gappoh, gappov, gappih, gappiv);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh + arg->i,
|
|
||||||
+ selmon->gappov + arg->i,
|
|
||||||
+ selmon->gappih + arg->i,
|
|
||||||
+ selmon->gappiv + arg->i
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrigaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh,
|
|
||||||
+ selmon->gappov,
|
|
||||||
+ selmon->gappih + arg->i,
|
|
||||||
+ selmon->gappiv + arg->i
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrogaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh + arg->i,
|
|
||||||
+ selmon->gappov + arg->i,
|
|
||||||
+ selmon->gappih,
|
|
||||||
+ selmon->gappiv
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrohgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh + arg->i,
|
|
||||||
+ selmon->gappov,
|
|
||||||
+ selmon->gappih,
|
|
||||||
+ selmon->gappiv
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrovgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh,
|
|
||||||
+ selmon->gappov + arg->i,
|
|
||||||
+ selmon->gappih,
|
|
||||||
+ selmon->gappiv
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrihgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh,
|
|
||||||
+ selmon->gappov,
|
|
||||||
+ selmon->gappih + arg->i,
|
|
||||||
+ selmon->gappiv
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+incrivgaps(const Arg *arg)
|
|
||||||
+{
|
|
||||||
+ setgaps(
|
|
||||||
+ selmon->gappoh,
|
|
||||||
+ selmon->gappov,
|
|
||||||
+ selmon->gappih,
|
|
||||||
+ selmon->gappiv + arg->i
|
|
||||||
+ );
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc)
|
|
||||||
+{
|
|
||||||
+ unsigned int n, oe, ie;
|
|
||||||
+ #if PERTAG_PATCH
|
|
||||||
+ oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag];
|
|
||||||
+ #else
|
|
||||||
+ oe = ie = enablegaps;
|
|
||||||
+ #endif // PERTAG_PATCH
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ if (smartgaps && n == 1) {
|
|
||||||
+ oe = 0; // outer gaps disabled when only one client
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ *oh = m->gappoh*oe; // outer horizontal gap
|
|
||||||
+ *ov = m->gappov*oe; // outer vertical gap
|
|
||||||
+ *ih = m->gappih*ie; // inner horizontal gap
|
|
||||||
+ *iv = m->gappiv*ie; // inner vertical gap
|
|
||||||
+ *nc = n; // number of clients
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr)
|
|
||||||
+{
|
|
||||||
+ unsigned int n;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mtotal = 0, stotal = 0;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
+ mfacts = MIN(n, m->nmaster);
|
|
||||||
+ sfacts = n - m->nmaster;
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
|
|
||||||
+ if (n < m->nmaster)
|
|
||||||
+ mtotal += msize / mfacts;
|
|
||||||
+ else
|
|
||||||
+ stotal += ssize / sfacts;
|
|
||||||
+
|
|
||||||
+ *mf = mfacts; // total factor of master area
|
|
||||||
+ *sf = sfacts; // total factor of stack area
|
|
||||||
+ *mr = msize - mtotal; // the remainder (rest) of pixels after an even master split
|
|
||||||
+ *sr = ssize - stotal; // the remainder (rest) of pixels after an even stack split
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/***
|
|
||||||
+ * Layouts
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Bottomstack layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/bottomstack/
|
|
||||||
+ */
|
|
||||||
+static void
|
|
||||||
+bstack(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mrest, srest;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ sh = mh = m->wh - 2*oh;
|
|
||||||
+ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1);
|
|
||||||
+ sw = m->ww - 2*ov - iv * (n - m->nmaster - 1);
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ sh = (mh - ih) * (1 - m->mfact);
|
|
||||||
+ mh = mh - ih - sh;
|
|
||||||
+ sx = mx;
|
|
||||||
+ sy = my + mh + ih;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
+ mx += WIDTH(c) + iv;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
+ sx += WIDTH(c) + iv;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void
|
|
||||||
+bstackhoriz(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mrest, srest;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ mh = m->wh - 2*oh;
|
|
||||||
+ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
|
|
||||||
+ mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1);
|
|
||||||
+ sw = m->ww - 2*ov;
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ sh = (mh - ih) * (1 - m->mfact);
|
|
||||||
+ mh = mh - ih - sh;
|
|
||||||
+ sy = my + mh + ih;
|
|
||||||
+ sh = m->wh - mh - 2*oh - ih * (n - m->nmaster);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
+ mx += WIDTH(c) + iv;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ sy += HEIGHT(c) + ih;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Centred master layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/centeredmaster/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+centeredmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int lx = 0, ly = 0, lw = 0, lh = 0;
|
|
||||||
+ int rx = 0, ry = 0, rw = 0, rh = 0;
|
|
||||||
+ float mfacts = 0, lfacts = 0, rfacts = 0;
|
|
||||||
+ int mtotal = 0, ltotal = 0, rtotal = 0;
|
|
||||||
+ int mrest = 0, lrest = 0, rrest = 0;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* initialize areas */
|
|
||||||
+ mx = m->wx + ov;
|
|
||||||
+ my = m->wy + oh;
|
|
||||||
+ mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1);
|
|
||||||
+ mw = m->ww - 2*ov;
|
|
||||||
+ lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1);
|
|
||||||
+ rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1));
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ if (n - m->nmaster > 1) {
|
|
||||||
+ /* ||<-S->|<---M--->|<-S->|| */
|
|
||||||
+ mw = (m->ww - 2*ov - 2*iv) * m->mfact;
|
|
||||||
+ lw = (m->ww - mw - 2*ov - 2*iv) / 2;
|
|
||||||
+ rw = (m->ww - mw - 2*ov - 2*iv) - lw;
|
|
||||||
+ mx += lw + iv;
|
|
||||||
+ } else {
|
|
||||||
+ /* ||<---M--->|<-S->|| */
|
|
||||||
+ mw = (mw - iv) * m->mfact;
|
|
||||||
+ lw = 0;
|
|
||||||
+ rw = m->ww - mw - iv - 2*ov;
|
|
||||||
+ }
|
|
||||||
+ lx = m->wx + ov;
|
|
||||||
+ ly = m->wy + oh;
|
|
||||||
+ rx = mx + mw + iv;
|
|
||||||
+ ry = m->wy + oh;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* calculate facts */
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
|
|
||||||
+ if (!m->nmaster || n < m->nmaster)
|
|
||||||
+ mfacts += 1;
|
|
||||||
+ else if ((n - m->nmaster) % 2)
|
|
||||||
+ lfacts += 1; // total factor of left hand stack area
|
|
||||||
+ else
|
|
||||||
+ rfacts += 1; // total factor of right hand stack area
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
|
|
||||||
+ if (!m->nmaster || n < m->nmaster)
|
|
||||||
+ mtotal += mh / mfacts;
|
|
||||||
+ else if ((n - m->nmaster) % 2)
|
|
||||||
+ ltotal += lh / lfacts;
|
|
||||||
+ else
|
|
||||||
+ rtotal += rh / rfacts;
|
|
||||||
+
|
|
||||||
+ mrest = mh - mtotal;
|
|
||||||
+ lrest = lh - ltotal;
|
|
||||||
+ rrest = rh - rtotal;
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ if (!m->nmaster || i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked vertically, in the center of the screen */
|
|
||||||
+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ my += HEIGHT(c) + ih;
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked vertically */
|
|
||||||
+ if ((i - m->nmaster) % 2 ) {
|
|
||||||
+ resize(c, lx, ly, lw - (2*c->bw), (lh / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ ly += HEIGHT(c) + ih;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, rx, ry, rw - (2*c->bw), (rh / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ ry += HEIGHT(c) + ih;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+centeredfloatingmaster(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ float mivf = 1.0; // master inner vertical gap factor
|
|
||||||
+ int oh, ov, ih, iv, mrest, srest;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ sh = mh = m->wh - 2*oh;
|
|
||||||
+ mw = m->ww - 2*ov - iv*(n - 1);
|
|
||||||
+ sw = m->ww - 2*ov - iv*(n - m->nmaster - 1);
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ mivf = 0.8;
|
|
||||||
+ /* go mfact box in the center if more than nmaster clients */
|
|
||||||
+ if (m->ww > m->wh) {
|
|
||||||
+ mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1);
|
|
||||||
+ mh = m->wh * 0.9;
|
|
||||||
+ } else {
|
|
||||||
+ mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1);
|
|
||||||
+ mh = m->wh * m->mfact;
|
|
||||||
+ }
|
|
||||||
+ mx = m->wx + (m->ww - mw) / 2;
|
|
||||||
+ my = m->wy + (m->wh - mh - 2*oh) / 2;
|
|
||||||
+
|
|
||||||
+ sx = m->wx + ov;
|
|
||||||
+ sy = m->wy + oh;
|
|
||||||
+ sh = m->wh - 2*oh;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ /* nmaster clients are stacked horizontally, in the center of the screen */
|
|
||||||
+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
+ mx += WIDTH(c) + iv*mivf;
|
|
||||||
+ } else {
|
|
||||||
+ /* stack clients are stacked horizontally */
|
|
||||||
+ resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
+ sx += WIDTH(c) + iv;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Deck layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/deck/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+deck(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mrest, srest;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
|
|
||||||
+ sw = mw = m->ww - 2*ov;
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ sw = (mw - iv) * (1 - m->mfact);
|
|
||||||
+ mw = mw - iv - sw;
|
|
||||||
+ sx = mx + mw + iv;
|
|
||||||
+ sh = m->wh - 2*oh;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
+
|
|
||||||
+ if (n - m->nmaster > 0) /* override layout symbol */
|
|
||||||
+ snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster);
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ my += HEIGHT(c) + ih;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Fibonacci layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/fibonacci/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+fibonacci(Monitor *m, int s)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int nx, ny, nw, nh;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int nv, hrest = 0, wrest = 0, r = 1;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ nx = m->wx + ov;
|
|
||||||
+ ny = m->wy + oh;
|
|
||||||
+ nw = m->ww - 2*ov;
|
|
||||||
+ nh = m->wh - 2*oh;
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
|
|
||||||
+ if (r) {
|
|
||||||
+ if ((i % 2 && (nh - ih) / 2 <= (bh + 2*c->bw))
|
|
||||||
+ || (!(i % 2) && (nw - iv) / 2 <= (bh + 2*c->bw))) {
|
|
||||||
+ r = 0;
|
|
||||||
+ }
|
|
||||||
+ if (r && i < n - 1) {
|
|
||||||
+ if (i % 2) {
|
|
||||||
+ nv = (nh - ih) / 2;
|
|
||||||
+ hrest = nh - 2*nv - ih;
|
|
||||||
+ nh = nv;
|
|
||||||
+ } else {
|
|
||||||
+ nv = (nw - iv) / 2;
|
|
||||||
+ wrest = nw - 2*nv - iv;
|
|
||||||
+ nw = nv;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((i % 4) == 2 && !s)
|
|
||||||
+ nx += nw + iv;
|
|
||||||
+ else if ((i % 4) == 3 && !s)
|
|
||||||
+ ny += nh + ih;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((i % 4) == 0) {
|
|
||||||
+ if (s) {
|
|
||||||
+ ny += nh + ih;
|
|
||||||
+ nh += hrest;
|
|
||||||
+ }
|
|
||||||
+ else {
|
|
||||||
+ nh -= hrest;
|
|
||||||
+ ny -= nh + ih;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ else if ((i % 4) == 1) {
|
|
||||||
+ nx += nw + iv;
|
|
||||||
+ nw += wrest;
|
|
||||||
+ }
|
|
||||||
+ else if ((i % 4) == 2) {
|
|
||||||
+ ny += nh + ih;
|
|
||||||
+ nh += hrest;
|
|
||||||
+ if (i < n - 1)
|
|
||||||
+ nw += wrest;
|
|
||||||
+ }
|
|
||||||
+ else if ((i % 4) == 3) {
|
|
||||||
+ if (s) {
|
|
||||||
+ nx += nw + iv;
|
|
||||||
+ nw -= wrest;
|
|
||||||
+ } else {
|
|
||||||
+ nw -= wrest;
|
|
||||||
+ nx -= nw + iv;
|
|
||||||
+ nh += hrest;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (i == 0) {
|
|
||||||
+ if (n != 1) {
|
|
||||||
+ nw = (m->ww - iv - 2*ov) - (m->ww - iv - 2*ov) * (1 - m->mfact);
|
|
||||||
+ wrest = 0;
|
|
||||||
+ }
|
|
||||||
+ ny = m->wy + oh;
|
|
||||||
+ }
|
|
||||||
+ else if (i == 1)
|
|
||||||
+ nw = m->ww - nw - iv - 2*ov;
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+dwindle(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ fibonacci(m, 1);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void
|
|
||||||
+spiral(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ fibonacci(m, 0);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Gappless grid layout + gaps (ironically)
|
|
||||||
+ * https://dwm.suckless.org/patches/gaplessgrid/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+gaplessgrid(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* grid dimensions */
|
|
||||||
+ for (cols = 0; cols <= n/2; cols++)
|
|
||||||
+ if (cols*cols >= n)
|
|
||||||
+ break;
|
|
||||||
+ if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
|
||||||
+ cols = 2;
|
|
||||||
+ rows = n/cols;
|
|
||||||
+ cn = rn = 0; // reset column no, row no, client count
|
|
||||||
+
|
|
||||||
+ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows;
|
|
||||||
+ cw = (m->ww - 2*ov - iv * (cols - 1)) / cols;
|
|
||||||
+ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
+ crest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols;
|
|
||||||
+ x = m->wx + ov;
|
|
||||||
+ y = m->wy + oh;
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
|
|
||||||
+ if (i/rows + 1 > cols - n%cols) {
|
|
||||||
+ rows = n/cols + 1;
|
|
||||||
+ ch = (m->wh - 2*oh - ih * (rows - 1)) / rows;
|
|
||||||
+ rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
+ }
|
|
||||||
+ resize(c,
|
|
||||||
+ x,
|
|
||||||
+ y + rn*(ch + ih) + MIN(rn, rrest),
|
|
||||||
+ cw + (cn < crest ? 1 : 0) - 2*c->bw,
|
|
||||||
+ ch + (rn < rrest ? 1 : 0) - 2*c->bw,
|
|
||||||
+ 0);
|
|
||||||
+ rn++;
|
|
||||||
+ if (rn >= rows) {
|
|
||||||
+ rn = 0;
|
|
||||||
+ x += cw + ih + (cn < crest ? 1 : 0);
|
|
||||||
+ cn++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Gridmode layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/gridmode/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+grid(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+
|
|
||||||
+ /* grid dimensions */
|
|
||||||
+ for (rows = 0; rows <= n/2; rows++)
|
|
||||||
+ if (rows*rows >= n)
|
|
||||||
+ break;
|
|
||||||
+ cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
|
|
||||||
+
|
|
||||||
+ /* window geoms (cell height/width) */
|
|
||||||
+ ch = (m->wh - 2*oh - ih * (rows - 1)) / (rows ? rows : 1);
|
|
||||||
+ cw = (m->ww - 2*ov - iv * (cols - 1)) / (cols ? cols : 1);
|
|
||||||
+ chrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
+ cwrest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols;
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
+ cc = i / rows;
|
|
||||||
+ cr = i % rows;
|
|
||||||
+ cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest);
|
|
||||||
+ cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest);
|
|
||||||
+ resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2*c->bw, ch + (cr < chrest ? 1 : 0) - 2*c->bw, False);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Horizontal grid layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/horizgrid/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+horizgrid(Monitor *m) {
|
|
||||||
+ Client *c;
|
|
||||||
+ unsigned int n, i;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ int ntop, nbottom = 1;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mrest, srest;
|
|
||||||
+
|
|
||||||
+ /* Count windows */
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ if (n <= 2)
|
|
||||||
+ ntop = n;
|
|
||||||
+ else {
|
|
||||||
+ ntop = n / 2;
|
|
||||||
+ nbottom = n - ntop;
|
|
||||||
+ }
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ sh = mh = m->wh - 2*oh;
|
|
||||||
+ sw = mw = m->ww - 2*ov;
|
|
||||||
+
|
|
||||||
+ if (n > ntop) {
|
|
||||||
+ sh = (mh - ih) / 2;
|
|
||||||
+ mh = mh - ih - sh;
|
|
||||||
+ sy = my + mh + ih;
|
|
||||||
+ mw = m->ww - 2*ov - iv * (ntop - 1);
|
|
||||||
+ sw = m->ww - 2*ov - iv * (nbottom - 1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ mfacts = ntop;
|
|
||||||
+ sfacts = nbottom;
|
|
||||||
+ mrest = mw - (mw / ntop) * ntop;
|
|
||||||
+ srest = sw - (sw / nbottom) * nbottom;
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < ntop) {
|
|
||||||
+ resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
+ mx += WIDTH(c) + iv;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, sx, sy, (sw / sfacts) + ((i - ntop) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
+ sx += WIDTH(c) + iv;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * nrowgrid layout + gaps
|
|
||||||
+ * https://dwm.suckless.org/patches/nrowgrid/
|
|
||||||
+ */
|
|
||||||
+void
|
|
||||||
+nrowgrid(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int n;
|
|
||||||
+ int ri = 0, ci = 0; /* counters */
|
|
||||||
+ int oh, ov, ih, iv; /* vanitygap settings */
|
|
||||||
+ unsigned int cx, cy, cw, ch; /* client geometry */
|
|
||||||
+ unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */
|
|
||||||
+ unsigned int cols, rows = m->nmaster + 1;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ /* count clients */
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+
|
|
||||||
+ /* nothing to do here */
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ /* force 2 clients to always split vertically */
|
|
||||||
+ if (FORCE_VSPLIT && n == 2)
|
|
||||||
+ rows = 1;
|
|
||||||
+
|
|
||||||
+ /* never allow empty rows */
|
|
||||||
+ if (n < rows)
|
|
||||||
+ rows = n;
|
|
||||||
+
|
|
||||||
+ /* define first row */
|
|
||||||
+ cols = n / rows;
|
|
||||||
+ uc = cols;
|
|
||||||
+ cy = m->wy + oh;
|
|
||||||
+ ch = (m->wh - 2*oh - ih*(rows - 1)) / rows;
|
|
||||||
+ uh = ch;
|
|
||||||
+
|
|
||||||
+ for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) {
|
|
||||||
+ if (ci == cols) {
|
|
||||||
+ uw = 0;
|
|
||||||
+ ci = 0;
|
|
||||||
+ ri++;
|
|
||||||
+
|
|
||||||
+ /* next row */
|
|
||||||
+ cols = (n - uc) / (rows - ri);
|
|
||||||
+ uc += cols;
|
|
||||||
+ cy = m->wy + oh + uh + ih;
|
|
||||||
+ uh += ch + ih;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ cx = m->wx + ov + uw;
|
|
||||||
+ cw = (m->ww - 2*ov - uw) / (cols - ci);
|
|
||||||
+ uw += cw + iv;
|
|
||||||
+
|
|
||||||
+ resize(c, cx, cy, cw - (2*c->bw), ch - (2*c->bw), 0);
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * Default tile layout + gaps
|
|
||||||
+ */
|
|
||||||
+static void
|
|
||||||
+tile(Monitor *m)
|
|
||||||
+{
|
|
||||||
+ unsigned int i, n;
|
|
||||||
+ int oh, ov, ih, iv;
|
|
||||||
+ int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
+ int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
+ float mfacts, sfacts;
|
|
||||||
+ int mrest, srest;
|
|
||||||
+ Client *c;
|
|
||||||
+
|
|
||||||
+ getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
+ if (n == 0)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ sx = mx = m->wx + ov;
|
|
||||||
+ sy = my = m->wy + oh;
|
|
||||||
+ mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
|
|
||||||
+ sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
|
|
||||||
+ sw = mw = m->ww - 2*ov;
|
|
||||||
+
|
|
||||||
+ if (m->nmaster && n > m->nmaster) {
|
|
||||||
+ sw = (mw - iv) * (1 - m->mfact);
|
|
||||||
+ mw = mw - iv - sw;
|
|
||||||
+ sx = mx + mw + iv;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
+
|
|
||||||
+ for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
+ if (i < m->nmaster) {
|
|
||||||
+ resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ my += HEIGHT(c) + ih;
|
|
||||||
+ } else {
|
|
||||||
+ resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
+ sy += HEIGHT(c) + ih;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
\ No newline at end of file
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
809
vanitygaps.c
809
vanitygaps.c
@ -1,809 +0,0 @@
|
|||||||
/* Key binding functions */
|
|
||||||
static void defaultgaps(const Arg *arg);
|
|
||||||
static void incrgaps(const Arg *arg);
|
|
||||||
static void incrigaps(const Arg *arg);
|
|
||||||
static void incrogaps(const Arg *arg);
|
|
||||||
static void incrohgaps(const Arg *arg);
|
|
||||||
static void incrovgaps(const Arg *arg);
|
|
||||||
static void incrihgaps(const Arg *arg);
|
|
||||||
static void incrivgaps(const Arg *arg);
|
|
||||||
static void togglegaps(const Arg *arg);
|
|
||||||
/* Layouts (delete the ones you do not need) */
|
|
||||||
static void bstack(Monitor *m);
|
|
||||||
static void bstackhoriz(Monitor *m);
|
|
||||||
static void centeredmaster(Monitor *m);
|
|
||||||
static void centeredfloatingmaster(Monitor *m);
|
|
||||||
static void deck(Monitor *m);
|
|
||||||
static void dwindle(Monitor *m);
|
|
||||||
static void fibonacci(Monitor *m, int s);
|
|
||||||
static void grid(Monitor *m);
|
|
||||||
static void nrowgrid(Monitor *m);
|
|
||||||
static void spiral(Monitor *m);
|
|
||||||
static void tile(Monitor *m);
|
|
||||||
/* Internals */
|
|
||||||
static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc);
|
|
||||||
static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr);
|
|
||||||
static void setgaps(int oh, int ov, int ih, int iv);
|
|
||||||
|
|
||||||
/* Settings */
|
|
||||||
#if !PERTAG_PATCH
|
|
||||||
static int enablegaps = 1;
|
|
||||||
#endif // PERTAG_PATCH
|
|
||||||
|
|
||||||
void
|
|
||||||
setgaps(int oh, int ov, int ih, int iv)
|
|
||||||
{
|
|
||||||
if (oh < 0) oh = 0;
|
|
||||||
if (ov < 0) ov = 0;
|
|
||||||
if (ih < 0) ih = 0;
|
|
||||||
if (iv < 0) iv = 0;
|
|
||||||
|
|
||||||
selmon->gappoh = oh;
|
|
||||||
selmon->gappov = ov;
|
|
||||||
selmon->gappih = ih;
|
|
||||||
selmon->gappiv = iv;
|
|
||||||
arrange(selmon);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
togglegaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
#if PERTAG_PATCH
|
|
||||||
selmon->pertag->enablegaps[selmon->pertag->curtag] = !selmon->pertag->enablegaps[selmon->pertag->curtag];
|
|
||||||
#else
|
|
||||||
enablegaps = !enablegaps;
|
|
||||||
#endif // PERTAG_PATCH
|
|
||||||
arrange(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
defaultgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(gappoh, gappov, gappih, gappiv);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh + arg->i,
|
|
||||||
selmon->gappov + arg->i,
|
|
||||||
selmon->gappih + arg->i,
|
|
||||||
selmon->gappiv + arg->i
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrigaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh,
|
|
||||||
selmon->gappov,
|
|
||||||
selmon->gappih + arg->i,
|
|
||||||
selmon->gappiv + arg->i
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrogaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh + arg->i,
|
|
||||||
selmon->gappov + arg->i,
|
|
||||||
selmon->gappih,
|
|
||||||
selmon->gappiv
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrohgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh + arg->i,
|
|
||||||
selmon->gappov,
|
|
||||||
selmon->gappih,
|
|
||||||
selmon->gappiv
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrovgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh,
|
|
||||||
selmon->gappov + arg->i,
|
|
||||||
selmon->gappih,
|
|
||||||
selmon->gappiv
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrihgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh,
|
|
||||||
selmon->gappov,
|
|
||||||
selmon->gappih + arg->i,
|
|
||||||
selmon->gappiv
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
incrivgaps(const Arg *arg)
|
|
||||||
{
|
|
||||||
setgaps(
|
|
||||||
selmon->gappoh,
|
|
||||||
selmon->gappov,
|
|
||||||
selmon->gappih,
|
|
||||||
selmon->gappiv + arg->i
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc)
|
|
||||||
{
|
|
||||||
unsigned int n, oe, ie;
|
|
||||||
#if PERTAG_PATCH
|
|
||||||
oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag];
|
|
||||||
#else
|
|
||||||
oe = ie = enablegaps;
|
|
||||||
#endif // PERTAG_PATCH
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
if (smartgaps && n == 1) {
|
|
||||||
oe = 0; // outer gaps disabled when only one client
|
|
||||||
}
|
|
||||||
|
|
||||||
*oh = m->gappoh*oe; // outer horizontal gap
|
|
||||||
*ov = m->gappov*oe; // outer vertical gap
|
|
||||||
*ih = m->gappih*ie; // inner horizontal gap
|
|
||||||
*iv = m->gappiv*ie; // inner vertical gap
|
|
||||||
*nc = n; // number of clients
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr)
|
|
||||||
{
|
|
||||||
unsigned int n;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mtotal = 0, stotal = 0;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
||||||
mfacts = MIN(n, m->nmaster);
|
|
||||||
sfacts = n - m->nmaster;
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
|
|
||||||
if (n < m->nmaster)
|
|
||||||
mtotal += msize / mfacts;
|
|
||||||
else
|
|
||||||
stotal += ssize / sfacts;
|
|
||||||
|
|
||||||
*mf = mfacts; // total factor of master area
|
|
||||||
*sf = sfacts; // total factor of stack area
|
|
||||||
*mr = msize - mtotal; // the remainder (rest) of pixels after an even master split
|
|
||||||
*sr = ssize - stotal; // the remainder (rest) of pixels after an even stack split
|
|
||||||
}
|
|
||||||
|
|
||||||
/***
|
|
||||||
* Layouts
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Bottomstack layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/bottomstack/
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
bstack(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mrest, srest;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
sh = mh = m->wh - 2*oh;
|
|
||||||
mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1);
|
|
||||||
sw = m->ww - 2*ov - iv * (n - m->nmaster - 1);
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
sh = (mh - ih) * (1 - m->mfact);
|
|
||||||
mh = mh - ih - sh;
|
|
||||||
sx = mx;
|
|
||||||
sy = my + mh + ih;
|
|
||||||
}
|
|
||||||
|
|
||||||
getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
mx += WIDTH(c) + iv;
|
|
||||||
} else {
|
|
||||||
resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
sx += WIDTH(c) + iv;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
bstackhoriz(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mrest, srest;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
mh = m->wh - 2*oh;
|
|
||||||
sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
|
|
||||||
mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1);
|
|
||||||
sw = m->ww - 2*ov;
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
sh = (mh - ih) * (1 - m->mfact);
|
|
||||||
mh = mh - ih - sh;
|
|
||||||
sy = my + mh + ih;
|
|
||||||
sh = m->wh - mh - 2*oh - ih * (n - m->nmaster);
|
|
||||||
}
|
|
||||||
|
|
||||||
getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
mx += WIDTH(c) + iv;
|
|
||||||
} else {
|
|
||||||
resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
sy += HEIGHT(c) + ih;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Centred master layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/centeredmaster/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
centeredmaster(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int lx = 0, ly = 0, lw = 0, lh = 0;
|
|
||||||
int rx = 0, ry = 0, rw = 0, rh = 0;
|
|
||||||
float mfacts = 0, lfacts = 0, rfacts = 0;
|
|
||||||
int mtotal = 0, ltotal = 0, rtotal = 0;
|
|
||||||
int mrest = 0, lrest = 0, rrest = 0;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* initialize areas */
|
|
||||||
mx = m->wx + ov;
|
|
||||||
my = m->wy + oh;
|
|
||||||
mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1);
|
|
||||||
mw = m->ww - 2*ov;
|
|
||||||
lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1);
|
|
||||||
rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1));
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
/* go mfact box in the center if more than nmaster clients */
|
|
||||||
if (n - m->nmaster > 1) {
|
|
||||||
/* ||<-S->|<---M--->|<-S->|| */
|
|
||||||
mw = (m->ww - 2*ov - 2*iv) * m->mfact;
|
|
||||||
lw = (m->ww - mw - 2*ov - 2*iv) / 2;
|
|
||||||
rw = (m->ww - mw - 2*ov - 2*iv) - lw;
|
|
||||||
mx += lw + iv;
|
|
||||||
} else {
|
|
||||||
/* ||<---M--->|<-S->|| */
|
|
||||||
mw = (mw - iv) * m->mfact;
|
|
||||||
lw = 0;
|
|
||||||
rw = m->ww - mw - iv - 2*ov;
|
|
||||||
}
|
|
||||||
lx = m->wx + ov;
|
|
||||||
ly = m->wy + oh;
|
|
||||||
rx = mx + mw + iv;
|
|
||||||
ry = m->wy + oh;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* calculate facts */
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
|
|
||||||
if (!m->nmaster || n < m->nmaster)
|
|
||||||
mfacts += 1;
|
|
||||||
else if ((n - m->nmaster) % 2)
|
|
||||||
lfacts += 1; // total factor of left hand stack area
|
|
||||||
else
|
|
||||||
rfacts += 1; // total factor of right hand stack area
|
|
||||||
}
|
|
||||||
|
|
||||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
|
|
||||||
if (!m->nmaster || n < m->nmaster)
|
|
||||||
mtotal += mh / mfacts;
|
|
||||||
else if ((n - m->nmaster) % 2)
|
|
||||||
ltotal += lh / lfacts;
|
|
||||||
else
|
|
||||||
rtotal += rh / rfacts;
|
|
||||||
|
|
||||||
mrest = mh - mtotal;
|
|
||||||
lrest = lh - ltotal;
|
|
||||||
rrest = rh - rtotal;
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
if (!m->nmaster || i < m->nmaster) {
|
|
||||||
/* nmaster clients are stacked vertically, in the center of the screen */
|
|
||||||
resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
my += HEIGHT(c) + ih;
|
|
||||||
} else {
|
|
||||||
/* stack clients are stacked vertically */
|
|
||||||
if ((i - m->nmaster) % 2 ) {
|
|
||||||
resize(c, lx, ly, lw - (2*c->bw), (lh / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
ly += HEIGHT(c) + ih;
|
|
||||||
} else {
|
|
||||||
resize(c, rx, ry, rw - (2*c->bw), (rh / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
ry += HEIGHT(c) + ih;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
centeredfloatingmaster(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
float mivf = 1.0; // master inner vertical gap factor
|
|
||||||
int oh, ov, ih, iv, mrest, srest;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
sh = mh = m->wh - 2*oh;
|
|
||||||
mw = m->ww - 2*ov - iv*(n - 1);
|
|
||||||
sw = m->ww - 2*ov - iv*(n - m->nmaster - 1);
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
mivf = 0.8;
|
|
||||||
/* go mfact box in the center if more than nmaster clients */
|
|
||||||
if (m->ww > m->wh) {
|
|
||||||
mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1);
|
|
||||||
mh = m->wh * 0.9;
|
|
||||||
} else {
|
|
||||||
mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1);
|
|
||||||
mh = m->wh * m->mfact;
|
|
||||||
}
|
|
||||||
mx = m->wx + (m->ww - mw) / 2;
|
|
||||||
my = m->wy + (m->wh - mh - 2*oh) / 2;
|
|
||||||
|
|
||||||
sx = m->wx + ov;
|
|
||||||
sy = m->wy + oh;
|
|
||||||
sh = m->wh - 2*oh;
|
|
||||||
}
|
|
||||||
|
|
||||||
getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
/* nmaster clients are stacked horizontally, in the center of the screen */
|
|
||||||
resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
mx += WIDTH(c) + iv*mivf;
|
|
||||||
} else {
|
|
||||||
/* stack clients are stacked horizontally */
|
|
||||||
resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
sx += WIDTH(c) + iv;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Deck layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/deck/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
deck(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mrest, srest;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
|
|
||||||
sw = mw = m->ww - 2*ov;
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
sw = (mw - iv) * (1 - m->mfact);
|
|
||||||
mw = mw - iv - sw;
|
|
||||||
sx = mx + mw + iv;
|
|
||||||
sh = m->wh - 2*oh;
|
|
||||||
}
|
|
||||||
|
|
||||||
getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
|
|
||||||
if (n - m->nmaster > 0) /* override layout symbol */
|
|
||||||
snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster);
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
my += HEIGHT(c) + ih;
|
|
||||||
} else {
|
|
||||||
resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Fibonacci layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/fibonacci/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
fibonacci(Monitor *m, int s)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int nx, ny, nw, nh;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int nv, hrest = 0, wrest = 0, r = 1;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
nx = m->wx + ov;
|
|
||||||
ny = m->wy + oh;
|
|
||||||
nw = m->ww - 2*ov;
|
|
||||||
nh = m->wh - 2*oh;
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
|
|
||||||
if (r) {
|
|
||||||
if ((i % 2 && (nh - ih) / 2 <= (bh + 2*c->bw))
|
|
||||||
|| (!(i % 2) && (nw - iv) / 2 <= (bh + 2*c->bw))) {
|
|
||||||
r = 0;
|
|
||||||
}
|
|
||||||
if (r && i < n - 1) {
|
|
||||||
if (i % 2) {
|
|
||||||
nv = (nh - ih) / 2;
|
|
||||||
hrest = nh - 2*nv - ih;
|
|
||||||
nh = nv;
|
|
||||||
} else {
|
|
||||||
nv = (nw - iv) / 2;
|
|
||||||
wrest = nw - 2*nv - iv;
|
|
||||||
nw = nv;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((i % 4) == 2 && !s)
|
|
||||||
nx += nw + iv;
|
|
||||||
else if ((i % 4) == 3 && !s)
|
|
||||||
ny += nh + ih;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((i % 4) == 0) {
|
|
||||||
if (s) {
|
|
||||||
ny += nh + ih;
|
|
||||||
nh += hrest;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
nh -= hrest;
|
|
||||||
ny -= nh + ih;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ((i % 4) == 1) {
|
|
||||||
nx += nw + iv;
|
|
||||||
nw += wrest;
|
|
||||||
}
|
|
||||||
else if ((i % 4) == 2) {
|
|
||||||
ny += nh + ih;
|
|
||||||
nh += hrest;
|
|
||||||
if (i < n - 1)
|
|
||||||
nw += wrest;
|
|
||||||
}
|
|
||||||
else if ((i % 4) == 3) {
|
|
||||||
if (s) {
|
|
||||||
nx += nw + iv;
|
|
||||||
nw -= wrest;
|
|
||||||
} else {
|
|
||||||
nw -= wrest;
|
|
||||||
nx -= nw + iv;
|
|
||||||
nh += hrest;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i == 0) {
|
|
||||||
if (n != 1) {
|
|
||||||
nw = (m->ww - iv - 2*ov) - (m->ww - iv - 2*ov) * (1 - m->mfact);
|
|
||||||
wrest = 0;
|
|
||||||
}
|
|
||||||
ny = m->wy + oh;
|
|
||||||
}
|
|
||||||
else if (i == 1)
|
|
||||||
nw = m->ww - nw - iv - 2*ov;
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
|
|
||||||
resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
dwindle(Monitor *m)
|
|
||||||
{
|
|
||||||
fibonacci(m, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
spiral(Monitor *m)
|
|
||||||
{
|
|
||||||
fibonacci(m, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Gappless grid layout + gaps (ironically)
|
|
||||||
* https://dwm.suckless.org/patches/gaplessgrid/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
gaplessgrid(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* grid dimensions */
|
|
||||||
for (cols = 0; cols <= n/2; cols++)
|
|
||||||
if (cols*cols >= n)
|
|
||||||
break;
|
|
||||||
if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
|
||||||
cols = 2;
|
|
||||||
rows = n/cols;
|
|
||||||
cn = rn = 0; // reset column no, row no, client count
|
|
||||||
|
|
||||||
ch = (m->wh - 2*oh - ih * (rows - 1)) / rows;
|
|
||||||
cw = (m->ww - 2*ov - iv * (cols - 1)) / cols;
|
|
||||||
rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
crest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols;
|
|
||||||
x = m->wx + ov;
|
|
||||||
y = m->wy + oh;
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
|
|
||||||
if (i/rows + 1 > cols - n%cols) {
|
|
||||||
rows = n/cols + 1;
|
|
||||||
ch = (m->wh - 2*oh - ih * (rows - 1)) / rows;
|
|
||||||
rrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
}
|
|
||||||
resize(c,
|
|
||||||
x,
|
|
||||||
y + rn*(ch + ih) + MIN(rn, rrest),
|
|
||||||
cw + (cn < crest ? 1 : 0) - 2*c->bw,
|
|
||||||
ch + (rn < rrest ? 1 : 0) - 2*c->bw,
|
|
||||||
0);
|
|
||||||
rn++;
|
|
||||||
if (rn >= rows) {
|
|
||||||
rn = 0;
|
|
||||||
x += cw + ih + (cn < crest ? 1 : 0);
|
|
||||||
cn++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Gridmode layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/gridmode/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
grid(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
|
|
||||||
/* grid dimensions */
|
|
||||||
for (rows = 0; rows <= n/2; rows++)
|
|
||||||
if (rows*rows >= n)
|
|
||||||
break;
|
|
||||||
cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
|
|
||||||
|
|
||||||
/* window geoms (cell height/width) */
|
|
||||||
ch = (m->wh - 2*oh - ih * (rows - 1)) / (rows ? rows : 1);
|
|
||||||
cw = (m->ww - 2*ov - iv * (cols - 1)) / (cols ? cols : 1);
|
|
||||||
chrest = (m->wh - 2*oh - ih * (rows - 1)) - ch * rows;
|
|
||||||
cwrest = (m->ww - 2*ov - iv * (cols - 1)) - cw * cols;
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
|
|
||||||
cc = i / rows;
|
|
||||||
cr = i % rows;
|
|
||||||
cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest);
|
|
||||||
cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest);
|
|
||||||
resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2*c->bw, ch + (cr < chrest ? 1 : 0) - 2*c->bw, False);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Horizontal grid layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/horizgrid/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
horizgrid(Monitor *m) {
|
|
||||||
Client *c;
|
|
||||||
unsigned int n, i;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
int ntop, nbottom = 1;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mrest, srest;
|
|
||||||
|
|
||||||
/* Count windows */
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (n <= 2)
|
|
||||||
ntop = n;
|
|
||||||
else {
|
|
||||||
ntop = n / 2;
|
|
||||||
nbottom = n - ntop;
|
|
||||||
}
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
sh = mh = m->wh - 2*oh;
|
|
||||||
sw = mw = m->ww - 2*ov;
|
|
||||||
|
|
||||||
if (n > ntop) {
|
|
||||||
sh = (mh - ih) / 2;
|
|
||||||
mh = mh - ih - sh;
|
|
||||||
sy = my + mh + ih;
|
|
||||||
mw = m->ww - 2*ov - iv * (ntop - 1);
|
|
||||||
sw = m->ww - 2*ov - iv * (nbottom - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
mfacts = ntop;
|
|
||||||
sfacts = nbottom;
|
|
||||||
mrest = mw - (mw / ntop) * ntop;
|
|
||||||
srest = sw - (sw / nbottom) * nbottom;
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
if (i < ntop) {
|
|
||||||
resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
|
|
||||||
mx += WIDTH(c) + iv;
|
|
||||||
} else {
|
|
||||||
resize(c, sx, sy, (sw / sfacts) + ((i - ntop) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
|
|
||||||
sx += WIDTH(c) + iv;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* nrowgrid layout + gaps
|
|
||||||
* https://dwm.suckless.org/patches/nrowgrid/
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
nrowgrid(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int n;
|
|
||||||
int ri = 0, ci = 0; /* counters */
|
|
||||||
int oh, ov, ih, iv; /* vanitygap settings */
|
|
||||||
unsigned int cx, cy, cw, ch; /* client geometry */
|
|
||||||
unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */
|
|
||||||
unsigned int cols, rows = m->nmaster + 1;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
/* count clients */
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
|
|
||||||
/* nothing to do here */
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* force 2 clients to always split vertically */
|
|
||||||
if (FORCE_VSPLIT && n == 2)
|
|
||||||
rows = 1;
|
|
||||||
|
|
||||||
/* never allow empty rows */
|
|
||||||
if (n < rows)
|
|
||||||
rows = n;
|
|
||||||
|
|
||||||
/* define first row */
|
|
||||||
cols = n / rows;
|
|
||||||
uc = cols;
|
|
||||||
cy = m->wy + oh;
|
|
||||||
ch = (m->wh - 2*oh - ih*(rows - 1)) / rows;
|
|
||||||
uh = ch;
|
|
||||||
|
|
||||||
for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) {
|
|
||||||
if (ci == cols) {
|
|
||||||
uw = 0;
|
|
||||||
ci = 0;
|
|
||||||
ri++;
|
|
||||||
|
|
||||||
/* next row */
|
|
||||||
cols = (n - uc) / (rows - ri);
|
|
||||||
uc += cols;
|
|
||||||
cy = m->wy + oh + uh + ih;
|
|
||||||
uh += ch + ih;
|
|
||||||
}
|
|
||||||
|
|
||||||
cx = m->wx + ov + uw;
|
|
||||||
cw = (m->ww - 2*ov - uw) / (cols - ci);
|
|
||||||
uw += cw + iv;
|
|
||||||
|
|
||||||
resize(c, cx, cy, cw - (2*c->bw), ch - (2*c->bw), 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Default tile layout + gaps
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
tile(Monitor *m)
|
|
||||||
{
|
|
||||||
unsigned int i, n;
|
|
||||||
int oh, ov, ih, iv;
|
|
||||||
int mx = 0, my = 0, mh = 0, mw = 0;
|
|
||||||
int sx = 0, sy = 0, sh = 0, sw = 0;
|
|
||||||
float mfacts, sfacts;
|
|
||||||
int mrest, srest;
|
|
||||||
Client *c;
|
|
||||||
|
|
||||||
getgaps(m, &oh, &ov, &ih, &iv, &n);
|
|
||||||
if (n == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
sx = mx = m->wx + ov;
|
|
||||||
sy = my = m->wy + oh;
|
|
||||||
mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
|
|
||||||
sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
|
|
||||||
sw = mw = m->ww - 2*ov;
|
|
||||||
|
|
||||||
if (m->nmaster && n > m->nmaster) {
|
|
||||||
sw = (mw - iv) * (1 - m->mfact);
|
|
||||||
mw = mw - iv - sw;
|
|
||||||
sx = mx + mw + iv;
|
|
||||||
}
|
|
||||||
|
|
||||||
getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
|
|
||||||
|
|
||||||
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
||||||
if (i < m->nmaster) {
|
|
||||||
resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
my += HEIGHT(c) + ih;
|
|
||||||
} else {
|
|
||||||
resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0);
|
|
||||||
sy += HEIGHT(c) + ih;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user