shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 08:26:52 +03:00
Code

vconsole-setup: don't set the kbd mode to unicode if is is currently in raw/off mode

Browse Source 
Let's not confuse X11
This commit is contained in:
Lennart Poettering 2013-02-09 02:40:57 +01:00
parent c65eb83653
commit a25d4d0e3c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/vconsole/vconsole-setup.c
View File

@ -68,9 +68,22 @@ static int disable_utf8(int fd) {
static int enable_utf8(int fd) { static int enable_utf8(int fd) {
int r = 0, k; int r = 0, k;
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) if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
r = -errno; r = -errno;
}
if (loop_write(fd, "\033%G", 3, false) < 0) if (loop_write(fd, "\033%G", 3, false) < 0)
r = -errno; r = -errno;