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

item->y is now relative to menu, not to root

Browse Source
This commit is contained in:
phillbush 2020-05-15 22:25:05 -03:00
parent a77326901f
commit a80fee227a
2 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.def.h
View File

@ -8,3 +8,4 @@
#define ITEMW 130 #define ITEMW 130
#define ITEMB 5 #define ITEMB 5
#define BORDER 2 #define BORDER 2
#define SEPARATOR 2

122
xmenu.c
View File

@ -29,7 +29,8 @@ struct Geometry {
int itemb; /* item border */ int itemb; /* item border */
int itemw; /* item width */ int itemw; /* item width */
int itemh; /* item height */ int itemh; /* item height */
int border; /* window border */ int border; /* window border width */
int separator; /* menu separator width */
}; };
/* screen geometry structure */ /* screen geometry structure */
@ -42,7 +43,7 @@ struct ScreenGeometry {
struct Item { struct Item {
char *label; char *label;
char *output; char *output;
int x, y; int y; /* only y is necessary, item's x is always 0 relative to the menu*/
struct Item *next; struct Item *next;
struct Menu *submenu; struct Menu *submenu;
}; };
@ -54,7 +55,6 @@ struct Menu {
struct Item *selected; struct Item *selected;
int x, y, w, h; int x, y, w, h;
unsigned level; unsigned level;
unsigned nitems;
Window win; Window win;
}; };
@ -63,9 +63,9 @@ static unsigned long getcolor(const char *s);
static void setupdc(void); static void setupdc(void);
static void setupgeom(void); static void setupgeom(void);
static void setupgrab(void); static void setupgrab(void);
static struct Item *allocitem(size_t count, const char *label, const char *output); static struct Item *allocitem(const char *label, const char *output);
static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level); static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);
static void getmenuitem(Window win, int x, int y, static void getmenuitem(Window win, int y,
struct Menu **menu_ret, struct Item **item_ret); struct Menu **menu_ret, struct Item **item_ret);
static void drawmenu(void); static void drawmenu(void);
static void calcscreengeom(void); static void calcscreengeom(void);
@ -89,7 +89,7 @@ static struct Menu *currmenu = NULL;
/* geometry variables */ /* geometry variables */
static struct Geometry geom; static struct Geometry geom;
static struct ScreenGeometry sgeom; static struct ScreenGeometry screengeom;
/* flag variables */ /* flag variables */
static Bool override_redirect = True; static Bool override_redirect = True;
@ -180,6 +180,7 @@ setupgeom(void)
geom.itemh = dc.fonth + ITEMB * 2; geom.itemh = dc.fonth + ITEMB * 2;
geom.itemw = ITEMW; geom.itemw = ITEMW;
geom.border = BORDER; geom.border = BORDER;
geom.separator = SEPARATOR;
} }
/* grab pointer */ /* grab pointer */
@ -192,7 +193,7 @@ setupgrab(void)
/* allocate an item */ /* allocate an item */
static struct Item * static struct Item *
allocitem(size_t count, const char *label, const char *output) allocitem(const char *label, const char *output)
{ {
struct Item *item; struct Item *item;
@ -202,8 +203,7 @@ allocitem(size_t count, const char *label, const char *output)
err(1, "strdup"); err(1, "strdup");
if ((item->output = strdup(output)) == NULL) if ((item->output = strdup(output)) == NULL)
err(1, "strdup"); err(1, "strdup");
item->x = 0; item->y = 0;
item->y = count * geom.itemh;
item->next = NULL; item->next = NULL;
item->submenu = NULL; item->submenu = NULL;
@ -222,12 +222,11 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
menu->parent = parent; menu->parent = parent;
menu->list = list; menu->list = list;
menu->selected = NULL; menu->selected = NULL;
menu->x = 0;
menu->y = 0;
menu->w = geom.itemw; menu->w = geom.itemw;
menu->h = geom.itemh; menu->h = 0; /* calculated by calcmenu() */
menu->x = 0; /* calculated by calcmenu() */
menu->y = 0; /* calculated by calcmenu() */
menu->level = level; menu->level = level;
menu->nitems = 0;
swa.override_redirect = override_redirect; swa.override_redirect = override_redirect;
swa.background_pixel = dc.decoration[ColorBG]; swa.background_pixel = dc.decoration[ColorBG];
@ -250,9 +249,10 @@ parsestdin(void)
char *label, *output; char *label, *output;
unsigned level = 0; unsigned level = 0;
unsigned i; unsigned i;
struct Item *item, *p; struct Item *curritem = NULL; /* item currently being read */
struct Menu *menu; struct Menu *prevmenu = NULL; /* menu the previous item was added to */
struct Menu *prevmenu = NULL; struct Item *item; /* dummy item for for loops */
struct Menu *menu; /* dummy menu for for loops */
size_t count = 0; /* number of items in the current menu */ size_t count = 0; /* number of items in the current menu */
while (fgets(buf, BUFSIZ, stdin) != NULL) { while (fgets(buf, BUFSIZ, stdin) != NULL) {
@ -281,10 +281,10 @@ parsestdin(void)
if (*s == '\n') if (*s == '\n')
*s = '\0'; *s = '\0';
item = allocitem(count, label, output); curritem = allocitem(label, output);
if (prevmenu == NULL) { /* there is no menu yet */ if (prevmenu == NULL) { /* there is no menu yet */
menu = allocmenu(NULL, item, level); menu = allocmenu(NULL, curritem, level);
rootmenu = menu; rootmenu = menu;
prevmenu = menu; prevmenu = menu;
count = 1; count = 1;
@ -297,25 +297,26 @@ parsestdin(void)
if (menu == NULL) if (menu == NULL)
errx(1, "reached NULL menu"); errx(1, "reached NULL menu");
for (p = menu->list; p->next != NULL; p = p->next) for (item = menu->list; item->next != NULL; item = item->next)
; ;
p->next = item; item->next = curritem;
prevmenu = menu; prevmenu = menu;
} else if (level == prevmenu->level) { /* item is a continuation of current menu */ } else if (level == prevmenu->level) { /* item is a continuation of current menu */
for (p = prevmenu->list; p->next != NULL; p = p->next) for (item = prevmenu->list; item->next != NULL; item = item->next)
; ;
p->next = item; item->next = curritem;
} else if (level > prevmenu->level) { /* item begins a new menu */ } else if (level > prevmenu->level) { /* item begins a new menu */
menu = allocmenu(prevmenu, item, level); menu = allocmenu(prevmenu, curritem, level);
for (p = prevmenu->list; p->next != NULL; p = p->next) for (item = prevmenu->list; item->next != NULL; item = item->next)
; ;
p->submenu = menu; item->submenu = menu;
prevmenu = menu; prevmenu = menu;
} }
count++;
} }
} }
@ -327,9 +328,9 @@ calcscreengeom(void)
int a, b; /* unused variables */ int a, b; /* unused variables */
unsigned mask; /* unused variable */ unsigned mask; /* unused variable */
XQueryPointer(dpy, rootwin, &w1, &w2, &sgeom.cursx, &sgeom.cursy, &a, &b, &mask); XQueryPointer(dpy, rootwin, &w1, &w2, &screengeom.cursx, &screengeom.cursy, &a, &b, &mask);
sgeom.screenw = DisplayWidth(dpy, screen); screengeom.screenw = DisplayWidth(dpy, screen);
sgeom.screenh = DisplayHeight(dpy, screen); screengeom.screenh = DisplayHeight(dpy, screen);
} }
/* recursivelly calculate height and position of the menus */ /* recursivelly calculate height and position of the menus */
@ -337,50 +338,45 @@ static void
calcmenu(struct Menu *menu) calcmenu(struct Menu *menu)
{ {
XWindowChanges changes; XWindowChanges changes;
struct Item *item, *p; struct Item *item;
size_t i;
/* calculate number of items */ /* calculate items positions and menu height */
i = 0; for (item = menu->list; item != NULL; item = item->next) {
for (item = menu->list; item != NULL; item = item->next) item->y = menu->h;
i++; if (*item->label == '\0') /* height for separator item */
menu->nitems = i; menu->h += geom.separator;
menu->h = geom.itemh * i; else
menu->h += geom.itemh;
}
/* calculate menu's x and y positions */ /* calculate menu's x and y positions */
if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */
if (sgeom.screenw - sgeom.cursx >= menu->w) if (screengeom.screenw - screengeom.cursx >= menu->w)
menu->x = sgeom.cursx; menu->x = screengeom.cursx;
else if (sgeom.cursx > menu->w) else if (screengeom.cursx > menu->w)
menu->x = sgeom.cursx - menu->w; menu->x = screengeom.cursx - menu->w;
if (sgeom.screenh - sgeom.cursy >= menu->h) if (screengeom.screenh - screengeom.cursy >= menu->h)
menu->y = sgeom.cursy; menu->y = screengeom.cursy;
else if (sgeom.screenh > menu->h) else if (screengeom.screenh > menu->h)
menu->y = sgeom.screenh - menu->h; menu->y = screengeom.screenh - menu->h;
} else { /* else, calculate in respect to parent menu */ } else { /* else, calculate in respect to parent menu */
/* search for the item in parent menu that generates this menu */ /* search for the item in parent menu that generates this menu */
for (p = menu->parent->list; p->submenu != menu; p = p->next) for (item = menu->parent->list; item->submenu != menu; item = item->next)
; ;
if (sgeom.screenw - (menu->parent->x + menu->parent->w) >= menu->w) if (screengeom.screenw - (menu->parent->x + menu->parent->w) >= menu->w)
menu->x = menu->parent->x + menu->parent->w; menu->x = menu->parent->x + menu->parent->w;
else if (menu->parent->x > menu->w) else if (menu->parent->x > menu->w)
menu->x = menu->parent->x - menu->w; menu->x = menu->parent->x - menu->w;
if (sgeom.screenh - p->y > menu->h) if (screengeom.screenh - (item->y + menu->parent->y) > menu->h)
menu->y = p->y; menu->y = item->y + menu->parent->y;
else if (sgeom.screenh - menu->parent->y > menu->h) else if (screengeom.screenh - menu->parent->y > menu->h)
menu->y = menu->parent->y; menu->y = menu->parent->y;
else if (sgeom.screenh > menu->h) else if (screengeom.screenh > menu->h)
menu->y = sgeom.screenh - menu->h; menu->y = screengeom.screenh - menu->h;
}
/* calculate position of each item in the menu */
for (i = 0, item = menu->list; item != NULL; item = item->next, i++) {
item->x = menu->x;
item->y = menu->y + i * geom.itemh;
} }
/* update menu geometry */ /* update menu geometry */
@ -389,6 +385,7 @@ calcmenu(struct Menu *menu)
changes.y = menu->y; changes.y = menu->y;
XConfigureWindow(dpy, menu->win, CWHeight | CWX | CWY, &changes); XConfigureWindow(dpy, menu->win, CWHeight | CWX | CWY, &changes);
/* calculate positions of submenus */
for (item = menu->list; item != NULL; item = item->next) { for (item = menu->list; item != NULL; item = item->next) {
if (item->submenu != NULL) if (item->submenu != NULL)
calcmenu(item->submenu); calcmenu(item->submenu);
@ -397,7 +394,7 @@ calcmenu(struct Menu *menu)
/* get menu and item of given window and position */ /* get menu and item of given window and position */
static void static void
getmenuitem(Window win, int x, int y, getmenuitem(Window win, int y,
struct Menu **menu_ret, struct Item **item_ret) struct Menu **menu_ret, struct Item **item_ret)
{ {
struct Menu *menu = NULL; struct Menu *menu = NULL;
@ -406,8 +403,7 @@ getmenuitem(Window win, int x, int y,
for (menu = currmenu; menu != NULL; menu = menu->parent) { for (menu = currmenu; menu != NULL; menu = menu->parent) {
if (menu->win == win) { if (menu->win == win) {
for (item = menu->list; item != NULL; item = item->next) { for (item = menu->list; item != NULL; item = item->next) {
if (x >= item->x && x <= item->x + geom.itemw && if (y >= item->y && y <= item->y + geom.itemh) {
y >= item->y && y <= item->y + geom.itemh) {
goto done; goto done;
} }
} }
@ -515,8 +511,7 @@ run(void)
drawmenu(); drawmenu();
break; break;
case MotionNotify: case MotionNotify:
getmenuitem(ev.xbutton.window, ev.xbutton.x_root, ev.xbutton.y_root, getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
&menu, &item);
if (menu != NULL && item != NULL) { if (menu != NULL && item != NULL) {
if (previtem != item) { if (previtem != item) {
if (item->submenu != NULL) if (item->submenu != NULL)
@ -530,8 +525,7 @@ run(void)
drawmenu(); drawmenu();
break; break;
case ButtonRelease: case ButtonRelease:
getmenuitem(ev.xbutton.window, ev.xbutton.x_root, ev.xbutton.y_root, getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
&menu, &item);
if (menu != NULL && item != NULL) { if (menu != NULL && item != NULL) {
if (item->submenu != NULL) { if (item->submenu != NULL) {
setcurrmenu(item->submenu); setcurrmenu(item->submenu);