X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwindow.c;h=04059f064a4cbd721ef57a104af5e94a77d3bac5;hb=5904545cc18289541702da284b00490cb25a753e;hp=bcf1ab811560e584fb8158b720f15aeb78853e86;hpb=c4833bae5a6fe9756a3789cd4d9a0ffa8b5a2996;p=PuTTY.git

diff --git a/windows/window.c b/windows/window.c
index bcf1ab81..04059f06 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -215,8 +215,11 @@ static UINT wm_mousewheel = WM_MOUSEWHEEL;
     (((wch) >= 0x180B && (wch) <= 0x180D) || /* MONGOLIAN FREE VARIATION SELECTOR */ \
      ((wch) >= 0xFE00 && (wch) <= 0xFE0F)) /* VARIATION SELECTOR 1-16 */
 
+const int share_can_be_downstream = TRUE;
+const int share_can_be_upstream = TRUE;
+
 /* Dummy routine, only required in plink. */
-void ldisc_update(void *frontend, int echo, int edit)
+void frontend_echoedit_update(void *frontend, int echo, int edit)
 {
 }
 
@@ -545,8 +548,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 			    q += 2;
 			conf_set_int(conf, CONF_protocol, PROT_TELNET);
 			p = q;
-			while (*p && *p != ':' && *p != '/')
-			    p++;
+                        p += host_strcspn(p, ":/");
 			c = *p;
 			if (*p)
 			    *p++ = '\0';
@@ -611,15 +613,15 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 
             /*
              * Trim a colon suffix off the hostname if it's there. In
-             * order to protect IPv6 address literals against this
-             * treatment, we do not do this if there's _more_ than one
-             * colon.
+             * order to protect unbracketed IPv6 address literals
+             * against this treatment, we do not do this if there's
+             * _more_ than one colon.
              */
             {
-                char *c = strchr(host, ':');
+                char *c = host_strchr(host, ':');
  
                 if (c) {
-                    char *d = strchr(c+1, ':');
+                    char *d = host_strchr(c+1, ':');
                     if (!d)
                         *c = '\0';
                 }
@@ -2232,9 +2234,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 		 * Flush the line discipline's edit buffer in the
 		 * case where local editing has just been disabled.
 		 */
-		ldisc_configure(ldisc, conf);
-		if (ldisc)
-		    ldisc_send(ldisc, NULL, 0, 0);
+		if (ldisc) {
+                    ldisc_configure(ldisc, conf);
+		    ldisc_echoedit_update(ldisc);
+                }
 		if (pal)
 		    DeleteObject(pal);
 		logpal = NULL;
@@ -2376,7 +2379,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	  case IDM_RESET:
 	    term_pwron(term, TRUE);
 	    if (ldisc)
-		ldisc_send(ldisc, NULL, 0, 0);
+		ldisc_echoedit_update(ldisc);
 	    break;
 	  case IDM_ABOUT:
 	    showabout(hwnd);
@@ -3246,10 +3249,6 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 				   TO_CHR_X(p.x),
 				   TO_CHR_Y(p.y), shift_pressed,
 				   control_pressed, is_alt_pressed());
-			term_mouse(term, b, translate_button(b),
-				   MA_RELEASE, TO_CHR_X(p.x),
-				   TO_CHR_Y(p.y), shift_pressed,
-				   control_pressed, is_alt_pressed());
 		    } /* else: not sure when this can fail */
 		} else {
 		    /* trigger a scroll */