Diff

Differences From Artifact [96bcb87827]:

To Artifact [21818c9da5]:


1291
1292
1293
1294
1295
1296
1297
1298
1299


1300
1301
1302
1303
1304
1305



1306
1307
1308
1309
1310
1311
1312
1291
1292
1293
1294
1295
1296
1297


1298
1299
1300
1301
1302
1303


1304
1305
1306
1307
1308
1309
1310
1311
1312
1313







-
-
+
+




-
-
+
+
+







    if (!midsession) {
	/*
	 * The Connection/Proxy panel.
	 */
	ctrl_settitle(b, "Connection/Proxy",
		      "Options controlling proxy usage");

	s = ctrl_getset(b, "Connection/Proxy", "basics", "Proxy basics");
	ctrl_radiobuttons(s, "Proxy type:", 't', 4,
	s = ctrl_getset(b, "Connection/Proxy", "basics", NULL);
	ctrl_radiobuttons(s, "Proxy type:", 't', 3,
			  HELPCTX(proxy_type),
			  dlg_stdradiobutton_handler,
			  I(offsetof(Config, proxy_type)),
			  "None", I(PROXY_NONE),
			  "HTTP", I(PROXY_HTTP),
			  "SOCKS", I(PROXY_SOCKS),
			  "SOCKS 4", I(PROXY_SOCKS4),
			  "SOCKS 5", I(PROXY_SOCKS5),
			  "HTTP", I(PROXY_HTTP),
			  "Telnet", I(PROXY_TELNET),
			  NULL);
	ctrl_columns(s, 2, 80, 20);
	c = ctrl_editbox(s, "Proxy hostname", 'y', 100,
			 HELPCTX(proxy_main),
			 dlg_stdeditbox_handler,
			 I(offsetof(Config,proxy_host)),
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1343
1344
1345
1346
1347
1348
1349



1350
1351
1352
1353
1354





1355
1356
1357
1358
1359
1360
1361







-
-
-





-
-
-
-
-







		     I(sizeof(((Config *)0)->proxy_username)));
	c = ctrl_editbox(s, "Password", 'w', 60,
			 HELPCTX(proxy_auth),
			 dlg_stdeditbox_handler,
			 I(offsetof(Config,proxy_password)),
			 I(sizeof(((Config *)0)->proxy_password)));
	c->editbox.password = 1;

	s = ctrl_getset(b, "Connection/Proxy", "misc",
			"Miscellaneous proxy settings");
	ctrl_editbox(s, "Telnet command", 'm', 100,
		     HELPCTX(proxy_command),
		     dlg_stdeditbox_handler,
		     I(offsetof(Config,proxy_telnet_command)),
		     I(sizeof(((Config *)0)->proxy_telnet_command)));
	ctrl_radiobuttons(s, "SOCKS Version", 'v', 2,
			  HELPCTX(proxy_socksver),
			  dlg_stdradiobutton_handler,
			  I(offsetof(Config, proxy_socks_version)),
			  "Version 5", I(5), "Version 4", I(4), NULL);
    }

    /*
     * The Telnet panel exists in the base config box, and in a
     * mid-session reconfig box _if_ we're using Telnet.
     */
    if (!midsession || protocol == PROT_TELNET) {