X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvconsole%2Fvconsole-setup.c;h=e11fd589cb3a89a2f005097604bfe8f1dd459af6;hb=e62d8c394474;hp=a652ec2b1a1b5b92061ef001c4ef21b4834f5736;hpb=8d789b905dba8aebd30238520b6ad52fb866af95;p=elogind.git diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index a652ec2b1..e11fd589c 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -29,17 +29,17 @@ #include #include #include -#include -#include #include #include #include #include +#include #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]; @@ -48,19 +48,6 @@ static bool is_vconsole(int fd) { return ioctl(fd, TIOCLINUX, data) >= 0; } -static bool is_locale_utf8(void) { - const char *set; - - if (!setlocale(LC_ALL, "")) - return true; - - set = nl_langinfo(CODESET); - if (!set) - return true; - - return streq(set, "UTF-8"); -} - static int disable_utf8(int fd) { int r = 0, k; @@ -82,9 +69,22 @@ static int disable_utf8(int fd) { static int enable_utf8(int fd) { int r = 0, k; + 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 (ioctl(fd, KDSKBMODE, K_UNICODE) < 0) + r = -errno; + } if (loop_write(fd, "\033%G", 3, false) < 0) r = -errno; @@ -99,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; @@ -134,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; @@ -172,6 +172,49 @@ 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]; + struct console_font_op cfo; + int _cleanup_close_ vcfd = -1; + + 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); + } +} + int main(int argc, char **argv) { const char *vc; char *vc_keymap = NULL; @@ -179,16 +222,11 @@ int main(int argc, char **argv) { char *vc_font = NULL; char *vc_font_map = NULL; char *vc_font_unimap = NULL; -#ifdef TARGET_GENTOO - char *vc_unicode = NULL; -#endif -#if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) - char *vc_keytable = NULL; -#endif 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(); @@ -198,8 +236,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) { @@ -244,207 +284,25 @@ int main(int argc, char **argv) { log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r)); } - if (r <= 0) { -#if defined(TARGET_FEDORA) - r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, - "SYSFONT", &vc_font, - "SYSFONTACM", &vc_font_map, - "UNIMAP", &vc_font_unimap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - - r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - "KEYMAP", &vc_keymap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - - if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) { - char *t; - - t = strdup("/etc/sysconfig/console/default.kmap"); - if (!t) { - log_oom(); - goto finish; - } - - free(vc_keymap); - vc_keymap = t; - } - -#elif defined(TARGET_SUSE) - r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - - r = parse_env_file("/etc/sysconfig/console", NEWLINE, - "CONSOLE_FONT", &vc_font, - "CONSOLE_SCREENMAP", &vc_font_map, - "CONSOLE_UNICODEMAP", &vc_font_unimap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); - -#elif defined(TARGET_ARCH) - r = parse_env_file("/etc/rc.conf", NEWLINE, - "KEYMAP", &vc_keymap, - "CONSOLEFONT", &vc_font, - "CONSOLEMAP", &vc_font_map, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); - -#elif defined(TARGET_FRUGALWARE) - r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, - "keymap", &vc_keymap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r)); - - r = parse_env_file("/etc/sysconfig/font", NEWLINE, - "font", &vc_font, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r)); - -#elif defined(TARGET_ALTLINUX) - r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keymap, - NULL) - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - - r = parse_env_file("/etc/sysconfig/consolefont", NEWLINE, - "SYSFONT", &vc_font, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/consolefont: %s", strerror(-r)); - -#elif defined(TARGET_GENTOO) - r = parse_env_file("/etc/rc.conf", NEWLINE, - "unicode", &vc_unicode, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); - - if (vc_unicode) { - int rc_unicode; - - rc_unicode = parse_boolean(vc_unicode); - if (rc_unicode < 0) - log_warning("Unknown value for /etc/rc.conf unicode=%s", vc_unicode); - else { - if (rc_unicode && !utf8) - log_warning("/etc/rc.conf wants unicode, but current locale is not UTF-8 capable!"); - else if (!rc_unicode && utf8) { - log_debug("/etc/rc.conf does not want unicode, leave it on in kernel but does not apply to vconsole."); - utf8 = false; - } - } - } - - /* /etc/conf.d/consolefont comments and gentoo - * documentation mention uppercase, but the actual - * contents are lowercase. the existing - * /etc/init.d/consolefont tries both - */ - r = parse_env_file("/etc/conf.d/consolefont", NEWLINE, - "CONSOLEFONT", &vc_font, - "consolefont", &vc_font, - "consoletranslation", &vc_font_map, - "CONSOLETRANSLATION", &vc_font_map, - "unicodemap", &vc_font_unimap, - "UNICODEMAP", &vc_font_unimap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/conf.d/consolefont: %s", strerror(-r)); - - r = parse_env_file("/etc/conf.d/keymaps", NEWLINE, - "keymap", &vc_keymap, - "KEYMAP", &vc_keymap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/conf.d/keymaps: %s", strerror(-r)); - -#elif defined(TARGET_MANDRIVA) || defined (TARGET_MAGEIA) - - r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, - "SYSFONT", &vc_font, - "SYSFONTACM", &vc_font_map, - "UNIMAP", &vc_font_unimap, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); - - r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, - "KEYTABLE", &vc_keytable, - "KEYMAP", &vc_keymap, - "UNIKEYTABLE", &vc_keymap, - "GRP_TOGGLE", &vc_keymap_toggle, - NULL); - if (r < 0 && r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/keyboard: %s", strerror(-r)); - - if (vc_keytable) { - free(vc_keymap); - if (utf8) { - if (endswith(vc_keytable, ".uni") || strstr(vc_keytable, ".uni.")) - vc_keymap = strdup(vc_keytable); - else { - char *s; - s = strstr(vc_keytable, ".map"); - if (s) - vc_keytable[s-vc_keytable+1] = '\0'; - vc_keymap = strappend(vc_keytable, ".uni"); - } - } else - vc_keymap = strdup(vc_keytable); - - free(vc_keytable); - - if (!vc_keymap) { - log_oom(); - goto finish; - } - } - - if (access("/etc/sysconfig/console/default.kmap", F_OK) >= 0) { - char *t; - - t = strdup("/etc/sysconfig/console/default.kmap"); - if (!t) { - log_oom(); - goto finish; - } - - free(vc_keymap); - vc_keymap = t; - } -#endif - } - - 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);