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

Reordering stuff, removing unused variables

Browse Source
This commit is contained in:
phillbush 2020-05-27 14:34:55 -03:00
parent 257e42cc23
commit c6d9174ec2
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xmenu.c
View File

@ -91,11 +91,11 @@ static void cleanup(struct Menu *rootmenu);
static void usage(void); static void usage(void);
/* global variables (X stuff and geometries) */ /* global variables (X stuff and geometries) */
static Colormap colormap;
static Display *dpy; static Display *dpy;
static int screen;
static Visual *visual; static Visual *visual;
static Window rootwin; static Window rootwin;
static int screen; static Colormap colormap;
static struct DC dc; static struct DC dc;
static struct Geometry geom; static struct Geometry geom;
@ -117,6 +117,9 @@ main(int argc, char *argv[])
argc -= optind; argc -= optind;
argv += optind; argv += optind;
if (argc != 0)
usage();
/* open connection to server and set X variables */ /* open connection to server and set X variables */
if ((dpy = XOpenDisplay(NULL)) == NULL) if ((dpy = XOpenDisplay(NULL)) == NULL)
errx(1, "cannot open display"); errx(1, "cannot open display");
@ -305,16 +308,15 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
static struct Menu * 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;
unsigned i; unsigned i;
struct Item *curritem = NULL; /* item currently being read */ struct Item *curritem = NULL; /* item currently being read */
struct Menu *prevmenu = NULL; /* menu the previous item was added to */ struct Menu *prevmenu = NULL; /* menu the previous item was added to */
struct Item *item; /* dummy item for for loops */ struct Item *item; /* dummy item for loops */
struct Menu *menu; /* dummy menu for for loops */ struct Menu *menu; /* dummy menu for loops */
size_t count = 0; /* number of items in the current menu */ struct Menu *rootmenu; /* menu to be returned */
rootmenu = NULL; rootmenu = NULL;
@ -350,7 +352,6 @@ parsestdin(void)
menu = allocmenu(NULL, curritem, level); menu = allocmenu(NULL, curritem, level);
rootmenu = menu; rootmenu = menu;
prevmenu = menu; prevmenu = menu;
count = 1;
curritem->prev = NULL; curritem->prev = NULL;
curritem->next = NULL; curritem->next = NULL;
} else if (level < prevmenu->level) { /* item is continuation of a parent menu*/ } else if (level < prevmenu->level) { /* item is continuation of a parent menu*/
@ -393,7 +394,6 @@ parsestdin(void)
prevmenu = menu; prevmenu = menu;
} }
count++;
} }
return rootmenu; return rootmenu;
@ -729,9 +729,8 @@ run(struct Menu *currmenu)
case MotionNotify: case MotionNotify:
menu = getmenu(currmenu, 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 || previtem == item)
break; break;
if (previtem != item) {
previtem = item; previtem = item;
menu->selected = item; menu->selected = item;
if (item->submenu != NULL) { if (item->submenu != NULL) {
@ -742,7 +741,6 @@ run(struct Menu *currmenu)
} }
mapmenu(currmenu); mapmenu(currmenu);
drawmenu(currmenu); drawmenu(currmenu);
}
break; break;
case ButtonRelease: case ButtonRelease:
menu = getmenu(currmenu, ev.xbutton.window); menu = getmenu(currmenu, ev.xbutton.window);
@ -846,6 +844,6 @@ cleanup(struct Menu *rootmenu)
static void static void
usage(void) usage(void)
{ {
(void)fprintf(stderr, "usage: xmenu title...\n"); (void)fprintf(stderr, "usage: xmenu\n");
exit(1); exit(1);
} }