mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-03 04:22:47 -05:00
Post-release destabilisation! Completely remove the struct type
'Config' in putty.h, which stores all PuTTY's settings and includes an arbitrary length limit on every single one of those settings which is stored in string form. In place of it is 'Conf', an opaque data type everywhere outside the new file conf.c, which stores a list of (key, value) pairs in which every key contains an integer identifying a configuration setting, and for some of those integers the key also contains extra parts (so that, for instance, CONF_environmt is a string-to-string mapping). Everywhere that a Config was previously used, a Conf is now; everywhere there was a Config structure copy, conf_copy() is called; every lookup, adjustment, load and save operation on a Config has been rewritten; and there's a mechanism for serialising a Conf into a binary blob and back for use with Duplicate Session. User-visible effects of this change _should_ be minimal, though I don't doubt I've introduced one or two bugs here and there which will eventually be found. The _intended_ visible effects of this change are that all arbitrary limits on configuration strings and lists (e.g. limit on number of port forwardings) should now disappear; that list boxes in the configuration will now be displayed in a sorted order rather than the arbitrary order in which they were added to the list (since the underlying data structure is now a sorted tree234 rather than an ad-hoc comma-separated string); and one more specific change, which is that local and dynamic port forwardings on the same port number are now mutually exclusive in the configuration (putting 'D' in the key rather than the value was a mistake in the first place). One other reorganisation as a result of this is that I've moved all the dialog.c standard handlers (dlg_stdeditbox_handler and friends) out into config.c, because I can't really justify calling them generic any more. When they took a pointer to an arbitrary structure type and the offset of a field within that structure, they were independent of whether that structure was a Config or something completely different, but now they really do expect to talk to a Conf, which can _only_ be used for PuTTY configuration, so I've renamed them all things like conf_editbox_handler and moved them out of the nominally independent dialog-box management module into the PuTTY-specific config.c. [originally from svn r9214]
This commit is contained in:
@ -42,8 +42,8 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
|
||||
"Control the scrollback in the window");
|
||||
ctrl_checkbox(s, "Scrollbar on left", 'l',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdcheckbox_handler,
|
||||
I(offsetof(Config,scrollbar_on_left)));
|
||||
conf_checkbox_handler,
|
||||
I(CONF_scrollbar_on_left));
|
||||
/*
|
||||
* Really this wants to go just after `Display scrollbar'. See
|
||||
* if we can find that control, and do some shuffling.
|
||||
@ -51,7 +51,7 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
|
||||
for (i = 0; i < s->ncontrols; i++) {
|
||||
c = s->ctrls[i];
|
||||
if (c->generic.type == CTRL_CHECKBOX &&
|
||||
c->generic.context.i == offsetof(Config,scrollbar)) {
|
||||
c->generic.context.i == CONF_scrollbar) {
|
||||
/*
|
||||
* Control i is the scrollbar checkbox.
|
||||
* Control s->ncontrols-1 is the scrollbar-on-left one.
|
||||
@ -89,29 +89,29 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
|
||||
"Fonts for displaying non-bold text");
|
||||
ctrl_fontsel(s, "Font used for ordinary text", 'f',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdfontsel_handler, I(offsetof(Config,font)));
|
||||
conf_fontsel_handler, I(CONF_font));
|
||||
ctrl_fontsel(s, "Font used for wide (CJK) text", 'w',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdfontsel_handler, I(offsetof(Config,widefont)));
|
||||
conf_fontsel_handler, I(CONF_widefont));
|
||||
s = ctrl_getset(b, "Window/Fonts", "fontbold",
|
||||
"Fonts for displaying bolded text");
|
||||
ctrl_fontsel(s, "Font used for bolded text", 'b',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdfontsel_handler, I(offsetof(Config,boldfont)));
|
||||
conf_fontsel_handler, I(CONF_boldfont));
|
||||
ctrl_fontsel(s, "Font used for bold wide text", 'i',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdfontsel_handler, I(offsetof(Config,wideboldfont)));
|
||||
conf_fontsel_handler, I(CONF_wideboldfont));
|
||||
ctrl_checkbox(s, "Use shadow bold instead of bold fonts", 'u',
|
||||
HELPCTX(no_help),
|
||||
dlg_stdcheckbox_handler,
|
||||
I(offsetof(Config,shadowbold)));
|
||||
conf_checkbox_handler,
|
||||
I(CONF_shadowbold));
|
||||
ctrl_text(s, "(Note that bold fonts or shadow bolding are only"
|
||||
" used if you have not requested bolding to be done by"
|
||||
" changing the text colour.)",
|
||||
HELPCTX(no_help));
|
||||
ctrl_editbox(s, "Horizontal offset for shadow bold:", 'z', 20,
|
||||
HELPCTX(no_help), dlg_stdeditbox_handler,
|
||||
I(offsetof(Config,shadowboldoffset)), I(-1));
|
||||
HELPCTX(no_help), conf_editbox_handler,
|
||||
I(CONF_shadowboldoffset), I(-1));
|
||||
|
||||
/*
|
||||
* Markus Kuhn feels, not totally unreasonably, that it's good
|
||||
@ -125,8 +125,8 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
|
||||
"Character set translation on received data");
|
||||
ctrl_checkbox(s, "Override with UTF-8 if locale says so", 'l',
|
||||
HELPCTX(translation_utf8_override),
|
||||
dlg_stdcheckbox_handler,
|
||||
I(offsetof(Config,utf8_override)));
|
||||
conf_checkbox_handler,
|
||||
I(CONF_utf8_override));
|
||||
|
||||
if (!midsession) {
|
||||
/*
|
||||
@ -137,8 +137,7 @@ void gtk_setup_config_box(struct controlbox *b, int midsession, void *win)
|
||||
s = ctrl_getset(b, "Window/Behaviour", "x11",
|
||||
"X Window System settings");
|
||||
ctrl_editbox(s, "Window class name:", 'z', 50,
|
||||
HELPCTX(no_help), dlg_stdeditbox_handler,
|
||||
I(offsetof(Config,winclass)),
|
||||
I(sizeof(((Config *)0)->winclass)));
|
||||
HELPCTX(no_help), conf_editbox_handler,
|
||||
I(CONF_winclass), I(1));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user