tcleaned up - dmenu - Dmenu fork with xft fonts.
 (HTM) git clone git://r-36.net/dmenu
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit 9f3b0c6ea843340b87a045ea0afd2d1b33425eee
 (DIR) parent 4508fd2c4ee3171bdc1bffb7e53ecda8290292ef
 (HTM) Author: Connor Lane Smith <cls@lubutu.com>
       Date:   Fri, 25 Jun 2010 04:33:41 +0100
       
       cleaned up
       Diffstat:
         dinput.c                            |       8 ++++----
         dmenu.c                             |      11 ++++++-----
       
       2 files changed, 10 insertions(+), 9 deletions(-)
       ---
 (DIR) diff --git a/dinput.c b/dinput.c
       t@@ -25,7 +25,7 @@ static void cleanup(void);
        static void drawcursor(void);
        static void drawinput(void);
        static Bool grabkeyboard(void);
       -static void kpress(XKeyEvent * e);
       +static void kpress(XKeyEvent *e);
        static void run(void);
        static void setup(Bool topbar);
        
       t@@ -100,7 +100,7 @@ grabkeyboard(void) {
        }
        
        void
       -kpress(XKeyEvent * e) {
       +kpress(XKeyEvent *e) {
                char buf[sizeof text];
                int num;
                unsigned int i, len;
       t@@ -140,6 +140,7 @@ kpress(XKeyEvent * e) {
                                ksym = XK_BackSpace;
                                break;
                        case XK_j:
       +                case XK_m:
                                ksym = XK_Return;
                                break;
                        case XK_k:
       t@@ -274,12 +275,11 @@ setup(Bool topbar) {
                selcol[ColBG] = getcolor(&dc, selbgcolor);
                selcol[ColFG] = getcolor(&dc, selfgcolor);
                initfont(&dc, font);
       -        fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);
        
                /* input window */
                wa.override_redirect = True;
                wa.background_pixmap = ParentRelative;
       -        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
       +        wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        
                /* input window geometry */
                mh = dc.font.height + 2;
 (DIR) diff --git a/dmenu.c b/dmenu.c
       t@@ -39,7 +39,7 @@ static void drawmenu(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);
       t@@ -191,7 +191,7 @@ drawmenuh(void) {
                dc.w = spaceitem;
                drawtext(&dc, curr->left ? "<" : NULL, normcol);
                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);
                        drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
                        dc.x += dc.w;
       t@@ -208,7 +208,7 @@ drawmenuv(void) {
                dc.w = mw - dc.x;
                dc.h = dc.font.height + 2;
                dc.y = dc.h;
       -        for(i = curr; i != next; i=i->right) {
       +        for(i = curr; i != next; i = i->right) {
                        drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
                        dc.y += dc.h;
                }
       t@@ -230,7 +230,7 @@ grabkeyboard(void) {
        }
        
        void
       -kpress(XKeyEvent * e) {
       +kpress(XKeyEvent *e) {
                char buf[sizeof text];
                int num;
                unsigned int i, len;
       t@@ -273,6 +273,7 @@ kpress(XKeyEvent * e) {
                                ksym = XK_Tab;
                                break;
                        case XK_j:
       +                case XK_m:
                                ksym = XK_Return;
                                break;
                        case XK_n:
       t@@ -501,7 +502,7 @@ setup(Bool topbar) {
                /* 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);