Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
Added tag 4.0 for changeset 78f9f72cc9c6
[dmenu.git]
/
dmenu.c
diff --git
a/dmenu.c
b/dmenu.c
index
a799f14
..
0f95af6
100644
(file)
--- a/
dmenu.c
+++ b/
dmenu.c
@@
-1,6
+1,6
@@
/* See LICENSE file for copyright and license details. */
/* See LICENSE file for copyright and license details. */
-#define _BSD_SOURCE
#include <ctype.h>
#include <ctype.h>
+#include <locale.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
@@
-78,7
+78,7
@@
static unsigned int mw, mh;
static unsigned int numlockmask = 0;
static Bool running = True;
static Display *dpy;
static unsigned int numlockmask = 0;
static Bool running = True;
static Display *dpy;
-static DC dc
= {0}
;
+static DC dc;
static Item *allitems = NULL; /* first of all items */
static Item *item = NULL; /* first of pattern matching items */
static Item *sel = NULL;
static Item *allitems = NULL; /* first of all items */
static Item *item = NULL; /* first of pattern matching items */
static Item *sel = NULL;
@@
-140,7
+140,7
@@
cistrstr(const char *s, const char *sub) {
do {
do {
if((csub = *s++) == 0)
do {
do {
if((csub = *s++) == 0)
- return
(NULL)
;
+ return
NULL
;
}
while(tolower(csub) != c);
}
}
while(tolower(csub) != c);
}
@@
-213,8
+213,8
@@
drawmenu(void) {
void
drawtext(const char *text, unsigned long col[ColLast]) {
void
drawtext(const char *text, unsigned long col[ColLast]) {
- int i, x, y, h, len, olen;
char buf[256];
char buf[256];
+ int i, x, y, h, len, olen;
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
XRectangle r = { dc.x, dc.y, dc.w, dc.h };
XSetForeground(dpy, dc.gc, col[ColBG]);
@@
-226,7
+226,7
@@
drawtext(const char *text, unsigned long col[ColLast]) {
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
x = dc.x + (h / 2);
/* shorten text if necessary */
- for(len = MIN(olen, sizeof buf); len && textnw(
buf
, len) > dc.w - h; len--);
+ for(len = MIN(olen, sizeof buf); len && textnw(
text
, len) > dc.w - h; len--);
if(!len)
return;
memcpy(buf, text, len);
if(!len)
return;
memcpy(buf, text, len);
@@
-280,8
+280,6
@@
initfont(const char *fontstr) {
if(!fontstr || fontstr[0] == '\0')
eprint("error, cannot load font: '%s'\n", fontstr);
missing = NULL;
if(!fontstr || fontstr[0] == '\0')
eprint("error, cannot load font: '%s'\n", fontstr);
missing = NULL;
- if(dc.font.set)
- XFreeFontSet(dpy, dc.font.set);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing)
XFreeStringList(missing);
dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def);
if(missing)
XFreeStringList(missing);
@@
-301,9
+299,6
@@
initfont(const char *fontstr) {
}
}
else {
}
}
else {
- if(dc.font.xfont)
- XFreeFont(dpy, dc.font.xfont);
- dc.font.xfont = NULL;
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
eprint("error, cannot load font: '%s'\n", fontstr);
if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
eprint("error, cannot load font: '%s'\n", fontstr);
@@
-322,7
+317,7
@@
kpress(XKeyEvent * e) {
len = strlen(text);
buf[0] = 0;
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;
if(IsKeypadKey(ksym)) {
if(ksym == XK_KP_Enter)
ksym = XK_Return;
@@
-400,10
+395,7
@@
kpress(XKeyEvent * e) {
default:
if(num && !iscntrl((int) buf[0])) {
buf[num] = 0;
default:
if(num && !iscntrl((int) buf[0])) {
buf[num] = 0;
- if(len > 0)
- strncat(text, buf, sizeof text);
- else
- strncpy(text, buf, sizeof text);
+ strncpy(text + len, buf, sizeof text - len);
match(text);
}
break;
match(text);
}
break;
@@
-541,7
+533,7
@@
readstdin(void) {
maxname = p;
max = len;
}
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;
eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
new->next = new->left = new->right = NULL;
new->text = p;
@@
-600,7
+592,7
@@
setup(Bool topbar) {
initfont(font);
/* menu window */
initfont(font);
/* menu window */
- wa.override_redirect =
1
;
+ wa.override_redirect =
True
;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
@@
-638,7
+630,7
@@
setup(Bool topbar) {
/* pixmap */
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
/* 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);
XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
if(!dc.font.set)
XSetFont(dpy, dc.gc, dc.font.xfont->fid);
@@
-707,9
+699,9
@@
main(int argc, char *argv[]) {
else
eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
" [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
else
eprint("usage: dmenu [-i] [-b] [-fn <font>] [-nb <color>] [-nf <color>]\n"
" [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
- if(!XSupportsLocale())
+ if(!
setlocale(LC_CTYPE, "") || !
XSupportsLocale())
fprintf(stderr, "warning: no locale support\n");
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);
eprint("dmenu: cannot open display\n");
screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen);