added gridsel to gridwm

[dwm.git] / menu.c

diff --git a/menu.c b/menu.c
index b4e08d4..650fc57 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -34,15 +34,15 @@ static Window win;
 static XRectangle rect;
 static Bool done = False;
 
-static Item *allitem = 0;      /* first of all items */
-static Item *item = 0; /* first of pattern matching items */
-static Item *sel = 0;
-static Item *nextoff = 0;
-static Item *prevoff = 0;
-static Item *curroff = 0;
+static Item *allitem = NULL;   /* first of all items */
+static Item *item = NULL;      /* first of pattern matching items */
+static Item *sel = NULL;
+static Item *nextoff = NULL;
+static Item *prevoff = NULL;
+static Item *curroff = NULL;
 
 static int screen;
-static char *title = 0;
+static char *title = NULL;
 static char text[4096];
 static int ret = 0;
 static int nitem = 0;
@@ -53,7 +53,7 @@ static const int seek = 30;           /* 30px */
 
 static Brush brush = {0};
 
-static void draw_menu(void);
+static void draw_menu();
 static void kpress(XKeyEvent * e);
 
 static char version[] = "gridmenu - " VERSION ", (C)opyright MMVI Anselm R. Garbe\n";
@@ -107,7 +107,7 @@ update_items(char *pattern)
        else
                cmdw = twidth;
 
-       item = j = 0;
+       item = j = NULL;
        nitem = 0;
 
        for(i = allitem; i; i=i->next)
@@ -117,7 +117,7 @@ update_items(char *pattern)
                        else
                                j->right = i;
                        i->left = j;
-                       i->right = 0;
+                       i->right = NULL;
                        j = i;
                        nitem++;
                }
@@ -129,7 +129,7 @@ update_items(char *pattern)
                        else
                                j->right = i;
                        i->left = j;
-                       i->right = 0;
+                       i->right = NULL;
                        j = i;
                        nitem++;
                }
@@ -319,7 +319,7 @@ kpress(XKeyEvent * e)
 static char *
 read_allitems()
 {
-       static char *maxname = 0;
+       static char *maxname = NULL;
        char *p, buf[1024];
        unsigned int len = 0, max = 0;
        Item *i, *new;
@@ -336,7 +336,7 @@ read_allitems()
                }
 
                new = emalloc(sizeof(Item));
-               new->next = new->left = new->right = 0;
+               new->next = new->left = new->right = NULL;
                new->text = p;
                if(!i)
                        allitem = new;
@@ -397,11 +397,10 @@ main(int argc, char *argv[])
 
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
-       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask
-               | SubstructureRedirectMask | SubstructureNotifyMask;
+       wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
 
        rect.width = DisplayWidth(dpy, screen);
-       rect.height = brush.font.height + 4;
+       rect.height = labelheight(&brush.font);
        rect.y = DisplayHeight(dpy, screen) - rect.height;
        rect.x = 0;
 
@@ -413,7 +412,7 @@ main(int argc, char *argv[])
        XFlush(dpy);
 
        /* pixmap */
-       brush.gc = XCreateGC(dpy, win, 0, 0);
+       brush.gc = XCreateGC(dpy, root, 0, 0);
        brush.drawable = XCreatePixmap(dpy, win, rect.width, rect.height,
                        DefaultDepth(dpy, screen));
        XFlush(dpy);