X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5bf9955dd5524e9b564f4d520e863b2509a56f89..f89c329410c18fe1f09d843747fad77babb9f89c:/unix/uxputty.c diff --git a/unix/uxputty.c b/unix/uxputty.c index 5b7c580a..58ae24da 100644 --- a/unix/uxputty.c +++ b/unix/uxputty.c @@ -3,93 +3,16 @@ */ #include +#include #include #include #include +#include #include "putty.h" #include "storage.h" /* - * TODO: - * - * - Arrange for the window title not to be `pterm'. - * - * - Fix command-line parsing to be more PuTTYlike and not so - * ptermy - in particular non-option arguments should be - * hostname and port in the obvious way. - * - * - Session loading and saving; current thinking says the best - * way is to have a subdir .putty/sessions containing files - * whose names are actually munged saved session names. - * - * - libcharset enumeration. - * - * - fix the printer enum (I think the sensible thing is simply to - * have uxcfg.c remove the drop-down list completely, since you - * can't sensibly provide an enumerated list of lpr commands!). - * - * - Ctrl+right-click for a context menu (also in Windows for - * consistency, I think). This should contain pretty much - * everything in the Windows PuTTY menu, and a subset of that in - * pterm: - * - * - Telnet special commands (not in pterm :-) - * - * - Event Log (this means we must implement the Event Log; not - * in pterm) - * - * - 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. - * + note this also requires config.c and uxcfg.c to be able - * to get hold of the application name. - * - * - Copy All to Clipboard (for what that's worth) - * - * - Clear Scrollback and Reset Terminal - * - * - About (and uxcfg.c must also supply the about box) - */ - -void cmdline_error(char *p, ...) -{ - va_list ap; - fprintf(stderr, "plink: "); - va_start(ap, p); - vfprintf(stderr, p, ap); - va_end(ap); - fputc('\n', stderr); - exit(1); -} - -/* * Clean up and exit. */ void cleanup_exit(int code) @@ -102,35 +25,6 @@ void cleanup_exit(int code) exit(code); } -/* - * Another bunch of temporary stub functions. These ones will want - * removing by means of implementing them properly: libcharset - * should invent its own sensible format for codepage names and a - * means of enumerating them, and printer_enum needs to be dealt - * with somehow or other too. - */ - -char *cp_name(int codepage) -{ - return ""; -} -char *cp_enumerate(int index) -{ - return NULL; -} -int decode_codepage(char *cp_name) -{ - return -2; -} - -printer_enum *printer_start_enum(int *nprinters_ptr) { - *nprinters_ptr = 0; - return NULL; -} -char *printer_get_name(printer_enum *pe, int i) { return NULL; -} -void printer_finish_enum(printer_enum *pe) { } - Backend *select_backend(Config *cfg) { int i; @@ -146,8 +40,85 @@ Backend *select_backend(Config *cfg) int cfgbox(Config *cfg) { - extern int do_config_box(const char *title, Config *cfg); - return do_config_box("PuTTY Configuration", cfg); + return do_config_box("PuTTY Configuration", cfg, 0, 0); +} + +static int got_host = 0; + +const int use_event_log = 1, new_session = 1, saved_sessions = 1; + +int process_nonoption_arg(char *arg, Config *cfg) +{ + char *p, *q = arg; + + if (got_host) { + /* + * If we already have a host name, treat this argument as a + * port number. NB we have to treat this as a saved -P + * 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); + assert(ret == 2); + } else if (!strncmp(q, "telnet:", 7)) { + /* + * If the hostname starts with "telnet:", + * set the protocol to Telnet and process + * the string as a Telnet URL. + */ + char c; + + q += 7; + if (q[0] == '/' && q[1] == '/') + q += 2; + cfg->protocol = PROT_TELNET; + p = q; + while (*p && *p != ':' && *p != '/') + p++; + c = *p; + if (*p) + *p++ = '\0'; + if (c == ':') + cfg->port = atoi(p); + else + cfg->port = -1; + strncpy(cfg->host, q, sizeof(cfg->host) - 1); + cfg->host[sizeof(cfg->host) - 1] = '\0'; + got_host = 1; + } else { + /* + * Otherwise, treat this argument as a host name. + */ + p = arg; + while (*p && !isspace((unsigned char)*p)) + p++; + if (*p) + *p++ = '\0'; + strncpy(cfg->host, q, sizeof(cfg->host) - 1); + cfg->host[sizeof(cfg->host) - 1] = '\0'; + got_host = 1; + } + return 1; +} + +char *make_default_wintitle(char *hostname) +{ + return dupcat(hostname, " - PuTTY", NULL); +} + +/* + * X11-forwarding-related things suitable for Gtk app. + */ + +const char platform_x11_best_transport[] = "unix"; + +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)