projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another wart in the command-line processing: if the user just specifies
[u/mdw/putty]
/
ldisc.c
diff --git
a/ldisc.c
b/ldisc.c
index
16c1f9b
..
d57e6d1
100644
(file)
--- a/
ldisc.c
+++ b/
ldisc.c
@@
-12,18
+12,18
@@
#include "terminal.h"
#include "ldisc.h"
#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))))
(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)
{
(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)
}
static int plen(Ldisc ldisc, unsigned char c)
@@
-32,14
+32,21
@@
static int plen(Ldisc ldisc, unsigned char c)
return 1;
else if (c < 128)
return 2; /* ^x for some x */
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
else
- return 4; /* <XY>
for hex XY
*/
+ return 4; /* <XY>
hex representation
*/
}
static void pwrite(Ldisc ldisc, unsigned char c)
{
}
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);
} else if (c < 128) {
char cc[2];
cc[1] = (c == 127 ? '?' : c + 0x40);
@@
-52,6
+59,14
@@
static void pwrite(Ldisc ldisc, unsigned char c)
}
}
}
}
+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--)
static void bsb(Ldisc ldisc, int n)
{
while (n--)
@@
-61,17
+76,18
@@
static void bsb(Ldisc ldisc, int n)
#define CTRL(x) (x^'@')
#define KCTRL(x) ((x^'@') | 0x100)
#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)
{
Backend *back, void *backhandle,
void *frontend)
{
- Ldisc ldisc = s
malloc(sizeof(*ldisc)
);
+ Ldisc ldisc = s
new(struct ldisc_tag
);
ldisc->buf = NULL;
ldisc->buflen = 0;
ldisc->bufsiz = 0;
ldisc->quotenext = 0;
ldisc->buf = NULL;
ldisc->buflen = 0;
ldisc->bufsiz = 0;
ldisc->quotenext = 0;
+ ldisc->cfg = mycfg;
ldisc->back = back;
ldisc->backhandle = backhandle;
ldisc->term = term;
ldisc->back = back;
ldisc->backhandle = backhandle;
ldisc->term = term;
@@
-86,6
+102,19
@@
void *ldisc_create(Terminal *term,
return ldisc;
}
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;
void ldisc_send(void *handle, char *buf, int len, int interactive)
{
Ldisc ldisc = (Ldisc) handle;
@@
-123,7
+152,9
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
c += KCTRL('@');
switch (ldisc->quotenext ? ' ' : c) {
/*
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
* ^w: delete, and output BSBs, to return to last
* space/nonspace boundary
* ^u: delete, and output BSBs, to return to BOL
@@
-139,9
+170,11
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
case KCTRL('H'):
case KCTRL('?'): /* backspace/delete */
if (ldisc->buflen > 0) {
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 */
}
break;
case CTRL('W'): /* delete word */
@@
-150,8
+183,8
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
ldisc->buflen--;
if (ldisc->buflen > 0 &&
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;
break;
}
break;
@@
-170,7
+203,7
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
* configured telnet specials off! This breaks
* talkers otherwise.
*/
* 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);
goto default_case;
if (c == CTRL('C'))
ldisc->back->special(ldisc->backhandle, TS_IP);
@@
-222,7
+255,7
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
* default clause because of the break.
*/
case CTRL('J'):
* 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]));
ldisc->buflen > 0 && ldisc->buf[ldisc->buflen - 1] == '\r') {
if (ECHOING)
bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
@@
-231,9
+264,9
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
case KCTRL('M'): /* send with newline */
if (ldisc->buflen > 0)
ldisc->back->send(ldisc->backhandle, ldisc->buf, ldisc->buflen);
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);
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);
ldisc->back->special(ldisc->backhandle, TS_EOL);
else
ldisc->back->send(ldisc->backhandle, "\r", 1);
@@
-247,7
+280,7
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
default_case:
if (ldisc->buflen >= ldisc->bufsiz) {
ldisc->bufsiz = ldisc->buflen + 256;
default_case:
if (ldisc->buflen >= ldisc->bufsiz) {
ldisc->bufsiz = ldisc->buflen + 256;
- ldisc->buf = sre
alloc(ldisc->buf, ldisc->bufsiz
);
+ ldisc->buf = sre
size(ldisc->buf, ldisc->bufsiz, char
);
}
ldisc->buf[ldisc->buflen++] = c;
if (ECHOING)
}
ldisc->buf[ldisc->buflen++] = c;
if (ECHOING)
@@
-267,27
+300,27
@@
void ldisc_send(void *handle, char *buf, int len, int interactive)
if (len > 0) {
if (ECHOING)
c_write(ldisc, buf, len);
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'):
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'):
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'):
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'):
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;
}
ldisc->back->special(ldisc->backhandle, TS_SUSP);
break;
}