Sebastian Kuschel reports that pfd_closing can be called for a socket
[u/mdw/putty] / sercfg.c
index c75879c..fef910f 100644 (file)
--- a/sercfg.c
+++ b/sercfg.c
-/*\r
- * sercfg.c - the serial-port specific parts of the PuTTY\r
- * configuration box. Centralised as cross-platform code because\r
- * more than one platform will want to use it, but not part of the\r
- * main configuration. The expectation is that each platform's\r
- * local config function will call out to ser_setup_config_box() if\r
- * it needs to set up the standard serial stuff. (Of course, it can\r
- * then apply local tweaks after ser_setup_config_box() returns, if\r
- * it needs to.)\r
- */\r
-\r
-#include <assert.h>\r
-#include <stdlib.h>\r
-\r
-#include "putty.h"\r
-#include "dialog.h"\r
-#include "storage.h"\r
-\r
-static void serial_parity_handler(union control *ctrl, void *dlg,\r
-                                 void *data, int event)\r
-{\r
-    static const struct {\r
-       const char *name;\r
-       int val;\r
-    } parities[] = {\r
-       {"None", SER_PAR_NONE},\r
-       {"Odd", SER_PAR_ODD},\r
-       {"Even", SER_PAR_EVEN},\r
-       {"Mark", SER_PAR_MARK},\r
-       {"Space", SER_PAR_SPACE},\r
-    };\r
-    int i;\r
-    Config *cfg = (Config *)data;\r
-\r
-    if (event == EVENT_REFRESH) {\r
-       dlg_update_start(ctrl, dlg);\r
-       dlg_listbox_clear(ctrl, dlg);\r
-       for (i = 0; i < lenof(parities); i++)\r
-           dlg_listbox_addwithid(ctrl, dlg, parities[i].name,\r
-                                 parities[i].val);\r
-       for (i = 0; i < lenof(parities); i++)\r
-           if (cfg->serparity == parities[i].val)\r
-               dlg_listbox_select(ctrl, dlg, i);\r
-       dlg_update_done(ctrl, dlg);\r
-    } else if (event == EVENT_SELCHANGE) {\r
-       int i = dlg_listbox_index(ctrl, dlg);\r
-       if (i < 0)\r
-           i = SER_PAR_NONE;\r
-       else\r
-           i = dlg_listbox_getid(ctrl, dlg, i);\r
-       cfg->serparity = i;\r
-    }\r
-}\r
-\r
-static void serial_flow_handler(union control *ctrl, void *dlg,\r
-                               void *data, int event)\r
-{\r
-    static const struct {\r
-       const char *name;\r
-       int val;\r
-    } flows[] = {\r
-       {"None", SER_FLOW_NONE},\r
-       {"XON/XOFF", SER_FLOW_XONXOFF},\r
-       {"RTS/CTS", SER_FLOW_RTSCTS},\r
-       {"DSR/DTR", SER_FLOW_DSRDTR},\r
-    };\r
-    int i;\r
-    Config *cfg = (Config *)data;\r
-\r
-    if (event == EVENT_REFRESH) {\r
-       dlg_update_start(ctrl, dlg);\r
-       dlg_listbox_clear(ctrl, dlg);\r
-       for (i = 0; i < lenof(flows); i++)\r
-           dlg_listbox_addwithid(ctrl, dlg, flows[i].name,\r
-                                 flows[i].val);\r
-       for (i = 0; i < lenof(flows); i++)\r
-           if (cfg->serflow == flows[i].val)\r
-               dlg_listbox_select(ctrl, dlg, i);\r
-       dlg_update_done(ctrl, dlg);\r
-    } else if (event == EVENT_SELCHANGE) {\r
-       int i = dlg_listbox_index(ctrl, dlg);\r
-       if (i < 0)\r
-           i = SER_PAR_NONE;\r
-       else\r
-           i = dlg_listbox_getid(ctrl, dlg, i);\r
-       cfg->serflow = i;\r
-    }\r
-}\r
-\r
-void ser_setup_config_box(struct controlbox *b, int midsession)\r
-{\r
-    struct controlset *s;\r
-    union control *c;\r
-\r
-    /*\r
-     * Add the serial back end to the protocols list at the top of\r
-     * the config box.\r
-     */\r
-    s = ctrl_getset(b, "Session", "hostport",\r
-                   "Specify your connection by host name or IP address");\r
-    {\r
-       int i;\r
-       extern void config_protocolbuttons_handler(union control *, void *,\r
-                                                  void *, int);\r
-        for (i = 0; i < s->ncontrols; i++) {\r
-            c = s->ctrls[i];\r
-           if (c->generic.type == CTRL_RADIO &&\r
-               c->generic.handler == config_protocolbuttons_handler) {\r
-               c->radio.nbuttons++;\r
-               c->radio.ncolumns++;\r
-               c->radio.buttons =\r
-                   sresize(c->radio.buttons, c->radio.nbuttons, char *);\r
-               c->radio.buttons[c->radio.nbuttons-1] =\r
-                   dupstr("Serial");\r
-               c->radio.buttondata =\r
-                   sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);\r
-               c->radio.buttondata[c->radio.nbuttons-1] = I(PROT_SERIAL);\r
-               if (c->radio.shortcuts) {\r
-                   c->radio.shortcuts =\r
-                       sresize(c->radio.shortcuts, c->radio.nbuttons, char);\r
-                   c->radio.shortcuts[c->radio.nbuttons-1] = NO_SHORTCUT;\r
-               }\r
-           }\r
-       }\r
-    }\r
-\r
-    /*\r
-     * Entirely new Connection/Serial panel for serial port\r
-     * configuration.\r
-     */\r
-    ctrl_settitle(b, "Connection/Serial",\r
-                 "Options controlling local serial lines");\r
-\r
-    if (!midsession) {\r
-       /*\r
-        * We don't permit switching to a different serial port in\r
-        * midflight, although we do allow all other\r
-        * reconfiguration.\r
-        */\r
-       s = ctrl_getset(b, "Connection/Serial", "serline",\r
-                       "Select a serial line");\r
-       ctrl_editbox(s, "Serial line to connect to", 'l', 40,\r
-                    HELPCTX(serial_line),\r
-                    dlg_stdeditbox_handler, I(offsetof(Config,serline)),\r
-                    I(sizeof(((Config *)0)->serline)));\r
-    }\r
-\r
-    s = ctrl_getset(b, "Connection/Serial", "sercfg", "Configure the serial line");\r
-    ctrl_editbox(s, "Speed (baud)", 's', 40,\r
-                HELPCTX(serial_speed),\r
-                dlg_stdeditbox_handler, I(offsetof(Config,serspeed)), I(-1));\r
-    ctrl_editbox(s, "Data bits", 'b', 40,\r
-                HELPCTX(serial_databits),\r
-                dlg_stdeditbox_handler,I(offsetof(Config,serdatabits)),I(-1));\r
-    /*\r
-     * Stop bits come in units of one half.\r
-     */\r
-    ctrl_editbox(s, "Stop bits", 't', 40,\r
-                HELPCTX(serial_stopbits),\r
-                dlg_stdeditbox_handler,I(offsetof(Config,serstopbits)),I(-2));\r
-    ctrl_droplist(s, "Parity", 'p', 40,\r
-                 HELPCTX(serial_parity),\r
-                 serial_parity_handler, I(0));\r
-    ctrl_droplist(s, "Flow control", 'f', 40,\r
-                 HELPCTX(serial_flow),\r
-                 serial_flow_handler, I(0));\r
-}\r
+/*
+ * sercfg.c - the serial-port specific parts of the PuTTY
+ * configuration box. Centralised as cross-platform code because
+ * more than one platform will want to use it, but not part of the
+ * main configuration. The expectation is that each platform's
+ * local config function will call out to ser_setup_config_box() if
+ * it needs to set up the standard serial stuff. (Of course, it can
+ * then apply local tweaks after ser_setup_config_box() returns, if
+ * it needs to.)
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+
+#include "putty.h"
+#include "dialog.h"
+#include "storage.h"
+
+static void serial_parity_handler(union control *ctrl, void *dlg,
+                                 void *data, int event)
+{
+    static const struct {
+       const char *name;
+       int val;
+    } parities[] = {
+       {"None", SER_PAR_NONE},
+       {"Odd", SER_PAR_ODD},
+       {"Even", SER_PAR_EVEN},
+       {"Mark", SER_PAR_MARK},
+       {"Space", SER_PAR_SPACE},
+    };
+    int mask = ctrl->listbox.context.i;
+    int i, j;
+    Conf *conf = (Conf *)data;
+
+    if (event == EVENT_REFRESH) {
+       /* Fetching this once at the start of the function ensures we
+        * remember what the right value is supposed to be when
+        * operations below cause reentrant calls to this function. */
+       int oldparity = conf_get_int(conf, CONF_serparity);
+
+       dlg_update_start(ctrl, dlg);
+       dlg_listbox_clear(ctrl, dlg);
+       for (i = 0; i < lenof(parities); i++)  {
+           if (mask & (1 << i))
+               dlg_listbox_addwithid(ctrl, dlg, parities[i].name,
+                                     parities[i].val);
+       }
+       for (i = j = 0; i < lenof(parities); i++) {
+           if (mask & (1 << i)) {
+               if (oldparity == parities[i].val) {
+                   dlg_listbox_select(ctrl, dlg, j);
+                   break;
+               }
+               j++;
+           }
+       }
+       if (i == lenof(parities)) {    /* an unsupported setting was chosen */
+           dlg_listbox_select(ctrl, dlg, 0);
+           oldparity = SER_PAR_NONE;
+       }
+       dlg_update_done(ctrl, dlg);
+       conf_set_int(conf, CONF_serparity, oldparity);    /* restore */
+    } else if (event == EVENT_SELCHANGE) {
+       int i = dlg_listbox_index(ctrl, dlg);
+       if (i < 0)
+           i = SER_PAR_NONE;
+       else
+           i = dlg_listbox_getid(ctrl, dlg, i);
+       conf_set_int(conf, CONF_serparity, i);
+    }
+}
+
+static void serial_flow_handler(union control *ctrl, void *dlg,
+                               void *data, int event)
+{
+    static const struct {
+       const char *name;
+       int val;
+    } flows[] = {
+       {"None", SER_FLOW_NONE},
+       {"XON/XOFF", SER_FLOW_XONXOFF},
+       {"RTS/CTS", SER_FLOW_RTSCTS},
+       {"DSR/DTR", SER_FLOW_DSRDTR},
+    };
+    int mask = ctrl->listbox.context.i;
+    int i, j;
+    Conf *conf = (Conf *)data;
+
+    if (event == EVENT_REFRESH) {
+       /* Fetching this once at the start of the function ensures we
+        * remember what the right value is supposed to be when
+        * operations below cause reentrant calls to this function. */
+       int oldflow = conf_get_int(conf, CONF_serflow);
+
+       dlg_update_start(ctrl, dlg);
+       dlg_listbox_clear(ctrl, dlg);
+       for (i = 0; i < lenof(flows); i++)  {
+           if (mask & (1 << i))
+               dlg_listbox_addwithid(ctrl, dlg, flows[i].name, flows[i].val);
+       }
+       for (i = j = 0; i < lenof(flows); i++) {
+           if (mask & (1 << i)) {
+               if (oldflow == flows[i].val) {
+                   dlg_listbox_select(ctrl, dlg, j);
+                   break;
+               }
+               j++;
+           }
+       }
+       if (i == lenof(flows)) {       /* an unsupported setting was chosen */
+           dlg_listbox_select(ctrl, dlg, 0);
+           oldflow = SER_FLOW_NONE;
+       }
+       dlg_update_done(ctrl, dlg);
+       conf_set_int(conf, CONF_serflow, oldflow);/* restore */
+    } else if (event == EVENT_SELCHANGE) {
+       int i = dlg_listbox_index(ctrl, dlg);
+       if (i < 0)
+           i = SER_FLOW_NONE;
+       else
+           i = dlg_listbox_getid(ctrl, dlg, i);
+       conf_set_int(conf, CONF_serflow, i);
+    }
+}
+
+void ser_setup_config_box(struct controlbox *b, int midsession,
+                         int parity_mask, int flow_mask)
+{
+    struct controlset *s;
+    union control *c;
+
+    if (!midsession) {
+       int i;
+       extern void config_protocolbuttons_handler(union control *, void *,
+                                                  void *, int);
+
+       /*
+        * Add the serial back end to the protocols list at the
+        * top of the config box.
+        */
+       s = ctrl_getset(b, "Session", "hostport",
+                       "Specify the destination you want to connect to");
+
+        for (i = 0; i < s->ncontrols; i++) {
+            c = s->ctrls[i];
+           if (c->generic.type == CTRL_RADIO &&
+               c->generic.handler == config_protocolbuttons_handler) {
+               c->radio.nbuttons++;
+               c->radio.ncolumns++;
+               c->radio.buttons =
+                   sresize(c->radio.buttons, c->radio.nbuttons, char *);
+               c->radio.buttons[c->radio.nbuttons-1] =
+                   dupstr("Serial");
+               c->radio.buttondata =
+                   sresize(c->radio.buttondata, c->radio.nbuttons, intorptr);
+               c->radio.buttondata[c->radio.nbuttons-1] = I(PROT_SERIAL);
+               if (c->radio.shortcuts) {
+                   c->radio.shortcuts =
+                       sresize(c->radio.shortcuts, c->radio.nbuttons, char);
+                   c->radio.shortcuts[c->radio.nbuttons-1] = 'r';
+               }
+           }
+       }
+    }
+
+    /*
+     * Entirely new Connection/Serial panel for serial port
+     * configuration.
+     */
+    ctrl_settitle(b, "Connection/Serial",
+                 "Options controlling local serial lines");
+
+    if (!midsession) {
+       /*
+        * We don't permit switching to a different serial port in
+        * midflight, although we do allow all other
+        * reconfiguration.
+        */
+       s = ctrl_getset(b, "Connection/Serial", "serline",
+                       "Select a serial line");
+       ctrl_editbox(s, "Serial line to connect to", 'l', 40,
+                    HELPCTX(serial_line),
+                    conf_editbox_handler, I(CONF_serline), I(1));
+    }
+
+    s = ctrl_getset(b, "Connection/Serial", "sercfg", "Configure the serial line");
+    ctrl_editbox(s, "Speed (baud)", 's', 40,
+                HELPCTX(serial_speed),
+                conf_editbox_handler, I(CONF_serspeed), I(-1));
+    ctrl_editbox(s, "Data bits", 'b', 40,
+                HELPCTX(serial_databits),
+                conf_editbox_handler, I(CONF_serdatabits), I(-1));
+    /*
+     * Stop bits come in units of one half.
+     */
+    ctrl_editbox(s, "Stop bits", 't', 40,
+                HELPCTX(serial_stopbits),
+                conf_editbox_handler, I(CONF_serstopbits), I(-2));
+    ctrl_droplist(s, "Parity", 'p', 40,
+                 HELPCTX(serial_parity),
+                 serial_parity_handler, I(parity_mask));
+    ctrl_droplist(s, "Flow control", 'f', 40,
+                 HELPCTX(serial_flow),
+                 serial_flow_handler, I(flow_mask));
+}