X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8eed910da111b888ec363493ee55c6057eb61acf..f08a390fab250d5d200b3fbdc531916f388a0ef3:/unix/uxputty.c diff --git a/unix/uxputty.c b/unix/uxputty.c index 8f2fad1b..fbaf029d 100644 --- a/unix/uxputty.c +++ b/unix/uxputty.c @@ -7,71 +7,16 @@ #include #include #include +#include #include "putty.h" #include "storage.h" /* - * TODO: - * - * - Copy-and-paste from the Event Log. - * - * - Remainder of the context menu: - * - * - New Session and Duplicate Session (perhaps in pterm, in fact?!) - * + Duplicate Session will be fun, since we must work out - * how to pass the config data through. - * + In fact this should be easier on Unix, since fork() is - * available so we need not even exec (this also saves us - * the trouble of scrabbling around trying to find our own - * binary). Possible scenario: respond to Duplicate - * Session by forking. Parent continues as before; child - * unceremoniously frees all extant resources (backend, - * terminal, ldisc, frontend etc) and then _longjmps_ (I - * kid you not) back to a point in pt_main() which causes - * it to go back round to the point of opening a new - * terminal window and a new backend. - * + A tricky bit here is how to free everything without - * also _destroying_ things - calling GTK to free up - * existing widgets is liable to send destroy messages to - * the X server, which won't go down too well with the - * parent process. exec() is a much cleaner solution to - * this bit, but requires us to invent some ghastly IPC as - * we did in Windows PuTTY. - * + Arrgh! Also, this won't work in pterm since we'll - * already have dropped privileges by this point, so we - * can't get another pty. Sigh. Looks like exec has to be - * the way forward then :-/ - * - * - Saved Sessions submenu (not in pterm of course) - * - * - Change Settings - * + we must also implement mid-session reconfig in pterm.c. - * + This will require some work. We have to throw the new - * config at the log module, the ldisc, the terminal, and - * the backend; that's the easy bit. But within pterm.c - * itself we must also: - * - redo the colour palette if necessary - * * might be nice to move this over into terminal.c. - * That way we could check which palette entries in - * cfg have actually been _changed_ during - * reconfiguration, and only update those ones in - * the currently visible palette. Also it'd save - * some of this hassle in the next port. - * - enable/disable/move the scroll bar if necessary - * - change the window title if necessary - * - reinitialise the fonts - * - resize the window if necessary (may be required - * either by terminal size change or font size change - * or both) - * - redraw everything, just to be safe. - * + In particular, among the above chaos, we must look into - * how the choice of font affects the choice of codepage - * since the Unix default is to derive the latter from the - * former. - * - * - Copy All to Clipboard (for what that's worth) + * Stubs to avoid uxpty.c needing to be linked in. */ +const int use_pty_argv = FALSE; +char **pty_argv; /* never used */ /* * Clean up and exit. @@ -86,30 +31,26 @@ void cleanup_exit(int code) exit(code); } -Backend *select_backend(Config *cfg) +Backend *select_backend(Conf *conf) { - int i; - Backend *back = NULL; - for (i = 0; backends[i].backend != NULL; i++) - if (backends[i].protocol == cfg->protocol) { - back = backends[i].backend; - break; - } + Backend *back = backend_from_proto(conf_get_int(conf, CONF_protocol)); assert(back != NULL); return back; } -int cfgbox(Config *cfg) +int cfgbox(Conf *conf) { - extern int do_config_box(const char *title, Config *cfg); - return do_config_box("PuTTY Configuration", cfg); + char *title = dupcat(appname, " Configuration", NULL); + int ret = do_config_box(title, conf, 0, 0); + sfree(title); + return ret; } static int got_host = 0; -const int use_event_log = 1; +const int use_event_log = 1, new_session = 1, saved_sessions = 1; -int process_nonoption_arg(char *arg, Config *cfg) +int process_nonoption_arg(char *arg, Conf *conf, int *allow_launch) { char *p, *q = arg; @@ -120,7 +61,7 @@ int process_nonoption_arg(char *arg, Config *cfg) * argument, so that it will be deferred until it's a good * moment to run it. */ - int ret = cmdline_process_param("-P", arg, 1, cfg); + int ret = cmdline_process_param("-P", arg, 1, conf); assert(ret == 2); } else if (!strncmp(q, "telnet:", 7)) { /* @@ -133,7 +74,7 @@ int process_nonoption_arg(char *arg, Config *cfg) q += 7; if (q[0] == '/' && q[1] == '/') q += 2; - cfg->protocol = PROT_TELNET; + conf_set_int(conf, CONF_protocol, PROT_TELNET); p = q; while (*p && *p != ':' && *p != '/') p++; @@ -141,11 +82,10 @@ int process_nonoption_arg(char *arg, Config *cfg) if (*p) *p++ = '\0'; if (c == ':') - cfg->port = atoi(p); + conf_set_int(conf, CONF_port, atoi(p)); else - cfg->port = -1; - strncpy(cfg->host, q, sizeof(cfg->host) - 1); - cfg->host[sizeof(cfg->host) - 1] = '\0'; + conf_set_int(conf, CONF_port, -1); + conf_set_str(conf, CONF_host, q); got_host = 1; } else { /* @@ -156,33 +96,48 @@ int process_nonoption_arg(char *arg, Config *cfg) p++; if (*p) *p++ = '\0'; - strncpy(cfg->host, q, sizeof(cfg->host) - 1); - cfg->host[sizeof(cfg->host) - 1] = '\0'; + conf_set_str(conf, CONF_host, q); got_host = 1; } + if (got_host) + *allow_launch = TRUE; return 1; } char *make_default_wintitle(char *hostname) { - return dupcat(hostname, " - PuTTY", NULL); + return dupcat(hostname, " - ", appname, NULL); +} + +/* + * X11-forwarding-related things suitable for Gtk app. + */ + +char *platform_get_x_display(void) { + const char *display; + /* Try to take account of --display and what have you. */ + if (!(display = gdk_get_display())) + /* fall back to traditional method */ + display = getenv("DISPLAY"); + return dupstr(display); } int main(int argc, char **argv) { extern int pt_main(int argc, char **argv); + int ret; + sk_init(); flags = FLAG_VERBOSE | FLAG_INTERACTIVE; default_protocol = be_default_protocol; /* Find the appropriate default port. */ { - int i; + Backend *b = backend_from_proto(default_protocol); default_port = 0; /* illegal */ - for (i = 0; backends[i].backend != NULL; i++) - if (backends[i].protocol == default_protocol) { - default_port = backends[i].backend->default_port; - break; - } + if (b) + default_port = b->default_port; } - return pt_main(argc, argv); + ret = pt_main(argc, argv); + cleanup_exit(ret); + return ret; /* not reached, but placates optimisers */ }