Make line drawing work again.

[st.git] / st.c

diff --git a/st.c b/st.c
index ef78896..769de8b 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1987,10 +1987,13 @@ tputc(char *c, int len) {
                        term.esc = ESC_START;
                        return;
                case '\016':    /* SO */
                        term.esc = ESC_START;
                        return;
                case '\016':    /* SO */

-                       term.c.attr.mode |= ATTR_GFX;
-                       return;

                case '\017':    /* SI */
                case '\017':    /* SI */

-                       term.c.attr.mode &= ~ATTR_GFX;
+                       /*
+                        * Different charsets are hard to handle. Applications
+                        * should use the right alt charset escapes for the
+                        * only reason they still exist: line drawing. The
+                        * rest is incompatible history st should not support.
+                        */

                        return;
                case '\032':    /* SUB */
                case '\030':    /* CAN */
                        return;
                case '\032':    /* SUB */
                case '\030':    /* CAN */


@@ -2538,7 +2541,7 @@ xinit(void) {
        */
 
        /* Xft rendering context */
        */
 
        /* Xft rendering context */

-       xw.draw = XftDrawCreate(xw.dpy, xw.win, xw.vis, xw.cmap);
+       xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);

 
        /* input methods */
        if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
 
        /* input methods */
        if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {


@@ -2836,7 +2839,6 @@ redraw(int timeout) {
        struct timespec tv = {0, timeout * 1000};
 
        tfulldirt();
        struct timespec tv = {0, timeout * 1000};
 
        tfulldirt();

-       fprintf(stderr, "draw from redraw\n");

        draw();
 
        if(timeout > 0) {
        draw();
 
        if(timeout > 0) {