|
 |
84b277 |
From e39ab9b0f4d2cbc9fab10c64c2527908526ea86e Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Carl Schaefer <schaefer@trilug.org>
|
|
|
84b277 |
Date: Mon, 23 Jun 2014 18:23:48 +0200
|
|
|
84b277 |
Subject: [PATCH] vconsole: also copy character maps (not just fonts) from vt1
|
|
|
84b277 |
to vt2, vt3, ...
|
|
|
84b277 |
|
|
|
84b277 |
https://bugs.freedesktop.org/show_bug.cgi?id=78796
|
|
|
84b277 |
|
|
|
84b277 |
(cherry picked from commit ff452e76e2c0f89a32542b7179bb2fd538335933)
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #1002450
|
|
|
84b277 |
---
|
|
|
84b277 |
src/vconsole/vconsole-setup.c | 24 ++++++++++++++++++++++++
|
|
|
84b277 |
1 file changed, 24 insertions(+)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
|
|
|
84b277 |
index 1bbf737..7196ddf 100644
|
|
|
84b277 |
--- a/src/vconsole/vconsole-setup.c
|
|
|
84b277 |
+++ b/src/vconsole/vconsole-setup.c
|
|
|
84b277 |
@@ -180,6 +180,10 @@ static int font_load(const char *vc, const char *font, const char *map, const ch
|
|
|
84b277 |
*/
|
|
|
84b277 |
static void font_copy_to_all_vcs(int fd) {
|
|
|
84b277 |
struct vt_stat vcs = {};
|
|
|
84b277 |
+ unsigned char map8[E_TABSZ];
|
|
|
84b277 |
+ unsigned short map16[E_TABSZ];
|
|
|
84b277 |
+ struct unimapdesc unimapd;
|
|
|
84b277 |
+ struct unipair unipairs[USHRT_MAX];
|
|
|
84b277 |
int i, r;
|
|
|
84b277 |
|
|
|
84b277 |
/* get active, and 16 bit mask of used VT numbers */
|
|
|
84b277 |
@@ -209,6 +213,26 @@ static void font_copy_to_all_vcs(int fd) {
|
|
|
84b277 |
cfo.op = KD_FONT_OP_COPY;
|
|
|
84b277 |
cfo.height = vcs.v_active-1; /* tty1 == index 0 */
|
|
|
84b277 |
ioctl(vcfd, KDFONTOP, &cfo;;
|
|
|
84b277 |
+
|
|
|
84b277 |
+ /* copy map of 8bit chars */
|
|
|
84b277 |
+ if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)
|
|
|
84b277 |
+ ioctl(vcfd, PIO_SCRNMAP, map8);
|
|
|
84b277 |
+
|
|
|
84b277 |
+ /* copy map of 8bit chars -> 16bit Unicode values */
|
|
|
84b277 |
+ if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)
|
|
|
84b277 |
+ ioctl(vcfd, PIO_UNISCRNMAP, map16);
|
|
|
84b277 |
+
|
|
|
84b277 |
+ /* copy unicode translation table */
|
|
|
84b277 |
+ /* unimapd is a ushort count and a pointer to an
|
|
|
84b277 |
+ array of struct unipair { ushort, ushort } */
|
|
|
84b277 |
+ unimapd.entries = unipairs;
|
|
|
84b277 |
+ unimapd.entry_ct = USHRT_MAX;
|
|
|
84b277 |
+ if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {
|
|
|
84b277 |
+ struct unimapinit adv = { 0, 0, 0 };
|
|
|
84b277 |
+
|
|
|
84b277 |
+ ioctl(vcfd, PIO_UNIMAPCLR, &adv);
|
|
|
84b277 |
+ ioctl(vcfd, PIO_UNIMAP, &unimapd);
|
|
|
84b277 |
+ }
|
|
|
84b277 |
}
|
|
|
84b277 |
}
|
|
|
84b277 |
|