Oops - repercussions of the close-on-exit stuff which I forgot to

check in. I must stop doing my Unix checkins in the Unix subdir :-(

[originally from svn r2125]

diff --git a/ldisc.c b/ldisc.c
index ceafa4167c507fe21832f84febc4385c04d2c8dc..a149c6d047a99ddef3d35fccfe1879d1c0da09f9 100644 (file)
--- a/ldisc.c
+++ b/ldisc.c
@@ -73,6 +73,12 @@ void ldisc_send(char *buf, int len, int interactive)
        ldisc_update(ECHOING, EDITING);
        return;
     }
+    /*
+     * Notify the front end that something was pressed, in case
+     * it's depending on finding out (e.g. keypress termination for
+     * Close On Exit). 
+     */
+    frontend_keypress();
     /*
      * Less than zero means null terminated special string.
      */

diff --git a/putty.h b/putty.h
index 99b19180c1bacb712f04d58a38cce88b480ec3f5..3594ceb363fdddf47a5b00904709d85755676f35 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -429,6 +429,7 @@ void beep(int);
 void begin_session(void);
 void sys_cursor(int x, int y);
 void request_paste(void);
+void frontend_keypress(void);
 #define OPTIMISE_IS_SCROLL 1
 
 void set_iconic(int iconic);

diff --git a/window.c b/window.c
index abbfdd89913626b15a97070517420254c962be8e..1aa20908b9ffbf2bb66c6731a3ed1a2ca4f9da47 100644 (file)
--- a/window.c
+++ b/window.c
@@ -4553,3 +4553,14 @@ void flip_full_screen()
        ShowWindow(hwnd, SW_MAXIMIZE);
     }
 }
+
+void frontend_keypress(void)
+{
+    /*
+     * Keypress termination in non-Close-On-Exit mode is not
+     * currently supported in PuTTY proper, because the window
+     * always has a perfectly good Close button anyway. So we do
+     * nothing here.
+     */
+    return;
+}