strv: fix STRV_FOREACH_PAIR macro definition

[elogind.git] / src / vconsole / vconsole-setup.c

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index b9d8681a8562072b91903784a9ebca7f91a83de1..c1f662baa6e6c546526e437c8934049e568ec19d 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -33,11 +33,13 @@
 #include <sys/wait.h>
 #include <linux/tiocl.h>
 #include <linux/kd.h>
+#include <linux/vt.h>
 
 #include "util.h"
 #include "log.h"
 #include "macro.h"
 #include "virt.h"
+#include "fileio.h"
 
 static bool is_vconsole(int fd) {
         unsigned char data[1];
@@ -67,9 +69,22 @@ static int disable_utf8(int fd) {
 
 static int enable_utf8(int fd) {
         int r = 0, k;
-
-        if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
-                r = -errno;
+        long current = 0;
+
+        if (ioctl(fd, KDGKBMODE, &current) < 0 || current == K_XLATE) {
+                /*
+                 * Change the current keyboard to unicode, unless it
+                 * is currently in raw or off mode anyway. We
+                 * shouldn't interfere with X11's processing of the
+                 * key events.
+                 *
+                 * http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html
+                 *
+                 */
+
+                if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
+                        r = -errno;
+        }
 
         if (loop_write(fd, "\033%G", 3, false) < 0)
                 r = -errno;
@@ -84,7 +99,7 @@ static int enable_utf8(int fd) {
         return r;
 }
 
-static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
+static int keymap_load(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
         const char *args[8];
         int i = 0;
         pid_t pid;
@@ -119,7 +134,7 @@ static int load_keymap(const char *vc, const char *map, const char *map_toggle,
         return 0;
 }
 
-static int load_font(const char *vc, const char *font, const char *map, const char *unimap, pid_t *_pid) {
+static int font_load(const char *vc, const char *font, const char *map, const char *unimap, pid_t *_pid) {
         const char *args[9];
         int i = 0;
         pid_t pid;
@@ -157,6 +172,51 @@ static int load_font(const char *vc, const char *font, const char *map, const ch
         return 0;
 }
 
+/*
+ * A newly allocated VT uses the font from the active VT. Here
+ * we update all possibly already allocated VTs with the configured
+ * font. It also allows to restart systemd-vconsole-setup.service,
+ * to apply a new font to all VTs.
+ */
+static void font_copy_to_all_vcs(int fd) {
+        struct vt_stat vcs;
+        int i;
+        int r;
+
+        /* get active, and 16 bit mask of used VT numbers */
+        zero(vcs);
+        r = ioctl(fd, VT_GETSTATE, &vcs);
+        if (r < 0)
+                return;
+
+        for (i = 1; i <= 15; i++) {
+                char vcname[16];
+                int vcfd;
+                struct console_font_op cfo;
+
+                if (i == vcs.v_active)
+                        continue;
+
+                /* skip non-allocated ttys */
+                snprintf(vcname, sizeof(vcname), "/dev/vcs%i", i);
+                if (access(vcname, F_OK) < 0)
+                        continue;
+
+                snprintf(vcname, sizeof(vcname), "/dev/tty%i", i);
+                vcfd = open_terminal(vcname, O_RDWR|O_CLOEXEC);
+                if (vcfd < 0)
+                        continue;
+
+                /* copy font from active VT, where the font was uploaded to */
+                zero(cfo);
+                cfo.op = KD_FONT_OP_COPY;
+                cfo.height = vcs.v_active-1; /* tty1 == index 0 */
+                ioctl(vcfd, KDFONTOP, &cfo);
+
+                close_nointr_nofail(vcfd);
+        }
+}
+
 int main(int argc, char **argv) {
         const char *vc;
         char *vc_keymap = NULL;
@@ -166,8 +226,9 @@ int main(int argc, char **argv) {
         char *vc_font_unimap = NULL;
         int fd = -1;
         bool utf8;
-        int r = EXIT_FAILURE;
         pid_t font_pid = 0, keymap_pid = 0;
+        bool font_copy = false;
+        int r = EXIT_FAILURE;
 
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
@@ -177,8 +238,10 @@ int main(int argc, char **argv) {
 
         if (argv[1])
                 vc = argv[1];
-        else
+        else {
                 vc = "/dev/tty0";
+                font_copy = true;
+        }
 
         fd = open_terminal(vc, O_RDWR|O_CLOEXEC);
         if (fd < 0) {
@@ -223,27 +286,25 @@ int main(int argc, char **argv) {
                         log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
         }
 
-        if (r <= 0) {
-        }
-
-        r = EXIT_FAILURE;
-
         if (utf8)
                 enable_utf8(fd);
         else
                 disable_utf8(fd);
 
-
-        if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
-            load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
+        r = EXIT_FAILURE;
+        if (keymap_load(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
+            font_load(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
                 r = EXIT_SUCCESS;
 
 finish:
         if (keymap_pid > 0)
                 wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid);
 
-        if (font_pid > 0)
+        if (font_pid > 0) {
                 wait_for_terminate_and_warn(KBD_SETFONT, font_pid);
+                if (font_copy)
+                        font_copy_to_all_vcs(fd);
+        }
 
         free(vc_keymap);
         free(vc_font);