Dbe is not required anymore.

[st.git] / st.c

diff --git a/st.c b/st.c
index 7010195..979fdc8 100644 (file)
--- a/st.c
+++ b/st.c
@@ -53,12 +53,12 @@
 #define XEMBED_FOCUS_OUT 5
 
 /* Arbitrary sizes */
-#define ESC_BUF_SIZ   256
+#define UTF_SIZ       4
+#define ESC_BUF_SIZ   (128*UTF_SIZ)
 #define ESC_ARG_SIZ   16
-#define STR_BUF_SIZ   256
-#define STR_ARG_SIZ   16
+#define STR_BUF_SIZ   ESC_BUF_SIZ
+#define STR_ARG_SIZ   ESC_ARG_SIZ
 #define DRAW_BUF_SIZ  20*1024
-#define UTF_SIZ       4
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
 
@@ -168,7 +168,7 @@ typedef struct {
        int len;               /* raw string length */
        char priv;
        int arg[ESC_ARG_SIZ];
-       int narg;             /* nb of args */
+       int narg;              /* nb of args */
        char mode;
 } CSIEscape;
 
@@ -203,7 +203,7 @@ typedef struct {
        Display *dpy;
        Colourmap cmap;
        Window win;
-       XdbeBackBuffer buf;
+       Drawable buf;
        Atom xembed, wmdeletewin;
        XIM xim;
        XIC xic;
@@ -414,6 +414,8 @@ static char *opt_embed = NULL;
 static char *opt_class = NULL;
 static char *opt_font = NULL;
 
+bool usedbe = False;
+
 static char *usedfont = NULL;
 static int usedfontsize = 0;
 
@@ -436,7 +438,7 @@ typedef struct {
  * the current length of used elements.
  */
 
-static Fontcache frc[2];
+static Fontcache frc[1024];
 static int frccur = -1, frclen = 0;
 
 ssize_t
@@ -1390,7 +1392,7 @@ tsetattr(int *attr, int l) {
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
-               case 3: /* enter standout (highlight) */
+               case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 4:
@@ -1406,7 +1408,7 @@ tsetattr(int *attr, int l) {
                case 22:
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
-               case 23: /* leave standout (highlight) mode */
+               case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 24:
@@ -1911,12 +1913,13 @@ tputc(char *c, int len) {
 
        if(iofd != -1) {
                if (xwrite(iofd, c, len) < 0) {
-                       fprintf(stderr, "Error writting in %s:%s\n",
+                       fprintf(stderr, "Error writing in %s:%s\n",
                                opt_io, strerror(errno));
                        close(iofd);
                        iofd = -1;
                }
        }
+
        /*
         * STR sequences must be checked before anything else
         * because it can use some control codes as part of the sequence.
@@ -1931,10 +1934,23 @@ tputc(char *c, int len) {
                        strhandle();
                        break;
                default:
-                       strescseq.buf[strescseq.len++] = ascii;
-                       if(strescseq.len+1 >= STR_BUF_SIZ) {
-                               term.esc = 0;
-                               strhandle();
+                       if(strescseq.len + len < sizeof(strescseq.buf)) {
+                               memmove(&strescseq.buf[strescseq.len], c, len);
+                               strescseq.len += len;
+                       } else {
+                       /*
+                        * Here is a bug in terminals. If the user never sends
+                        * some code to stop the str or esc command, then st
+                        * will stop responding. But this is better than
+                        * silently failing with unknown characters. At least
+                        * then users will report back.
+                        *
+                        * In the case users ever get fixed, here is the code:
+                        */
+                       /*
+                        * term.esc = 0;
+                        * strhandle();
+                        */
                        }
                }
                return;
@@ -2486,7 +2502,8 @@ xinit(void) {
                | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
        attrs.colormap = xw.cmap;
 
-       parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr);
+       parent = opt_embed ? strtol(opt_embed, NULL, 0) : \
+                       XRootWindow(xw.dpy, xw.scr);
        xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy,
                        xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
                        xw.vis,
@@ -2495,12 +2512,16 @@ xinit(void) {
                        &attrs);
 
        /* double buffering */
-       if(!XdbeQueryExtension(xw.dpy, &major, &minor))
-               die("Xdbe extension is not present\n");
-       xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied);
+       if(XdbeQueryExtension(xw.dpy, &major, &minor)) {
+               xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win,
+                               XdbeBackground);
+               usedbe = True;
+       } else {
+               xw.buf = xw.win;
+       }
 
        /* Xft rendering context */
-       xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
+       xw.draw = XftDrawCreate(xw.dpy, xw.win, xw.vis, xw.cmap);
 
        /* input methods */
        if((xw.xim =  XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) {
@@ -2808,7 +2829,8 @@ draw(void) {
        XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}};
 
        drawregion(0, 0, term.col, term.row);
-       XdbeSwapBuffers(xw.dpy, swpinfo, 1);
+       if(usedbe)
+               XdbeSwapBuffers(xw.dpy, swpinfo, 1);
 }
 
 void