|
|
|
@ -6,6 +6,7 @@
|
|
|
|
#include <string.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include <X11/Xatom.h>
|
|
|
|
#include <X11/Xatom.h>
|
|
|
|
@ -144,7 +145,7 @@ drawmenu(void)
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
|
|
|
|
drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
|
|
|
|
|
|
|
|
|
|
|
|
drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
|
|
|
|
curpos = TEXTW(text) - TEXTW(&text[cursor]);
|
|
|
|
if ((curpos += lrpad / 2 - 1) < w) {
|
|
|
|
if ((curpos += lrpad / 2 - 1) < w) {
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_setscheme(drw, scheme[SchemeNorm]);
|
|
|
|
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
|
|
|
|
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
|
|
|
|
@ -287,18 +288,42 @@ nextrune(int inc)
|
|
|
|
return n;
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
|
|
movewordedge(int dir)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (dir < 0) { /* move cursor to the start of the word*/
|
|
|
|
|
|
|
|
while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
|
|
|
|
|
|
|
|
cursor = nextrune(-1);
|
|
|
|
|
|
|
|
while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
|
|
|
|
|
|
|
|
cursor = nextrune(-1);
|
|
|
|
|
|
|
|
} else { /* move cursor to the end of the word */
|
|
|
|
|
|
|
|
while (text[cursor] && strchr(worddelimiters, text[cursor]))
|
|
|
|
|
|
|
|
cursor = nextrune(+1);
|
|
|
|
|
|
|
|
while (text[cursor] && !strchr(worddelimiters, text[cursor]))
|
|
|
|
|
|
|
|
cursor = nextrune(+1);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
keypress(XKeyEvent *ev)
|
|
|
|
keypress(XKeyEvent *ev)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
char buf[32];
|
|
|
|
char buf[32];
|
|
|
|
int len;
|
|
|
|
int len;
|
|
|
|
KeySym ksym = NoSymbol;
|
|
|
|
KeySym ksym;
|
|
|
|
Status status;
|
|
|
|
Status status;
|
|
|
|
|
|
|
|
|
|
|
|
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
|
|
|
|
len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
|
|
|
|
if (status == XBufferOverflow)
|
|
|
|
switch (status) {
|
|
|
|
|
|
|
|
default: /* XLookupNone, XBufferOverflow */
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
if (ev->state & ControlMask)
|
|
|
|
case XLookupChars:
|
|
|
|
|
|
|
|
goto insert;
|
|
|
|
|
|
|
|
case XLookupKeySym:
|
|
|
|
|
|
|
|
case XLookupBoth:
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (ev->state & ControlMask) {
|
|
|
|
switch(ksym) {
|
|
|
|
switch(ksym) {
|
|
|
|
case XK_a: ksym = XK_Home; break;
|
|
|
|
case XK_a: ksym = XK_Home; break;
|
|
|
|
case XK_b: ksym = XK_Left; break;
|
|
|
|
case XK_b: ksym = XK_Left; break;
|
|
|
|
@ -334,6 +359,12 @@ keypress(XKeyEvent *ev)
|
|
|
|
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
|
|
|
XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
|
|
|
|
utf8, utf8, win, CurrentTime);
|
|
|
|
utf8, utf8, win, CurrentTime);
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
|
|
|
|
case XK_Left:
|
|
|
|
|
|
|
|
movewordedge(-1);
|
|
|
|
|
|
|
|
goto draw;
|
|
|
|
|
|
|
|
case XK_Right:
|
|
|
|
|
|
|
|
movewordedge(+1);
|
|
|
|
|
|
|
|
goto draw;
|
|
|
|
case XK_Return:
|
|
|
|
case XK_Return:
|
|
|
|
case XK_KP_Enter:
|
|
|
|
case XK_KP_Enter:
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -343,8 +374,14 @@ keypress(XKeyEvent *ev)
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (ev->state & Mod1Mask)
|
|
|
|
} else if (ev->state & Mod1Mask) {
|
|
|
|
switch(ksym) {
|
|
|
|
switch(ksym) {
|
|
|
|
|
|
|
|
case XK_b:
|
|
|
|
|
|
|
|
movewordedge(-1);
|
|
|
|
|
|
|
|
goto draw;
|
|
|
|
|
|
|
|
case XK_f:
|
|
|
|
|
|
|
|
movewordedge(+1);
|
|
|
|
|
|
|
|
goto draw;
|
|
|
|
case XK_g: ksym = XK_Home; break;
|
|
|
|
case XK_g: ksym = XK_Home; break;
|
|
|
|
case XK_G: ksym = XK_End; break;
|
|
|
|
case XK_G: ksym = XK_End; break;
|
|
|
|
case XK_h: ksym = XK_Up; break;
|
|
|
|
case XK_h: ksym = XK_Up; break;
|
|
|
|
@ -354,8 +391,11 @@ keypress(XKeyEvent *ev)
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
switch(ksym) {
|
|
|
|
switch(ksym) {
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
|
|
|
|
insert:
|
|
|
|
if (!iscntrl(*buf))
|
|
|
|
if (!iscntrl(*buf))
|
|
|
|
insert(buf, len);
|
|
|
|
insert(buf, len);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
@ -455,6 +495,8 @@ keypress(XKeyEvent *ev)
|
|
|
|
match();
|
|
|
|
match();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
draw:
|
|
|
|
drawmenu();
|
|
|
|
drawmenu();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -467,10 +509,12 @@ paste(void)
|
|
|
|
Atom da;
|
|
|
|
Atom da;
|
|
|
|
|
|
|
|
|
|
|
|
/* we have been given the current selection, now insert it into input */
|
|
|
|
/* we have been given the current selection, now insert it into input */
|
|
|
|
XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
|
|
|
if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
|
|
|
|
utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
|
|
|
|
utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
|
|
|
|
|
|
|
|
== Success && p) {
|
|
|
|
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
|
|
|
|
insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
|
|
|
|
XFree(p);
|
|
|
|
XFree(p);
|
|
|
|
|
|
|
|
}
|
|
|
|
drawmenu();
|
|
|
|
drawmenu();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -512,6 +556,11 @@ run(void)
|
|
|
|
if (XFilterEvent(&ev, win))
|
|
|
|
if (XFilterEvent(&ev, win))
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
switch(ev.type) {
|
|
|
|
switch(ev.type) {
|
|
|
|
|
|
|
|
case DestroyNotify:
|
|
|
|
|
|
|
|
if (ev.xdestroywindow.window != win)
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
cleanup();
|
|
|
|
|
|
|
|
exit(1);
|
|
|
|
case Expose:
|
|
|
|
case Expose:
|
|
|
|
if (ev.xexpose.count == 0)
|
|
|
|
if (ev.xexpose.count == 0)
|
|
|
|
drw_map(drw, win, 0, 0, mw, mh);
|
|
|
|
drw_map(drw, win, 0, 0, mw, mh);
|
|
|
|
@ -539,22 +588,21 @@ run(void)
|
|
|
|
static void
|
|
|
|
static void
|
|
|
|
setup(void)
|
|
|
|
setup(void)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int x, y, i = 0;
|
|
|
|
int x, y, i, j;
|
|
|
|
unsigned int du;
|
|
|
|
unsigned int du;
|
|
|
|
XSetWindowAttributes swa;
|
|
|
|
XSetWindowAttributes swa;
|
|
|
|
XIM xim;
|
|
|
|
XIM xim;
|
|
|
|
Window w, dw, *dws;
|
|
|
|
Window w, dw, *dws;
|
|
|
|
XWindowAttributes wa;
|
|
|
|
XWindowAttributes wa;
|
|
|
|
|
|
|
|
XClassHint ch = {"dmenu", "dmenu"};
|
|
|
|
#ifdef XINERAMA
|
|
|
|
#ifdef XINERAMA
|
|
|
|
XineramaScreenInfo *info;
|
|
|
|
XineramaScreenInfo *info;
|
|
|
|
Window pw;
|
|
|
|
Window pw;
|
|
|
|
int a, j, di, n, area = 0;
|
|
|
|
int a, di, n, area = 0;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/* init appearance */
|
|
|
|
/* init appearance */
|
|
|
|
scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 2);
|
|
|
|
for (j = 0; j < SchemeLast; j++)
|
|
|
|
scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 2);
|
|
|
|
scheme[j] = drw_scm_create(drw, colors[j], 2);
|
|
|
|
scheme[SchemeOut] = drw_scm_create(drw, colors[SchemeOut], 2);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
|
|
|
clip = XInternAtom(dpy, "CLIPBOARD", False);
|
|
|
|
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
|
|
|
utf8 = XInternAtom(dpy, "UTF8_STRING", False);
|
|
|
|
@ -564,6 +612,7 @@ setup(void)
|
|
|
|
lines = MAX(lines, 0);
|
|
|
|
lines = MAX(lines, 0);
|
|
|
|
mh = (lines + 1) * bh;
|
|
|
|
mh = (lines + 1) * bh;
|
|
|
|
#ifdef XINERAMA
|
|
|
|
#ifdef XINERAMA
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
|
|
if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
|
|
|
|
XGetInputFocus(dpy, &w, &di);
|
|
|
|
XGetInputFocus(dpy, &w, &di);
|
|
|
|
if (mon >= 0 && mon < n)
|
|
|
|
if (mon >= 0 && mon < n)
|
|
|
|
@ -613,15 +662,19 @@ setup(void)
|
|
|
|
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
|
|
|
win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
|
|
|
|
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
|
|
CopyFromParent, CopyFromParent, CopyFromParent,
|
|
|
|
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
|
|
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
|
|
|
|
|
|
|
|
XSetClassHint(dpy, win, &ch);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* input methods */
|
|
|
|
|
|
|
|
if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
|
|
|
|
|
|
|
|
die("XOpenIM failed: could not open input device");
|
|
|
|
|
|
|
|
|
|
|
|
/* open input methods */
|
|
|
|
|
|
|
|
xim = XOpenIM(dpy, NULL, NULL, NULL);
|
|
|
|
|
|
|
|
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
|
|
|
|
xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
|
|
|
|
XNClientWindow, win, XNFocusWindow, win, NULL);
|
|
|
|
XNClientWindow, win, XNFocusWindow, win, NULL);
|
|
|
|
|
|
|
|
|
|
|
|
XMapRaised(dpy, win);
|
|
|
|
XMapRaised(dpy, win);
|
|
|
|
if (embed) {
|
|
|
|
if (embed) {
|
|
|
|
XSelectInput(dpy, parentwin, FocusChangeMask);
|
|
|
|
XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
|
|
|
|
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
|
|
|
|
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
|
|
|
|
for (i = 0; i < du && dws[i] != win; ++i)
|
|
|
|
for (i = 0; i < du && dws[i] != win; ++i)
|
|
|
|
XSelectInput(dpy, dws[i], FocusChangeMask);
|
|
|
|
XSelectInput(dpy, dws[i], FocusChangeMask);
|
|
|
|
@ -699,7 +752,12 @@ main(int argc, char *argv[])
|
|
|
|
die("no fonts could be loaded.");
|
|
|
|
die("no fonts could be loaded.");
|
|
|
|
lrpad = drw->fonts->h;
|
|
|
|
lrpad = drw->fonts->h;
|
|
|
|
|
|
|
|
|
|
|
|
if (fast) {
|
|
|
|
#ifdef __OpenBSD__
|
|
|
|
|
|
|
|
if (pledge("stdio rpath", NULL) == -1)
|
|
|
|
|
|
|
|
die("pledge");
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (fast && !isatty(0)) {
|
|
|
|
grabkeyboard();
|
|
|
|
grabkeyboard();
|
|
|
|
readstdin();
|
|
|
|
readstdin();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
Ronald Reagan
7 years ago