encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed console check, let the kernel decide whether muting is appropriate on this terminal. 

We don't fail the init if we can't mute the terminal (we might be running from ssh, or on a system without virtual terminals, etc.)
This commit is contained in:
Sam Lantinga 2017-01-08 19:04:38 -08:00
parent c16dd74f3b
commit 7b66295e05
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/linux/SDL_evdev.c
View File

@ -135,20 +135,9 @@ static Uint8 EVDEV_MouseButtons[] = {
SDL_BUTTON_X2 + 3 /* BTN_TASK 0x117 */ SDL_BUTTON_X2 + 3 /* BTN_TASK 0x117 */
}; };
static int SDL_EVDEV_is_console(int fd) {
char type;
return isatty(fd) && ioctl(fd, KDGKBTYPE, &type) == 0 &&
(type == KB_101 || type == KB_84);
}
/* Prevent keystrokes from reaching the tty */ /* Prevent keystrokes from reaching the tty */
static int SDL_EVDEV_mute_keyboard(int tty_fd, int* old_kb_mode) static int SDL_EVDEV_mute_keyboard(int tty_fd, int* old_kb_mode)
{ {
if (!SDL_EVDEV_is_console(tty_fd)) {
return SDL_SetError("Tried to mute an invalid tty");
}
if (ioctl(tty_fd, KDGKBMODE, old_kb_mode) < 0) { if (ioctl(tty_fd, KDGKBMODE, old_kb_mode) < 0) {
return SDL_SetError("Failed to get keyboard mode during muting"); return SDL_SetError("Failed to get keyboard mode during muting");
} }
@ -164,7 +153,7 @@ static int SDL_EVDEV_mute_keyboard(int tty_fd, int* old_kb_mode)
static void SDL_EVDEV_unmute_keyboard(int tty_fd, int old_kb_mode) static void SDL_EVDEV_unmute_keyboard(int tty_fd, int old_kb_mode)
{ {
if (ioctl(tty_fd, KDSKBMODE, old_kb_mode) < 0) { if (ioctl(tty_fd, KDSKBMODE, old_kb_mode) < 0) {
SDL_Log("Failed to set keyboard mode"); SDL_SetError("Failed to set keyboard mode during unmuting");
} }
} }