mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using BETWEEN macro, and fixing fallback position

Browse Source
This commit is contained in:
phillbush 2020-07-31 09:22:13 -03:00
parent b1cf3ebd74
commit d2304ecf93
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xmenu.c
View File

@ -297,8 +297,8 @@ initmonitor(void)
if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) { if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
for (i = 0; i < nmons; i++) { for (i = 0; i < nmons; i++) {
if (cursx >= info[i].x_org && cursx <= info[i].x_org + info[i].width && if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
cursy >= info[i].y_org && cursy <= info[i].y_org + info[i].height) { BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {
selmon = i; selmon = i;
break; break;
} }
@ -437,10 +437,6 @@ allocitem(const char *label, const char *output, char *file)
} }
item->y = 0; item->y = 0;
item->h = 0; item->h = 0;
if (item->label == NULL)
item->labellen = 0;
else
item->labellen = strlen(item->label);
item->next = NULL; item->next = NULL;
item->submenu = NULL; item->submenu = NULL;
item->icon = NULL; item->icon = NULL;
@ -461,10 +457,10 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
menu->list = list; menu->list = list;
menu->caller = NULL; menu->caller = NULL;
menu->selected = NULL; menu->selected = NULL;
menu->w = 0; /* calculated by setupmenu() */ menu->w = 0; /* recalculated by setupmenu() */
menu->h = 0; /* calculated by setupmenu() */ menu->h = 0; /* recalculated by setupmenu() */
menu->x = 0; /* calculated by setupmenu() */ menu->x = mon.x; /* recalculated by setupmenu() */
menu->y = 0; /* calculated by setupmenu() */ menu->y = mon.y; /* recalculated by setupmenu() */
menu->level = level; menu->level = level;
menu->drawn = 0; menu->drawn = 0;
menu->hasicon = 0; menu->hasicon = 0;
@ -705,7 +701,7 @@ setupitems(struct Menu *menu)
menu->h += item->h; menu->h += item->h;
if (item->label) if (item->label)
textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label); textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label);
else else
textwidth = 0; textwidth = 0;