Commit Graph

55 Commits

Author SHA1 Message Date
Toomas Soome
e7fd9688ea Move font related data structured to sys/font.c and update vtfontcvt
Prepare support to be able to handle font data in loader, consolidate
data structures to sys/font.h and update vtfontcvt.

vtfontcvt update is about to output set of glyphs in form of C source,
the implementation does allow to output compressed or uncompressed font
bitmaps.

Reviewed by:	bcr
Differential Revision:	https://reviews.freebsd.org/D24189
2020-06-14 06:58:58 +00:00
Ed Maste
0a3ed02ab8 vt: fix duplicate keymap descriptions
PR:		246495
Submitted by:	Jorge Maidana
MFC after:	1 week
2020-05-20 20:24:37 +00:00
Toomas Soome
1311154d3b gallant: pound sign (0xa3) is a bit broken. Add extra glyphs.
I did add some more glyphs to provide box drawing and set of additional
glyphs to provide better support for some code pages. Still does not quite
match terminus.
2020-03-30 20:07:25 +00:00
Carlo Strub
829a8a6550 - sort according to scan code
- adapt some alt and alt shift keys to other standard keyboards
- fix ctrl-d to issue eot

Approved by:	philip (implicit)
2020-03-22 21:41:32 +00:00
Toomas Soome
f67d5361a8 gallant is 12x22, not 8x16
INDEX.fonts does list gallant with wrong size.
2020-03-09 19:43:28 +00:00
Hiroki Sato
604d0dd551 Use 0x5c for the scan code 0x7d.
Japanese keyboards traditionally use 0x5c for
both Japanese yen sign key and backslash key.
While a Japanese yen sign is depicted on the keytop,
most of Japanese expect that the scan code 0x7d gives
a backslash (0x5c), not a Japanese yen sign (0xa5).

This is because JIS X 0201 encoding (aka ISO/IEC 646-JA,
an extended version of ASCII which is very popular
in Japan) has Japanese yen sign at 0x5c and
no backslash.  On the other hand, ISO/IEC 8859-1
has Japanese yen sign at 0xa5.  This difference has
caused a confusion after Unicode became popular since
ISO/IEC 10646 adopted 8859-1 for the plane 0.

MFC after:	1 week
2020-02-18 01:50:44 +00:00
Ed Maste
ca74f06a98 remove again nonexistent from-* entries from vt INDEX.keymaps
A number of entries of the form "de.kbd.from-cp850" existed in vt's
INDEX.keymaps, added in r270114, but these files do not exist.

I removed them in r355585 but accidentally re-added them in r355592.
Remove them yet again.

PR:		235564, 235853
MFC after:	1 week
2019-12-10 20:11:39 +00:00
Ed Maste
46035750a4 Add Danish translation for vt font and keymap INDEX files
Also sort some entries into the correct location, correct MacBook
capitalization, etc.

PR:		235853
MFC after:	1 week
Submitted by:	scootergrisen gmail com
2019-12-10 20:02:57 +00:00
Stefan Eßer
746af69907 Replace two remaining hex values for control codes with their names.
These were the only values in the range from 0 to 0x1f that were defined
as hex values, all other occurances have been converted before.

MFC after:	1 week
2019-12-10 19:52:29 +00:00
Ed Maste
be35d6745b remove nonexistent from-* entries from vt INDEX.keymaps
A number of entries of the form "de.kbd.from-cp850" existed in vt's
INDEX.keymaps, added in r270114, but these files do not exist.

PR:		235564
Submitted by:	scootergrisen gmail com
MFC after:	1 week
2019-12-10 14:35:38 +00:00
Ed Maste
061346b271 strip trailing whitespace from font and keymap INDEX files
PR:		235853
Submitted by:	scootergrisen gmail com
MFC after:	1 week
2019-12-10 13:52:08 +00:00
Ed Maste
00b6911b7f Add missing language specifier for Hebrew il.kbd description
PR:		235094 (related)
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
2019-12-10 03:42:59 +00:00
Ed Maste
c6e475ff5a allow vt(4) fonts to be built from .bdf files
vtfontcvt(8) can convert both .bdf and .hex inputs to binary vt(4) .fnt
files.

Event:		Berlin Devsummit 2019
Sponsored by:	The FreeBSD Foundation
2019-06-16 12:44:49 +00:00
Carlo Strub
71ceff9f0b Colemak Mod DH keyboard layout
This is a minor modification of the Colemak keyboard layout.
See: http://colemakmods.github.io/mod-dh/

Reviewed by:	philip
Differential Revision:	https://reviews.freebsd.org/D20133
2019-05-05 09:02:32 +00:00
David Bright
735bd25d31 Add uk.macbook.kbd keymap (vt)
PR:		215185
Submitted by:	James Wright <james.wright@jigsawdezign.com>
Reported by:	James Wright <james.wright@jigsawdezign.com>
Reviewed by:	emaste (earlier version)
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D18395
2018-12-11 02:14:40 +00:00
Ed Maste
c7be3f26e8 Add some tom-thumb vt font glyphs
Primarily missing glyphs used by mandoc.

Added:
U+2010 hyphen
U+2011 non-breaking hyphen
U+2012 figure dash
U+2013 en dash
U+2014 em dash
U+2018 left single quotation mark
U+2019 right single quotation mark
U+2020 dagger
U+2021 double dagger
U+203E overline
U+2122 trade mark sign
U+2502 box drawings light vertical
U+25A1 white square
U+25CA lozenge
U+25CB circle
U+2660 black spade suit
U+2663 black club suit
U+2665 black heart suit
U+2666 black diamond suit
U+FFFD replacement char

Sponsored by:	The FreeBSD Foundation
2018-10-21 00:35:54 +00:00
Ed Maste
6c8a899dc5 Add vt(4) INDEX.fonts
PR:		231237
Submitted by:	Martin <martin.jakob@gmx.com> (original version)
Approved by:	re (gjb, kib)
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
2018-09-10 20:46:17 +00:00
Kevin Lo
2a7ea45864 Follow up to r333195, add us Macbook/Macbook Pro keyboard support.
Tested by:	rcyu
2018-08-09 09:06:30 +00:00
Ed Maste
55efba01c6 Correct tom-thumb vt font glyphs
A few glyphs were converted incorrectly:
U+00A6 broken bar - center
U+2022 bullet - center
U+2026 horizontal ellipsis - move to bottom of character cell
2018-04-13 17:37:39 +00:00
Ed Maste
7075c67633 Add tom-thumb, a tiny (4x6) vt font
Obtained from:	https://robey.lag.net/2010/01/23/tiny-monospace-font.html
MFC after:	2 weeks
2018-04-13 16:54:49 +00:00
Ed Maste
5436aaae64 vt: add Ctrl+/ key mapping
This matches Xorg's handling of Ctrl+/ and may be useful as a tmux
escape.

PR:		212197
Submitted by:	martin at sugioarto.com
Tested by:	Arshan Khanifar <arshankhanifar_gmail.com>
MFC after:	2 weeks
Relnotes:	Yes
2018-01-25 21:13:42 +00:00
Stefan Eßer
eb69150993 Adjust path to X11 locale files (/usr/X11 has been changed to /usr/local a
long ago) in comment. No functional change.
2017-08-01 09:34:15 +00:00
Stefan Eßer
5c4a023c86 Add alternate Turkish keyboard layout F. The layout and menu texts have
been provided by Ufuk Güler, with minor changes for consistency by me.

Submitted by:	Ufuk Güler <ufukguler@yahoo.com>
MFC after:	1 week
2017-08-01 09:30:21 +00:00
Ed Maste
f44ebc9c73 Add "Terminus BSD Console" size 32
Dimitar Toshkov, Terminus' creator, has made size 32 available under the
2-clause BSD license for use by *BSD consoles.
2017-06-26 18:11:48 +00:00
Yoshihiro Takahashi
2b375b4edd Remove pc98 support completely.
I thank all developers and contributors for pc98.

Relnotes:	yes
2017-01-28 02:22:15 +00:00
Ed Maste
68510f3bac Remove uudecode make rule for vt fonts
vt(4) fonts are provided in either .bdf or .hex form, and the binary
.fnt file is generated by vtfontcvt at build time.
2016-02-29 18:35:16 +00:00
Ed Maste
13f727c862 Replace prebuilt uuencoded gallant.fnt with editable hex version 2016-01-27 20:23:42 +00:00
Ed Maste
80cc8ef4d7 Use correct name 'us' for character 31 in keymaps
'ns' was a historical accident, and kbdcontrol(1) has accepted the
correct 'us' as well as 'ns' since r38139.

PR:		205776
MFC after:	1 week
2016-01-02 04:42:53 +00:00
Bryan Drewery
b1f92fa229 META MODE: Update dependencies with 'the-lot' and add missing directories.
This is not properly respecting WITHOUT or ARCH dependencies in target/.
Doing so requires a massive effort to rework targets/ to do so.  A
better approach will be to either include the SUBDIR Makefiles directly
and map to DIRDEPS or just dynamically lookup the SUBDIR.  These lose
the benefit of having a userland/lib, userland/libexec, etc, though and
results in a massive package.  The current implementation of targets/ is
very unmaintainable.

Currently rescue/rescue and sys/modules are still not connected.

Sponsored by:	EMC / Isilon Storage Division
2015-12-01 05:23:19 +00:00
Bryan Drewery
93e779a26c META MODE: These need object directories to handle staging.
Sponsored by:	EMC / Isilon Storage Division
2015-11-26 01:14:27 +00:00
Ed Maste
0e28ca2eff Add double size 16x32 VGA ROM font
This was created from vgarom-8x16.hex, and should be useful for higher
resolution displays.

Sponsored by:	The FreeBSD Foundation
2015-09-25 02:52:54 +00:00
Ed Maste
bfb439bb66 kbdmap(1): Correct menu title: keyboards have a layout, not a language
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D2545
2015-05-14 18:09:56 +00:00
Ed Maste
eb34081ba1 Restore 'he' language code for Hebrew kbdmap(1) menu title
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
2015-05-14 14:40:01 +00:00
Ed Maste
e51fbd6f54 Correct language code -- "Danish" is English
The menu entry "Danish ISO-8859-1 (macbook)" was first added to the
syscons(4) INDEX.keymaps in r241851 with no language code, and then in
r256367 incorrectly tagged with "da".  It is a Danish keyboard map, but
the description is in English and therefore must be "en".

This error subsequently propagated into the vt(4) INDEX.keymaps.

PR:		146793, 193656
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
2015-05-14 14:07:44 +00:00
Ed Maste
37842ca51f Correct UTF-8 encoding in Británico
One á was ISO 8859-1 0xE1 instead of UTF-8 0xC3 0xA1.
2015-05-14 13:27:24 +00:00
Stefan Eßer
dfa754ef3e Add forgotten keymap files fr.kbd and fr.acc.kbd to the FILES list.
Obtained from:	thierry
MFC after:	3 days
2014-09-12 06:23:57 +00:00
Stefan Eßer
7a93a037ea Next round of fixes.
MFC after:	3 days
2014-08-21 20:33:09 +00:00
Stefan Eßer
fdd869bd8a Another rpund of fixes, after checking keymaps for plausibility and with
several updates to the converter tools. There is now support for hybrid
source keymaps, which e.g. use ISO8859-1 (not -15) but still provide an
Euro key (on the "E" key). ISO8859-1 currency symbols on other keys are
still converted to that character, not the Euro sign. A similar hack was
applied to the Japanese keyboards to add the Yen key, that could not be
expressed in SYSCONS.

Several modifications have been applied after the conversion (removal of
unused accents tables, some reformatting, exchange of a few key symbols).

The German keymap (de.kbd) is now using deadkeys only for those keys,
that behave that way under Windows. There are now ".acc" and ".noacc"
variants, which use deadkeys vs. nodeadkeys for all accent keys.

I'm still in the process of comparing keymaps that existed in different
encodings in SYSCONS. These are generally translated slightly differently,
either because of mistakes, or because of different preferences, or due
to limitations of the respective encoding.

MFC after:	3 days
2014-08-20 17:00:47 +00:00
Stefan Eßer
0ee7262a72 Fix conversion errors leading to malformed keymap files.
MFC after:	3 days
2014-08-20 07:48:09 +00:00
Stefan Eßer
62016143f1 Fix a few conversion problems (e.g. when a keymap is derived from ISO8859-1,
but shall provide an Euro sign - similar for Japanese Yen).

The Brazilian keymap "br.kbd" now has accents, by default - the no-accents
version has been renamed to "br.noacc.kbd".

MFC after:	3 days
2014-08-18 21:07:12 +00:00
Ed Maste
9b3057f932 Add Canadian Bilingual keyboard 2014-08-18 17:10:55 +00:00
Ed Maste
63200084dc Rename ca keyboard to ca-fr
"ca" will shortly be used for the Canadian Multilingual keyboard.
2014-08-18 01:49:42 +00:00
Stefan Eßer
7ba08f8145 Attempt at converting the SYSCONS keymaps to Unicode for use with NEWCONS.
I have spent many hours comparing source and destination formats, and hope
to have caught the most severe conversion errors.

Files were converted with a Perl script which I'll shortly commit to the
tools directory. This script is a much enhanced version of the one
provided by ray@ and is expected to support the full kbdmap(5) syntax.

The naming convention used is:

 <2-letter country code>.<variant>.kbd

Only if there are multiple layouts for different languages:

 <2-letter country code>-<2-letter language code>.<variant>.kbd

In nearly all cases, the keyboards are country specific, only. Currently
there is only one case where the language was added ("ch-fr.kbd" for
the Swiss-French keyboard layout).

I choose to write Unicode character codes as hex numbers. While this
increases the diff to the SYSCONS keymap files for the trivial cases
(conversion from ISO8859-1), it really helps to verify the more complex
cases against a Unicode table (which is indexed by hex numbers).

This commit does not cover all files that have been converted, since I
need to sort out which ones to use, if there were several with different
source encodings to choose from.

Review and test of the keymap files is highly desirable before 10.1 is
released. I'd also appreciate educated opinions regarding the optimum
variant (to be made available as the default for each language).

Since there are no NEWCONS keymaps in 10-STABLE, I plan to MFC after
the minimum allowed delay of 3 days, to allow at least a few weeks to
test and improve what will be in the next release.

MFC after:	3 days
2014-08-17 19:54:21 +00:00
Ed Maste
661840985b Fix euro symbol in copied keymaps
These were copied from share/syscons/keymaps/??.iso.kbd.  They were
not actually ISO 8859-1 as assumed.  When interpreted as Unicode they
ended up with the generic currency sign (U+00A4) instead of the euro
(U+20AC).

Reported by:	Claude Buisson, tijl@
2014-08-14 13:45:02 +00:00
Ed Maste
d43409ee19 Remove trailing whitespace 2014-08-13 19:55:14 +00:00
Ed Maste
a232c1d130 Copy country-code .iso syscons keymaps for vt(4)
Existing syscons ISO 8859-1 keymaps (??.iso.kbd) are usable without
change as Unicode keymaps for vt(4).

Sponsored by:	The FreeBSD Foundation
2014-08-13 19:06:29 +00:00
Edward Tomasz Napierala
03eb55e53c Add polish vt(4) keymap.
Sponsored by:	The FreeBSD Foundation
2014-06-18 07:23:04 +00:00
Ed Maste
31bcfda84e Add glyphs from converted syscons iso* fonts
This consists of the unique glyphs from the following font files in
/usr/share/syscons/fonts:

iso*.fnt     ISO-8859-1 West European
iso02*.fnt   ISO-8859-2 Central European
iso04*.fnt   ISO-8859-4 Baltic
iso05*.fnt   ISO-8859-5 Cyrillic
iso07*.fnt   ISO-8859-7 Greek
iso08*.fnt   ISO-8859-8 Hebrew
iso09*.fnt   ISO-8859-9 Turkish
iso15*.fnt   ISO-8859-15 West European

Sponsored by:	The FreeBSD Foundation
2014-06-17 13:12:30 +00:00
Ed Maste
cce0f18281 Build vt(4) fonts during buildworld
vtfontcvt(8) is now built during buildworld, so can be used as a
bootstrap tool to create vt(4) fonts from source .hex or .bdf font
files, rather than having uuencoded binary fonts in the tree.

Sponsored by:	The FreeBSD Foundation
2014-06-12 18:31:32 +00:00
Ed Maste
d1aefcd58f Add thin versions of VGAROM 8x8 and 8x16 fonts for vt(4)
These are converted from syscons(4) cp437-thin-8x* fonts.
2014-06-12 15:23:51 +00:00