sbstnc / dmenu-ee Goto Github PK

diff --git a/dmenu.c b/dmenu.c
index c4b2899..6c66db8 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -955,6 +955,8 @@ run(void) {
                        continue;
                switch(ev.type) {
                case MotionNotify:
+                       while(XCheckTypedEvent(dc->dpy, MotionNotify, &ev))
+                               (void)0;
                        pointermove(&ev);
                        break;
                case ButtonPress:

y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh - yoffset;

y = topbar ? yoffset : DisplayHeight(dc->dpy, screen) - mh - yoffset;

diff --git a/dmenu.c b/dmenu.c
index 6c66db8..36580aa 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -725,14 +725,18 @@ buttonpress(XEvent *e) {
        }
        /* scroll up */
        if(ev->button == Button4 && prev) {
-               sel = curr = prev;
+               int i = 0;
+               while(++i < 4 && sel && sel->left)
+                       curr = sel = sel->left;
                calcoffsets();
                drawmenu();
                return;
        }
        /* scroll down */
        if(ev->button == Button5 && next) {
-               sel = curr = next;
+               int i = 0;
+               while(++i < 4 && sel && sel->right)
+                       curr = sel = sel->right;
                calcoffsets();
                drawmenu();
                return;