diff options
| author | Connor Lane Smith <cls@lubutu.com> | 2010-06-25 04:33:41 +0100 |
|---|---|---|
| committer | Connor Lane Smith <cls@lubutu.com> | 2010-06-25 04:33:41 +0100 |
| commit | 9f3b0c6ea843340b87a045ea0afd2d1b33425eee (patch) | |
| tree | 0ee0fc482aa4cb4c2d06bc85dd04cc7d69fdbfad | |
| parent | moved draw.c to libdraw.a (diff) | |
| download | dmenu-9f3b0c6ea843340b87a045ea0afd2d1b33425eee.tar.gz dmenu-9f3b0c6ea843340b87a045ea0afd2d1b33425eee.tar.bz2 dmenu-9f3b0c6ea843340b87a045ea0afd2d1b33425eee.zip | |
cleaned up
| -rw-r--r-- | dinput.c | 8 | ||||
| -rw-r--r-- | dmenu.c | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dinput.c b/dinput.c index 283b018..228780c 100644 --- a/dinput.c +++ b/dinput.c @@ -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); @@ -100,7 +100,7 @@ grabkeyboard(void) { } void -kpress(XKeyEvent * e) { +kpress(XKeyEvent *e) { char buf[sizeof text]; int num; unsigned int i, len; @@ -140,6 +140,7 @@ kpress(XKeyEvent * e) { ksym = XK_BackSpace; break; case XK_j: + case XK_m: ksym = XK_Return; break; case XK_k: @@ -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; diff --git a/dmenu.c b/dmenu.c index 6641ba2..8c0ea41 100644 --- 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 kpress(XKeyEvent * e); +static void kpress(XKeyEvent *e); static void match(char *pattern); static void readstdin(void); static void run(void); @@ -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; @@ -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; } @@ -230,7 +230,7 @@ grabkeyboard(void) { } void -kpress(XKeyEvent * e) { +kpress(XKeyEvent *e) { char buf[sizeof text]; int num; unsigned int i, len; @@ -273,6 +273,7 @@ kpress(XKeyEvent * e) { ksym = XK_Tab; break; case XK_j: + case XK_m: ksym = XK_Return; break; case XK_n: @@ -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); |