nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-30 16:30:29 -05:00
Code Issues Projects Releases Wiki Activity

A few more command-line options.

Browse Source 
[originally from svn r2086]
This commit is contained in:
Simon Tatham 2002-10-16 16:00:38 +00:00
parent 8f922f77ba
commit ac3d4e70ad
1 changed files with 72 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
unix/pterm.c
View File

@ -11,6 +11,8 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -1602,10 +1604,16 @@ int do_cmdline(int argc, char **argv, int do_everything)
if (!do_everything) continue; \ if (!do_everything) continue; \
} while (0) } while (0)
/*
* TODO:
*
* finish -geometry
*/
char *val; char *val;
while (--argc > 0) { while (--argc > 0) {
char *p = *++argv; char *p = *++argv;
if (!strcmp(p, "-fn")) { if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
EXPECTS_ARG; EXPECTS_ARG;
SECOND_PASS_ONLY; SECOND_PASS_ONLY;
strncpy(cfg.font, val, sizeof(cfg.font)); strncpy(cfg.font, val, sizeof(cfg.font));
@ -1617,6 +1625,54 @@ int do_cmdline(int argc, char **argv, int do_everything)
strncpy(cfg.boldfont, val, sizeof(cfg.boldfont)); strncpy(cfg.boldfont, val, sizeof(cfg.boldfont));
cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0'; cfg.boldfont[sizeof(cfg.boldfont)-1] = '\0';
} else if (!strcmp(p, "-geometry")) {
int flags, x, y, w, h;
EXPECTS_ARG;
SECOND_PASS_ONLY;
flags = XParseGeometry(val, &x, &y, &w, &h);
if (flags & WidthValue)
cfg.width = w;
if (flags & HeightValue)
cfg.height = h;
/*
* Apparently setting the initial window position is
* difficult in GTK 1.2. Not entirely sure why this
* should be. 2.0 has gtk_window_parse_geometry(),
* which would help... For the moment, though, I can't
* be bothered with this.
*/
} else if (!strcmp(p, "-sl")) {
EXPECTS_ARG;
SECOND_PASS_ONLY;
cfg.savelines = atoi(val);
} else if (!strcmp(p, "-fg") || !strcmp(p, "-bg") ||
!strcmp(p, "-bfg") || !strcmp(p, "-bbg") ||
!strcmp(p, "-cfg") || !strcmp(p, "-cbg")) {
GdkColor col;
EXPECTS_ARG;
SECOND_PASS_ONLY;
if (!gdk_color_parse(val, &col)) {
err = 1;
fprintf(stderr, "pterm: unable to parse colour \"%s\"\n", val);
} else {
int index;
index = (!strcmp(p, "-fg") ? 0 :
!strcmp(p, "-bg") ? 2 :
!strcmp(p, "-bfg") ? 1 :
!strcmp(p, "-bbg") ? 3 :
!strcmp(p, "-cfg") ? 4 :
!strcmp(p, "-cbg") ? 5 : -1);
assert(index != -1);
cfg.colours[index][0] = col.red / 256;
cfg.colours[index][1] = col.green / 256;
cfg.colours[index][2] = col.blue / 256;
}
} else if (!strcmp(p, "-e")) { } else if (!strcmp(p, "-e")) {
/* This option swallows all further arguments. */ /* This option swallows all further arguments. */
if (!do_everything) if (!do_everything)
@ -1646,23 +1702,31 @@ int do_cmdline(int argc, char **argv, int do_everything)
cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0'; cfg.logfilename[sizeof(cfg.logfilename)-1] = '\0';
cfg.logtype = LGTYP_DEBUG; cfg.logtype = LGTYP_DEBUG;
} else if (!strcmp(p, "-hide")) { } else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
SECOND_PASS_ONLY;
cfg.hide_mouseptr = 1;
} else if (!strcmp(p, "-ut-")) {
SECOND_PASS_ONLY; SECOND_PASS_ONLY;
cfg.stamp_utmp = 0; cfg.stamp_utmp = 0;
} else if (!strcmp(p, "-ls-")) { } else if (!strcmp(p, "-ut")) {
SECOND_PASS_ONLY;
cfg.stamp_utmp = 0;
} else if (!strcmp(p, "-ls-") || !strcmp(p, "+ls")) {
SECOND_PASS_ONLY; SECOND_PASS_ONLY;
cfg.login_shell = 0; cfg.login_shell = 0;
} else if (!strcmp(p, "-ls")) {
SECOND_PASS_ONLY;
cfg.login_shell = 1;
} else if (!strcmp(p, "-nethack")) { } else if (!strcmp(p, "-nethack")) {
SECOND_PASS_ONLY; SECOND_PASS_ONLY;
cfg.nethack_keypad = 1; cfg.nethack_keypad = 1;
} else if (!strcmp(p, "-sb-")) { } else if (!strcmp(p, "-sb-") || !strcmp(p, "+sb")) {
SECOND_PASS_ONLY;
cfg.scrollbar = 0;
} else if (!strcmp(p, "-sb")) {
SECOND_PASS_ONLY; SECOND_PASS_ONLY;
cfg.scrollbar = 0; cfg.scrollbar = 0;