dont print color warning on color reset OSC 104 without parameter

[st.git] / st.c

diff --git a/st.c b/st.c
index c383b43..48d65ca 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1830,7 +1830,7 @@ csireset(void)
 void
 strhandle(void)
 {
 void
 strhandle(void)
 {

-       char *p = NULL;
+       char *p = NULL, *dec;

        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);
        int j, narg, par;
 
        term.esc &= ~(ESC_STR_END|ESC_STR);


@@ -1848,8 +1848,6 @@ strhandle(void)
                        return;
                case 52:
                        if (narg > 2) {
                        return;
                case 52:
                        if (narg > 2) {

-                               char *dec;
-

                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);
                                dec = base64dec(strescseq.args[2]);
                                if (dec) {
                                        xsetsel(dec);


@@ -1867,7 +1865,10 @@ strhandle(void)
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {
                case 104: /* color reset, here p = NULL */
                        j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
                        if (xsetcolorname(j, p)) {

-                               fprintf(stderr, "erresc: invalid color %s\n", p);
+                               if (par == 104 && narg <= 1)
+                                       return; /* color reset without parameter */
+                               fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
+                                       j, p ? p : "(null)");

                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders
                        } else {
                                /*
                                 * TODO if defaultbg color is changed, borders