summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2012-06-29 12:55:36 +0000
committerache <ache@FreeBSD.org>2012-06-29 12:55:36 +0000
commit213f4b7f2551bf5affdf0ffd7bd47680c677b0ee (patch)
tree54eb066bb4e49ccdfa5994e20238a7fd00f83e9f /usr.sbin
parentc7cc39ce72219109c44462457210f0113ed35680 (diff)
downloadFreeBSD-src-213f4b7f2551bf5affdf0ffd7bd47680c677b0ee.zip
FreeBSD-src-213f4b7f2551bf5affdf0ffd7bd47680c677b0ee.tar.gz
Call set_terminal_mode() after video mode change, not before, because
video mode change always reset terminal mode to xterm. It allows things like 'vidcontrol -T cons25 80x30' works as supposed, and allows 'allscreens_flags="-T cons25 80x30"' in /etc/rc.conf too. MFC after: 1 week
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/vidcontrol/vidcontrol.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.sbin/vidcontrol/vidcontrol.c b/usr.sbin/vidcontrol/vidcontrol.c
index b2e41bf..630de74 100644
--- a/usr.sbin/vidcontrol/vidcontrol.c
+++ b/usr.sbin/vidcontrol/vidcontrol.c
@@ -1192,15 +1192,13 @@ set_terminal_mode(char *arg)
fprintf(stderr, "\033[=T");
else if (strcmp(arg, "cons25") == 0)
fprintf(stderr, "\033[=1T");
- else
- usage();
}
int
main(int argc, char **argv)
{
- char *font, *type;
+ char *font, *type, *termmode;
int dumpmod, dumpopt, opt;
int reterr;
@@ -1212,6 +1210,7 @@ main(int argc, char **argv)
err(1, "must be on a virtual console");
dumpmod = 0;
dumpopt = DUMP_FBF;
+ termmode = NULL;
while ((opt = getopt(argc, argv,
"b:Cc:df:g:h:Hi:l:LM:m:pPr:S:s:T:t:x")) != -1)
switch(opt) {
@@ -1283,7 +1282,10 @@ main(int argc, char **argv)
set_console(optarg);
break;
case 'T':
- set_terminal_mode(optarg);
+ if (strcmp(optarg, "xterm") != 0 &&
+ strcmp(optarg, "cons25") != 0)
+ usage();
+ termmode = optarg;
break;
case 't':
set_screensaver_timeout(optarg);
@@ -1306,6 +1308,8 @@ main(int argc, char **argv)
}
video_mode(argc, argv, &optind);
+ if (termmode != NULL)
+ set_terminal_mode(termmode);
get_normal_colors(argc, argv, &optind);
OpenPOWER on IntegriCloud