Adding the -f option

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 4d1c223..68c8360 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -30,7 +30,7 @@ static void ealloccolor(const char *s, XftColor *color);
 static void initmonitor(void);
 static void initresources(void);
 static void initdc(void);
 static void initmonitor(void);
 static void initresources(void);
 static void initdc(void);

-static void initconfig(void);
+static void initiconsize(void);

 static void initatoms(void);
 
 /* structure builders, and their helper routines */
 static void initatoms(void);
 
 /* structure builders, and their helper routines */


@@ -95,6 +95,7 @@ static Atom wmdelete;
 static Atom netatom[NetLast];
 
 /* flags */
 static Atom netatom[NetLast];
 
 /* flags */

+static int fflag = 0;   /* whether glyphs should align based on the first font */

 static int iflag = 0;   /* whether to disable icons */
 static int mflag = 0;   /* whether the user specified a monitor with -p */
 static int pflag = 0;   /* whether the user specified a position with -p */
 static int iflag = 0;   /* whether to disable icons */
 static int mflag = 0;   /* whether the user specified a monitor with -p */
 static int pflag = 0;   /* whether the user specified a position with -p */


@@ -116,8 +117,11 @@ main(int argc, char *argv[])
        XClassHint classh;
        int ch;
 
        XClassHint classh;
        int ch;
 

-       while ((ch = getopt(argc, argv, "ip:w")) != -1) {
+       while ((ch = getopt(argc, argv, "fip:w")) != -1) {

                switch (ch) {
                switch (ch) {

+               case 'f':
+                       fflag = 1;
+                       break;

                case 'i':
                        iflag = 1;
                        break;
                case 'i':
                        iflag = 1;
                        break;


@@ -160,7 +164,7 @@ main(int argc, char *argv[])
        initmonitor();
        initresources();
        initdc();
        initmonitor();
        initresources();
        initdc();

-       initconfig();
+       initiconsize();

        initatoms();
 
        /* set window class */
        initatoms();
 
        /* set window class */


@@ -297,8 +301,8 @@ initmonitor(void)
 
                if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
                        for (i = 0; i < nmons; i++) {
 
                if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) {
                        for (i = 0; i < nmons; i++) {

-                               if (cursx >= info[i].x_org && cursx <= info[i].x_org + info[i].width &&
-                                   cursy >= info[i].y_org && cursy <= info[i].y_org + info[i].height) {
+                               if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
+                                   BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {

                                        selmon = i;
                                        break;
                                }
                                        selmon = i;
                                        break;
                                }


@@ -390,12 +394,10 @@ initdc(void)
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 

-/* calculate configuration values that are not set manually */
+/* calculate icon size */

 static void
 static void

-initconfig(void)
+initiconsize(void)

 {
 {

-       config.screenw = DisplayWidth(dpy, screen);
-       config.screenh = DisplayHeight(dpy, screen);

        config.iconsize = config.height_pixels - config.iconpadding * 2;
 }
 
        config.iconsize = config.height_pixels - config.iconpadding * 2;
 }
 


@@ -439,10 +441,6 @@ allocitem(const char *label, const char *output, char *file)
        }
        item->y = 0;
        item->h = 0;
        }
        item->y = 0;
        item->h = 0;

-       if (item->label == NULL)
-               item->labellen = 0;
-       else
-               item->labellen = strlen(item->label);

        item->next = NULL;
        item->submenu = NULL;
        item->icon = NULL;
        item->next = NULL;
        item->submenu = NULL;
        item->icon = NULL;


@@ -463,12 +461,13 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
        menu->list = list;
        menu->caller = NULL;
        menu->selected = NULL;
        menu->list = list;
        menu->caller = NULL;
        menu->selected = NULL;

-       menu->w = 0;    /* calculated by setupmenu() */
-       menu->h = 0;    /* calculated by setupmenu() */
-       menu->x = 0;    /* calculated by setupmenu() */
-       menu->y = 0;    /* calculated by setupmenu() */
+       menu->w = 0;        /* recalculated by setupmenu() */
+       menu->h = 0;        /* recalculated by setupmenu() */
+       menu->x = mon.x;    /* recalculated by setupmenu() */
+       menu->y = mon.y;    /* recalculated by setupmenu() */

        menu->level = level;
        menu->drawn = 0;
        menu->level = level;
        menu->drawn = 0;

+       menu->hasicon = 0;

 
        swa.override_redirect = (wflag) ? False : True;
        swa.background_pixel = dc.normal[ColorBG].pixel;
 
        swa.override_redirect = (wflag) ? False : True;
        swa.background_pixel = dc.normal[ColorBG].pixel;


@@ -543,6 +542,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
                curritem->prev = NULL;
        }
 
                curritem->prev = NULL;
        }
 

+       if (curritem->file)
+               prevmenu->hasicon = 1;
+

        return rootmenu;
 }
 
        return rootmenu;
 }
 


@@ -644,6 +646,9 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t
        FcChar32 ucode;
        XftFont *currfont;
        int textlen = 0;
        FcChar32 ucode;
        XftFont *currfont;
        int textlen = 0;

+       int texty;
+
+       texty = y + (h - (dc.fonts[0]->ascent + dc.fonts[0]->descent))/2 + dc.fonts[0]->ascent;

 
        s = text;
        while (*s) {
 
        s = text;
        while (*s) {


@@ -669,9 +674,8 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t
                textlen += ext.xOff;
 
                if (draw) {
                textlen += ext.xOff;
 
                if (draw) {

-                       int texty;
-
-                       texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
+                       if (!fflag)
+                               texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;

                        XftDrawStringUtf8(draw, color, currfont, x, texty,
                                          (XftChar8 *)s, len);
                        x += ext.xOff;
                        XftDrawStringUtf8(draw, color, currfont, x, texty,
                                          (XftChar8 *)s, len);
                        x += ext.xOff;


@@ -703,7 +707,7 @@ setupitems(struct Menu *menu)
                menu->h += item->h;
 
                if (item->label)
                menu->h += item->h;
 
                if (item->label)

-                       textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label);
+                       textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label);

                else
                        textwidth = 0;
 
                else
                        textwidth = 0;
 


@@ -720,7 +724,7 @@ setupitems(struct Menu *menu)
                 * padding appears 3 times: before the label and around the triangle.
                 */
                itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;
                 * padding appears 3 times: before the label and around the triangle.
                 */
                itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;

-               itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
+               itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding;

                menu->w = MAX(menu->w, itemwidth);
        }
 }
                menu->w = MAX(menu->w, itemwidth);
        }
 }


@@ -741,7 +745,7 @@ setupmenupos(struct Menu *menu)
 
                if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height))
                        menu->y = config.posy;
 
                if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height))
                        menu->y = config.posy;

-               else if (config.screenh > height)
+               else if (mon.y + mon.h > height)

                        menu->y = mon.y + mon.h - height;
        } else {                    /* else, calculate in respect to parent menu */
                int parentwidth;
                        menu->y = mon.y + mon.h - height;
        } else {                    /* else, calculate in respect to parent menu */
                int parentwidth;


@@ -753,10 +757,8 @@ setupmenupos(struct Menu *menu)
                else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
                        menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 
                else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
                        menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 

-               if (mon.y + mon.h - (menu->caller->y + menu->parent->y) > height)
+               if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height)

                        menu->y = menu->caller->y + menu->parent->y;
                        menu->y = menu->caller->y + menu->parent->y;

-               else if (mon.y + mon.h - menu->parent->y > height)
-                       menu->y = menu->parent->y;

                else if (mon.y + mon.h > height)
                        menu->y = mon.y + mon.h - height;
        }
                else if (mon.y + mon.h > height)
                        menu->y = mon.y + mon.h - height;
        }


@@ -793,7 +795,7 @@ setupmenu(struct Menu *menu, XClassHint *classh)
        XStringListToTextProperty(&title, 1, &wintitle);
 
        /* set window manager hints */
        XStringListToTextProperty(&title, 1, &wintitle);
 
        /* set window manager hints */

-       sizeh.flags = PMaxSize | PMinSize;
+       sizeh.flags = USPosition | PMaxSize | PMinSize;

        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);


@@ -904,7 +906,7 @@ drawitems(struct Menu *menu)
 
                        /* draw text */
                        x = config.horzpadding;
 
                        /* draw text */
                        x = config.horzpadding;

-                       x += (iflag) ? 0 : config.horzpadding + config.iconsize;
+                       x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize;

                        dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
                        dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
                        XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);
                        dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
                        dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
                        XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);


@@ -1253,6 +1255,8 @@ cleanmenu(struct Menu *menu)
 static void
 cleanup(void)
 {
 static void
 cleanup(void)
 {

+       size_t i;
+

        XUngrabPointer(dpy, CurrentTime);
        XUngrabKeyboard(dpy, CurrentTime);
 
        XUngrabPointer(dpy, CurrentTime);
        XUngrabKeyboard(dpy, CurrentTime);
 


@@ -1263,6 +1267,9 @@ cleanup(void)
        XftColorFree(dpy, visual, colormap, &dc.separator);
        XftColorFree(dpy, visual, colormap, &dc.border);
 
        XftColorFree(dpy, visual, colormap, &dc.separator);
        XftColorFree(dpy, visual, colormap, &dc.border);
 

+       for (i = 0; i < dc.nfonts; i++)
+               XftFontClose(dpy, dc.fonts[i]);
+

        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);
 }
        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);
 }


@@ -1271,6 +1278,6 @@ cleanup(void)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       (void)fprintf(stderr, "usage: xmenu [-iw] [-p position] [title]\n");
+       (void)fprintf(stderr, "usage: xmenu [-fiw] [-p position] [title]\n");

        exit(1);
 }
        exit(1);
 }