Commit Graph

60 Commits

Author SHA1 Message Date
Andrey A. Chernov
436f647402 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
2012-06-29 12:55:36 +00:00
Ulrich Spörlein
3df5ecac8c Spelling fixes for usr.sbin/ 2011-12-30 10:58:14 +00:00
Ulrich Spörlein
f76b319989 Reencode files to UTF-8. Drop CP1252 em-dash. 2011-12-30 00:59:08 +00:00
Ed Schouten
3be02c20ca Add static keywords to vidcontrol(1).
While there, remove the false optimisation of the colors array. It seems
that changing it to an array of pointers instead of a 16x16 array does
not cause any increase in binary size at all.
2011-12-11 21:02:33 +00:00
Jung-uk Kim
f46f4ae113 Print memory model of the video mode except for planar memory model.
'P', 'D', 'C', 'H', 'V' mean packed pixel, direct color, CGA, Hercules,
VGA X memory models respectively where they have fixed number of planes.
2010-03-29 20:12:44 +00:00
Ed Schouten
c8f1c81702 Add a new flag to vidcontrol, -T, that allows terminal mode switching.
This will make it more easy for people to experiment with TERM=xterm.
Instead of echoing these strange escape sequences, I can just instruct
them to run `vidcontrol -T xterm'.
2009-11-11 08:39:57 +00:00
Ruslan Ermilov
eb0fa6f5d7 Remove bogus casts of valid integer ioctl() arguments. 2006-09-26 21:46:12 +00:00
Craig Rodrigues
387d535430 Fix so that color changes are not lost when the video mode changes.
PR:	bin/83553
Submitted by:	Dan Lukes <dan at obluda dot cz>
2005-09-17 12:52:04 +00:00
Xin LI
f112120666 Add VESA mode support for syscons, which enables the support of 15, 16,
24, and 32 bit modes.  To use that, syscons(4) must be built with
the compile time option 'options SC_PIXEL_MODE', and VESA support (a.k.a.
vesa.ko) must be either loaded, or be compiled into the kernel.

Do not return EINVAL when the mouse state is changed to what it already is,
which seems to cause problems when you have two mice attached, and
applications are not likely obtain useful information through the EINVAL
caused by showing the mouse pointer twice.

Teach vidcontrol(8) about mode names like MODE_<NUMBER>, where <NUMBER> is
the video mode number from the vidcontrol -i mode output.  Also, revert the
video mode if something fails.

Obtained from:	DragonFlyBSD
Discussed at:	current@ with patch attached [1]
PR:		kern/71142 [2]
Submitted by:	Xuefeng DENG <dsnofe at msn com> [1],
		Cyrille Lefevre <cyrille dot lefevre at laposte dot net> [2]
2005-05-29 08:43:44 +00:00
Yoshihiro Takahashi
5ad9a2d7ba Use \033 instead of \e because \e is not a standard.
Noticed by:	stefanf
Reviewed by:	diff(1)
2005-05-15 09:43:14 +00:00
Yoshihiro Takahashi
947d66c070 A foreground color number on pc98 console is 7 not 15. 2005-05-15 08:04:46 +00:00
Yoshihiro Takahashi
2d8cb12d20 Use \e for escape char instead of ^[ directly. 2005-05-15 07:41:38 +00:00
Xin LI
9a03b27dba WANRS=6 cleanup for vidcontrol(1):
- Use foo(void) instead of foo().
	- Use static where applicable.
	- Apply more const's when passing parameters
	- signed/unsigned madness
	- Avoid namespace collision by adding underscores.
	- For 64-bit architectures, use %zx instead of %x
	  when necessary.
	- When storing constants, use const instead of
	  variable.
	- Bump WARNS?= from 2 to 6
2005-01-13 03:59:44 +00:00
Eivind Eklund
a0503c278d Propagate ioctl() failure to exit status 2003-09-18 16:20:32 +00:00
Maxim Sobolev
c449db6ab2 Add a new -H' modifier, which when combined with -p' or `-P' allows to dump
full console history.
2002-08-19 16:33:23 +00:00
Dima Dorfman
5d1bb94f36 Remove some missing words.
Submitted by:	roam
2002-07-10 03:39:52 +00:00
Dima Dorfman
5ec065ee15 Deuglify the usage message by making it look more like the synopsis in
the manual page.
2002-07-10 03:37:42 +00:00
Dima Dorfman
b471ed9e9d Add an -S option that allows the user to disable vty switching. It is
implemented using a new VT_LOCKSWITCH ioctl.  Although it is possible
to implement something like this by VT_SETMODEing to VT_PROCESS and
never releasing the vty, that method has a number of downsides, the
biggest of which is that some program has to stay resident for the
lock to be in effect.

Reviewed by:	roam, sheldonh
2002-07-10 03:31:25 +00:00
Jens Schweikhardt
21dc7d4f57 Fix typo in the BSD copyright: s/withough/without/
Spotted and suggested by:	des
MFC after:	3 weeks
2002-06-02 20:05:59 +00:00
Maxim Sobolev
3646fbdacb When loading a font allow suffix specifying its size be omited, in which
case use size of the currently displaying font as a suffix. For example,
when the when the size of the currently displayed font is 8x8 the
following command will load koi8-r-8x8.fnt.

# vidcontrol -f koi8-r

MFC after:	2 weeks
2002-03-16 23:35:51 +00:00
Kazutaka YOKOTA
e64c88b2dc Use the correct ioctl command to set a VESA mode.
PR: 24423
MFC after: 10 days
2001-07-22 13:30:32 +00:00
Dag-Erling Smørgrav
031c57af94 Move the scrollback controls from kbdcontrol to vidcontrol.
Also fix some style bugs in the code and poor language in the man pages.

Reviewed by:	sobomax
2001-05-28 11:05:28 +00:00
Maxim Sobolev
1f22a113d0 - Sort usage() output;
- sync usage() with reality and manpage;
- display usage() even if terminal is not a syscons.

Submitted by:	ru, sobomax
2001-05-20 12:17:31 +00:00
Maxim Sobolev
d02ca551d3 Move scrshot(1) functionality into vidcontrol(1).
Suggested by:		many
Not objected to by:	nik (scrshot co-author)
2001-05-19 06:47:36 +00:00
Andrey A. Chernov
e4ef2fa234 Proper upper limit for mousechar start is UCHAR_MAX - 3, not UCHAR_MAX
PR:		24437
Submitted by:	Cejka Rudolf <cejkar@dcse.fee.vutbr.cz>
2001-04-21 13:50:32 +00:00
Maxim Sobolev
5e0db936b5 Allow user to omit font size specification when loading a font. In addition
the following fixes had been made:

- check the size of the font being loaded and compare it with possible sizes
  to minimise possibility of loading something that is not a fontfile at all
  and turning console screen into garbage;

- prevent buffer overflow (and coredump as a result ) when loading valid
  uuencoded file with size that exceeds allocated buffer;

- correct and improve several error messages.

Approved by:	-audit, -hackers (silently)
2001-04-09 17:24:29 +00:00
Maxim Sobolev
acdb2839d6 New option `-g' to allow selecting custom text geometry in VESA_800x600 raster
text mode. For example `vidcontrol -g 100x37 VESA_800x600' will setup 100x37
text mode as opposed to default 80x25.

Reviewed by:	imp
2001-01-25 16:53:22 +00:00
Poul-Henning Kamp
00d25f512c Initiate deorbit burn sequence for <machine/console.h>.
Replace all in-tree uses with necessary subset of <sys/{fb,kb,cons}io.h>.
This is also the appropriate fix for exo-tree sources.

Put warnings in <machine/console.h> to discourage use.
November 15th 2000 the warnings will be converted to errors.
January 15th 2001 the <machine/console.h> files will be removed.
2000-10-08 21:34:00 +00:00
Kazutaka YOKOTA
e2f29c6e43 Make the mouse cursor char code configurable via the CONS_MOUSECTL
ioctl.

By popular demand.
2000-01-12 12:30:33 +00:00
Bill Fumerola
39b235ef20 -Wall fix: ambigious else 1999-10-15 17:33:24 +00:00
Kazutaka YOKOTA
a0d3b21c88 Fix -s option.
PR: bin/13799
1999-09-19 08:04:07 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Kazutaka YOKOTA
ac80d4b498 Reflect recent changes in syscons. 1999-06-22 14:15:46 +00:00
Doug Rabson
2bfad86d33 Back out a couple of i386 conditionals which aren't needed with the new
syscons and fix a few printfs.

Reviewed by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1999-01-25 08:48:49 +00:00
Matt Jacob
bc9e0443f4 fix for compiling on alpha 1999-01-12 23:05:45 +00:00
Kazutaka YOKOTA
c67e8bd332 The first stage of console driver reorganization: activate new
keyboard and video card drivers.
1999-01-11 03:20:32 +00:00
Kazutaka YOKOTA
ad7b2eec31 - Express various sizes in bytes, rather than Kbytes, in the video
mode and adapter information structures.
1998-10-01 11:40:22 +00:00
Gary Palmer
028a80e4a8 Don't assume that we have extended modes on all platforms. 1998-09-24 01:36:36 +00:00
Kazutaka YOKOTA
cb1d2924c4 VESA BIOS support update in syscons.
- Accept generic video mode names: 80x25, 80x30, etc. Specific video
  mode names, VGA_80x25, VESA_132x25, are still accpeted too.
- Update the man page accordingly.
1998-09-23 10:00:15 +00:00
Andrzej Bialecki
8a8d9b082f Add new '-i' option to usage(). 1998-09-16 13:55:26 +00:00
Søren Schmidt
a8445737e7 Add VESA support to syscons.
Kazu writes:

The VESA support code requires vm86 support. Make sure your kernel
configuration file has the following line.
        options "VM86"
If you want to statically link the VESA support code to the kernel,
add the following option to the kernel configuration file.
        options "VESA"

The vidcontrol command now accepts the following video mode names:
VESA_132x25, VESA_132x43, VESA_132x50, VESA_132x60, VESA_800x600

The VESA_800x600 mode is a raster display mode. The 80x25 text will
be displayed on the 800x600 screen. Useful for some laptop computers.

vidcontrol accepts the new `-i <info>' option, where <info> must be
either `adapter' or `mode'.  When the `-i adapter' option is given,
vidcontrol will print basic information (not much) on the video
adapter. When the `-i mode' option is specified, vidcontrol will
list video modes which are actually supported by the video adapter.

Submitted by:   Kazutaka YOKOTA yokota@FreeBSD.ORG
1998-09-15 18:16:39 +00:00
Bruce Evans
af01fff37b ioctl() request args are unsigned longs, so don't attempt to store
them as ints.  Among other bugs, doing so at best caused benign
overflow followed by fatal sign extension on machines with 32-bit
ints and 64-bit longs.
1998-07-14 10:32:27 +00:00
Philippe Charnier
9396247ef7 Use err(3). Stylistic changes in man page. 1997-10-27 07:52:10 +00:00
Peter Wemm
ca54d4017a Update to compile under Lite2 includes 1997-03-11 14:25:31 +00:00
Brian Somers
bfc214e329 Add a -s option for setting the current vty. This should make
life easier if a PS/2 mouse locks up the keyboard (frequent-ish,
but not repeatable).
Tidy up code (a bit) and make it -Wall

Is this a 2.2 candidate ? (although it doesn't -Wall in 2.2 because
of the lack of sys/sysproto.h
1997-03-07 01:34:47 +00:00
Peter Wemm
476602a9d0 Revert $FreeBSD$ to $Id$ 1997-02-22 16:15:28 +00:00
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Gary Palmer
21496d485b Fix typo.
Submitted by:	Philippe Charnier <charnier@xp11.frmug.org>
1996-07-03 22:06:12 +00:00
Søren Schmidt
bfa09c9c30 Added new -m option, that enable / disables the mousepointer on
a textmode screen.
1996-06-21 07:20:13 +00:00
Rodney W. Grimes
709e8f9ae1 Remove trailing whitespace. 1995-05-30 03:57:47 +00:00