#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.77 2015/07/04 22:54:14 tom Exp $")
#define MAX_SIZE 0x3fff /* 16k is big enough for a window or pad */
result = 0;
break;
}
+ result = buffer;
}
ch = fgetc(fp);
if (ch == EOF)
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;
}
}
target += strlen(target);
*target++ = MARKER;
if (ch < 32 || ch >= 127) {
- sprintf(target, "%03o", ch);
+ sprintf(target, "%03o", UChar(ch));
} else {
switch (ch) {
case ' ':
*target = '\0';
break;
default:
- sprintf(--target, "%c", ch);
+ sprintf(--target, "%c", UChar(ch));
break;
}
}
|| 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);
+#else
+ encode_cell(buffer, CHREF(data[x]), CHREF(last_cell));
+ last_cell = data[x];
+ PUTS(buffer);
+#endif
}
PUTS("\n");
}