jab2870/Dmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cleaning up

Browse source
This commit is contained in:
Connor Lane Smith 2010-05-02 23:17:02 +01:00
parent 518c9b72d1
commit a6835349df
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dmenu.c
View file

@ -212,12 +212,12 @@ drawmenu(void) {
dc.h = mh; dc.h = mh;
drawtext(NULL, dc.norm); drawtext(NULL, dc.norm);
/* print prompt? */ /* print prompt? */
if(promptw) { if(prompt) {
dc.w = promptw; dc.w = promptw;
drawtext(prompt, dc.sel); drawtext(prompt, dc.sel);
dc.x += dc.w;
} }
dc.x += promptw; dc.w = mw - dc.x;
dc.w = mw - promptw;
/* print command */ /* print command */
if(cmdw && item && lines == 0) if(cmdw && item && lines == 0)
dc.w = cmdw; dc.w = cmdw;
@ -241,14 +241,13 @@ drawmenuh(void) {
dc.w = spaceitem; dc.w = spaceitem;
drawtext(curr->left ? "<" : NULL, dc.norm); drawtext(curr->left ? "<" : NULL, dc.norm);
dc.x += dc.w; dc.x += dc.w;
/* determine maximum items */
for(i = curr; i != next; i=i->right) { for(i = curr; i != next; i=i->right) {
dc.w = MIN(textw(i->text), mw / 3); dc.w = MIN(textw(i->text), mw / 3);
drawtext(i->text, (sel == i) ? dc.sel : dc.norm); drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
dc.x += dc.w; dc.x += dc.w;
} }
dc.x = mw - spaceitem;
dc.w = spaceitem; dc.w = spaceitem;
dc.x = mw - dc.w;
drawtext(next ? ">" : NULL, dc.norm); drawtext(next ? ">" : NULL, dc.norm);
} }
@ -259,7 +258,6 @@ drawmenuv(void) {
dc.x = 0; dc.x = 0;
dc.w = mw; dc.w = mw;
dc.y += dc.font.height + 2; dc.y += dc.font.height + 2;
/* determine maximum items */
for(i = curr; i != next; i=i->right) { for(i = curr; i != next; i=i->right) {
drawtext(i->text, (sel == i) ? dc.sel : dc.norm); drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
dc.y += dc.font.height + 2; dc.y += dc.font.height + 2;
@ -340,13 +338,11 @@ initfont(const char *fontstr) {
if(missing) if(missing)
XFreeStringList(missing); XFreeStringList(missing);
if(dc.font.set) { if(dc.font.set) {
XFontSetExtents *font_extents;
XFontStruct **xfonts; XFontStruct **xfonts;
char **font_names; char **font_names;
dc.font.ascent = dc.font.descent = 0; dc.font.ascent = dc.font.descent = 0;
font_extents = XExtentsOfFontSet(dc.font.set);
n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names);
for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { for(i = 0; i < n; i++) {
dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent);
dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent); dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent);
xfonts++; xfonts++;