X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=1bbf737c36f9dde13d968ae07ea28babd5f21dba;hb=fa28bc2df724e4aff46d19cb7aa732cc64c71061;hp=d8cdb7c609bf810fd2974511b0d15525b7073893;hpb=dd04aac97f9e4739152e77d9f52bb0d0da1375d6;p=elogind.git diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index d8cdb7c60..1bbf737c3 100644 --- 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]; @@ -56,7 +57,7 @@ static int disable_utf8(int fd) { if (loop_write(fd, "\033%@", 3, false) < 0) r = -errno; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "0"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "0"); if (k < 0) r = k; @@ -68,14 +69,27 @@ 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, ¤t) < 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; - k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1"); + k = write_string_file("/sys/module/vt/parameters/default_utf8", "1"); if (k < 0) r = k; @@ -158,47 +172,43 @@ static int font_load(const char *vc, const char *font, const char *map, const ch return 0; } -static void font_copy_to_all_vts(int fd, int from_vt) { - struct vt_stat vts; - unsigned short bits; - int i; - int r; - - /* get 16 bit mask of used VT numbers */ - zero(vts); - r = ioctl(fd, VT_GETSTATE, &vts); +/* + * 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, r; + + /* get active, and 16 bit mask of used VT numbers */ + r = ioctl(fd, VT_GETSTATE, &vcs); if (r < 0) return; - bits = vts.v_state; - for (i = 1; i <= 16; i++) { - char vtname[16]; - int vtfd; - struct console_font_op cfo; - bool used; - - /* skip unused VTs */ - used = bits & 1; - bits >>= 1; - if (!used) + for (i = 1; i <= 15; i++) { + char vcname[16]; + _cleanup_close_ int vcfd = -1; + struct console_font_op cfo = {}; + + if (i == vcs.v_active) continue; - if (i == from_vt) + /* skip non-allocated ttys */ + snprintf(vcname, sizeof(vcname), "/dev/vcs%i", i); + if (access(vcname, F_OK) < 0) continue; - snprintf(vtname , sizeof(vtname), "/dev/tty%i", i); - vtfd = open_terminal(vtname, O_RDWR|O_CLOEXEC); - if (vtfd < 0) + snprintf(vcname, sizeof(vcname), "/dev/tty%i", i); + vcfd = open_terminal(vcname, O_RDWR|O_CLOEXEC); + if (vcfd < 0) continue; - /* copy font from from_vt to this VT */ - zero(cfo); + /* copy font from active VT, where the font was uploaded to */ cfo.op = KD_FONT_OP_COPY; - /* the index numbers seem to start at 0 for tty1 */ - cfo.height = from_vt - 1; - ioctl(vtfd, KDFONTOP, &cfo); - - close_nointr_nofail(vtfd); + cfo.height = vcs.v_active-1; /* tty1 == index 0 */ + ioctl(vcfd, KDFONTOP, &cfo); } } @@ -212,7 +222,7 @@ int main(int argc, char **argv) { int fd = -1; bool utf8; pid_t font_pid = 0, keymap_pid = 0; - int font_copy_from_vt = 0; + bool font_copy = false; int r = EXIT_FAILURE; log_set_target(LOG_TARGET_AUTO); @@ -224,8 +234,8 @@ int main(int argc, char **argv) { if (argv[1]) vc = argv[1]; else { - vc = "/dev/tty1"; - font_copy_from_vt = 1; + vc = "/dev/tty0"; + font_copy = true; } fd = open_terminal(vc, O_RDWR|O_CLOEXEC); @@ -241,8 +251,18 @@ int main(int argc, char **argv) { utf8 = is_locale_utf8(); - r = 0; + r = parse_env_file("/etc/vconsole.conf", NEWLINE, + "KEYMAP", &vc_keymap, + "KEYMAP_TOGGLE", &vc_keymap_toggle, + "FONT", &vc_font, + "FONT_MAP", &vc_font_map, + "FONT_UNIMAP", &vc_font_unimap, + NULL); + if (r < 0 && r != -ENOENT) + log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); + + /* Let the kernel command line override /etc/vconsole.conf */ if (detect_container(NULL) <= 0) { r = parse_env_file("/proc/cmdline", WHITESPACE, "vconsole.keymap", &vc_keymap, @@ -256,21 +276,6 @@ int main(int argc, char **argv) { log_warning("Failed to read /proc/cmdline: %s", strerror(-r)); } - /* Hmm, nothing set on the kernel cmd line? Then let's - * try /etc/vconsole.conf */ - if (r <= 0) { - r = parse_env_file("/etc/vconsole.conf", NEWLINE, - "KEYMAP", &vc_keymap, - "KEYMAP_TOGGLE", &vc_keymap_toggle, - "FONT", &vc_font, - "FONT_MAP", &vc_font_map, - "FONT_UNIMAP", &vc_font_unimap, - NULL); - - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); - } - if (utf8) enable_utf8(fd); else @@ -287,8 +292,8 @@ finish: if (font_pid > 0) { wait_for_terminate_and_warn(KBD_SETFONT, font_pid); - if (font_copy_from_vt > 0) - font_copy_to_all_vts(fd, font_copy_from_vt); + if (font_copy) + font_copy_to_all_vcs(fd); } free(vc_keymap);