tonitch/dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efficiency tweaks

Browse Source
This commit is contained in:
Connor Lane Smith
2011-07-14 20:03:08 +01:00
parent 16a0c0d52a
commit 2b92c95230
2 changed files with 44 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
dmenu.c
View File

@ -25,8 +25,8 @@ struct Item {
static void appenditem(Item *item, Item **list, Item **last); static void appenditem(Item *item, Item **list, Item **last);
static void calcoffsets(void); static void calcoffsets(void);
static char *cistrstr(const char *s, const char *sub);
static void drawmenu(void); static void drawmenu(void);
static char *fstrstr(const char *s, const char *sub);
static void grabkeyboard(void); static void grabkeyboard(void);
static void insert(const char *str, ssize_t n); static void insert(const char *str, ssize_t n);
static void keypress(XKeyEvent *ev); static void keypress(XKeyEvent *ev);
@ -60,6 +60,7 @@ static Item *prev, *curr, *next, *sel;
static Window win; static Window win;
static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
static char *(*fstrstr)(const char *, const char *) = strstr;
int int
main(int argc, char *argv[]) { main(int argc, char *argv[]) {
@ -76,8 +77,10 @@ main(int argc, char *argv[]) {
topbar = False; topbar = False;
else if(!strcmp(argv[i], "-f")) else if(!strcmp(argv[i], "-f"))
fast = True; fast = True;
else if(!strcmp(argv[i], "-i")) else if(!strcmp(argv[i], "-i")) {
fstrncmp = strncasecmp; fstrncmp = strncasecmp;
fstrstr = cistrstr;
}
else if(i+1 == argc) else if(i+1 == argc)
usage(); usage();
/* double flags */ /* double flags */
@ -112,7 +115,7 @@ main(int argc, char *argv[]) {
setup(); setup();
run(); run();
return EXIT_FAILURE; /* should not reach */ return EXIT_FAILURE; /* unreachable */
} }
void void
@ -121,6 +124,7 @@ appenditem(Item *item, Item **list, Item **last) {
*list = item; *list = item;
else else
(*last)->right = item; (*last)->right = item;
item->left = *last; item->left = *last;
item->right = NULL; item->right = NULL;
*last = item; *last = item;
@ -143,6 +147,16 @@ calcoffsets(void) {
break; break;
} }
char *
cistrstr(const char *s, const char *sub) {
size_t len;
for(len = strlen(sub); *s; s++)
if(!strncasecmp(s, sub, len))
return (char *)s;
return NULL;
}
void void
drawmenu(void) { drawmenu(void) {
int curpos; int curpos;
@ -188,16 +202,6 @@ drawmenu(void) {
mapdc(dc, win, mw, mh); mapdc(dc, win, mw, mh);
} }
char *
fstrstr(const char *s, const char *sub) {
size_t len;
for(len = strlen(sub); *s; s++)
if(!fstrncmp(s, sub, len))
return (char *)s;
return NULL;
}
void void
grabkeyboard(void) { grabkeyboard(void) {
int i; int i;
@ -233,46 +237,23 @@ keypress(XKeyEvent *ev) {
XConvertCase(ksym, &lower, &upper); XConvertCase(ksym, &lower, &upper);
switch(lower) { switch(lower) {
default: case XK_a: ksym = XK_Home; break;
return; case XK_b: ksym = XK_Left; break;
case XK_a: case XK_c: ksym = XK_Escape; break;
ksym = XK_Home; case XK_d: ksym = XK_Delete; break;
break; case XK_e: ksym = XK_End; break;
case XK_b: case XK_f: ksym = XK_Right; break;
ksym = XK_Left; case XK_h: ksym = XK_BackSpace; break;
break; case XK_i: ksym = XK_Tab; break;
case XK_c: case XK_j: ksym = XK_Return; break;
ksym = XK_Escape; case XK_m: ksym = XK_Return; break;
break; case XK_n: ksym = XK_Up; break;
case XK_d: case XK_p: ksym = XK_Down; break;
ksym = XK_Delete;
break;
case XK_e:
ksym = XK_End;
break;
case XK_f:
ksym = XK_Right;
break;
case XK_h:
ksym = XK_BackSpace;
break;
case XK_i:
ksym = XK_Tab;
break;
case XK_j:
case XK_m:
ksym = XK_Return;
break;
case XK_k: /* delete right */ case XK_k: /* delete right */
text[cursor] = '\0'; text[cursor] = '\0';
match(False); match(False);
break; break;
case XK_n:
ksym = XK_Next;
break;
case XK_p:
ksym = XK_Prior;
break;
case XK_u: /* delete left */ case XK_u: /* delete left */
insert(NULL, 0 - cursor); insert(NULL, 0 - cursor);
break; break;
@ -285,6 +266,8 @@ keypress(XKeyEvent *ev) {
case XK_y: /* paste selection */ case XK_y: /* paste selection */
XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
return; return;
default:
return;
} }
} }
switch(ksym) { switch(ksym) {
@ -297,7 +280,8 @@ keypress(XKeyEvent *ev) {
return; return;
cursor = nextrune(+1); cursor = nextrune(+1);
case XK_BackSpace: case XK_BackSpace:
if(cursor > 0) if(cursor == 0)
return;
insert(NULL, nextrune(-1) - cursor); insert(NULL, nextrune(-1) - cursor);
break; break;
case XK_End: case XK_End:
@ -351,7 +335,7 @@ keypress(XKeyEvent *ev) {
break; break;
case XK_Return: case XK_Return:
case XK_KP_Enter: case XK_KP_Enter:
fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout); puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
case XK_Right: case XK_Right:
if(text[cursor] != '\0') { if(text[cursor] != '\0') {
@ -468,7 +452,7 @@ run(void) {
switch(ev.type) { switch(ev.type) {
case Expose: case Expose:
if(ev.xexpose.count == 0) if(ev.xexpose.count == 0)
drawmenu(); mapdc(dc, win, mw, mh);
break; break;
case KeyPress: case KeyPress:
keypress(&ev.xkey); keypress(&ev.xkey);

6
draw.c
View File

@ -96,7 +96,7 @@ initdc(void) {
DC *dc; DC *dc;
if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
fprintf(stderr, "no locale support\n"); fputs("no locale support\n", stderr);
if(!(dc = calloc(1, sizeof *dc))) if(!(dc = calloc(1, sizeof *dc)))
eprintf("cannot malloc %u bytes:", sizeof *dc); eprintf("cannot malloc %u bytes:", sizeof *dc);
if(!(dc->dpy = XOpenDisplay(NULL))) if(!(dc->dpy = XOpenDisplay(NULL)))
@ -153,10 +153,10 @@ resizedc(DC *dc, unsigned int w, unsigned int h) {
if(dc->canvas) if(dc->canvas)
XFreePixmap(dc->dpy, dc->canvas); XFreePixmap(dc->dpy, dc->canvas);
dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
dc->w = w; dc->w = w;
dc->h = h; dc->h = h;
dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
} }
int int