ncurses 6.0 - patch 20150912

[ncurses.git] / ncurses / base / lib_screen.c

diff --git a/ncurses/base/lib_screen.c b/ncurses/base/lib_screen.c
index f7fc7badf8f1df076c6b9019241af051dd897db3..484f36505063bbf0ad51844d16bee103ec674aa4 100644 (file)
--- a/ncurses/base/lib_screen.c
+++ b/ncurses/base/lib_screen.c
@@ -41,7 +41,7 @@
 #define CUR SP_TERMTYPE
 #endif
 
 #define CUR SP_TERMTYPE
 #endif
 

-MODULE_ID("$Id: lib_screen.c,v 1.74 2015/04/04 14:00:34 tom Exp $")
+MODULE_ID("$Id: lib_screen.c,v 1.78 2015/09/12 20:47:43 tom Exp $")

 
 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
 
 
 #define MAX_SIZE 0x3fff                /* 16k is big enough for a window or pad */
 


@@ -179,6 +179,7 @@ read_txt(FILE *fp)
                    result = 0;
                    break;
                }
                    result = 0;
                    break;
                }

+               result = buffer;

            }
            ch = fgetc(fp);
            if (ch == EOF)
            }
            ch = fgetc(fp);
            if (ch == EOF)


@@ -351,7 +352,7 @@ decode_cchar(char *source, cchar_t *fillin, cchar_t *target)
     while (source[0] == MARKER && source[1] == APPEND) {
        source += 2;
        source = decode_char(source, &value);
     while (source[0] == MARKER && source[1] == APPEND) {
        source += 2;
        source = decode_char(source, &value);

-       if (append++ < CCHARW_MAX) {
+       if (++append < CCHARW_MAX) {

            chars[append] = (wchar_t) value;
        }
     }
            chars[append] = (wchar_t) value;
        }
     }


@@ -735,7 +736,7 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous)
     target += strlen(target);
     *target++ = MARKER;
     if (ch < 32 || ch >= 127) {
     target += strlen(target);
     *target++ = MARKER;
     if (ch < 32 || ch >= 127) {

-       sprintf(target, "%03o", ch);
+       sprintf(target, "%03o", UChar(ch));

     } else {
        switch (ch) {
        case ' ':
     } else {
        switch (ch) {
        case ' ':


@@ -746,11 +747,10 @@ encode_cell(char *target, CARG_CH_T source, CARG_CH_T previous)
            *target = '\0';
            break;
        default:
            *target = '\0';
            break;
        default:

-           sprintf(--target, "%c", ch);
+           sprintf(--target, "%c", UChar(ch));

            break;
        }
     }
            break;
        }
     }

-    target += strlen(target);

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -843,12 +843,18 @@ putwin(WINDOW *win, FILE *filep)
                || ferror(filep))
                returnCode(code);
            for (x = 0; x <= win->_maxx; x++) {
                || ferror(filep))
                returnCode(code);
            for (x = 0; x <= win->_maxx; x++) {

+#if NCURSES_WIDECHAR

                int len = wcwidth(data[x].chars[0]);
                encode_cell(buffer, CHREF(data[x]), CHREF(last_cell));
                last_cell = data[x];
                PUTS(buffer);
                if (len > 1)
                    x += (len - 1);
                int len = wcwidth(data[x].chars[0]);
                encode_cell(buffer, CHREF(data[x]), CHREF(last_cell));
                last_cell = data[x];
                PUTS(buffer);
                if (len > 1)
                    x += (len - 1);

+#else
+               encode_cell(buffer, CHREF(data[x]), CHREF(last_cell));
+               last_cell = data[x];
+               PUTS(buffer);
+#endif

            }
            PUTS("\n");
        }
            }
            PUTS("\n");
        }