#include "terminal.h"
#include "ldisc.h"
-#define ECHOING (cfg.localecho == LD_YES || \
- (cfg.localecho == LD_BACKEND && \
+#define ECHOING (ldisc->cfg->localecho == FORCE_ON || \
+ (ldisc->cfg->localecho == AUTO && \
(ldisc->back->ldisc(ldisc->backhandle, LD_ECHO) || \
term_ldisc(ldisc->term, LD_ECHO))))
-#define EDITING (cfg.localedit == LD_YES || \
- (cfg.localedit == LD_BACKEND && \
+#define EDITING (ldisc->cfg->localedit == FORCE_ON || \
+ (ldisc->cfg->localedit == AUTO && \
(ldisc->back->ldisc(ldisc->backhandle, LD_EDIT) || \
term_ldisc(ldisc->term, LD_EDIT))))
static void c_write(Ldisc ldisc, char *buf, int len)
{
- from_backend(ldisc->term, 0, buf, len);
+ from_backend(ldisc->frontend, 0, buf, len);
}
static int plen(Ldisc ldisc, unsigned char c)
return 1;
else if (c < 128)
return 2; /* ^x for some x */
+ else if (in_utf(ldisc->term) && c >= 0xC0)
+ return 1; /* UTF-8 introducer character
+ * (FIXME: combining / wide chars) */
+ else if (in_utf(ldisc->term) && c >= 0x80 && c < 0xC0)
+ return 0; /* UTF-8 followup character */
else
- return 4; /* <XY> for hex XY */
+ return 4; /* <XY> hex representation */
}
static void pwrite(Ldisc ldisc, unsigned char c)
{
- if ((c >= 32 && c <= 126) || (c >= 160 && !in_utf(ldisc->term))) {
- c_write(ldisc, &c, 1);
+ if ((c >= 32 && c <= 126) ||
+ (!in_utf(ldisc->term) && c >= 0xA0) ||
+ (in_utf(ldisc->term) && c >= 0x80)) {
+ c_write(ldisc, (char *)&c, 1);
} else if (c < 128) {
char cc[2];
cc[1] = (c == 127 ? '?' : c + 0x40);
}
}
+static int char_start(Ldisc ldisc, unsigned char c)
+{
+ if (in_utf(ldisc->term))
+ return (c < 0x80 || c >= 0xC0);
+ else
+ return 1;
+}
+
static void bsb(Ldisc ldisc, int n)
{
while (n--)
#define CTRL(x) (x^'@')
#define KCTRL(x) ((x^'@') | 0x100)
-void *ldisc_create(Terminal *term,
+void *ldisc_create(Config *mycfg, Terminal *term,
Backend *back, void *backhandle,
void *frontend)
{
- Ldisc ldisc = smalloc(sizeof(*ldisc));
+ Ldisc ldisc = snew(struct ldisc_tag);
ldisc->buf = NULL;
ldisc->buflen = 0;
ldisc->bufsiz = 0;
ldisc->quotenext = 0;
+ ldisc->cfg = mycfg;
ldisc->back = back;
ldisc->backhandle = backhandle;
ldisc->term = term;
return ldisc;
}
+void ldisc_free(void *handle)
+{
+ Ldisc ldisc = (Ldisc) handle;
+
+ if (ldisc->term)
+ ldisc->term->ldisc = NULL;
+ if (ldisc->back)
+ ldisc->back->provide_ldisc(ldisc->backhandle, NULL);
+ if (ldisc->buf)
+ sfree(ldisc->buf);
+ sfree(ldisc);
+}
+
void ldisc_send(void *handle, char *buf, int len, int interactive)
{
Ldisc ldisc = (Ldisc) handle;
c += KCTRL('@');
switch (ldisc->quotenext ? ' ' : c) {
/*
- * ^h/^?: delete one char and output one BSB
+ * ^h/^?: delete, and output BSBs, to return to
+ * last character boundary (in UTF-8 mode this may
+ * be more than one byte)
* ^w: delete, and output BSBs, to return to last
* space/nonspace boundary
* ^u: delete, and output BSBs, to return to BOL
case KCTRL('H'):
case KCTRL('?'): /* backspace/delete */
if (ldisc->buflen > 0) {
- if (ECHOING)
- bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
- ldisc->buflen--;
+ do {
+ if (ECHOING)
+ bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
+ ldisc->buflen--;
+ } while (!char_start(ldisc, ldisc->buf[ldisc->buflen]));
}
break;
case CTRL('W'): /* delete word */
bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
ldisc->buflen--;
if (ldisc->buflen > 0 &&
- isspace(ldisc->buf[ldisc->buflen - 1]) &&
- !isspace(ldisc->buf[ldisc->buflen]))
+ isspace((unsigned char)ldisc->buf[ldisc->buflen-1]) &&
+ !isspace((unsigned char)ldisc->buf[ldisc->buflen]))
break;
}
break;
* configured telnet specials off! This breaks
* talkers otherwise.
*/
- if (!cfg.telnet_keyboard)
+ if (!ldisc->cfg->telnet_keyboard)
goto default_case;
if (c == CTRL('C'))
ldisc->back->special(ldisc->backhandle, TS_IP);
* default clause because of the break.
*/
case CTRL('J'):
- if (cfg.protocol == PROT_RAW &&
+ if (ldisc->cfg->protocol == PROT_RAW &&
ldisc->buflen > 0 && ldisc->buf[ldisc->buflen - 1] == '\r') {
if (ECHOING)
bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
case KCTRL('M'): /* send with newline */
if (ldisc->buflen > 0)
ldisc->back->send(ldisc->backhandle, ldisc->buf, ldisc->buflen);
- if (cfg.protocol == PROT_RAW)
+ if (ldisc->cfg->protocol == PROT_RAW)
ldisc->back->send(ldisc->backhandle, "\r\n", 2);
- else if (cfg.protocol == PROT_TELNET && cfg.telnet_newline)
+ else if (ldisc->cfg->protocol == PROT_TELNET && ldisc->cfg->telnet_newline)
ldisc->back->special(ldisc->backhandle, TS_EOL);
else
ldisc->back->send(ldisc->backhandle, "\r", 1);
default_case:
if (ldisc->buflen >= ldisc->bufsiz) {
ldisc->bufsiz = ldisc->buflen + 256;
- ldisc->buf = srealloc(ldisc->buf, ldisc->bufsiz);
+ ldisc->buf = sresize(ldisc->buf, ldisc->bufsiz, char);
}
ldisc->buf[ldisc->buflen++] = c;
if (ECHOING)
if (len > 0) {
if (ECHOING)
c_write(ldisc, buf, len);
- if (keyflag && cfg.protocol == PROT_TELNET && len == 1) {
+ if (keyflag && ldisc->cfg->protocol == PROT_TELNET && len == 1) {
switch (buf[0]) {
case CTRL('M'):
- if (cfg.protocol == PROT_TELNET && cfg.telnet_newline)
+ if (ldisc->cfg->protocol == PROT_TELNET && ldisc->cfg->telnet_newline)
ldisc->back->special(ldisc->backhandle, TS_EOL);
else
ldisc->back->send(ldisc->backhandle, "\r", 1);
break;
case CTRL('?'):
case CTRL('H'):
- if (cfg.telnet_keyboard) {
+ if (ldisc->cfg->telnet_keyboard) {
ldisc->back->special(ldisc->backhandle, TS_EC);
break;
}
case CTRL('C'):
- if (cfg.telnet_keyboard) {
+ if (ldisc->cfg->telnet_keyboard) {
ldisc->back->special(ldisc->backhandle, TS_IP);
break;
}
case CTRL('Z'):
- if (cfg.telnet_keyboard) {
+ if (ldisc->cfg->telnet_keyboard) {
ldisc->back->special(ldisc->backhandle, TS_SUSP);
break;
}