applied a change made by Uriel to dmenu (though I didn't applied everything)

[dmenu.git] / main.c

diff --git a/main.c b/main.c
index 03c8b1f..77a61b9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -42,8 +42,7 @@ static Window root;
 static Window win;
 
 static void
-calcoffsets()
-{
+calcoffsets(void) {
        unsigned int tw, w;
 
        if(!curr)
@@ -71,8 +70,7 @@ calcoffsets()
 }
 
 static void
-drawmenu()
-{
+drawmenu(void) {
        Item *i;
 
        dc.x = 0;
@@ -110,8 +108,7 @@ drawmenu()
 }
 
 static void
-match(char *pattern)
-{
+match(char *pattern) {
        unsigned int plen;
        Item *i, *j;
 
@@ -123,19 +120,8 @@ match(char *pattern)
        nitem = 0;
 
        for(i = allitems; i; i=i->next)
-               if(!plen || !strncmp(pattern, i->text, plen)) {
-                       if(!j)
-                               item = i;
-                       else
-                               j->right = i;
-                       i->left = j;
-                       i->right = NULL;
-                       j = i;
-                       nitem++;
-               }
-       for(i = allitems; i; i=i->next)
-               if(plen && strncmp(pattern, i->text, plen)
-                               && strstr(i->text, pattern)) {
+               if(plen ? !strncmp(pattern, i->text, plen) :
+                               strncmp(pattern, i->text, plen) && strstr(i->text, pattern)) {
                        if(!j)
                                item = i;
                        else
@@ -151,8 +137,7 @@ match(char *pattern)
 }
 
 static void
-kpress(XKeyEvent * e)
-{
+kpress(XKeyEvent * e) {
        char buf[32];
        int num, prev_nitem;
        unsigned int i, len;
@@ -212,10 +197,8 @@ kpress(XKeyEvent * e)
                }
                break;
        case XK_Return:
-               if(e->state & ShiftMask) {
-                       if(text)
-                               fprintf(stdout, "%s", text);
-               }
+               if((e->state & ShiftMask) && text)
+                       fprintf(stdout, "%s", text);
                else if(sel)
                        fprintf(stdout, "%s", sel->text);
                else if(text)
@@ -251,8 +234,7 @@ kpress(XKeyEvent * e)
 }
 
 static char *
-readstdin()
-{
+readstdin(void) {
        static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
@@ -289,8 +271,7 @@ Display *dpy;
 DC dc = {0};
 
 int
-main(int argc, char *argv[])
-{
+main(int argc, char *argv[]) {
        char *maxname;
        fd_set rd;
        struct timeval timeout;