Xinqi Bao's Git
projects
/
dmenu.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
removed ido-matching, changed behavior of -i meaning case insensitive matching now...
[dmenu.git]
/
dmenu.c
diff --git
a/dmenu.c
b/dmenu.c
index
a4fca09
..
864c8f0
100644
(file)
--- a/
dmenu.c
+++ b/
dmenu.c
@@
-56,8
+56,8
@@
void kpress(XKeyEvent * e);
void match(char *pattern);
void readstdin(void);
void run(void);
void match(char *pattern);
void readstdin(void);
void run(void);
-void setup(
Bool bottom
);
-
int strcaseido(const char *text, const char *pattern
);
+void setup(
int x, int y, int w
);
+
char *cistrstr(const char *s, const char *sub
);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
unsigned int textnw(const char *text, unsigned int len);
unsigned int textw(const char *text);
@@
-79,7
+79,6
@@
unsigned int mw, mh;
unsigned int promptw = 0;
unsigned int nitem = 0;
unsigned int numlockmask = 0;
unsigned int promptw = 0;
unsigned int nitem = 0;
unsigned int numlockmask = 0;
-Bool idomatch = False;
Bool running = True;
Display *dpy;
DC dc = {0};
Bool running = True;
Display *dpy;
DC dc = {0};
@@
-90,6
+89,7
@@
Item *next = NULL;
Item *prev = NULL;
Item *curr = NULL;
Window root, win;
Item *prev = NULL;
Item *curr = NULL;
Window root, win;
+char *(*fstrstr)(const char *, const char *) = strstr;
Item *
appenditem(Item *i, Item *last) {
Item *
appenditem(Item *i, Item *last) {
@@
-507,20
+507,12
@@
match(char *pattern) {
nitem = 0;
for(i = allitems; i; i=i->next)
i->matched = False;
nitem = 0;
for(i = allitems; i; i=i->next)
i->matched = False;
-
for(i = allitems; i; i = i->next)
if(!i->matched && !strncasecmp(pattern, i->text, plen))
j = appenditem(i, j);
for(i = allitems; i; i = i->next)
if(!i->matched && !strncasecmp(pattern, i->text, plen))
j = appenditem(i, j);
-
- for (i = allitems; i; i = i->next)
- if(!i->matched && strcasestr(i->text, pattern))
+ for(i = allitems; i; i = i->next)
+ if(!i->matched && fstrstr(i->text, pattern))
j = appenditem(i, j);
j = appenditem(i, j);
-
- if(idomatch)
- for (i = allitems; i; i = i->next)
- if(!i->matched && strcaseido(i->text, pattern))
- j = appenditem(i, j);
-
curr = prev = next = sel = item;
calcoffsets();
}
curr = prev = next = sel = item;
calcoffsets();
}
@@
-572,7
+564,7
@@
run(void) {
}
void
}
void
-setup(
Bool bottom
) {
+setup(
int x, int y, int w
) {
unsigned int i, j;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
unsigned int i, j;
XModifierKeymap *modmap;
XSetWindowAttributes wa;
@@
-598,10
+590,9
@@
setup(Bool bottom) {
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
wa.override_redirect = 1;
wa.background_pixmap = ParentRelative;
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
- mw = DisplayWidth(dpy, screen);
+ mw =
w ? w :
DisplayWidth(dpy, screen);
mh = dc.font.height + 2;
mh = dc.font.height + 2;
- win = XCreateWindow(dpy, root, 0,
- bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
+ win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
@@
-625,13
+616,28
@@
setup(Bool bottom) {
XMapRaised(dpy, win);
}
XMapRaised(dpy, win);
}
-int
-strcaseido(const char *text, const char *pattern) {
- for(; *text && *pattern; text++)
- if (tolower(*text) == tolower(*pattern))
- pattern++;
- return !*pattern;
-}
+char *
+cistrstr(const char *s, const char *sub) {
+ int c, csub;
+ unsigned int len;
+
+ if(!sub)
+ return (char *)s;
+ if((c = *sub++) != 0) {
+ c = tolower(c);
+ len = strlen(sub);
+ do {
+ do {
+ if((csub = *s++) == 0)
+ return (NULL);
+ }
+ while(tolower(csub) != c);
+ }
+ while(strncasecmp(s, sub, len) != 0);
+ s--;
+ }
+ return (char *)s;
+}
unsigned int
textnw(const char *text, unsigned int len) {
unsigned int
textnw(const char *text, unsigned int len) {
@@
-651,16
+657,13
@@
textw(const char *text) {
int
main(int argc, char *argv[]) {
int
main(int argc, char *argv[]) {
-
Bool bottom = False
;
+
int x = 0, y = 0, w = 0
;
unsigned int i;
/* command line args */
for(i = 1; i < argc; i++)
unsigned int i;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strcmp(argv[i], "-b")) {
- bottom = True;
- }
- else if(!strcmp(argv[i], "-i"))
- idomatch = True;
+ if(!strcmp(argv[i], "-i"))
+ fstrstr = cistrstr;
else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i];
}
else if(!strcmp(argv[i], "-fn")) {
if(++i < argc) font = argv[i];
}
@@
-679,11
+682,21
@@
main(int argc, char *argv[]) {
else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfg = argv[i];
}
else if(!strcmp(argv[i], "-sf")) {
if(++i < argc) selfg = argv[i];
}
+ else if(!strcmp(argv[i], "-x")) {
+ if(++i < argc) x = atoi(argv[i]);
+ }
+ else if(!strcmp(argv[i], "-y")) {
+ if(++i < argc) y = atoi(argv[i]);
+ }
+ else if(!strcmp(argv[i], "-w")) {
+ if(++i < argc) w = atoi(argv[i]);
+ }
else if(!strcmp(argv[i], "-v"))
else if(!strcmp(argv[i], "-v"))
- eprint("dmenu-"VERSION", © 2006-200
7 Anselm R. Garbe, Sander van Dijk, Michał Janeczek
\n");
+ eprint("dmenu-"VERSION", © 2006-200
8 dmenu engineers, see LICENSE for details
\n");
else
else
- eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
- " [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+ eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+ " [-p <prompt>] [-sb <color>] [-sf <color>]\n"
+ " [-x <x>] [-y <y>] [-w <w>] [-v]\n");
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
@@
-700,7
+713,7
@@
main(int argc, char *argv[]) {
readstdin();
}
readstdin();
}
- setup(
bottom
);
+ setup(
x, y, w
);
drawmenu();
XSync(dpy, False);
run();
drawmenu();
XSync(dpy, False);
run();