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

Eliminate useless checks

Browse source
This commit is contained in:
Moritz Luedecke 2017-08-20 17:18:51 +02:00
parent 3c6d13e0eb
commit a5971e5e0b
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pinentry-dmenu.c
View file

@ -150,18 +150,18 @@ drawwin(void) {
drw_setscheme(drw, scheme[SchemeNormal]);
drw_rect(drw, 0, 0, mw, mh, 1, 1);
if (prompt && *prompt) {
if (prompt) {
drw_setscheme(drw, scheme[SchemePrompt]);
x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
}
if (pinentry->prompt && *pinentry->prompt) {
if (pinentry->prompt) {
drw_setscheme(drw, scheme[SchemePrompt]);
drw_text(drw, x, 0, ppromptw, bh, lrpad / 2, pinentry->prompt, 0);
x += ppromptw;
}
if (pinentry->description && *pinentry->description) {
if (pinentry->description) {
pb = mw - x;
pdesclen = strlen(pinentry->description);
@ -221,8 +221,6 @@ static void
setup(void) {
int x, y, i = 0;
unsigned int du;
const char* pprompt = pinentry->prompt;
const char* pdesc = pinentry->description;
XSetWindowAttributes swa;
XIM xim;
Window w, dw, *dws;
@ -296,9 +294,9 @@ setup(void) {
mw = wa.width;
}
promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
ppromptw = (pprompt && *pprompt) ? TEXTW(pprompt) : 0;
pdescw = (pdesc && *pdesc) ? TEXTW(pdesc) : 0;
promptw = (prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
ppromptw = (pinentry->prompt) ? TEXTW(pinentry->prompt) : 0;
pdescw = (pinentry->description) ? TEXTW(pinentry->description) : 0;
/* create menu window */
swa.override_redirect = True;