Fix disabling of bold and fastblink

[st.git] / st.c

diff --git a/st.c b/st.c
index b221f33..0c917fd 100644 (file)
--- a/st.c
+++ b/st.c
@@ -89,7 +89,7 @@ char *argv0;
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {
-        ATTR_NULL      = 0,
+       ATTR_NULL      = 0,
        ATTR_BOLD      = 1,
        ATTR_FAINT     = 2,
        ATTR_ITALIC    = 4,
@@ -1718,11 +1718,8 @@ tsetattr(int *attr, int l) {
                case 9:
                        term.c.attr.mode |= ATTR_STRUCK;
                        break;
-               case 21:
-                       term.c.attr.mode &= ~ATTR_BOLD;
-                       break;
                case 22:
-                       term.c.attr.mode &= ~ATTR_FAINT;
+                       term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
@@ -1731,10 +1728,7 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
-                       term.c.attr.mode &= ~ATTR_BLINK;
-                       break;
-               case 26:
-                       term.c.attr.mode &= ~ATTR_FASTBLINK;
+                       term.c.attr.mode &= ~(ATTR_BLINK | ATTR_FASTBLINK);
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
@@ -3786,6 +3780,8 @@ run(void) {
        /* Waiting for window mapping */
        while(1) {
                XNextEvent(xw.dpy, &ev);
+               if(XFilterEvent(&ev, None))
+                       continue;
                if(ev.type == ConfigureNotify) {
                        w = ev.xconfigure.width;
                        h = ev.xconfigure.height;