From 05c436022c87a67e09fdc1cfc7e47dd72f42fbc6 Mon Sep 17 00:00:00 2001
From: speedie <speedie@duck.com>
Date: Sat, 6 May 2023 14:36:50 +0200
Subject: [PATCH] apply last commit for even more functions

---
 libs/event.c       |   4 +-
 libs/history.c     |   8 +---
 libs/img.c         |  51 ++++++----------------
 libs/key.c         |  16 ++-----
 libs/libdrw/draw.c | 104 ++++++++++++---------------------------------
 5 files changed, 46 insertions(+), 137 deletions(-)

diff --git a/libs/event.c b/libs/event.c
index 7e12320..193f229 100644
--- a/libs/event.c
+++ b/libs/event.c
@@ -1,6 +1,4 @@
-void
-eventloop(void)
-{
+void eventloop(void) {
 	XEvent ev;
     #if USEIMAGE
     int noimg = 0;
diff --git a/libs/history.c b/libs/history.c
index 04a6089..c7e7222 100644
--- a/libs/history.c
+++ b/libs/history.c
@@ -1,6 +1,4 @@
-void
-loadhistory(void)
-{
+void loadhistory(void) {
 	FILE *fp = NULL;
 	static size_t cap = 0;
 	size_t llen;
@@ -50,9 +48,7 @@ loadhistory(void)
 	}
 }
 
-void
-navigatehistfile(int dir)
-{
+void navigatehistfile(int dir) {
 	static char def[BUFSIZ];
 	char *p = NULL;
 	size_t len = 0;
diff --git a/libs/img.c b/libs/img.c
index d8d0c8e..c12c124 100644
--- a/libs/img.c
+++ b/libs/img.c
@@ -1,7 +1,5 @@
 #if USEIMAGE
-void
-setimagesize(int width, int height)
-{
+void setimagesize(int width, int height) {
     int oih = 0;
     int oiw = 0;
 
@@ -28,9 +26,7 @@ setimagesize(int width, int height)
     drawmenu();
 }
 
-void
-flipimage(void)
-{
+void flipimage(void) {
     // flip image
     switch (flip) {
         case 1: // horizontal
@@ -48,25 +44,19 @@ flipimage(void)
     }
 }
 
-void
-rotateimage(void)
-{
+void rotateimage(void) {
     rotation %= 4;
     imlib_image_orientate(rotation);
 }
 
-void
-cleanupimage(void)
-{
+void cleanupimage(void) {
     if (image) { // free image using imlib2
         imlib_free_image();
         image = NULL;
     }
 }
 
-void
-drawimage(void)
-{
+void drawimage(void) {
     int width = 0, height = 0;
     char *limg = NULL;
 
@@ -132,9 +122,7 @@ drawimage(void)
     }
 }
 
-void
-setimageopts(void)
-{
+void setimageopts(void) {
     imlib_set_cache_size(8192 * 1024);
 	imlib_context_set_blend(1);
 	imlib_context_set_dither(1);
@@ -145,9 +133,7 @@ setimageopts(void)
 	imlib_context_set_drawable(win);
 }
 
-void
-createifnexist(const char *dir)
-{
+void createifnexist(const char *dir) {
     // exists, so return
 	if (access(dir, F_OK) == 0)
         return;
@@ -161,9 +147,7 @@ createifnexist(const char *dir)
 		fprintf(stderr, "spmenu: failed to create directory: %s\n", dir);
 }
 
-void
-createifnexist_rec(const char *dir)
-{
+void createifnexist_rec(const char *dir) {
 	char *buf, *s = (char*)dir, *bs;
 
     if(!(buf = malloc(strlen(s)+1)))
@@ -181,9 +165,7 @@ createifnexist_rec(const char *dir)
 	free(buf);
 }
 
-void
-loadimage(const char *file, int *width, int *height)
-{
+void loadimage(const char *file, int *width, int *height) {
     if (!file) return;
 
 	image = imlib_load_image(file);
@@ -197,9 +179,7 @@ loadimage(const char *file, int *width, int *height)
 	*height = imlib_image_get_height();
 }
 
-void
-scaleimage(int *width, int *height)
-{
+void scaleimage(int *width, int *height) {
 	int new_width, new_height;
 	float aspect = 1.0f;
 
@@ -230,9 +210,7 @@ scaleimage(int *width, int *height)
     return;
 }
 
-void
-loadimagecache(const char *file, int *width, int *height)
-{
+void loadimagecache(const char *file, int *width, int *height) {
 	int slen = 0, i;
 	unsigned char digest[MD5_DIGEST_LENGTH];
 	char md5[MD5_DIGEST_LENGTH*2+1];
@@ -326,8 +304,7 @@ loadimagecache(const char *file, int *width, int *height)
     }
 }
 
-void
-jumptoindex(unsigned int index) {
+void jumptoindex(unsigned int index) {
 	unsigned int i;
 	sel = curr = matches;
 
@@ -341,9 +318,7 @@ jumptoindex(unsigned int index) {
 	}
 }
 
-void
-resizetoimageheight(int imageheight)
-{
+void resizetoimageheight(int imageheight) {
 	int omh = mh, olines = lines;
 	lines = reallines;
     int wtr = 0;
diff --git a/libs/key.c b/libs/key.c
index bc793e4..19dcc5e 100644
--- a/libs/key.c
+++ b/libs/key.c
@@ -1,6 +1,4 @@
-void
-updatenumlockmask(void)
-{
+void updatenumlockmask(void) {
 	unsigned int i, j;
 	XModifierKeymap *modmap;
 
@@ -14,9 +12,7 @@ updatenumlockmask(void)
 	XFreeModifiermap(modmap);
 }
 
-void
-keypress(XEvent *e)
-{
+void keypress(XEvent *e) {
    	updatenumlockmask();
     {
         unsigned int i;
@@ -72,9 +68,7 @@ keypress(XEvent *e)
     }
 }
 
-void
-grabkeyboard(void)
-{
+void grabkeyboard(void) {
 	struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
 	int i;
 
@@ -93,9 +87,7 @@ grabkeyboard(void)
 	die("cannot grab keyboard");
 }
 
-void
-getcapsstate(void)
-{
+void getcapsstate(void) {
     unsigned int cs = 0;
 
     XkbGetIndicatorState(dpy, XkbUseCoreKbd, &cs);
diff --git a/libs/libdrw/draw.c b/libs/libdrw/draw.c
index 4a01b3f..bacf7b2 100644
--- a/libs/libdrw/draw.c
+++ b/libs/libdrw/draw.c
@@ -28,18 +28,14 @@ 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)
-{
+static long utf8decodebyte(const char c, size_t *i) {
 	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
 		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
 			return (unsigned char)c & ~utfmask[*i];
 	return 0;
 }
 
-static size_t
-utf8validate(long *u, size_t i)
-{
+static size_t utf8validate(long *u, size_t i) {
 	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
 		*u = UTF_INVALID;
 	for (i = 1; *u > utfmax[i]; ++i)
@@ -47,9 +43,7 @@ utf8validate(long *u, size_t i)
 	return i;
 }
 
-static size_t
-utf8decode(const char *c, long *u, size_t clen)
-{
+static size_t utf8decode(const char *c, long *u, size_t clen) {
 	size_t i, j, len, type;
 	long udecoded;
 
@@ -75,9 +69,7 @@ utf8decode(const char *c, long *u, size_t clen)
 
 Clr transcheme[3];
 
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
-{
+Drw * drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) {
 	Drw *drw = ecalloc(1, sizeof(Drw));
 
 	drw->dpy = dpy;
@@ -95,9 +87,7 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
 	return drw;
 }
 
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
+void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
 	if (!drw)
 		return;
 
@@ -108,9 +98,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
 	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
 }
 
-void
-drw_free(Drw *drw)
-{
+void drw_free(Drw *drw) {
 	XFreePixmap(drw->dpy, drw->drawable);
 	XFreeGC(drw->dpy, drw->gc);
 	drw_font_free(drw->font);
@@ -118,9 +106,7 @@ drw_free(Drw *drw)
 }
 
 #if USEPANGO
-static Fnt *
-xfont_create(Drw *drw, const char *fontname)
-{
+static Fnt * xfont_create(Drw *drw, const char *fontname) {
 	Fnt *font;
 	PangoFontMap *fontmap;
 	PangoContext *context;
@@ -149,9 +135,7 @@ xfont_create(Drw *drw, const char *fontname)
 	return font;
 }
 
-void
-xfont_free(Fnt *font)
-{
+void xfont_free(Fnt *font) {
 	if (!font)
 		return;
 	if (font->layout)
@@ -159,9 +143,7 @@ xfont_free(Fnt *font)
 	free(font);
 }
 #else
-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;
@@ -205,9 +187,7 @@ xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
 	return font;
 }
 
-void
-xfont_free(Fnt *font)
-{
+void xfont_free(Fnt *font) {
 	if (!font)
 		return;
 	if (font->pattern)
@@ -217,9 +197,7 @@ xfont_free(Fnt *font)
 }
 #endif
 
-Fnt*
-drw_font_create(Drw* drw, char *font[], size_t fontcount)
-{
+Fnt* drw_font_create(Drw* drw, char *font[], size_t fontcount) {
 	if (!drw || !font)
 		return NULL;
 
@@ -242,9 +220,7 @@ drw_font_create(Drw* drw, char *font[], size_t fontcount)
     #endif
 }
 
-void
-drw_font_free(Fnt *font)
-{
+void drw_font_free(Fnt *font) {
 	if (font) {
         #if !USEPANGO
         drw_font_free(font->next);
@@ -253,9 +229,7 @@ drw_font_free(Fnt *font)
 	}
 }
 
-void
-drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha)
-{
+void drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha) {
 	if (!drw || !dest || !clrname)
 		return;
 
@@ -268,9 +242,7 @@ drw_clr_create(Drw *drw, Clr *dest, char *clrname, unsigned int alpha)
 
 /* 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, char *clrnames[], unsigned int alphas[], size_t clrcount)
-{
+Clr * drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcount) {
 	size_t i;
 	Clr *ret;
 
@@ -283,25 +255,19 @@ drw_scm_create(Drw *drw, char *clrnames[], unsigned int alphas[], size_t clrcoun
 	return ret;
 }
 
-void
-drw_setscheme(Drw *drw, Clr *scm)
-{
+void drw_setscheme(Drw *drw, Clr *scm) {
 	if (drw)
 		drw->scheme = scm;
 }
 
-void
-drw_settrans(Drw *drw, Clr *psc, Clr *nsc)
-{
+void drw_settrans(Drw *drw, Clr *psc, Clr *nsc) {
 	if (drw) {
 		transcheme[0] = psc[ColBg]; transcheme[1] = nsc[ColBg]; transcheme[2] = psc[ColPwl];
 		drw->scheme = transcheme;
 	}
 }
 
-void
-drw_arrow(Drw *drw, int x, int y, unsigned int w, unsigned int h, int direction, int slash)
-{
+void drw_arrow(Drw *drw, int x, int y, unsigned int w, unsigned int h, int direction, int slash) {
 	if (!drw || !drw->scheme)
 		return;
 
@@ -328,9 +294,7 @@ drw_arrow(Drw *drw, int x, int y, unsigned int w, unsigned int h, int direction,
 	XFillPolygon(drw->dpy, drw->drawable, drw->gc, points, 3, Nonconvex, CoordModeOrigin);
 }
 
-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) {
 	if (!drw || !drw->scheme)
 		return;
 	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
@@ -340,15 +304,11 @@ drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int
 		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
 }
 
-int
-xerrordummy(Display *dpy, XErrorEvent *ee)
-{
+int xerrordummy(Display *dpy, XErrorEvent *ee) {
 	return 0;
 }
 
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup)
-{
+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup) {
     XSetErrorHandler(xerrordummy);
 
     #if USEPANGO // pango
@@ -539,9 +499,7 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
     XSync(drw->dpy, False);
 }
 
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
+void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) {
 	if (!drw)
 		return;
 
@@ -549,17 +507,13 @@ drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
 	XSync(drw->dpy, False);
 }
 
-unsigned int
-drw_font_getwidth(Drw *drw, const char *text, Bool markup)
-{
+unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup) {
 	if (!drw || !drw->font || !text)
 		return 0;
 	return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup);
 }
 
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup)
-{
+void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup) {
     #if !USEPANGO
     XGlyphInfo ext;
     #endif
@@ -589,9 +543,7 @@ drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w,
 		*h = font->h;
 }
 
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
+Cur * drw_cur_create(Drw *drw, int shape) {
 	Cur *cur;
 
 	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
@@ -602,9 +554,7 @@ drw_cur_create(Drw *drw, int shape)
 	return cur;
 }
 
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
+void drw_cur_free(Drw *drw, Cur *cursor) {
 	if (!cursor)
 		return;
 
@@ -612,9 +562,7 @@ drw_cur_free(Drw *drw, Cur *cursor)
 	free(cursor);
 }
 
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n, Bool markup)
-{
+unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n, Bool markup) {
 	unsigned int tmp = 0;
 	if (drw && drw->font && text && n)
 		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n, markup);