tyler/pinentry-dmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

description moved to separat line for center menu

Browse Source
This commit is contained in:
mrdotx 2021-07-30 14:43:12 +02:00
parent 10edec7695
commit 5898a76083
No known key found for this signature in database
GPG Key ID: 433F70E636E6EB87
1 changed files with 51 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
pinentry-dmenu.c
View File

@ -73,7 +73,41 @@ pinentry_t pinentry_info;
#include "config.h" #include "config.h"
static void xinitvisual(); static void
xinitvisual(void) {
XVisualInfo *infos;
XRenderPictFormat *fmt;
int nitems;
int i;
XVisualInfo tpl = {
.screen = screen,
.depth = 32,
.class = TrueColor
};
long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
visual = NULL;
for(i = 0; i < nitems; i ++) {
fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
visual = infos[i].visual;
depth = infos[i].depth;
cmap = XCreateColormap(dpy, root, visual, AllocNone);
useargb = 1;
break;
}
}
XFree(infos);
if (! visual) {
visual = DefaultVisual(dpy, screen);
depth = DefaultDepth(dpy, screen);
cmap = DefaultColormap(dpy, screen);
}
}
static int static int
drawitem(const char* text, Bool sel, int x, int y, int w) { drawitem(const char* text, Bool sel, int x, int y, int w) {
@ -199,7 +233,7 @@ drawwin(void) {
char* pprompt = (repeat) ? pinentry_info->repeat_passphrase : pinentry_info->prompt; char* pprompt = (repeat) ? pinentry_info->repeat_passphrase : pinentry_info->prompt;
int ppromptw = (pprompt) ? TEXTW(pprompt) : 0; int ppromptw = (pprompt) ? TEXTW(pprompt) : 0;
unsigned int censortl = minpwlen * TEXTW(asterisk) / strlen(asterisk); unsigned int censortl = (center) ? 0 : minpwlen * TEXTW(asterisk) / strlen(asterisk);
unsigned int confirml = TEXTW(" YesNo ") + 3 * lrpad; unsigned int confirml = TEXTW(" YesNo ") + 3 * lrpad;
drw_setscheme(drw, scheme[SchemeNormal]); drw_setscheme(drw, scheme[SchemeNormal]);
@ -216,10 +250,6 @@ drawwin(void) {
x += ppromptw; x += ppromptw;
} }
if (center) {
censortl /= 4;
}
if (pinentry_info->description) { if (pinentry_info->description) {
pb = mw - x; pb = mw - x;
pdesclen = strlen(pinentry_info->description); pdesclen = strlen(pinentry_info->description);
@ -241,8 +271,13 @@ drawwin(void) {
} }
drw_setscheme(drw, scheme[SchemeDesc]); drw_setscheme(drw, scheme[SchemeDesc]);
drw_text(drw, pb, 0, pbw, bh, lrpad / 2, pinentry_info->description, if (center) {
0); drw_text(drw, 0, lineheight, centerwidth, bh, lrpad / 2,
pinentry_info->description, 0);
} else {
drw_text(drw, pb, 0, pbw, bh, lrpad / 2,
pinentry_info->description, 0);
}
} else { } else {
pbw = 0; pbw = 0;
} }
@ -260,13 +295,13 @@ drawwin(void) {
} }
censort[i+1] = '\n'; censort[i+1] = '\n';
leftinput = mw - x - pbw; leftinput = (center) ? mw - x : mw - x - pbw;
drw_text(drw, x, 0, leftinput, bh, lrpad / 2, censort, 0); drw_text(drw, x, 0, leftinput, bh, lrpad / 2, censort, 0);
drw_font_getexts(drw->fonts, censort, cursor * asterlen, &curpos, NULL); drw_font_getexts(drw->fonts, censort, cursor * asterlen, &curpos, NULL);
if ((curpos += lrpad / 2 - 1) < leftinput) { if ((curpos += lrpad / 2 - 1) < leftinput) {
drw_setscheme(drw, scheme[SchemeNormal]); drw_setscheme(drw, scheme[SchemeNormal]);
drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0); drw_rect(drw, x + curpos, 2 + (bh - fh) / 2, 2, fh - 4, 1, 0);
} }
free(censort); free(censort);
@ -303,8 +338,8 @@ setup(void) {
/* Calculate menu geometry */ /* Calculate menu geometry */
bh = drw->fonts->h + 2; bh = drw->fonts->h + 2;
bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */ bh = MAX(bh,lineheight); /* make a menu line AT LEAST 'lineheight' tall */
mh = bh; mh = (center) ? bh * 2 : bh;
#ifdef XINERAMA #ifdef XINERAMA
info = XineramaQueryScreens(dpy, &n); info = XineramaQueryScreens(dpy, &n);
@ -346,8 +381,8 @@ setup(void) {
y = info[i].y_org + ((info[i].height - mh) / 2); y = info[i].y_org + ((info[i].height - mh) / 2);
} else { } else {
x = info[i].x_org; x = info[i].x_org;
y = info[i].y_org + (bottom ? info[i].height - mh : 0); y = info[i].y_org + (bottom ? info[i].height - mh - (borderwidth * 2) : 0);
mw = info[i].width; mw = info[i].width - (borderwidth * 2);
} }
XFree(info); XFree(info);
@ -364,8 +399,8 @@ setup(void) {
y = (wa.height - mh) / 2; y = (wa.height - mh) / 2;
} else { } else {
x = 0; x = 0;
y = bottom ? wa.height - mh : 0; y = bottom ? wa.height - mh - (borderwidth * 2) : 0;
mw = wa.width; mw = wa.width - (borderwidth * 2);
} }
} }
@ -866,40 +901,3 @@ main(int argc, char *argv[]) {
return 0; return 0;
} }
void
xinitvisual()
{
XVisualInfo *infos;
XRenderPictFormat *fmt;
int nitems;
int i;
XVisualInfo tpl = {
.screen = screen,
.depth = 32,
.class = TrueColor
};
long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
visual = NULL;
for(i = 0; i < nitems; i ++) {
fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
visual = infos[i].visual;
depth = infos[i].depth;
cmap = XCreateColormap(dpy, root, visual, AllocNone);
useargb = 1;
break;
}
}
XFree(infos);
if (! visual) {
visual = DefaultVisual(dpy, screen);
depth = DefaultDepth(dpy, screen);
cmap = DefaultColormap(dpy, screen);
}
}