daandemeyer / rpms / systemd

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