X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=ldisc.c;h=8f653a18f0ee23c74323eb1c83a249f13f87f820;hb=89b8e3d6096dc7d6016eb4458bcf4e6bc32951b2;hp=d57e6d1740d3790642fdff3724b93122cceaf92c;hpb=fb7dd5a255629d00522564dc012e59e98383c609;p=PuTTY.git

diff --git a/ldisc.c b/ldisc.c
index d57e6d17..8f653a18 100644
--- a/ldisc.c
+++ b/ldisc.c
@@ -12,12 +12,12 @@
 #include "terminal.h"
 #include "ldisc.h"
 
-#define ECHOING (ldisc->cfg->localecho == FORCE_ON || \
-                 (ldisc->cfg->localecho == AUTO && \
+#define ECHOING (ldisc->localecho == FORCE_ON || \
+                 (ldisc->localecho == AUTO && \
                       (ldisc->back->ldisc(ldisc->backhandle, LD_ECHO) || \
 			   term_ldisc(ldisc->term, LD_ECHO))))
-#define EDITING (ldisc->cfg->localedit == FORCE_ON || \
-                 (ldisc->cfg->localedit == AUTO && \
+#define EDITING (ldisc->localedit == FORCE_ON || \
+                 (ldisc->localedit == AUTO && \
                       (ldisc->back->ldisc(ldisc->backhandle, LD_EDIT) || \
 			   term_ldisc(ldisc->term, LD_EDIT))))
 
@@ -76,7 +76,7 @@ static void bsb(Ldisc ldisc, int n)
 #define CTRL(x) (x^'@')
 #define KCTRL(x) ((x^'@') | 0x100)
 
-void *ldisc_create(Config *mycfg, Terminal *term,
+void *ldisc_create(Conf *conf, Terminal *term,
 		   Backend *back, void *backhandle,
 		   void *frontend)
 {
@@ -87,12 +87,13 @@ void *ldisc_create(Config *mycfg, Terminal *term,
     ldisc->bufsiz = 0;
     ldisc->quotenext = 0;
 
-    ldisc->cfg = mycfg;
     ldisc->back = back;
     ldisc->backhandle = backhandle;
     ldisc->term = term;
     ldisc->frontend = frontend;
 
+    ldisc_configure(ldisc, conf);
+
     /* Link ourselves into the backend and the terminal */
     if (term)
 	term->ldisc = ldisc;
@@ -102,6 +103,17 @@ void *ldisc_create(Config *mycfg, Terminal *term,
     return ldisc;
 }
 
+void ldisc_configure(void *handle, Conf *conf)
+{
+    Ldisc ldisc = (Ldisc) handle;
+
+    ldisc->telnet_keyboard = conf_get_int(conf, CONF_telnet_keyboard);
+    ldisc->telnet_newline = conf_get_int(conf, CONF_telnet_newline);
+    ldisc->protocol = conf_get_int(conf, CONF_protocol);
+    ldisc->localecho = conf_get_int(conf, CONF_localecho);
+    ldisc->localedit = conf_get_int(conf, CONF_localedit);
+}
+
 void ldisc_free(void *handle)
 {
     Ldisc ldisc = (Ldisc) handle;
@@ -134,6 +146,18 @@ void ldisc_send(void *handle, char *buf, int len, int interactive)
      */
     frontend_keypress(ldisc->frontend);
 
+    if (interactive && ldisc->term) {
+        /*
+         * Interrupt a paste from the clipboard, if one was in
+         * progress when the user pressed a key. This is easier than
+         * buffering the current piece of data and saving it until the
+         * terminal has finished pasting, and has the potential side
+         * benefit of permitting a user to cancel an accidental huge
+         * paste.
+         */
+        term_nopaste(ldisc->term);
+    }
+
     /*
      * Less than zero means null terminated special string.
      */
@@ -147,7 +171,7 @@ void ldisc_send(void *handle, char *buf, int len, int interactive)
     if (EDITING) {
 	while (len--) {
 	    int c;
-	    c = *buf++ + keyflag;
+	    c = (unsigned char)(*buf++) + keyflag;
 	    if (!interactive && c == '\r')
 		c += KCTRL('@');
 	    switch (ldisc->quotenext ? ' ' : c) {
@@ -203,7 +227,7 @@ void ldisc_send(void *handle, char *buf, int len, int interactive)
                  * configured telnet specials off! This breaks
                  * talkers otherwise.
                  */
-                if (!ldisc->cfg->telnet_keyboard)
+                if (!ldisc->telnet_keyboard)
                     goto default_case;
 		if (c == CTRL('C'))
 		    ldisc->back->special(ldisc->backhandle, TS_IP);
@@ -255,7 +279,7 @@ void ldisc_send(void *handle, char *buf, int len, int interactive)
 		 *    default clause because of the break.
 		 */
 	      case CTRL('J'):
-		if (ldisc->cfg->protocol == PROT_RAW &&
+		if (ldisc->protocol == PROT_RAW &&
 		    ldisc->buflen > 0 && ldisc->buf[ldisc->buflen - 1] == '\r') {
 		    if (ECHOING)
 			bsb(ldisc, plen(ldisc, ldisc->buf[ldisc->buflen - 1]));
@@ -264,9 +288,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);
-		    if (ldisc->cfg->protocol == PROT_RAW)
+		    if (ldisc->protocol == PROT_RAW)
 			ldisc->back->send(ldisc->backhandle, "\r\n", 2);
-		    else if (ldisc->cfg->protocol == PROT_TELNET && ldisc->cfg->telnet_newline)
+		    else if (ldisc->protocol == PROT_TELNET && ldisc->telnet_newline)
 			ldisc->back->special(ldisc->backhandle, TS_EOL);
 		    else
 			ldisc->back->send(ldisc->backhandle, "\r", 1);
@@ -300,27 +324,27 @@ void ldisc_send(void *handle, char *buf, int len, int interactive)
 	if (len > 0) {
 	    if (ECHOING)
 		c_write(ldisc, buf, len);
-	    if (keyflag && ldisc->cfg->protocol == PROT_TELNET && len == 1) {
+	    if (keyflag && ldisc->protocol == PROT_TELNET && len == 1) {
 		switch (buf[0]) {
 		  case CTRL('M'):
-		    if (ldisc->cfg->protocol == PROT_TELNET && ldisc->cfg->telnet_newline)
+		    if (ldisc->protocol == PROT_TELNET && ldisc->telnet_newline)
 			ldisc->back->special(ldisc->backhandle, TS_EOL);
 		    else
 			ldisc->back->send(ldisc->backhandle, "\r", 1);
 		    break;
 		  case CTRL('?'):
 		  case CTRL('H'):
-		    if (ldisc->cfg->telnet_keyboard) {
+		    if (ldisc->telnet_keyboard) {
 			ldisc->back->special(ldisc->backhandle, TS_EC);
 			break;
 		    }
 		  case CTRL('C'):
-		    if (ldisc->cfg->telnet_keyboard) {
+		    if (ldisc->telnet_keyboard) {
 			ldisc->back->special(ldisc->backhandle, TS_IP);
 			break;
 		    }
 		  case CTRL('Z'):
-		    if (ldisc->cfg->telnet_keyboard) {
+		    if (ldisc->telnet_keyboard) {
 			ldisc->back->special(ldisc->backhandle, TS_SUSP);
 			break;
 		    }