~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ahem. Doing loads of stuff to inst->cfg would probably be best done
[sgt/putty]
/
unix
/
pterm.c
diff --git
a/unix/pterm.c
b/unix/pterm.c
index
cc6b2d0
..
d31e884
100644
(file)
--- a/
unix/pterm.c
+++ b/
unix/pterm.c
@@
-2251,12
+2251,6
@@
int main(int argc, char **argv)
gtk_init(&argc, &argv);
gtk_init(&argc, &argv);
- if (do_cmdline(argc, argv, 0, &inst->cfg))
- exit(1); /* pre-defaults pass to get -class */
- do_defaults(NULL, &inst->cfg);
- if (do_cmdline(argc, argv, 1, &inst->cfg))
- exit(1); /* post-defaults, do everything */
-
/*
* Create an instance structure and initialise to zeroes
*/
/*
* Create an instance structure and initialise to zeroes
*/
@@
-2264,6
+2258,12
@@
int main(int argc, char **argv)
memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
memset(inst, 0, sizeof(*inst));
inst->alt_keycode = -1; /* this one needs _not_ to be zero */
+ if (do_cmdline(argc, argv, 0, &inst->cfg))
+ exit(1); /* pre-defaults pass to get -class */
+ do_defaults(NULL, &inst->cfg);
+ if (do_cmdline(argc, argv, 1, &inst->cfg))
+ exit(1); /* post-defaults, do everything */
+
inst->fonts[0] = gdk_font_load(inst->cfg.font);
if (!inst->fonts[0]) {
fprintf(stderr, "pterm: unable to load font \"%s\"\n", inst->cfg.font);
inst->fonts[0] = gdk_font_load(inst->cfg.font);
if (!inst->fonts[0]) {
fprintf(stderr, "pterm: unable to load font \"%s\"\n", inst->cfg.font);