nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-09 15:18:06 -05:00
Code Issues Projects Releases Wiki Activity

Make gtkmain.c contain the actual main().

Browse Source 
Instead of main() living in uxputty.c and uxpterm.c, and doing a
little bit of setup before calling the larger pt_main() in gtkmain.c,
I've now turned things backwards: the big function in gtkmain.c *is*
main(), and the small pieces of preliminary setup in uxputty.c and
uxpterm.c are now a function called setup() which is called from
there. This will allow me to reuse the rest of ux{putty,pterm}.c, i.e.
the assorted top-level bits and pieces that distinguish PuTTY from
pterm, in the upcoming OS X application that will have its own main().
This commit is contained in:
Simon Tatham 2016-03-23 21:58:40 +00:00
parent 450a995f05
commit 01778a2d54
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unix/gtkmain.c
View File

@ -534,13 +534,20 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
extern int cfgbox(Conf *conf);
int pt_main(int argc, char **argv)
int main(int argc, char **argv)
{
Conf *conf;
int need_config_box;
setlocale(LC_CTYPE, "");
{
/* Call the function in ux{putty,pterm}.c to do app-type
* specific setup */
extern void setup(int);
setup(TRUE); /* TRUE means we are a one-session process */
}
progname = argv[0];
/*

11
unix/uxpterm.c
View File

@ -43,18 +43,13 @@ char *make_default_wintitle(char *hostname)
return dupstr("pterm");
}
int main(int argc, char **argv)
void setup(int single)
{
extern int pt_main(int argc, char **argv);
extern void pty_pre_init(void); /* declared in pty.c */
int ret;
cmdline_tooltype = TOOLTYPE_NONNETWORK;
default_protocol = -1;
pty_pre_init();
ret = pt_main(argc, argv);
cleanup_exit(ret);
return ret; /* not reached, but placates optimisers */
if (single)
pty_pre_init();
}

8
unix/uxputty.c
View File

@ -132,11 +132,8 @@ char *platform_get_x_display(void) {
const int share_can_be_downstream = TRUE;
const int share_can_be_upstream = TRUE;
int main(int argc, char **argv)
void setup(int single)
{
extern int pt_main(int argc, char **argv);
int ret;
sk_init();
flags = FLAG_VERBOSE | FLAG_INTERACTIVE;
default_protocol = be_default_protocol;
@ -147,7 +144,4 @@ int main(int argc, char **argv)
if (b)
default_port = b->default_port;
}
ret = pt_main(argc, argv);
cleanup_exit(ret);
return ret; /* not reached, but placates optimisers */
}