prepared dmenu-4.1 release

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 1762dba..3fd9275 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -42,8 +42,8 @@ typedef struct {
 typedef struct Item Item;
 struct Item {
        char *text;
 typedef struct Item Item;
 struct Item {
        char *text;

-       Item *next;             /* traverses all items */
-       Item *left, *right;     /* traverses items matching current search pattern */
+       Item *next;         /* traverses all items */
+       Item *left, *right; /* traverses items matching current search pattern */

 };
 
 /* forward declarations */
 };
 
 /* forward declarations */


@@ -85,8 +85,8 @@ static unsigned int numlockmask = 0;
 static Bool running = True;
 static Display *dpy;
 static DC dc;
 static Bool running = True;
 static Display *dpy;
 static DC dc;

-static Item *allitems = NULL;  /* first of all items */
-static Item *item = NULL;      /* first of pattern matching items */
+static Item *allitems = NULL;  /* first of all items */
+static Item *item = NULL;      /* first of pattern matching items */

 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;
 static Item *sel = NULL;
 static Item *next = NULL;
 static Item *prev = NULL;


@@ -255,8 +255,7 @@ void
 drawmenuv(void) {
        Item *i;
 
 drawmenuv(void) {
        Item *i;
 

-       dc.x = 0;
-       dc.w = mw;
+       dc.w = mw - dc.x;

        dc.y += dc.font.height + 2;
        for(i = curr; i != next; i=i->right) {
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);
        dc.y += dc.font.height + 2;
        for(i = curr; i != next; i=i->right) {
                drawtext(i->text, (sel == i) ? dc.sel : dc.norm);