git clone dmenu dmenu Log gph
Found at: gopher.r-36.net:70/scm/dmenu/commit/a1ad9c2a1c42abdc1309f9a7052b06968050a6c1.gph
tapplied Matthias Christian Ott's sanity fixes (thanks a lot!) - dmenu - Dmenu fork with xft fonts.
git clone git://r-36.net/dmenu
---
commit a1ad9c2a1c42abdc1309f9a7052b06968050a6c1
parent 51224dcb79aef90ff53c0d6edbd7233ca9ccdb26
Date: Sat, 21 Feb 2009 19:21:54 +0000
applied Matthias Christian Ott's sanity fixes (thanks a lot!)
Diffstat:
config.mk | 2 +-
dmenu.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/config.mk b/config.mk
t@@ -19,7 +19,7 @@ INCS = -I. -I/usr/include -I${X11INC}
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CPPFLAGS = -D_BSD_SOURCE -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS}
diff --git a/dmenu.c b/dmenu.c
t@@ -1,5 +1,4 @@
/* See LICENSE file for copyright and license details. */
-#define _BSD_SOURCE
#include
#include
#include
t@@ -141,7 +140,7 @@ cistrstr(const char *s, const char *sub) {
do {
do {
if((csub = *s++) == 0)
- return (NULL);
+ return NULL;
}
while(tolower(csub) != c);
}
t@@ -318,7 +317,7 @@ kpress(XKeyEvent * e) {
len = strlen(text);
buf[0] = 0;
- num = XLookupString(e, buf, sizeof buf, &ksym, 0);
+ num = XLookupString(e, buf, sizeof buf, &ksym, NULL);
if(IsKeypadKey(ksym)) {
if(ksym == XK_KP_Enter)
ksym = XK_Return;
t@@ -534,7 +533,7 @@ readstdin(void) {
maxname = p;
max = len;
}
- if((new = (Item *)malloc(sizeof(Item))) == NULL)
+ if(!(new = (Item *)malloc(sizeof(Item))))
eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
new->next = new->left = new->right = NULL;
new->text = p;
t@@ -593,7 +592,7 @@ setup(Bool topbar) {
initfont(font);
/* menu window */
- wa.override_redirect = 1;
+ wa.override_redirect = True;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
t@@ -631,7 +630,7 @@ setup(Bool topbar) {
/* pixmap */
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
- dc.gc = XCreateGC(dpy, root, 0, 0);
+ dc.gc = XCreateGC(dpy, root, 0, NULL);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
t@@ -702,7 +701,7 @@ main(int argc, char *argv[]) {
" [-p] [-sb ] [-sf ] [-v]\n");
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fprintf(stderr, "warning: no locale support\n");
- if(!(dpy = XOpenDisplay(0)))
+ if(!(dpy = XOpenDisplay(NULL)))
eprint("dmenu: cannot open display\n");
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);
.