Remove unnecessary XFilterEvent call.

[st.git] / st.c

diff --git a/st.c b/st.c
index a7064b1..c48132a 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3591,15 +3591,15 @@ xdrawcursor(void) {
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,
                        case 4: /* Steady Underline */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                                borderpx + curx * xw.cw,

-                                               borderpx + (term.c.y + 1) * xw.ch - 1,
-                                               xw.cw, 1);
+                                               borderpx + (term.c.y + 1) * xw.ch - cursorthickness,
+                                               xw.cw, cursorthickness);

                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],
                                break;
                        case 5: /* Blinking bar */
                        case 6: /* Steady bar */
                                XftDrawRect(xw.draw, &dc.col[defaultcs],

-                                                               borderpx + curx * xw.cw,
-                                                               borderpx + term.c.y * xw.ch,
-                                                               1, xw.ch);
+                                               borderpx + curx * xw.cw,
+                                               borderpx + term.c.y * xw.ch,
+                                               cursorthickness, xw.ch);

                                break;
                }
        } else {
                                break;
                }
        } else {


@@ -3917,17 +3917,13 @@ run(void) {
        long deltatime;
 
        /* Waiting for window mapping */
        long deltatime;
 
        /* Waiting for window mapping */

-       while(1) {
+       do {

                XNextEvent(xw.dpy, &ev);
                XNextEvent(xw.dpy, &ev);

-               if(XFilterEvent(&ev, None))
-                       continue;

                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;

-               } else if(ev.type == MapNotify) {
-                       break;

                }
                }

-       }
+       } while(ev.type != MapNotify);

 
        ttynew();
        cresize(w, h);
 
        ttynew();
        cresize(w, h);