franck.stauffer/dwm
1
0
Fork 0
Code Releases Activity

Personalize config.def.h and config.mk, add format target, format code

Browse Source
This commit is contained in:
Franck STAUFFER 2020-09-04 09:46:51 +02:00
parent 61bb8b2241
commit 100fed48d9
Signed by: franck.stauffer
GPG Key ID: AAF5A94045CEC261
7 changed files with 2388 additions and 1980 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -26,7 +26,7 @@ dwm: ${OBJ}
${CC} -o $@ ${OBJ} ${LDFLAGS}
clean:
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz config.h
dist: clean
mkdir -p dwm-${VERSION}
@ -36,6 +36,9 @@ dist: clean
gzip dwm-${VERSION}.tar
rm -rf dwm-${VERSION}
format:
clang-format -i -style="{BasedOnStyle: mozilla, IndentWidth: 4}" *.c
install: all
mkdir -p ${DESTDIR}${PREFIX}/bin
cp -f dwm ${DESTDIR}${PREFIX}/bin

28
config.def.h
View File

@ -5,17 +5,15 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=10" };
static const char dmenufont[] = "monospace:size=10";
static const char col_gray1[] = "#222222";
static const char col_gray2[] = "#444444";
static const char col_gray3[] = "#bbbbbb";
static const char col_gray4[] = "#eeeeee";
static const char col_cyan[] = "#005577";
static const char *fonts[] = { "SauceCodePro Nerd Font Mono:size=10:antialias:true:autohint:true" };
static const char dmenufont[] = "SauceCodePro Nerd Font Mono:size=10:antialias:true:autohint:true";
static const char color_black[] = "#1D2021";
static const char color_green[] = "#98971A";
static const char color_red[] = "#CC241D";
static const char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
[SchemeNorm] = { color_red, color_black, color_red },
[SchemeSel] = { color_black, color_red, color_green },
};
/* tagging */
@ -40,7 +38,7 @@ static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
{ "[ ]", monocle },
};
/* key definitions */
@ -56,13 +54,19 @@ static const Layout layouts[] = {
/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "st", NULL };
static const char *dmenucmd[] = { "/usr/bin/dmenu_run", "-m", dmenumon, NULL };
static const char *termcmd[] = { "/usr/bin/xterm", NULL };
static const char *lockcmd[] = { "/usr/bin/xsecurelock", NULL };
static const char *mailcmd[] = { "/usr/bin/thunderbird", NULL };
static const char *webcmd[] = { "/usr/bin/chromium", NULL };
static Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ MODKEY|ShiftMask, XK_l, spawn, {.v = lockcmd } },
{ MODKEY|ShiftMask, XK_m, spawn, {.v = mailcmd } },
{ MODKEY|ShiftMask, XK_w, spawn, {.v = webcmd } },
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },

11
config.mk
View File

@ -4,7 +4,7 @@ VERSION = 6.2
# Customize below to fit your system
# paths
PREFIX = /usr/local
PREFIX = /usr
MANPREFIX = ${PREFIX}/share/man
X11INC = /usr/X11R6/include
@ -25,14 +25,13 @@ INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS}
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -D_FORTIFY_SURCE=2
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Ofast -march=native -mtune=native -fstack-protector -fno-plt ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS} -Wl,-O3,-z,now,-z,relro -s
# Solaris
#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
#LDFLAGS = ${LIBS}
# compiler and linker
CC = cc
CC = clang

173
drw.c
View File

@ -1,9 +1,9 @@
/* See LICENSE file for copyright and license details. */
#include <X11/Xft/Xft.h>
#include <X11/Xlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <X11/Xlib.h>
#include <X11/Xft/Xft.h>
#include "drw.h"
#include "util.h"
@ -11,13 +11,21 @@
#define UTF_INVALID 0xFFFD
#define UTF_SIZ 4
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 long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000};
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
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 long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000 };
static const long utfmax[UTF_SIZ + 1] = { 0x10FFFF,
0x7F,
0x7FF,
0xFFFF,
0x10FFFF };
static long
utf8decodebyte(const char c, size_t *i)
utf8decodebyte(const char c, size_t* i)
{
for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
@ -26,7 +34,7 @@ utf8decodebyte(const char c, size_t *i)
}
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))
*u = UTF_INVALID;
@ -36,7 +44,7 @@ utf8validate(long *u, size_t i)
}
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;
long udecoded;
@ -60,10 +68,14 @@ utf8decode(const char *c, long *u, size_t clen)
return len;
}
Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
Drw*
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->screen = screen;
@ -78,7 +90,7 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
}
void
drw_resize(Drw *drw, unsigned int w, unsigned int h)
drw_resize(Drw* drw, unsigned int w, unsigned int h)
{
if (!drw)
return;
@ -87,11 +99,12 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
drw->h = h;
if (drw->drawable)
XFreePixmap(drw->dpy, drw->drawable);
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
drw->drawable = XCreatePixmap(
drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
}
void
drw_free(Drw *drw)
drw_free(Drw* drw)
{
XFreePixmap(drw->dpy, drw->drawable);
XFreeGC(drw->dpy, drw->gc);
@ -102,12 +115,12 @@ drw_free(Drw *drw)
/* This function is an implementation detail. Library users should use
* drw_fontset_create instead.
*/
static Fnt *
xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
static Fnt*
xfont_create(Drw* drw, const char* fontname, FcPattern* fontpattern)
{
Fnt *font;
XftFont *xfont = NULL;
FcPattern *pattern = NULL;
Fnt* font;
XftFont* xfont = NULL;
FcPattern* pattern = NULL;
if (fontname) {
/* Using the pattern found at font->xfont->pattern does not yield the
@ -116,11 +129,14 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
* behaviour whereas the former just results in missing-character
* rectangles being drawn, at least with some fonts. */
if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
fprintf(
stderr, "error, cannot load font from name: '%s'\n", fontname);
return NULL;
}
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
if (!(pattern = FcNameParse((FcChar8*)fontname))) {
fprintf(stderr,
"error, cannot parse font name to pattern: '%s'\n",
fontname);
XftFontClose(drw->dpy, xfont);
return NULL;
}
@ -141,7 +157,9 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
* and lots more all over the internet.
*/
FcBool iscol;
if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
if (FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) ==
FcResultMatch &&
iscol) {
XftFontClose(drw->dpy, xfont);
return NULL;
}
@ -156,7 +174,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
}
static void
xfont_free(Fnt *font)
xfont_free(Fnt* font)
{
if (!font)
return;
@ -167,7 +185,7 @@ xfont_free(Fnt *font)
}
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;
size_t i;
@ -185,7 +203,7 @@ drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
}
void
drw_fontset_free(Fnt *font)
drw_fontset_free(Fnt* font)
{
if (font) {
drw_fontset_free(font->next);
@ -194,27 +212,30 @@ drw_fontset_free(Fnt *font)
}
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)
return;
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
if (!XftColorAllocName(drw->dpy,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen),
clrname, dest))
clrname,
dest))
die("error, cannot allocate color '%s'", clrname);
}
/* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */
Clr *
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
Clr*
drw_scm_create(Drw* drw, const char* clrnames[], size_t clrcount)
{
size_t i;
Clr *ret;
Clr* ret;
/* need at least two colors for a scheme */
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
if (!drw || !clrnames || clrcount < 2 ||
!(ret = ecalloc(clrcount, sizeof(XftColor))))
return NULL;
for (i = 0; i < clrcount; i++)
@ -223,25 +244,34 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
}
void
drw_setfontset(Drw *drw, Fnt *set)
drw_setfontset(Drw* drw, Fnt* set)
{
if (drw)
drw->fonts = set;
}
void
drw_setscheme(Drw *drw, Clr *scm)
drw_setscheme(Drw* drw, Clr* scm)
{
if (drw)
drw->scheme = scm;
}
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)
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);
if (filled)
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
else
@ -249,20 +279,27 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, 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)
{
char buf[1024];
int ty;
unsigned int ew;
XftDraw *d = NULL;
XftDraw* d = NULL;
Fnt *usedfont, *curfont, *nextfont;
size_t i, len;
int utf8strlen, utf8charlen, render = x || y || w || h;
long utf8codepoint = 0;
const char *utf8str;
FcCharSet *fccharset;
FcPattern *fcpattern;
FcPattern *match;
const char* utf8str;
FcCharSet* fccharset;
FcPattern* fcpattern;
FcPattern* match;
XftResult result;
int charexists = 0;
@ -272,9 +309,11 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (!render) {
w = ~w;
} else {
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
XSetForeground(
drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
d = XftDrawCreate(drw->dpy, drw->drawable,
d = XftDrawCreate(drw->dpy,
drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
x += lpad;
@ -289,7 +328,9 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
while (*text) {
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
for (curfont = drw->fonts; curfont; curfont = curfont->next) {
charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
charexists =
charexists ||
XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
if (charexists) {
if (curfont == usedfont) {
utf8strlen += utf8charlen;
@ -322,8 +363,13 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (render) {
ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont, x, ty, (XftChar8 *)buf, len);
XftDrawStringUtf8(d,
&drw->scheme[invert ? ColBg : ColFg],
usedfont->xfont,
x,
ty,
(XftChar8*)buf,
len);
}
x += ew;
w -= ew;
@ -345,7 +391,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (!drw->fonts->pattern) {
/* Refer to the comment in xfont_create for more information. */
die("the first font in the cache must be loaded from a font string.");
die("the first font in the cache must be loaded from a font "
"string.");
}
fcpattern = FcPatternDuplicate(drw->fonts->pattern);
@ -362,8 +409,10 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
if (match) {
usedfont = xfont_create(drw, NULL, match);
if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
if (usedfont &&
XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
for (curfont = drw->fonts; curfont->next;
curfont = curfont->next)
; /* NOP */
curfont->next = usedfont;
} else {
@ -380,7 +429,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
}
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)
return;
@ -390,7 +439,7 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
}
unsigned int
drw_fontset_getwidth(Drw *drw, const char *text)
drw_fontset_getwidth(Drw* drw, const char* text)
{
if (!drw || !drw->fonts || !text)
return 0;
@ -398,24 +447,28 @@ drw_fontset_getwidth(Drw *drw, const char *text)
}
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;
if (!font || !text)
return;
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8*)text, len, &ext);
if (w)
*w = ext.xOff;
if (h)
*h = font->h;
}
Cur *
drw_cur_create(Drw *drw, int shape)
Cur*
drw_cur_create(Drw* drw, int shape)
{
Cur *cur;
Cur* cur;
if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
return NULL;
@ -426,7 +479,7 @@ drw_cur_create(Drw *drw, int shape)
}
void
drw_cur_free(Drw *drw, Cur *cursor)
drw_cur_free(Drw* drw, Cur* cursor)
{
if (!cursor)
return;

1272
dwm.c
View File

File diff suppressed because it is too large Load Diff

10
transient.c
View File

@ -1,12 +1,14 @@
/* cc transient.c -o transient -lX11 */
#include <stdlib.h>
#include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <stdlib.h>
#include <unistd.h>
int main(void) {
Display *d;
int
main(void)
{
Display* d;
Window r, f, t = None;
XSizeHints h;
XEvent e;

9
util.c
View File

@ -6,10 +6,10 @@
#include "util.h"
void *
void*
ecalloc(size_t nmemb, size_t size)
{
void *p;
void* p;
if (!(p = calloc(nmemb, size)))
die("calloc:");
@ -17,14 +17,15 @@ ecalloc(size_t nmemb, size_t size)
}
void
die(const char *fmt, ...) {
die(const char* fmt, ...)
{
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
if (fmt[0] && fmt[strlen(fmt) - 1] == ':') {
fputc(' ', stderr);
perror(NULL);
} else {