From 41d83615beba984cc40b141373fa61f9fd1273e4 Mon Sep 17 00:00:00 2001

From: Carl Schaefer <schaefer@trilug.org>

Date: Mon, 23 Jun 2014 18:23:48 +0200

Subject: [PATCH] vconsole: also copy character maps (not just fonts) from vt1

 to vt2, vt3, ...

https://bugs.freedesktop.org/show_bug.cgi?id=78796

(cherry picked from commit ff452e76e2c0f89a32542b7179bb2fd538335933)

---

 src/vconsole/vconsole-setup.c | 24 ++++++++++++++++++++++++

 1 file changed, 24 insertions(+)

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c

index 0f2b7066..e0c40506 100644

--- a/src/vconsole/vconsole-setup.c

+++ b/src/vconsole/vconsole-setup.c

@@ -180,6 +180,10 @@ static int font_load(const char *vc, const char *font, const char *map, const ch

  */

 static void font_copy_to_all_vcs(int fd) {

         struct vt_stat vcs = {};

+        unsigned char map8[E_TABSZ];

+        unsigned short map16[E_TABSZ];

+        struct unimapdesc unimapd;

+        struct unipair unipairs[USHRT_MAX];

         int i, r;

         /* get active, and 16 bit mask of used VT numbers */

@@ -209,6 +213,26 @@ static void font_copy_to_all_vcs(int fd) {

                 cfo.op = KD_FONT_OP_COPY;

                 cfo.height = vcs.v_active-1; /* tty1 == index 0 */

                 ioctl(vcfd, KDFONTOP, &cfo;;

+

+                /* copy map of 8bit chars */

+                if (ioctl(fd, GIO_SCRNMAP, map8) >= 0)

+                    ioctl(vcfd, PIO_SCRNMAP, map8);

+

+                /* copy map of 8bit chars -> 16bit Unicode values */

+                if (ioctl(fd, GIO_UNISCRNMAP, map16) >= 0)

+                    ioctl(vcfd, PIO_UNISCRNMAP, map16);

+

+                /* copy unicode translation table */

+                /* unimapd is a ushort count and a pointer to an

+                   array of struct unipair { ushort, ushort } */

+                unimapd.entries  = unipairs;

+                unimapd.entry_ct = USHRT_MAX;

+                if (ioctl(fd, GIO_UNIMAP, &unimapd) >= 0) {

+                        struct unimapinit adv = { 0, 0, 0 };

+

+                        ioctl(vcfd, PIO_UNIMAPCLR, &adv);

+                        ioctl(vcfd, PIO_UNIMAP, &unimapd);

+                }

         }

 }