archy-linux/archy-dwm
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 4 Packages Wiki Activity

More format and more improve :D

Browse source
This commit is contained in:
Anas Elgarhy 2022-10-31 15:25:39 +02:00
parent 44f85c76ec
commit 6099f19a49
12 changed files with 633 additions and 628 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
src/drw.c
View file

@ -13,31 +13,27 @@
static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; static const long utfmin[UTF_SIZ + 1] = {0, 0, 0x80, 0x800, 0x10000};
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
static long static long
utf8decodebyte(const char c, size_t *i) utf8decodebyte(const char c, size_t *i) {
{
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i)) for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i]) if (((unsigned char) c & utfmask[*i]) == utfbyte[*i])
return (unsigned char)c & ~utfmask[*i]; return (unsigned char) c & ~utfmask[*i];
return 0; return 0;
} }
static size_t static size_t
utf8validate(long *u, size_t i) utf8validate(long *u, size_t i) {
{
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID; *u = UTF_INVALID;
for (i = 1; *u > utfmax[i]; ++i) for (i = 1; *u > utfmax[i]; ++i);
;
return i; return i;
} }
static size_t static size_t
utf8decode(const char *c, long *u, size_t clen) utf8decode(const char *c, long *u, size_t clen) {
{
size_t i, j, len, type; size_t i, j, len, type;
long udecoded; long udecoded;
@ -61,8 +57,7 @@ utf8decode(const char *c, long *u, size_t clen)
} }
Drw * Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) {
{
Drw *drw = ecalloc(1, sizeof(Drw)); Drw *drw = ecalloc(1, sizeof(Drw));
drw->dpy = dpy; drw->dpy = dpy;
@ -78,8 +73,7 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
} }
void void
drw_resize(Drw *drw, unsigned int w, unsigned int h) drw_resize(Drw *drw, unsigned int w, unsigned int h) {
{
if (!drw) if (!drw)
return; return;
@ -91,8 +85,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
} }
void void
drw_free(Drw *drw) drw_free(Drw *drw) {
{
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
XFreeGC(drw->dpy, drw->gc); XFreeGC(drw->dpy, drw->gc);
drw_fontset_free(drw->fonts); drw_fontset_free(drw->fonts);
@ -103,8 +96,7 @@ drw_free(Drw *drw)
* drw_fontset_create instead. * drw_fontset_create instead.
*/ */
static Fnt * static Fnt *
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern) {
{
Fnt *font; Fnt *font;
XftFont *xfont = NULL; XftFont *xfont = NULL;
FcPattern *pattern = NULL; FcPattern *pattern = NULL;
@ -143,8 +135,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
} }
static void static void
xfont_free(Fnt *font) xfont_free(Fnt *font) {
{
if (!font) if (!font)
return; return;
if (font->pattern) if (font->pattern)
@ -153,9 +144,8 @@ xfont_free(Fnt *font)
free(font); free(font);
} }
Fnt* Fnt *
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount) drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount) {
{
Fnt *cur, *ret = NULL; Fnt *cur, *ret = NULL;
size_t i; size_t i;
@ -172,8 +162,7 @@ drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
} }
void void
drw_fontset_free(Fnt *font) drw_fontset_free(Fnt *font) {
{
if (font) { if (font) {
drw_fontset_free(font->next); drw_fontset_free(font->next);
xfont_free(font); xfont_free(font);
@ -181,8 +170,7 @@ drw_fontset_free(Fnt *font)
} }
void void
drw_clr_create(Drw *drw, Clr *dest, const char *clrname) drw_clr_create(Drw *drw, Clr *dest, const char *clrname) {
{
if (!drw || !dest || !clrname) if (!drw || !dest || !clrname)
return; return;
@ -195,8 +183,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
/* Wrapper to create color schemes. The caller has to call free(3) on the /* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */ * returned color scheme when done using it. */
Clr * Clr *
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) {
{
size_t i; size_t i;
Clr *ret; Clr *ret;
@ -210,22 +197,19 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
} }
void void
drw_setfontset(Drw *drw, Fnt *set) drw_setfontset(Drw *drw, Fnt *set) {
{
if (drw) if (drw)
drw->fonts = set; drw->fonts = set;
} }
void void
drw_setscheme(Drw *drw, Clr *scm) drw_setscheme(Drw *drw, Clr *scm) {
{
if (drw) if (drw)
drw->scheme = scm; drw->scheme = scm;
} }
void void
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert) {
{
if (!drw || !drw->scheme) if (!drw || !drw->scheme)
return; return;
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel); XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
@ -236,8 +220,7 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int
} }
int int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert) {
{
int i, ty, ellipsis_x = 0; int i, ty, ellipsis_x = 0;
unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len; unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
XftDraw *d = NULL; XftDraw *d = NULL;
@ -251,8 +234,13 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
XftResult result; XftResult result;
int charexists = 0, overflow = 0; int charexists = 0, overflow = 0;
/* keep track of a couple codepoints for which we have no match. */ /* keep track of a couple codepoints for which we have no match. */
enum { nomatches_len = 64 }; enum {
static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches; nomatches_len = 64
};
static struct {
long codepoint[nomatches_len];
unsigned int idx;
} nomatches;
static unsigned int ellipsis_width = 0; static unsigned int ellipsis_width = 0;
if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts) if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
@ -320,7 +308,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (render) { if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent; ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg], XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen); usedfont->xfont, x, ty, (XftChar8 *) utf8str, utf8strlen);
} }
x += ew; x += ew;
w -= ew; w -= ew;
@ -366,13 +354,12 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (match) { if (match) {
usedfont = xfont_create(drw, NULL, match); usedfont = xfont_create(drw, NULL, match);
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) { if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
for (curfont = drw->fonts; curfont->next; curfont = curfont->next) for (curfont = drw->fonts; curfont->next; curfont = curfont->next); /* NOP */
; /* NOP */
curfont->next = usedfont; curfont->next = usedfont;
} else { } else {
xfont_free(usedfont); xfont_free(usedfont);
nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint; nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
no_match: no_match:
usedfont = drw->fonts; usedfont = drw->fonts;
} }
} }
@ -385,8 +372,7 @@ no_match:
} }
void void
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
{
if (!drw) if (!drw)
return; return;
@ -395,16 +381,14 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
} }
unsigned int unsigned int
drw_fontset_getwidth(Drw *drw, const char *text) drw_fontset_getwidth(Drw *drw, const char *text) {
{
if (!drw || !drw->fonts || !text) if (!drw || !drw->fonts || !text)
return 0; return 0;
return drw_text(drw, 0, 0, 0, 0, 0, text, 0); return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
} }
unsigned int unsigned int
drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n) {
{
unsigned int tmp = 0; unsigned int tmp = 0;
if (drw && drw->fonts && text && n) if (drw && drw->fonts && text && n)
tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n); tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
@ -412,14 +396,13 @@ drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
} }
void void
drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h) {
{
XGlyphInfo ext; XGlyphInfo ext;
if (!font || !text) if (!font || !text)
return; return;
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext); XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *) text, len, &ext);
if (w) if (w)
*w = ext.xOff; *w = ext.xOff;
if (h) if (h)
@ -427,8 +410,7 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
} }
Cur * Cur *
drw_cur_create(Drw *drw, int shape) drw_cur_create(Drw *drw, int shape) {
{
Cur *cur; Cur *cur;
if (!drw || !(cur = ecalloc(1, sizeof(Cur)))) if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
@ -440,8 +422,7 @@ drw_cur_create(Drw *drw, int shape)
} }
void void
drw_cur_free(Drw *drw, Cur *cursor) drw_cur_free(Drw *drw, Cur *cursor) {
{
if (!cursor) if (!cursor)
return; return;

18
src/drw.h
View file

@ -12,7 +12,9 @@ typedef struct Fnt {
struct Fnt *next; struct Fnt *next;
} Fnt; } Fnt;
enum { ColFg, ColBg, ColBorder }; /* Clr scheme index */ enum {
ColFg, ColBg, ColBorder
}; /* Clr scheme index */
typedef XftColor Clr; typedef XftColor Clr;
typedef struct { typedef struct {
@ -28,30 +30,40 @@ typedef struct {
/* Drawable abstraction */ /* Drawable abstraction */
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
void drw_resize(Drw *drw, unsigned int w, unsigned int h); void drw_resize(Drw *drw, unsigned int w, unsigned int h);
void drw_free(Drw *drw); void drw_free(Drw *drw);
/* Fnt abstraction */ /* Fnt abstraction */
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount); Fnt *drw_fontset_create(Drw *drw, const char *fonts[], size_t fontcount);
void drw_fontset_free(Fnt* set);
void drw_fontset_free(Fnt *set);
unsigned int drw_fontset_getwidth(Drw *drw, const char *text); unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n); unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
/* Colorscheme abstraction */ /* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);
void drw_cur_free(Drw *drw, Cur *cursor); void drw_cur_free(Drw *drw, Cur *cursor);
/* Drawing context manipulation */ /* Drawing context manipulation */
void drw_setfontset(Drw *drw, Fnt *set); void drw_setfontset(Drw *drw, Fnt *set);
void drw_setscheme(Drw *drw, Clr *scm); void drw_setscheme(Drw *drw, Clr *scm);
/* Drawing functions */ /* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert); void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert); int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
/* Map functions */ /* Map functions */

13
src/dwm.c
View file

@ -47,18 +47,6 @@
#include "dwm.h" #include "dwm.h"
/* macros */ /* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x, y, w, h, m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define SYSTEM_TRAY_REQUEST_DOCK 0 #define SYSTEM_TRAY_REQUEST_DOCK 0
/* XEMBED messages */ /* XEMBED messages */
#define XEMBED_EMBEDDED_NOTIFY 0 #define XEMBED_EMBEDDED_NOTIFY 0
@ -70,7 +58,6 @@
#define XEMBED_WINDOW_DEACTIVATE 2 #define XEMBED_WINDOW_DEACTIVATE 2
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
/* variables */ /* variables */
static Systray *systray = NULL; static Systray *systray = NULL;

33
src/layouts/centeredmaster.c
View file

@ -1,6 +1,8 @@
#include "../dwm.h"
#include "../util.h"
void void
centeredmaster(Monitor *m) centeredmaster(Monitor *m) {
{
unsigned int i, n, h, mw, mx, my, oty, ety, tw; unsigned int i, n, h, mw, mx, my, oty, ety, tw;
Client *c; Client *c;
@ -34,28 +36,27 @@ centeredmaster(Monitor *m)
/* nmaster clients are stacked vertically, in the center /* nmaster clients are stacked vertically, in the center
* of the screen */ * of the screen */
h = (m->wh - my) / (MIN(n, m->nmaster) - i); h = (m->wh - my) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, mw - (2*c->bw), resize(c, m->wx + mx, m->wy + my, mw - (2 * c->bw),
h - (2*c->bw), 0); h - (2 * c->bw), 0);
my += HEIGHT(c); my += HEIGHT(c);
} else { } else {
/* stack clients are stacked vertically */ /* stack clients are stacked vertically */
if ((i - m->nmaster) % 2 ) { if ((i - m->nmaster) % 2) {
h = (m->wh - ety) / ( (1 + n - i) / 2); h = (m->wh - ety) / ((1 + n - i) / 2);
resize(c, m->wx, m->wy + ety, tw - (2*c->bw), resize(c, m->wx, m->wy + ety, tw - (2 * c->bw),
h - (2*c->bw), 0); h - (2 * c->bw), 0);
ety += HEIGHT(c); ety += HEIGHT(c);
} else { } else {
h = (m->wh - oty) / ((1 + n - i) / 2); h = (m->wh - oty) / ((1 + n - i) / 2);
resize(c, m->wx + mx + mw, m->wy + oty, resize(c, m->wx + mx + mw, m->wy + oty,
tw - (2*c->bw), h - (2*c->bw), 0); tw - (2 * c->bw), h - (2 * c->bw), 0);
oty += HEIGHT(c); oty += HEIGHT(c);
} }
} }
} }
void void
centeredfloatingmaster(Monitor *m) centeredfloatingmaster(Monitor *m) {
{
unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx; unsigned int i, n, w, mh, mw, mx, mxo, my, myo, tx;
Client *c; Client *c;
@ -84,19 +85,19 @@ centeredfloatingmaster(Monitor *m)
my = myo = 0; my = myo = 0;
} }
for(i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = tx = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
/* nmaster clients are stacked horizontally, in the center /* nmaster clients are stacked horizontally, in the center
* of the screen */ * of the screen */
w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i); w = (mw + mxo - mx) / (MIN(n, m->nmaster) - i);
resize(c, m->wx + mx, m->wy + my, w - (2*c->bw), resize(c, m->wx + mx, m->wy + my, w - (2 * c->bw),
mh - (2*c->bw), 0); mh - (2 * c->bw), 0);
mx += WIDTH(c); mx += WIDTH(c);
} else { } else {
/* stack clients are stacked horizontally */ /* stack clients are stacked horizontally */
w = (m->ww - tx) / (n - i); w = (m->ww - tx) / (n - i);
resize(c, m->wx + tx, m->wy, w - (2*c->bw), resize(c, m->wx + tx, m->wy, w - (2 * c->bw),
m->wh - (2*c->bw), 0); m->wh - (2 * c->bw), 0);
tx += WIDTH(c); tx += WIDTH(c);
} }
} }

2
src/layouts/centeredmaster.h
View file

@ -7,4 +7,4 @@ static void centeredfloatingmaster(Monitor *m);
#include "centeredmaster.c" #include "centeredmaster.c"
#endif // !centeredmaster.h #endif // centeredmaster_H

39
src/layouts/fibonacci.c
View file

@ -1,10 +1,12 @@
#include "../dwm.h"
void void
fibonacci(Monitor *mon, int s) { fibonacci(Monitor *mon, int s) {
unsigned int i, n, nx, ny, nw, nh; unsigned int i, n, nx, ny, nw, nh;
Client *c; Client *c;
for(n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++); for (n = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next), n++);
if(n == 0) if (n == 0)
return; return;
nx = mon->wx; nx = mon->wx;
@ -12,42 +14,39 @@ fibonacci(Monitor *mon, int s) {
nw = mon->ww; nw = mon->ww;
nh = mon->wh; nh = mon->wh;
for(i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) { for (i = 0, c = nexttiled(mon->clients); c; c = nexttiled(c->next)) {
if((i % 2 && nh / 2 > 2 * c->bw) if ((i % 2 && nh / 2 > 2 * c->bw)
|| (!(i % 2) && nw / 2 > 2 * c->bw)) { || (!(i % 2) && nw / 2 > 2 * c->bw)) {
if(i < n - 1) { if (i < n - 1) {
if(i % 2) if (i % 2)
nh /= 2; nh /= 2;
else else
nw /= 2; nw /= 2;
if((i % 4) == 2 && !s) if ((i % 4) == 2 && !s)
nx += nw; nx += nw;
else if((i % 4) == 3 && !s) else if ((i % 4) == 3 && !s)
ny += nh; ny += nh;
} }
if((i % 4) == 0) { if ((i % 4) == 0) {
if(s) if (s)
ny += nh; ny += nh;
else else
ny -= nh; ny -= nh;
} } else if ((i % 4) == 1)
else if((i % 4) == 1)
nx += nw; nx += nw;
else if((i % 4) == 2) else if ((i % 4) == 2)
ny += nh; ny += nh;
else if((i % 4) == 3) { else if ((i % 4) == 3) {
if(s) if (s)
nx += nw; nx += nw;
else else
nx -= nw; nx -= nw;
} }
if(i == 0) if (i == 0) {
{ if (n != 1)
if(n != 1)
nw = mon->ww * mon->mfact; nw = mon->ww * mon->mfact;
ny = mon->wy; ny = mon->wy;
} } else if (i == 1)
else if(i == 1)
nw = mon->ww - nw; nw = mon->ww - nw;
i++; i++;
} }

10
src/layouts/grid.c
View file

@ -1,21 +1,23 @@
#include "../dwm.h"
void void
grid(Monitor *m) { grid(Monitor *m) {
unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows; unsigned int i, n, cx, cy, cw, ch, aw, ah, cols, rows;
Client *c; Client *c;
for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next))
n++; n++;
/* grid dimensions */ /* grid dimensions */
for(rows = 0; rows <= n/2; rows++) for (rows = 0; rows <= n / 2; rows++)
if(rows*rows >= n) if (rows * rows >= n)
break; break;
cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows; cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
/* window geoms (cell height/width) */ /* window geoms (cell height/width) */
ch = m->wh / (rows ? rows : 1); ch = m->wh / (rows ? rows : 1);
cw = m->ww / (cols ? cols : 1); cw = m->ww / (cols ? cols : 1);
for(i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) { for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
cx = m->wx + (i / rows) * cw; cx = m->wx + (i / rows) * cw;
cy = m->wy + (i % rows) * ch; cy = m->wy + (i % rows) * ch;
/* adjust height/width of last row/column's windows */ /* adjust height/width of last row/column's windows */

6
src/layouts/monocle.c
View file

@ -1,6 +1,8 @@
#include "../dwm.h"
#include "../util.h"
void void
monocle(Monitor *m) monocle(Monitor *m) {
{
unsigned int n = 0; unsigned int n = 0;
Client *c; Client *c;

10
src/layouts/tile.c
View file

@ -1,6 +1,8 @@
#include "../dwm.h"
#include "../util.h"
void void
tile(Monitor *m) tile(Monitor *m) {
{
unsigned int i, n, h, mw, my, ty; unsigned int i, n, h, mw, my, ty;
Client *c; Client *c;
@ -15,12 +17,12 @@ tile(Monitor *m)
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) { if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i); 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); resize(c, m->wx, m->wy + my, mw - (2 * c->bw), h - (2 * c->bw), 0);
if (my + HEIGHT(c) < m->wh) if (my + HEIGHT(c) < m->wh)
my += HEIGHT(c); my += HEIGHT(c);
} else { } else {
h = (m->wh - ty) / (n - i); 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); 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) if (ty + HEIGHT(c) < m->wh)
ty += HEIGHT(c); ty += HEIGHT(c);
} }

44
src/movestack.c
View file

@ -1,46 +1,48 @@
#include "dwm.h"
#include "util.h"
static void static void
movestack(const Arg *arg) { movestack(const Arg *arg) {
Client *c = NULL, *p = NULL, *pc = NULL, *i; Client *c = NULL, *p = NULL, *pc = NULL, *i;
if(arg->i > 0) { if (arg->i > 0) {
/* find the client after selmon->sel */ /* find the client after selmon->sel */
for(c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next); for (c = selmon->sel->next; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
if(!c) if (!c)
for(c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next); for (c = selmon->clients; c && (!ISVISIBLE(c) || c->isfloating); c = c->next);
} } else {
else {
/* find the client before selmon->sel */ /* find the client before selmon->sel */
for(i = selmon->clients; i != selmon->sel; i = i->next) for (i = selmon->clients; i != selmon->sel; i = i->next)
if(ISVISIBLE(i) && !i->isfloating) if (ISVISIBLE(i) && !i->isfloating)
c = i; c = i;
if(!c) if (!c)
for(; i; i = i->next) for (; i; i = i->next)
if(ISVISIBLE(i) && !i->isfloating) if (ISVISIBLE(i) && !i->isfloating)
c = i; c = i;
} }
/* find the client before selmon->sel and c */ /* find the client before selmon->sel and c */
for(i = selmon->clients; i && (!p || !pc); i = i->next) { for (i = selmon->clients; i && (!p || !pc); i = i->next) {
if(i->next == selmon->sel) if (i->next == selmon->sel)
p = i; p = i;
if(i->next == c) if (i->next == c)
pc = i; pc = i;
} }
/* swap c and selmon->sel selmon->clients in the selmon->clients list */ /* swap c and selmon->sel selmon->clients in the selmon->clients list */
if(c && c != selmon->sel) { if (c && c != selmon->sel) {
Client *temp = selmon->sel->next==c?selmon->sel:selmon->sel->next; Client *temp = selmon->sel->next == c ? selmon->sel : selmon->sel->next;
selmon->sel->next = c->next==selmon->sel?c:c->next; selmon->sel->next = c->next == selmon->sel ? c : c->next;
c->next = temp; c->next = temp;
if(p && p != c) if (p && p != c)
p->next = c; p->next = c;
if(pc && pc != selmon->sel) if (pc && pc != selmon->sel)
pc->next = selmon->sel; pc->next = selmon->sel;
if(selmon->sel == selmon->clients) if (selmon->sel == selmon->clients)
selmon->clients = c; selmon->clients = c;
else if(c == selmon->clients) else if (c == selmon->clients)
selmon->clients = selmon->sel; selmon->clients = selmon->sel;
arrange(selmon); arrange(selmon);

19
src/util.h
View file

@ -1,8 +1,25 @@
/* See LICENSE file for copyright and license details. */ #ifndef UTIL_H
#define UTIL_H
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x, y, w, h, m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
#define MAX(A, B) ((A) > (B) ? (A) : (B)) #define MAX(A, B) ((A) > (B) ? (A) : (B))
#define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B))
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) #define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
void die(const char *fmt, ...); void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size); void *ecalloc(size_t nmemb, size_t size);
#endif // util_H