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

Getting rid of some global variables

Browse Source 
They are local now.
This commit is contained in:
phillbush
2020-05-27 13:40:11 -03:00
parent 571d99e165
commit 257e42cc23
1 changed files with 105 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
xmenu.c
View File

@@ -34,16 +34,10 @@ struct DC {
}; };
/* menu geometry structure */ /* menu geometry structure */
struct MenuGeometry { struct Geometry {
int itemb; /* item border */ int border; /* window border width */
int itemw; /* item width */ int separator; /* menu separator width */
int itemh; /* item height */ int itemw, itemh; /* item width and height */
int border; /* window border width */
int separator; /* menu separator width */
};
/* screen geometry structure */
struct ScreenGeometry {
int cursx, cursy; /* cursor position */ int cursx, cursy; /* cursor position */
int screenw, screenh; /* screen width and height */ int screenw, screenh; /* screen width and height */
}; };
@@ -73,48 +67,44 @@ struct Menu {
Window win; /* menu window to map on the screen */ Window win; /* menu window to map on the screen */
}; };
/* function declarations */ /* functions declarations */
static void getcolor(const char *s, XftColor *color);
static void getresources(void); static void getresources(void);
static void getcolor(const char *s, XftColor *color);
static void setupdc(void); static void setupdc(void);
static void setupgeom(void); static void calcgeom(void);
static struct Item *allocitem(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 struct Menu *getmenu(Window win); static struct Menu *parsestdin(void);
static struct Item *getitem(struct Menu *menu, int y);
static void drawseparator(struct Menu *menu, struct Item *item);
static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);
static void drawmenu(void);
static void calcscreengeom(void);
static void calcmenu(struct Menu *menu); static void calcmenu(struct Menu *menu);
static void grabpointer(void); static void grabpointer(void);
static void grabkeyboard(void); static void grabkeyboard(void);
static void setcurrmenu(struct Menu *currmenu_new); static struct Menu *getmenu(struct Menu *currmenu, Window win);
static void parsestdin(void); static struct Item *getitem(struct Menu *menu, int y);
static void run(void); static void mapmenu(struct Menu *currmenu);
static void drawseparator(struct Menu *menu, struct Item *item);
static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);
static void drawmenu(struct Menu *currmenu);
static struct Item *itemcycle(struct Menu *currmenu, int direction);
static void run(struct Menu *currmenu);
static void freewindow(struct Menu *menu); static void freewindow(struct Menu *menu);
static void cleanup(void); static void cleanup(struct Menu *rootmenu);
static void usage(void); static void usage(void);
/* X variables */ /* global variables (X stuff and geometries) */
static Colormap colormap; static Colormap colormap;
static Display *dpy; static Display *dpy;
static Visual *visual; static Visual *visual;
static Window rootwin; static Window rootwin;
static int screen; static int screen;
static struct DC dc; static struct DC dc;
static struct ScreenGeometry screengeom; static struct Geometry geom;
/* menu variables */
static struct Menu *rootmenu = NULL;
static struct Menu *currmenu = NULL;
static struct MenuGeometry geom;
#include "config.h" #include "config.h"
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
struct Menu *rootmenu;
int ch; int ch;
while ((ch = getopt(argc, argv, "")) != -1) { while ((ch = getopt(argc, argv, "")) != -1) {
@@ -138,13 +128,12 @@ main(int argc, char *argv[])
/* setup */ /* setup */
getresources(); getresources();
setupdc(); setupdc();
setupgeom(); calcgeom();
/* generate menus and recalculate them */ /* generate menus and recalculate them */
parsestdin(); rootmenu = parsestdin();
if (rootmenu == NULL) if (rootmenu == NULL)
errx(1, "no menu generated"); errx(1, "no menu generated");
calcscreengeom();
calcmenu(rootmenu); calcmenu(rootmenu);
/* grab mouse and keyboard */ /* grab mouse and keyboard */
@@ -152,9 +141,9 @@ main(int argc, char *argv[])
grabkeyboard(); grabkeyboard();
/* run event loop */ /* run event loop */
run(); run(rootmenu);
cleanup(); cleanup(rootmenu);
return 0; return 0;
} }
@@ -232,11 +221,17 @@ setupdc(void)
dc.gc = XCreateGC(dpy, rootwin, 0, NULL); dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
} }
/* init menu geometry values */ /* calculate menu and screen geometry */
static void static void
setupgeom(void) calcgeom(void)
{ {
geom.itemb = padding_pixels; Window w1, w2; /* unused variables */
int a, b; /* unused variables */
unsigned mask; /* unused variable */
XQueryPointer(dpy, rootwin, &w1, &w2, &geom.cursx, &geom.cursy, &a, &b, &mask);
geom.screenw = DisplayWidth(dpy, screen);
geom.screenh = DisplayHeight(dpy, screen);
geom.itemh = dc.font->height + padding_pixels * 2; geom.itemh = dc.font->height + padding_pixels * 2;
geom.itemw = width_pixels; geom.itemw = width_pixels;
geom.border = border_pixels; geom.border = border_pixels;
@@ -307,9 +302,10 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
} }
/* create menus and items from the stdin */ /* create menus and items from the stdin */
static void static struct Menu *
parsestdin(void) parsestdin(void)
{ {
struct Menu *rootmenu;
char *s, buf[BUFSIZ]; char *s, buf[BUFSIZ];
char *label, *output; char *label, *output;
unsigned level = 0; unsigned level = 0;
@@ -320,6 +316,8 @@ parsestdin(void)
struct Menu *menu; /* dummy menu 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 */
rootmenu = NULL;
while (fgets(buf, BUFSIZ, stdin) != NULL) { while (fgets(buf, BUFSIZ, stdin) != NULL) {
level = 0; level = 0;
s = buf; s = buf;
@@ -397,19 +395,8 @@ parsestdin(void)
} }
count++; count++;
} }
}
/* calculate screen geometry */ return rootmenu;
static void
calcscreengeom(void)
{
Window w1, w2; /* unused variables */
int a, b; /* unused variables */
unsigned mask; /* unused variable */
XQueryPointer(dpy, rootwin, &w1, &w2, &screengeom.cursx, &screengeom.cursy, &a, &b, &mask);
screengeom.screenw = DisplayWidth(dpy, screen);
screengeom.screenh = DisplayHeight(dpy, screen);
} }
/* recursivelly calculate menu geometry and set window hints */ /* recursivelly calculate menu geometry and set window hints */
@@ -440,27 +427,27 @@ calcmenu(struct Menu *menu)
/* 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 (screengeom.screenw - screengeom.cursx >= menu->w) if (geom.screenw - geom.cursx >= menu->w)
menu->x = screengeom.cursx; menu->x = geom.cursx;
else if (screengeom.cursx > menu->w) else if (geom.cursx > menu->w)
menu->x = screengeom.cursx - menu->w; menu->x = geom.cursx - menu->w;
if (screengeom.screenh - screengeom.cursy >= menu->h) if (geom.screenh - geom.cursy >= menu->h)
menu->y = screengeom.cursy; menu->y = geom.cursy;
else if (screengeom.screenh > menu->h) else if (geom.screenh > menu->h)
menu->y = screengeom.screenh - menu->h; menu->y = geom.screenh - menu->h;
} else { /* else, calculate in respect to parent menu */ } else { /* else, calculate in respect to parent menu */
if (screengeom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w) if (geom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w)
menu->x = menu->parent->x + menu->parent->w + geom.border; menu->x = menu->parent->x + menu->parent->w + geom.border;
else if (menu->parent->x > menu->w + geom.border) else if (menu->parent->x > menu->w + geom.border)
menu->x = menu->parent->x - menu->w - geom.border; menu->x = menu->parent->x - menu->w - geom.border;
if (screengeom.screenh - (menu->caller->y + menu->parent->y) > menu->h) if (geom.screenh - (menu->caller->y + menu->parent->y) > menu->h)
menu->y = menu->caller->y + menu->parent->y; menu->y = menu->caller->y + menu->parent->y;
else if (screengeom.screenh - menu->parent->y > menu->h) else if (geom.screenh - menu->parent->y > menu->h)
menu->y = menu->parent->y; menu->y = menu->parent->y;
else if (screengeom.screenh > menu->h) else if (geom.screenh > menu->h)
menu->y = screengeom.screenh - menu->h; menu->y = geom.screenh - menu->h;
} }
/* update menu geometry */ /* update menu geometry */
@@ -524,7 +511,7 @@ grabkeyboard(void)
/* get menu of given window */ /* get menu of given window */
static struct Menu * static struct Menu *
getmenu(Window win) getmenu(struct Menu *currmenu, Window win)
{ {
struct Menu *menu; struct Menu *menu;
@@ -551,37 +538,35 @@ getitem(struct Menu *menu, int y)
return NULL; return NULL;
} }
/* set currentmenu to menu, umap previous menus and map current menu and its parents */ /* umap previous menus and map current menu and its parents */
static void static void
setcurrmenu(struct Menu *currmenu_new) mapmenu(struct Menu *currmenu)
{ {
static struct Menu *prevmenu = NULL;
struct Menu *menu, *menu_; struct Menu *menu, *menu_;
struct Item *item;
struct Menu *lcamenu; /* lowest common ancestor menu */ struct Menu *lcamenu; /* lowest common ancestor menu */
unsigned minlevel; /* level of the closest to root menu */ unsigned minlevel; /* level of the closest to root menu */
unsigned maxlevel; /* level of the closest to root menu */ unsigned maxlevel; /* level of the closest to root menu */
/* do not update currmenu to itself */ /* do not remap current menu if it wasn't updated*/
if (currmenu_new == currmenu) if (prevmenu == currmenu)
return; return;
/* if there was no currmenu, skip calculations */ /* if this is the first time mapping, skip calculations */
if (currmenu == NULL) { if (prevmenu == NULL) {
currmenu = currmenu_new;
XMapWindow(dpy, currmenu->win); XMapWindow(dpy, currmenu->win);
return; goto done;
} }
/* find lowest common ancestor menu */ /* find lowest common ancestor menu */
lcamenu = rootmenu; minlevel = MIN(currmenu->level, prevmenu->level);
minlevel = MIN(currmenu_new->level, currmenu->level); maxlevel = MAX(currmenu->level, prevmenu->level);
maxlevel = MAX(currmenu_new->level, currmenu->level); if (currmenu->level == maxlevel) {
if (currmenu_new->level == maxlevel) {
menu = currmenu_new;
menu_ = currmenu;
} else {
menu = currmenu; menu = currmenu;
menu_ = currmenu_new; menu_ = prevmenu;
} else {
menu = prevmenu;
menu_ = currmenu;
} }
while (menu->level > minlevel) while (menu->level > minlevel)
menu = menu->parent; menu = menu->parent;
@@ -592,18 +577,18 @@ setcurrmenu(struct Menu *currmenu_new)
lcamenu = menu; lcamenu = menu;
/* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */ /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */
for (menu = currmenu; menu != lcamenu; menu = menu->parent) { for (menu = prevmenu; menu != lcamenu; menu = menu->parent) {
menu->selected = NULL; menu->selected = NULL;
XUnmapWindow(dpy, menu->win); XUnmapWindow(dpy, menu->win);
} }
currmenu = currmenu_new;
/* map menus from currmenu (inclusive) until lcamenu (exclusive) */ /* map menus from currmenu (inclusive) until lcamenu (exclusive) */
item = NULL;
for (menu = currmenu; menu != lcamenu; menu = menu->parent) { for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
XMapWindow(dpy, menu->win); XMapWindow(dpy, menu->win);
} }
done:
prevmenu = currmenu;
} }
/* draw separator item */ /* draw separator item */
@@ -627,15 +612,15 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color)
int x, y; int x, y;
x = 0 + dc.font->height; x = 0 + dc.font->height;
y = item->y + dc.font->height + geom.itemb / 2; y = item->y + item->h/2 + dc.font->ascent/2 - 1;
XSetForeground(dpy, dc.gc, color[ColorFG].pixel); XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font, XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
x, y, item->label, item->labellen); x, y, item->label, item->labellen);
/* draw triangle, if item contains a submenu */ /* draw triangle, if item contains a submenu */
if (item->submenu != NULL) { if (item->submenu != NULL) {
x = menu->w - dc.font->height + geom.itemb - 1; x = menu->w - dc.font->height/2 - triangle_width/2;
y = item->y + geom.itemh/2 - triangle_height/2 - 1; y = item->y + item->h/2 - triangle_height/2 - 1;
XPoint triangle[] = { XPoint triangle[] = {
{x, y}, {x, y},
@@ -651,7 +636,7 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color)
/* draw items of the current menu and of its ancestors */ /* draw items of the current menu and of its ancestors */
static void static void
drawmenu(void) drawmenu(struct Menu *currmenu)
{ {
struct Menu *menu; struct Menu *menu;
struct Item *item; struct Item *item;
@@ -684,7 +669,7 @@ drawmenu(void)
/* cycle through the items; non-zero direction is next, zero is prev */ /* cycle through the items; non-zero direction is next, zero is prev */
static struct Item * static struct Item *
itemcycle(int direction) itemcycle(struct Menu *currmenu, int direction)
{ {
struct Item *item; struct Item *item;
struct Item *lastitem; struct Item *lastitem;
@@ -725,7 +710,7 @@ itemcycle(int direction)
/* run event loop */ /* run event loop */
static void static void
run(void) run(struct Menu *currmenu)
{ {
struct Menu *menu; struct Menu *menu;
struct Item *item; struct Item *item;
@@ -733,31 +718,34 @@ run(void)
KeySym ksym; KeySym ksym;
XEvent ev; XEvent ev;
setcurrmenu(rootmenu); mapmenu(currmenu);
while (!XNextEvent(dpy, &ev)) { while (!XNextEvent(dpy, &ev)) {
switch(ev.type) { switch(ev.type) {
case Expose: case Expose:
if (ev.xexpose.count == 0) if (ev.xexpose.count == 0)
drawmenu(); drawmenu(currmenu);
break; break;
case MotionNotify: case MotionNotify:
menu = getmenu(ev.xbutton.window); menu = getmenu(currmenu, ev.xbutton.window);
item = getitem(menu, ev.xbutton.y); item = getitem(menu, ev.xbutton.y);
if (menu == NULL || item == NULL) if (menu == NULL || item == NULL)
break; break;
if (previtem != item) { if (previtem != item) {
menu->selected = item;
if (item->submenu != NULL)
setcurrmenu(item->submenu);
else
setcurrmenu(menu);
previtem = item; previtem = item;
drawmenu(); menu->selected = item;
if (item->submenu != NULL) {
currmenu = item->submenu;
currmenu->selected = NULL;
} else {
currmenu = menu;
}
mapmenu(currmenu);
drawmenu(currmenu);
} }
break; break;
case ButtonRelease: case ButtonRelease:
menu = getmenu(ev.xbutton.window); menu = getmenu(currmenu, ev.xbutton.window);
item = getitem(menu, ev.xbutton.y); item = getitem(menu, ev.xbutton.y);
if (menu == NULL || item == NULL) if (menu == NULL || item == NULL)
break; break;
@@ -765,16 +753,17 @@ selectitem:
if (item->label == NULL) if (item->label == NULL)
break; /* ignore separators */ break; /* ignore separators */
if (item->submenu != NULL) { if (item->submenu != NULL) {
setcurrmenu(item->submenu); currmenu = item->submenu;
} else { } else {
printf("%s\n", item->output); printf("%s\n", item->output);
return; return;
} }
mapmenu(currmenu);
currmenu->selected = currmenu->list; currmenu->selected = currmenu->list;
drawmenu(); drawmenu(currmenu);
break; break;
case ButtonPress: case ButtonPress:
menu = getmenu(ev.xbutton.window); menu = getmenu(currmenu, ev.xbutton.window);
if (menu == NULL) if (menu == NULL)
return; return;
break; break;
@@ -782,7 +771,7 @@ selectitem:
ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0); ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
/* esc closes xmenu when current menu is the root menu */ /* esc closes xmenu when current menu is the root menu */
if (ksym == XK_Escape && currmenu == rootmenu) if (ksym == XK_Escape && currmenu->parent == NULL)
return; return;
/* Shift-Tab = ISO_Left_Tab */ /* Shift-Tab = ISO_Left_Tab */
@@ -792,9 +781,9 @@ selectitem:
/* cycle through menu */ /* cycle through menu */
item = NULL; item = NULL;
if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) { if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) {
item = itemcycle(ITEMPREV); item = itemcycle(currmenu, ITEMPREV);
} else if (ksym == XK_Tab || ksym == XK_Down) { } else if (ksym == XK_Tab || ksym == XK_Down) {
item = itemcycle(ITEMNEXT); item = itemcycle(currmenu, ITEMNEXT);
} else if ((ksym == XK_Return || ksym == XK_Right) && } else if ((ksym == XK_Return || ksym == XK_Right) &&
currmenu->selected != NULL) { currmenu->selected != NULL) {
item = currmenu->selected; item = currmenu->selected;
@@ -802,16 +791,17 @@ selectitem:
} else if ((ksym == XK_Escape || ksym == XK_Left) && } else if ((ksym == XK_Escape || ksym == XK_Left) &&
currmenu->parent != NULL) { currmenu->parent != NULL) {
item = currmenu->parent->selected; item = currmenu->parent->selected;
setcurrmenu(currmenu->parent); currmenu = currmenu->parent;
mapmenu(currmenu);
} else } else
break; break;
currmenu->selected = item; currmenu->selected = item;
drawmenu(); drawmenu(currmenu);
break; break;
case LeaveNotify: case LeaveNotify:
previtem = NULL; previtem = NULL;
currmenu->selected = NULL; currmenu->selected = NULL;
drawmenu(); drawmenu(currmenu);
break; break;
} }
} }
@@ -834,8 +824,11 @@ freewindow(struct Menu *menu)
/* cleanup and exit */ /* cleanup and exit */
static void static void
cleanup(void) cleanup(struct Menu *rootmenu)
{ {
XUngrabPointer(dpy, CurrentTime);
XUngrabKeyboard(dpy, CurrentTime);
freewindow(rootmenu); freewindow(rootmenu);
XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]); XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]);