Modernization

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

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 679dc1aafb77cba7e532a22ee476c3ec5affd261..e11fd589cb3a89a2f005097604bfe8f1dd459af6 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -39,6 +39,7 @@
 #include "log.h"
 #include "macro.h"
 #include "virt.h"
+#include "fileio.h"
 
 static bool is_vconsole(int fd) {
         unsigned char data[1];
@@ -68,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;
@@ -177,17 +191,18 @@ static void font_copy_to_all_vcs(int fd) {
 
         for (i = 1; i <= 15; i++) {
                 char vcname[16];
-                int vcfd;
                 struct console_font_op cfo;
+                int _cleanup_close_ vcfd = -1;
 
                 if (i == vcs.v_active)
                         continue;
 
-                /* skip unused VTs above tty6 to avoid allocating them */
-                if (i > 6 && ((vcs.v_state >> i) & 1) == 0)
+                /* 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);
+                snprintf(vcname, sizeof(vcname), "/dev/tty%i", i);
                 vcfd = open_terminal(vcname, O_RDWR|O_CLOEXEC);
                 if (vcfd < 0)
                         continue;
@@ -197,8 +212,6 @@ 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);
-
-                close_nointr_nofail(vcfd);
         }
 }