Revert "Move verify_vc_kbmode() to terminal-util.c as vt_verify_kbmode()"

This reverts commit bb5ac84d79.
This commit is contained in:
Lennart Poettering
2019-07-18 16:21:02 +02:00
parent 15bba61325
commit 26382cab1b
3 changed files with 20 additions and 21 deletions
-17
View File
@@ -1260,23 +1260,6 @@ int vt_default_utf8(void) {
return parse_boolean(b);
}
int vt_verify_kbmode(int fd) {
int curr_mode;
/*
* Make sure we only adjust consoles in K_XLATE or K_UNICODE mode.
* Otherwise we would (likely) interfere with X11's processing of the
* key events.
*
* http://lists.freedesktop.org/archives/systemd-devel/2013-February/008573.html
*/
if (ioctl(fd, KDGKBMODE, &curr_mode) < 0)
return -errno;
return IN_SET(curr_mode, K_XLATE, K_UNICODE) ? 0 : -EBUSY;
}
int vt_reset_keyboard(int fd) {
int kb;
-1
View File
@@ -158,7 +158,6 @@ int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave);
int open_terminal_in_namespace(pid_t pid, const char *name, int mode);
int vt_default_utf8(void);
int vt_verify_kbmode(int fd);
int vt_reset_keyboard(int fd);
int vt_restore(int fd);
int vt_release(int fd, bool restore_vt);