X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/5fd7af18c6b24bffd4701156feffcbc0db3b1d69..65912f2a96d32600a07b963e9149f70ca22e73bb:/main.c
diff --git a/main.c b/main.c
index 7b4365e..964fad6 100644
--- a/main.c
+++ b/main.c
@@ -2,17 +2,16 @@
* (C)opyright MMVI Sander van Dijk <a dot h dot vandijk at gmail dot com>
* See LICENSE file for license details.
*/
-
#include "dmenu.h"
#include <ctype.h>
+#include <locale.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
#include <sys/select.h>
#include <sys/time.h>
-#include <X11/cursorfont.h>
#include <X11/Xutil.h>
#include <X11/keysym.h>
@@ -26,10 +25,12 @@ struct Item {
/* static */
static char text[4096];
+static char *prompt = NULL;
static int mx, my, mw, mh;
static int ret = 0;
static int nitem = 0;
static unsigned int cmdw = 0;
+static unsigned int promptw = 0;
static Bool running = True;
static Item *allitems = NULL; /* first of all items */
static Item *item = NULL; /* first of pattern matching items */
@@ -46,7 +47,7 @@ calcoffsets(void) {
if(!curr)
return;
- w = cmdw + 2 * SPACE;
+ w = promptw + cmdw + 2 * SPACE;
for(next = curr; next; next=next->right) {
tw = textw(next->text);
if(tw > mw / 3)
@@ -55,7 +56,7 @@ calcoffsets(void) {
if(w > mw)
break;
}
- w = cmdw + 2 * SPACE;
+ w = promptw + cmdw + 2 * SPACE;
for(prev = curr; prev && prev->left; prev=prev->left) {
tw = textw(prev->left->text);
if(tw > mw / 3)
@@ -75,6 +76,13 @@ drawmenu(void) {
dc.w = mw;
dc.h = mh;
drawtext(NULL, dc.norm);
+ /* print prompt? */
+ if(promptw) {
+ dc.w = promptw;
+ drawtext(prompt, dc.sel);
+ }
+ dc.x += promptw;
+ dc.w = mw - promptw;
/* print command */
if(cmdw && item)
dc.w = cmdw;
@@ -146,7 +154,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, 0);
if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
|| IsPrivateKeypadKey(ksym))
@@ -171,6 +179,42 @@ kpress(XKeyEvent * e) {
}
}
switch(ksym) {
+ default:
+ if(num && !iscntrl((int) buf[0])) {
+ buf[num] = 0;
+ if(len > 0)
+ strncat(text, buf, sizeof text);
+ else
+ strncpy(text, buf, sizeof text);
+ match(text);
+ }
+ break;
+ case XK_BackSpace:
+ if((i = len)) {
+ prev_nitem = nitem;
+ do {
+ text[--i] = 0;
+ match(text);
+ } while(i && nitem && prev_nitem == nitem);
+ match(text);
+ }
+ break;
+ case XK_End:
+ while(next) {
+ sel = curr = next;
+ calcoffsets();
+ }
+ while(sel->right)
+ sel = sel->right;
+ break;
+ case XK_Escape:
+ ret = 1;
+ running = False;
+ break;
+ case XK_Home:
+ sel = curr = item;
+ calcoffsets();
+ break;
case XK_Left:
if(!(sel && sel->left))
return;
@@ -180,18 +224,15 @@ kpress(XKeyEvent * e) {
calcoffsets();
}
break;
- case XK_Tab:
- if(!sel)
- return;
- strncpy(text, sel->text, sizeof(text));
- match(text);
+ case XK_Next:
+ if(next) {
+ sel = curr = next;
+ calcoffsets();
+ }
break;
- case XK_Right:
- if(!(sel && sel->right))
- return;
- sel=sel->right;
- if(sel == next) {
- curr = next;
+ case XK_Prior:
+ if(prev) {
+ sel = curr = prev;
calcoffsets();
}
break;
@@ -205,29 +246,21 @@ kpress(XKeyEvent * e) {
fflush(stdout);
running = False;
break;
- case XK_Escape:
- ret = 1;
- running = False;
- break;
- case XK_BackSpace:
- if((i = len)) {
- prev_nitem = nitem;
- do {
- text[--i] = 0;
- match(text);
- } while(i && nitem && prev_nitem == nitem);
- match(text);
+ case XK_Right:
+ if(!(sel && sel->right))
+ return;
+ sel=sel->right;
+ if(sel == next) {
+ curr = next;
+ calcoffsets();
}
break;
- default:
- if(num && !iscntrl((int) buf[0])) {
- buf[num] = 0;
- if(len > 0)
- strncat(text, buf, sizeof(text));
- else
- strncpy(text, buf, sizeof(text));
- match(text);
- }
+ case XK_Tab:
+ if(!sel)
+ return;
+ strncpy(text, sel->text, sizeof text);
+ match(text);
+ break;
}
drawmenu();
}
@@ -240,7 +273,7 @@ readstdin(void) {
Item *i, *new;
i = 0;
- while(fgets(buf, sizeof(buf), stdin)) {
+ while(fgets(buf, sizeof buf, stdin)) {
len = strlen(buf);
if (buf[len - 1] == '\n')
buf[len - 1] = 0;
@@ -287,24 +320,34 @@ main(int argc, char *argv[]) {
timeout.tv_sec = 3;
/* command line args */
for(i = 1; i < argc; i++)
- if(!strncmp(argv[i], "-font", 6))
- font = argv[++i];
- else if(!strncmp(argv[i], "-normbg", 8))
- normbg = argv[++i];
- else if(!strncmp(argv[i], "-normfg", 8))
- normfg = argv[++i];
- else if(!strncmp(argv[i], "-selbg", 7))
- selbg = argv[++i];
- else if(!strncmp(argv[i], "-selfg", 7))
- selfg = argv[++i];
- else if(!strncmp(argv[i], "-t", 3))
- timeout.tv_sec = atoi(argv[++i]);
+ if(!strncmp(argv[i], "-font", 6)) {
+ if(++i < argc) font = argv[i];
+ }
+ else if(!strncmp(argv[i], "-normbg", 8)) {
+ if(++i < argc) normbg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-normfg", 8)) {
+ if(++i < argc) normfg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-selbg", 7)) {
+ if(++i < argc) selbg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-selfg", 7)) {
+ if(++i < argc) selfg = argv[i];
+ }
+ else if(!strncmp(argv[i], "-p", 3)) {
+ if(++i < argc) prompt = argv[i];
+ }
+ else if(!strncmp(argv[i], "-t", 3)) {
+ if(++i < argc) timeout.tv_sec = atoi(argv[i]);
+ }
else if(!strncmp(argv[i], "-v", 3)) {
fputs("dmenu-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
exit(EXIT_SUCCESS);
}
else
- eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-t <seconds>] [-v]\n", stdout);
+ eprint("usage: dmenu [-font <name>] [-{norm,sel}{bg,fg} <color>] [-p <prompt>] [-t <seconds>] [-v]\n", stdout);
+ setlocale(LC_CTYPE, "");
dpy = XOpenDisplay(0);
if(!dpy)
eprint("dmenu: cannot open display\n");
@@ -341,7 +384,6 @@ main(int argc, char *argv[]) {
DefaultDepth(dpy, screen), CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
- XDefineCursor(dpy, win, XCreateFontCursor(dpy, XC_xterm));
/* pixmap */
dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen));
dc.gc = XCreateGC(dpy, root, 0, 0);
@@ -350,6 +392,10 @@ main(int argc, char *argv[]) {
cmdw = textw(maxname);
if(cmdw > mw / 3)
cmdw = mw / 3;
+ if(prompt)
+ promptw = textw(prompt);
+ if(promptw > mw / 5)
+ promptw = mw / 5;
text[0] = 0;
match(text);
XMapRaised(dpy, win);
@@ -357,7 +403,7 @@ main(int argc, char *argv[]) {
XSync(dpy, False);
/* main event loop */
- while(running && !XNextEvent(dpy, &ev)) {
+ while(running && !XNextEvent(dpy, &ev))
switch (ev.type) {
default: /* ignore all crap */
break;
@@ -369,7 +415,6 @@ main(int argc, char *argv[]) {
drawmenu();
break;
}
- }
/* cleanup */
while(allitems) {