extended libdraw

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 6641ba2..8059f29 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -39,7 +39,7 @@ static void drawmenu(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static Bool grabkeyboard(void);
 static void drawmenuh(void);
 static void drawmenuv(void);
 static Bool grabkeyboard(void);

-static void kpress(XKeyEvent * e);
+static void kpress(XKeyEvent *e);

 static void match(char *pattern);
 static void readstdin(void);
 static void run(void);
 static void match(char *pattern);
 static void readstdin(void);
 static void run(void);


@@ -161,18 +161,18 @@ drawmenu(void) {
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;
        dc.y = 0;
        dc.w = mw;
        dc.h = mh;

-       drawtext(&dc, NULL, normcol);
+       drawtext(&dc, NULL, normcol, False);

        /* print prompt? */
        if(prompt) {
                dc.w = promptw;
        /* print prompt? */
        if(prompt) {
                dc.w = promptw;

-               drawtext(&dc, prompt, selcol);
+               drawtext(&dc, prompt, selcol, False);

                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;
                dc.x += dc.w;
        }
        dc.w = mw - dc.x;
        /* print command */
        if(cmdw && item && lines == 0)
                dc.w = cmdw;

-       drawtext(&dc, *text ? text : NULL, normcol);
+       drawtext(&dc, *text ? text : NULL, normcol, False);

        if(curr) {
                if(lines > 0)
                        drawmenuv();
        if(curr) {
                if(lines > 0)
                        drawmenuv();


@@ -189,16 +189,16 @@ drawmenuh(void) {
 
        dc.x += cmdw;
        dc.w = spaceitem;
 
        dc.x += cmdw;
        dc.w = spaceitem;

-       drawtext(&dc, curr->left ? "<" : NULL, normcol);
+       drawtext(&dc, curr->left ? "<" : NULL, normcol, False);

        dc.x += dc.w;
        dc.x += dc.w;

-       for(i = curr; i != next; i=i->right) {
+       for(i = curr; i != next; i = i->right) {

                dc.w = MIN(textw(&dc, i->text), mw / 3);
                dc.w = MIN(textw(&dc, i->text), mw / 3);

-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);

                dc.x += dc.w;
        }
        dc.w = spaceitem;
        dc.x = mw - dc.w;
                dc.x += dc.w;
        }
        dc.w = spaceitem;
        dc.x = mw - dc.w;

-       drawtext(&dc, next ? ">" : NULL, normcol);
+       drawtext(&dc, next ? ">" : NULL, normcol, False);

 }
 
 void
 }
 
 void


@@ -208,12 +208,12 @@ drawmenuv(void) {
        dc.w = mw - dc.x;
        dc.h = dc.font.height + 2;
        dc.y = dc.h;
        dc.w = mw - dc.x;
        dc.h = dc.font.height + 2;
        dc.y = dc.h;

-       for(i = curr; i != next; i=i->right) {
-               drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
+       for(i = curr; i != next; i = i->right) {
+               drawtext(&dc, i->text, (sel == i) ? selcol : normcol, False);

                dc.y += dc.h;
        }
        dc.h = mh - dc.y;
                dc.y += dc.h;
        }
        dc.h = mh - dc.y;

-       drawtext(&dc, NULL, normcol);
+       drawtext(&dc, NULL, normcol, False);

 }
 
 Bool
 }
 
 Bool


@@ -230,7 +230,7 @@ grabkeyboard(void) {
 }
 
 void
 }
 
 void

-kpress(XKeyEvent * e) {
+kpress(XKeyEvent *e) {

        char buf[sizeof text];
        int num;
        unsigned int i, len;
        char buf[sizeof text];
        int num;
        unsigned int i, len;


@@ -273,6 +273,7 @@ kpress(XKeyEvent * e) {
                        ksym = XK_Tab;
                        break;
                case XK_j:
                        ksym = XK_Tab;
                        break;
                case XK_j:

+               case XK_m:

                        ksym = XK_Return;
                        break;
                case XK_n:
                        ksym = XK_Return;
                        break;
                case XK_n:


@@ -455,7 +456,7 @@ run(void) {
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))
 
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev))

-               switch (ev.type) {
+               switch(ev.type) {

                case KeyPress:
                        kpress(&ev.xkey);
                        break;
                case KeyPress:
                        kpress(&ev.xkey);
                        break;


@@ -501,7 +502,7 @@ setup(Bool topbar) {
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;

-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
+       wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

 
        /* menu window geometry */
        mh = (dc.font.height + 2) * (lines + 1);
 
        /* menu window geometry */
        mh = (dc.font.height + 2) * (lines + 1);