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

recieve prompt and description from gpg-agent

Browse source
This commit is contained in:
zavok 2015-11-23 20:48:59 +03:00
parent 51da5915b0
commit baf9529e6d
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config.h
View file

@ -4,8 +4,8 @@ static const char *fonts[]={
"monospace:size=8" "monospace:size=8"
}; };
static char *secchar = "*"; static char *secchar = "*";
static char *description = NULL; /*static char *description = NULL;
static char *prompt = "PIN:"; static char *prompt = "PIN:";*/
static const char *normbgcolor = "#000000"; static const char *normbgcolor = "#000000";
static const char *normfgcolor = "#ffffff"; static const char *normfgcolor = "#ffffff";
static const char *selbgcolor = "#ff0000"; static const char *selbgcolor = "#ff0000";

29
spine.c
View file

@ -50,6 +50,8 @@ static int sw, sh;
static int timed_out; static int timed_out;
pinentry_t pinentry;
#include "config.h" #include "config.h"
void void
@ -94,15 +96,15 @@ drawwin(void){
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,True,1,1);
if (description && *description) { if ((pinentry->description) && *(pinentry->description)) {
drw_setscheme(drw, &scheme[SchemeSel]); drw_setscheme(drw, &scheme[SchemeSel]);
drw_text(drw, 0,0,mw,bh,description,0); drw_text(drw, 0,0,mw,bh,pinentry->description,0);
y+=bh; y+=bh;
} }
if (prompt && *prompt) { if ((pinentry->prompt) && *(pinentry->prompt)) {
drw_setscheme(drw, &scheme[SchemeSel]); drw_setscheme(drw, &scheme[SchemeSel]);
drw_text(drw, x, y, promptw, bh, prompt, 0); drw_text(drw, x, y, promptw, bh, pinentry->prompt, 0);
x += promptw; x += promptw;
} }
@ -142,11 +144,11 @@ setup(void){
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; bh = drw->fonts[0]->h + 2;
mh = (description && *description)? bh * 2 : bh; mh = (pinentry->description && *(pinentry->description))? bh * 2 : bh;
x = 0; x = 0;
y = topbar ? 0 : sh - mh; y = topbar ? 0 : sh - mh;
mw = sw; mw = sw;
promptw = (prompt && *prompt) ? TEXTW(prompt) : 0; promptw = (pinentry->prompt && *(pinentry->prompt)) ? TEXTW(pinentry->prompt) : 0;
inputw = mw-promptw; inputw = mw-promptw;
swa.override_redirect = True; swa.override_redirect = True;
swa.background_pixel = scheme[SchemeNorm].bg->pix; swa.background_pixel = scheme[SchemeNorm].bg->pix;
@ -268,7 +270,7 @@ run(void) {
} }
void void
promptwin(pinentry_t pinentry) { promptwin(void) {
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))) /*NULL was here*/
@ -296,8 +298,8 @@ catchsig(int sig)
} }
int int
password (pinentry_t pinentry) { password (void) {
promptwin(pinentry); promptwin();
char *buf = secmem_malloc(strlen(text)); char *buf = secmem_malloc(strlen(text));
strcpy(buf, text); strcpy(buf, text);
pinentry_setbuffer_use (pinentry, buf, 0); pinentry_setbuffer_use (pinentry, buf, 0);
@ -305,12 +307,13 @@ password (pinentry_t pinentry) {
} }
int int
confirm(pinentry_t pinentry) { confirm(void) {
return 1; return 1;
} }
int int
spinecmdhandler (pinentry_t pinentry) { spinecmdhandler (pinentry_t recieved_pinentry) {
pinentry = recieved_pinentry;
if (pinentry->timeout){ if (pinentry->timeout){
struct sigaction sa; struct sigaction sa;
@ -320,9 +323,9 @@ spinecmdhandler (pinentry_t pinentry) {
alarm(pinentry->timeout); alarm(pinentry->timeout);
} }
if (pinentry->pin) if (pinentry->pin)
return password(pinentry); return password();
else else
return confirm(pinentry); return confirm();
return -1; return -1;
} }