dominic/pinentry-dmenu
1
0
Fork 0
Code Issues Pull requests Releases Activity

Revert some changes and add old code from dmenu

Browse source
This commit is contained in:
Moritz Luedecke 2017-08-01 20:00:08 +02:00
parent ff4fd40baa
commit 410ef5960f
7 changed files with 436 additions and 371 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
config.h
View file

@ -1,12 +1,13 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
static Bool topbar = True; /* Default settings; can be overriden by command line. */
static const char *fonts[]={
"Noto Sans UI:size=13" static int topbar = 1;
static const char *fonts[] = {
"monospace:size=10"
};
static const char *prompt = NULL;
static const char *asterisk = "*";
static const char *colors[SchemeLast][2] = {
[SchemeNorm] = { "#bbbbbb", "#222222" },
[SchemeSel] = { "#eeeeee", "#005577" }
}; };
static const char *secstring = "● ● ";
/*static char *description = NULL;*/
static const char *prompt = "🔑 Pinentry ";
static const char *normbgcolor = "#000000";
static const char *normfgcolor = "#ffffff";
static const char *selbgcolor = "#d9904a";
static const char *selfgcolor = "#ffffff";

2
config.mk
View file

@ -24,7 +24,7 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags # flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CPPFLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
CFLAGS = -ansi -pedantic -Wall -Os ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
LDFLAGS = -s ${LIBS} LDFLAGS = -s ${LIBS}
# compiler and linker # compiler and linker

422
drw.c
View file

@ -17,50 +17,54 @@ static const long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000
static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
static long static long
utf8decodebyte(const char c, size_t *i) { utf8decodebyte(const char c, size_t *i)
for(*i = 0; *i < (UTF_SIZ + 1); ++(*i)) {
if(((unsigned char)c & utfmask[*i]) == utfbyte[*i]) for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
return (unsigned char)c & ~utfmask[*i]; return (unsigned char)c & ~utfmask[*i];
return 0; return 0;
} }
static size_t static size_t
utf8validate(long *u, size_t i) { utf8validate(long *u, size_t i)
if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) {
if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
*u = UTF_INVALID; *u = UTF_INVALID;
for(i = 1; *u > utfmax[i]; ++i) for (i = 1; *u > utfmax[i]; ++i)
; ;
return i; return i;
} }
static size_t static size_t
utf8decode(const char *c, long *u, size_t clen) { utf8decode(const char *c, long *u, size_t clen)
{
size_t i, j, len, type; size_t i, j, len, type;
long udecoded; long udecoded;
*u = UTF_INVALID; *u = UTF_INVALID;
if(!clen) if (!clen)
return 0; return 0;
udecoded = utf8decodebyte(c[0], &len); udecoded = utf8decodebyte(c[0], &len);
if(!BETWEEN(len, 1, UTF_SIZ)) if (!BETWEEN(len, 1, UTF_SIZ))
return 1; return 1;
for(i = 1, j = 1; i < clen && j < len; ++i, ++j) { for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
if(type != 0) if (type)
return j; return j;
} }
if(j < len) if (j < len)
return 0; return 0;
*u = udecoded; *u = udecoded;
utf8validate(u, len); utf8validate(u, len);
return len; return len;
} }
Drw * Drw *
drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) { drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
Drw *drw = (Drw *)calloc(1, sizeof(Drw)); {
if(!drw) Drw *drw = ecalloc(1, sizeof(Drw));
return NULL;
drw->dpy = dpy; drw->dpy = dpy;
drw->screen = screen; drw->screen = screen;
drw->root = root; drw->root = root;
@ -68,166 +72,178 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
drw->h = h; drw->h = h;
drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
drw->gc = XCreateGC(dpy, root, 0, NULL); drw->gc = XCreateGC(dpy, root, 0, NULL);
drw->fontcount = 0;
XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
return drw; return drw;
} }
void void
drw_resize(Drw *drw, unsigned int w, unsigned int h) { drw_resize(Drw *drw, unsigned int w, unsigned int h)
if(!drw) {
if (!drw)
return; return;
drw->w = w; drw->w = w;
drw->h = h; drw->h = h;
if(drw->drawable != 0) if (drw->drawable)
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
} }
void void
drw_free(Drw *drw) { drw_free(Drw *drw)
size_t i; {
/* This was breaking the program when I tried to bring window up second time
Too lazy to dig deeper right now,*\
\*or (i = 0; i < drw->fontcount; i++) {
drw_font_free(drw->fonts[i]);
}*/
XFreePixmap(drw->dpy, drw->drawable); XFreePixmap(drw->dpy, drw->drawable);
XFreeGC(drw->dpy, drw->gc); XFreeGC(drw->dpy, drw->gc);
free(drw); free(drw);
} }
/* This function is an implementation detail. Library users should use /* This function is an implementation detail. Library users should use
* drw_font_create instead. * drw_fontset_create instead.
*/ */
static Fnt * static Fnt *
drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern) { xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
{
Fnt *font; Fnt *font;
XftFont *xfont = NULL;
if (!(fontname || fontpattern)) FcPattern *pattern = NULL;
die("No font specified.\n");
if (!(font = (Fnt *)calloc(1, sizeof(Fnt))))
return NULL;
if (fontname) { if (fontname) {
/* Using the pattern found at font->xfont->pattern does not yield same /* Using the pattern found at font->xfont->pattern does not yield the
* the same substitution results as using the pattern returned by * same substitution results as using the pattern returned by
* FcNameParse; using the latter results in the desired fallback * FcNameParse; using the latter results in the desired fallback
* behaviour whereas the former just results in * behaviour whereas the former just results in missing-character
* missing-character-rectangles being drawn, at least with some fonts. * rectangles being drawn, at least with some fonts. */
*/ if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
if (!(font->xfont = XftFontOpenName(drw->dpy, drw->screen, fontname)) || fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
!(font->pattern = FcNameParse((FcChar8 *) fontname))) {
if (font->xfont) {
XftFontClose(drw->dpy, font->xfont);
font->xfont = NULL;
}
fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
}
} else if (fontpattern) {
if (!(font->xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
fprintf(stderr, "error, cannot load font pattern.\n");
} else {
font->pattern = NULL;
}
}
if (!font->xfont) {
free(font);
return NULL; return NULL;
} }
if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
XftFontClose(drw->dpy, xfont);
return NULL;
}
} else if (fontpattern) {
if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
fprintf(stderr, "error, cannot load font from pattern.\n");
return NULL;
}
} else {
die("no font specified.");
}
font->ascent = font->xfont->ascent; font = ecalloc(1, sizeof(Fnt));
font->descent = font->xfont->descent; font->xfont = xfont;
font->h = font->ascent + font->descent; font->pattern = pattern;
font->h = xfont->ascent + xfont->descent;
font->dpy = drw->dpy; font->dpy = drw->dpy;
return font; return font;
} }
Fnt* static void
drw_font_create(Drw *drw, const char *fontname) { xfont_free(Fnt *font)
return drw_font_xcreate(drw, fontname, NULL); {
} if (!font)
void
drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount) {
size_t i;
Fnt *font;
for (i = 0; i < fontcount; i++) {
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
die("Font cache exhausted.\n");
} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
drw->fonts[drw->fontcount++] = font;
}
}
}
void
drw_font_free(Fnt *font) {
if(!font)
return; return;
if(font->pattern) if (font->pattern)
FcPatternDestroy(font->pattern); FcPatternDestroy(font->pattern);
XftFontClose(font->dpy, font->xfont); XftFontClose(font->dpy, font->xfont);
free(font); free(font);
} }
Fnt*
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
{
Fnt *cur, *ret = NULL;
size_t i;
if (!drw || !fonts)
return NULL;
for (i = 1; i <= fontcount; i++) {
if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
cur->next = ret;
ret = cur;
}
}
return (drw->fonts = ret);
}
void
drw_fontset_free(Fnt *font)
{
if (font) {
drw_fontset_free(font->next);
xfont_free(font);
}
}
void
drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
{
if (!drw || !dest || !clrname)
return;
if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen),
clrname, dest))
die("error, cannot allocate color '%s'", clrname);
}
/* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */
Clr * Clr *
drw_clr_create(Drw *drw, const char *clrname) { drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
Clr *clr; {
Colormap cmap; size_t i;
Visual *vis; Clr *ret;
if(!drw) /* need at least two colors for a scheme */
if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
return NULL; return NULL;
clr = (Clr *)calloc(1, sizeof(Clr));
if(!clr) for (i = 0; i < clrcount; i++)
return NULL; drw_clr_create(drw, &ret[i], clrnames[i]);
cmap = DefaultColormap(drw->dpy, drw->screen); return ret;
vis = DefaultVisual(drw->dpy, drw->screen);
if(!XftColorAllocName(drw->dpy, vis, cmap, clrname, &clr->rgb))
die("error, cannot allocate color '%s'\n", clrname);
clr->pix = clr->rgb.pixel;
return clr;
} }
void void
drw_clr_free(Clr *clr) { drw_setfontset(Drw *drw, Fnt *set)
free(clr); {
if (drw)
drw->fonts = set;
} }
void void
drw_setscheme(Drw *drw, ClrScheme *scheme) { drw_setscheme(Drw *drw, Clr *scm)
if(!drw) {
if (drw)
drw->scheme = scm;
}
void
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
{
if (!drw || !drw->scheme)
return; return;
drw->scheme = scheme; XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
} if (filled)
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
void else
drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert) { XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
if(!drw || !drw->scheme)
return;
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
if(filled)
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
else if(empty)
XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
} }
int int
drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert) { drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
{
char buf[1024]; char buf[1024];
int tx, ty, th; int ty;
Extnts tex; unsigned int ew;
Colormap cmap; XftDraw *d = NULL;
Visual *vis; Fnt *usedfont, *curfont, *nextfont;
XftDraw *d;
Fnt *curfont, *nextfont;
size_t i, len; size_t i, len;
int utf8strlen, utf8charlen, render; int utf8strlen, utf8charlen, render = x || y || w || h;
long utf8codepoint = 0; long utf8codepoint = 0;
const char *utf8str; const char *utf8str;
FcCharSet *fccharset; FcCharSet *fccharset;
@ -236,73 +252,67 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
XftResult result; XftResult result;
int charexists = 0; int charexists = 0;
if (!(render = x || y || w || h)) { if (!drw || (render && !drw->scheme) || !text || !drw->fonts)
return 0;
if (!render) {
w = ~w; w = ~w;
} } else {
XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
if (!drw || !drw->scheme) {
return 0;
} else if (render) {
XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->fg->pix : drw->scheme->bg->pix);
XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
d = XftDrawCreate(drw->dpy, drw->drawable,
DefaultVisual(drw->dpy, drw->screen),
DefaultColormap(drw->dpy, drw->screen));
x += lpad;
w -= lpad;
} }
if (!text || !drw->fontcount) { usedfont = drw->fonts;
return 0;
} else if (render) {
cmap = DefaultColormap(drw->dpy, drw->screen);
vis = DefaultVisual(drw->dpy, drw->screen);
d = XftDrawCreate(drw->dpy, drw->drawable, vis, cmap);
}
curfont = drw->fonts[0];
while (1) { while (1) {
utf8strlen = 0; utf8strlen = 0;
utf8str = text; utf8str = text;
nextfont = NULL; nextfont = NULL;
while (*text) { while (*text) {
utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ); utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
for (i = 0; i < drw->fontcount; i++) { for (curfont = drw->fonts; curfont; curfont = curfont->next) {
charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint); charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
if (charexists) { if (charexists) {
if (drw->fonts[i] == curfont) { if (curfont == usedfont) {
utf8strlen += utf8charlen; utf8strlen += utf8charlen;
text += utf8charlen; text += utf8charlen;
} else { } else {
nextfont = drw->fonts[i]; nextfont = curfont;
} }
break; break;
} }
} }
if (!charexists || (nextfont && nextfont != curfont)) { if (!charexists || nextfont)
break; break;
} else { else
charexists = 0; charexists = 0;
} }
}
if (utf8strlen) { if (utf8strlen) {
drw_font_getexts(curfont, utf8str, utf8strlen, &tex); drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
/* shorten text if necessary */ /* shorten text if necessary */
for(len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--) for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
drw_font_getexts(curfont, utf8str, len, &tex); drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
if (len) { if (len) {
memcpy(buf, utf8str, len); memcpy(buf, utf8str, len);
buf[len] = '\0'; buf[len] = '\0';
if(len < utf8strlen) if (len < utf8strlen)
for(i = len; i && i > len - 3; buf[--i] = '.'); for (i = len; i && i > len - 3; buf[--i] = '.')
; /* NOP */
if (render) { if (render) {
th = curfont->ascent + curfont->descent; ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
ty = y + (h / 2) - (th / 2) + curfont->ascent; XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
tx = x + (h / 2); usedfont->xfont, x, ty, (XftChar8 *)buf, len);
XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
} }
x += ew;
x += tex.w; w -= ew;
w -= tex.w;
} }
} }
@ -310,28 +320,21 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
break; break;
} else if (nextfont) { } else if (nextfont) {
charexists = 0; charexists = 0;
curfont = nextfont; usedfont = nextfont;
} else { } else {
/* Regardless of whether or not a fallback font is found, the /* Regardless of whether or not a fallback font is found, the
* character must be drawn. * character must be drawn. */
*/
charexists = 1; charexists = 1;
if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
continue;
}
fccharset = FcCharSetCreate(); fccharset = FcCharSetCreate();
FcCharSetAddChar(fccharset, utf8codepoint); FcCharSetAddChar(fccharset, utf8codepoint);
if (!drw->fonts[0]->pattern) { if (!drw->fonts->pattern) {
/* Refer to the comment in drw_font_xcreate for more /* Refer to the comment in xfont_create for more information. */
* information. die("the first font in the cache must be loaded from a font string.");
*/
die("The first font in the cache must be loaded from a font string.\n");
} }
fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern); fcpattern = FcPatternDuplicate(drw->fonts->pattern);
FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue); FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
@ -343,73 +346,76 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *tex
FcPatternDestroy(fcpattern); FcPatternDestroy(fcpattern);
if (match) { if (match) {
curfont = drw_font_xcreate(drw, NULL, match); usedfont = xfont_create(drw, NULL, match);
if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) { if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
drw->fonts[drw->fontcount++] = curfont; for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
; /* NOP */
curfont->next = usedfont;
} else { } else {
if (curfont) { xfont_free(usedfont);
drw_font_free(curfont); usedfont = drw->fonts;
}
curfont = drw->fonts[0];
} }
} }
} }
} }
if (d)
if (render) {
XftDrawDestroy(d); XftDrawDestroy(d);
}
return x; return x + (render ? w : 0);
} }
void void
drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h) { drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
if(!drw) {
if (!drw)
return; return;
XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y); XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
XSync(drw->dpy, False); XSync(drw->dpy, False);
} }
unsigned int
void drw_fontset_getwidth(Drw *drw, const char *text)
drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex) { {
XGlyphInfo ext; if (!drw || !drw->fonts || !text)
return 0;
if(!font || !text) return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
return;
XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
tex->h = font->h;
tex->w = ext.xOff;
} }
unsigned int void
drw_font_getexts_width(Fnt *font, const char *text, unsigned int len) { drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
Extnts tex; {
XGlyphInfo ext;
if(!font) if (!font || !text)
return -1; return;
drw_font_getexts(font, text, len, &tex);
return tex.w; XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
if (w)
*w = ext.xOff;
if (h)
*h = font->h;
} }
Cur * Cur *
drw_cur_create(Drw *drw, int shape) { drw_cur_create(Drw *drw, int shape)
{
Cur *cur; Cur *cur;
if(!drw) if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
return NULL;
cur = (Cur *)calloc(1, sizeof(Cur));
if (!cur)
return NULL; return NULL;
cur->cursor = XCreateFontCursor(drw->dpy, shape); cur->cursor = XCreateFontCursor(drw->dpy, shape);
return cur; return cur;
} }
void void
drw_cur_free(Drw *drw, Cur *cursor) { drw_cur_free(Drw *drw, Cur *cursor)
if(!drw || !cursor) {
if (!cursor)
return; return;
XFreeCursor(drw->dpy, cursor->cursor); XFreeCursor(drw->dpy, cursor->cursor);
free(cursor); free(cursor);
} }

51
drw.h
View file

@ -1,29 +1,19 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#define DRW_FONT_CACHE_SIZE 32
typedef struct {
unsigned long pix;
XftColor rgb;
} Clr;
typedef struct { typedef struct {
Cursor cursor; Cursor cursor;
} Cur; } Cur;
typedef struct { typedef struct Fnt {
Display *dpy; Display *dpy;
int ascent;
int descent;
unsigned int h; unsigned int h;
XftFont *xfont; XftFont *xfont;
FcPattern *pattern; FcPattern *pattern;
struct Fnt *next;
} Fnt; } Fnt;
typedef struct { enum { ColFg, ColBg }; /* Clr scheme index */
Clr *fg; typedef XftColor Clr;
Clr *bg;
Clr *border;
} ClrScheme;
typedef struct { typedef struct {
unsigned int w, h; unsigned int w, h;
@ -32,43 +22,36 @@ typedef struct {
Window root; Window root;
Drawable drawable; Drawable drawable;
GC gc; GC gc;
ClrScheme *scheme; Clr *scheme;
size_t fontcount; Fnt *fonts;
Fnt *fonts[DRW_FONT_CACHE_SIZE];
} Drw; } Drw;
typedef struct {
unsigned int w;
unsigned int h;
} Extnts;
/* Drawable abstraction */ /* Drawable abstraction */
Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
void drw_resize(Drw *drw, unsigned int w, unsigned int h); void drw_resize(Drw *drw, unsigned int w, unsigned int h);
void drw_free(Drw *drw); void drw_free(Drw *drw);
/* Fnt abstraction */ /* Fnt abstraction */
Fnt *drw_font_create(Drw *drw, const char *fontname); Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
void drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount); void drw_fontset_free(Fnt* set);
void drw_font_free(Fnt *font); unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
void drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *extnts); void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
unsigned int drw_font_getexts_width(Fnt *font, const char *text, unsigned int len);
/* Colour abstraction */ /* Colorscheme abstraction */
Clr *drw_clr_create(Drw *drw, const char *clrname); void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
void drw_clr_free(Clr *clr); Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);
void drw_cur_free(Drw *drw, Cur *cursor); void drw_cur_free(Drw *drw, Cur *cursor);
/* Drawing context manipulation */ /* Drawing context manipulation */
void drw_setfont(Drw *drw, Fnt *font); void drw_setfontset(Drw *drw, Fnt *set);
void drw_setscheme(Drw *drw, ClrScheme *scheme); void drw_setscheme(Drw *drw, Clr *scm);
/* Drawing functions */ /* Drawing functions */
void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert); void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert); int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
/* Map functions */ /* Map functions */
void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h); void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);

270
pinentry-dmenu.c
View file

@ -1,12 +1,14 @@
#include <signal.h> /* See LICENSE file for copyright and license details. */
#include <time.h>
#include <ctype.h> #include <ctype.h>
#include <locale.h> #include <locale.h>
#include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h>
#include <string.h> #include <string.h>
#include <strings.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -22,50 +24,54 @@
#include "pinentry/memory.h" #include "pinentry/memory.h"
/* macros */ /* macros */
#define INTERSECT(x, y, w, h, r) \ #define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
(MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \
&& MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) && MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
#define LENGTH(X) (sizeof X / sizeof X[0]) #define LENGTH(X) (sizeof X / sizeof X[0])
#define TEXTNW(X, N) (drw_font_getexts_width(drw->fonts[0], (X), (N))) #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
const char *str_OK = "OK\n";
const char *str_ERRUNPARS = "ERR1337 dunno what to do with it\n";
const char *str_ERRNOTIMP = "ERR4100 not implemented yet\n";
/* enums */ /* enums */
enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */ enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
enum { WinPin, WinConfirm }; /* window modes */ enum { WinPin, WinConfirm }; /* window modes */
enum { Ok, NotOk, Cancel }; /* return status */ enum { Ok, NotOk, Cancel }; /* return status */
static char text[2048] = ""; struct item {
static int bh, mw, mh; char *text;
static int inputw, promptw; struct item *left, *right;
static size_t cursor = 0; int out;
static Atom clip, utf8; };
static Window win;
static XIC xic;
static int mon = 0;
static ClrScheme scheme[SchemeLast]; static char text[BUFSIZ] = "";
static char *embed;
static int bh, mw, mh;
static int inputw = 0, promptw, ppromptw;
static int lrpad; /* sum of left and right padding */
static size_t cursor;
static struct item *items = NULL;
static struct item *prev, *curr, *next, *sel;
static int mon = -1, screen;
static Atom clip, utf8;
static Display *dpy; static Display *dpy;
static int screen; static Window root, parentwin, win;
static Window root; static XIC xic;
static Drw *drw; static Drw *drw;
static Clr *scheme[SchemeLast];
static int timed_out; static int timed_out;
static int confirmed; static int confirmed;
static int winmode; static int winmode;
pinentry_t pinentry; pinentry_t pinentry;
#include "config.h" #include "config.h"
void static void
grabkeyboard(void) { grabkeyboard(void) {
int i; int i;
if (embed) {
return;
}
/* try to grab keyboard, /* try to grab keyboard,
* we may have to wait for another process to ungrab */ * we may have to wait for another process to ungrab */
for (i = 0; i < 1000; i++) { for (i = 0; i < 1000; i++) {
@ -75,10 +81,11 @@ grabkeyboard(void) {
} }
usleep(1000); usleep(1000);
} }
die("cannot grab keyboard\n");
die("cannot grab keyboard");
} }
size_t static size_t
nextrune(int cursor, int inc) { nextrune(int cursor, int inc) {
ssize_t n; ssize_t n;
@ -88,8 +95,7 @@ nextrune(int cursor, int inc) {
return n; return n;
} }
static void
void
insert(const char *str, ssize_t n) { insert(const char *str, ssize_t n) {
if (strlen(text) + n > sizeof text - 1) { if (strlen(text) + n > sizeof text - 1) {
return; return;
@ -104,84 +110,116 @@ insert(const char *str, ssize_t n) {
cursor += n; cursor += n;
} }
void static void
drawwin(void) { drawwin(void) {
int curpos; unsigned int curpos;
int x = 0, y = 0, w; int x = 0, y = 0, w, i;
char *sectext; size_t asterlen = strlen(asterisk);
int i; char* censort = ecalloc(1, asterlen * sizeof(text));
#if 0
/* TODO: Code from first pintenry-demnu version */
char *sectext = malloc(sizeof (char) * 2048);
int seccursor = 0; int seccursor = 0;
ssize_t n; int n;
#endif
drw_setscheme(drw, &scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, 0, 0, mw, mh, True, 1, 1); drw_rect(drw, 0, 0, mw, mh, 1, 1);
if ((pinentry->description) && *(pinentry->description)) { if (prompt && *prompt) {
drw_setscheme(drw, &scheme[SchemeSel]); drw_setscheme(drw, scheme[SchemeSel]);
drw_text(drw, 0, 0, mw, bh, pinentry->description, 0); x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
y += bh;
} }
if ((pinentry->prompt) && *(pinentry->prompt)) { if (pinentry->prompt && *pinentry->prompt) {
drw_setscheme(drw, &scheme[SchemeSel]); drw_setscheme(drw, scheme[SchemeSel]);
drw_text(drw, x, y, promptw, bh, pinentry->prompt, 0); drw_text(drw, x, y, ppromptw, bh, lrpad / 2, pinentry->prompt, 0);
x += promptw; x += ppromptw;
} }
/* Draw input field */
w = inputw; w = inputw;
drw_setscheme(drw, &scheme[SchemeNorm]); drw_setscheme(drw, scheme[SchemeNorm]);
sectext = malloc (sizeof (char) * 2048); #if 0
/* TODO: Code from first pintenry-demnu version */
sectext[0] = '\0'; sectext[0] = '\0';
for (i=0; text[i] != '\0'; i = nextrune(i, +1)) { for (i = 0; text[i] != '\0'; i = nextrune(i, +1)) {
strcat(sectext, secstring); strcat(sectext, asterisk);
if (i < cursor) { if (i < cursor) {
for (n = seccursor + 1; n + 1 >= 0 && (sectext[n] & 0xc0) == 0x80; for (n = seccursor + 1; n > 0 && (sectext[n] & 0xc0) == 0x80; n++);
n ++);
seccursor = n; seccursor = n;
} }
} }
#endif
if (winmode == WinPin) { if (winmode == WinPin) {
drw_text(drw, x, y, mw, bh, sectext, 0); #if 0
/* TODO: Code from first pintenry-demnu version */
drw_text(drw, x, y, mw, bh, lrpad / 2, censort, 0);
if ((curpos = TEXTNW(sectext, seccursor) + bh/2 - 2) < w) { drw_font_getexts(drw->fonts, sectext, seccursor, &curpos, NULL);
drw_rect(drw, x + curpos + 2, y + 2, 1 , bh - 4 , True, 1, 0); curpos += bh / 2 - 2;
if (curpos < w) {
drw_rect(drw, x + curpos + 2, y + 2, 1, bh - 4, 1, 0);
} }
#else
for (i = 0; i < asterlen * strlen(text); i += asterlen) {
memcpy(&censort[i], asterisk, asterlen);
}
censort[i+1] = '\n';
drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
drw_font_getexts(drw->fonts, censort, cursor * asterlen, &curpos, NULL);
#endif
free(censort);
} else { } else {
drw_text(drw, x, y, mw, bh, "(y/n)", 0); // TODO: Do this with a list view? 3 entries: startentry/neutral, YES and NO
drw_text(drw, x, y, mw, bh, lrpad / 2, "(y/n)", 0);
} }
#if 0
/* This is code from the first pinentry-dmenu version */
if ((curpos += lrpad / 2 - 1) < w) {
drw_setscheme(drw, scheme[SchemeNorm]);
drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
}
#endif
drw_map(drw, win, 0, 0, mw, mh); drw_map(drw, win, 0, 0, mw, mh);
} }
void static void
setup(void){ setup(void) {
int x, y; int x, y, i = 0;
Window pw;
XWindowAttributes wa;
#ifdef XINERAMA
unsigned int du; unsigned int du;
int a, i, di, n, j, area = 0; const char* pprompt = pinentry->prompt;
Window w, dw, *dws;
XineramaScreenInfo *info;
#endif
XSetWindowAttributes swa; XSetWindowAttributes swa;
XIM xim; XIM xim;
scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor); Window w, dw, *dws;
scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor); XWindowAttributes wa;
scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor); #ifdef XINERAMA
scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor); XineramaScreenInfo *info;
Window pw;
int a, j, di, n, area = 0;
#endif
/* Init appearance */
scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 2);
scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 2);
clip = XInternAtom(dpy, "CLIPBOARD", False); clip = XInternAtom(dpy, "CLIPBOARD", False);
utf8 = XInternAtom(dpy, "UTF8_STRING", False); utf8 = XInternAtom(dpy, "UTF8_STRING", False);
bh = drw->fonts[0]->h + 2;
/* Calculate menu geometry */
bh = drw->fonts->h + 2;
mh = bh; mh = bh;
#ifdef XINERAMA #ifdef XINERAMA
info = XineramaQueryScreens(dpy, &n); info = XineramaQueryScreens(dpy, &n);
if (info) { if (parentwin == root && info) {
XGetInputFocus(dpy, &w, &di); XGetInputFocus(dpy, &w, &di);
if (mon >= 0 && mon < n) { if (mon >= 0 && mon < n) {
i = mon; i = mon;
@ -212,6 +250,7 @@ setup(void){
} }
} }
} }
x = info[i].x_org; x = info[i].x_org;
y = info[i].y_org + (topbar ? 0 : info[i].height - mh); y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
mw = info[i].width; mw = info[i].width;
@ -219,45 +258,54 @@ setup(void){
} else } else
#endif #endif
{ {
if (!XGetWindowAttributes(dpy, root, &wa)) { if (!XGetWindowAttributes(dpy, parentwin, &wa)) {
die("could not get embedding window attributes: 0x%lx", root); die("could not get embedding window attributes: 0x%lx", parentwin);
} }
x = 0; x = 0;
y = topbar ? 0 : wa.height - mh; y = topbar ? 0 : wa.height - mh;
mw = wa.width; mw = wa.width;
} }
/* FIXME */
if (pinentry->prompt && *(pinentry->prompt)) { promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
promptw = TEXTW(pinentry->prompt); ppromptw = (pprompt && *pprompt) ? TEXTW(pprompt) : 0;
} else { inputw = MIN(inputw, mw / 3);
promptw = 0;
} /* create menu window */
inputw = mw-promptw;
swa.override_redirect = True; swa.override_redirect = True;
swa.background_pixel = scheme[SchemeNorm].bg->pix; swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
win = XCreateWindow(dpy, root, x, y, mw, mh, 0, win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
DefaultDepth(dpy, screen), CopyFromParent, CopyFromParent, CopyFromParent, CopyFromParent,
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
/* Open input methods */
xim = XOpenIM(dpy, NULL, NULL, NULL); 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);
drw_resize(drw, mw, mh);
if (embed) {
XSelectInput(dpy, parentwin, FocusChangeMask);
if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
for (i = 0; i < du && dws[i] != win; ++i) {
XSelectInput(dpy, dws[i], FocusChangeMask);
}
XFree(dws);
}
grabfocus();
}
drw_resize(drw, mw, mh);
drawwin(); drawwin();
} }
void static void
cleanup(void) { cleanup(void) {
XUngrabKey(dpy, AnyKey, AnyModifier, root); XUngrabKey(dpy, AnyKey, AnyModifier, root);
drw_clr_free(scheme[SchemeNorm].bg); free(scheme[SchemeNorm]);
drw_clr_free(scheme[SchemeNorm].fg); free(scheme[SchemeSel]);
drw_clr_free(scheme[SchemeSel].fg);
drw_clr_free(scheme[SchemeSel].bg);
drw_free(drw); drw_free(drw);
XSync(dpy, False); XSync(dpy, False);
XCloseDisplay(dpy); XCloseDisplay(dpy);
@ -277,14 +325,17 @@ keypress(XKeyEvent *ev) {
} }
if (winmode == WinConfirm) { if (winmode == WinConfirm) {
switch(ksym){ switch(ksym) {
case XK_KP_Enter: case XK_KP_Enter:
case XK_Return: case XK_Return:
case XK_y: case XK_y:
case XK_Y:
confirmed = 1; confirmed = 1;
return 1; return 1;
break; break;
case XK_n: case XK_n:
case XK_N:
confirmed = 0; confirmed = 0;
return 1; return 1;
break; break;
@ -295,7 +346,7 @@ keypress(XKeyEvent *ev) {
break; break;
} }
} else { } else {
switch(ksym){ switch(ksym) {
default: default:
if (!iscntrl(*buf)) { if (!iscntrl(*buf)) {
insert(buf, len); insert(buf, len);
@ -335,21 +386,23 @@ keypress(XKeyEvent *ev) {
break; break;
} }
} }
drawwin(); drawwin();
return 0; return 0;
} }
void static void
paste(void) { paste(void) {
char *p, *q; char *p, *q;
int di; int di;
unsigned long dl; unsigned long dl;
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, 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);
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);
drawwin(); drawwin();
} }
@ -414,7 +467,7 @@ password (void) {
buf = secmem_malloc(strlen(text)); buf = secmem_malloc(strlen(text));
strcpy(buf, text); strcpy(buf, text);
pinentry_setbuffer_use (pinentry, buf, 0); pinentry_setbuffer_use(pinentry, buf, 0);
return 1; return 1;
} }
@ -429,31 +482,34 @@ confirm(void) {
} }
static int static int
cmdhandler (pinentry_t recieved_pinentry) { cmdhandler(pinentry_t received_pinentry) {
struct sigaction sa; struct sigaction sa;
XWindowAttributes wa; XWindowAttributes wa;
text[0]='\0'; text[0]='\0';
cursor = 0; cursor = 0;
pinentry = recieved_pinentry; pinentry = received_pinentry;
if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) { if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) {
fputs("warning: no locale support\n", stderr); fputs("warning: no locale support\n", stderr);
} }
if (!(dpy = XOpenDisplay(pinentry->display))) { /* NULL was here */ if (!(dpy = XOpenDisplay(pinentry->display))) {
die("dmenu: cannot open display\n"); die("cannot open display");
} }
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);
root = RootWindow(dpy, screen); root = RootWindow(dpy, screen);
if (!XGetWindowAttributes(dpy, root, &wa)) { if (!embed || !(parentwin = strtol(embed, NULL, 0))) {
die("could not get embedding window attributes: 0x%lx", root); parentwin = root;
}
if (!XGetWindowAttributes(dpy, parentwin, &wa)) {
die("could not get embedding window attributes: 0x%lx", parentwin);
} }
drw = drw_create(dpy, screen, root, wa.width, wa.height); drw = drw_create(dpy, screen, root, wa.width, wa.height);
drw_load_fonts(drw, fonts, LENGTH(fonts)); if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) {
if (!drw->fontcount) { die("no fonts could be loaded.");
die("No fonts could be loaded.\n");
} }
drw_setscheme(drw, &scheme[SchemeNorm]); lrpad = drw->fonts->h;
drw_setscheme(drw, scheme[SchemeNorm]);
if (pinentry->timeout) { if (pinentry->timeout) {
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));

32
util.c
View file

@ -2,16 +2,34 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "util.h" #include "util.h"
void void *
die(const char *errstr, ...) { ecalloc(size_t nmemb, size_t size)
va_list ap; {
void *p;
va_start(ap, errstr); if (!(p = calloc(nmemb, size)))
vfprintf(stderr, errstr, ap); die("calloc:");
va_end(ap); return p;
exit(EXIT_FAILURE);
} }
void
die(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
vfprintf(stderr, fmt, ap);
va_end(ap);
if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
fputc(' ', stderr);
perror(NULL);
} else {
fputc('\n', stderr);
}
exit(1);
}

3
util.h
View file

@ -4,4 +4,5 @@
#define MIN(A, B) ((A) < (B) ? (A) : (B)) #define MIN(A, B) ((A) < (B) ? (A) : (B))
#define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B)) #define BETWEEN(X, A, B) ((A) <= (X) && (X) <= (B))
void die(const char *errstr, ...); void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size);