fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 06:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dont-set-keyboard-mode-so-much' into 'main'

Browse source 
ply-terminal: Only set keyboard mode when changing it

See merge request plymouth/plymouth!294
This commit is contained in:
Ray Strode 2024-01-03 00:56:21 +00:00
commit 38964e5eaf
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libply-splash-core/ply-terminal.c
View file

@ -241,13 +241,14 @@ ply_terminal_set_unbuffered_input (ply_terminal_t *terminal)
ply_terminal_unlock (terminal);
if (terminal->is_disabled)
if (terminal->is_disabled) {
ply_trace ("terminal input is getting enabled in unbuffered mode");
terminal->is_disabled = false;
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_UNICODE);
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_UNICODE);
terminal->is_disabled = false;
}
tcgetattr (terminal->fd, &term_attributes);
@ -279,13 +280,14 @@ ply_terminal_set_buffered_input (ply_terminal_t *terminal)
{
struct termios term_attributes;
if (terminal->is_disabled)
if (terminal->is_disabled) {
ply_trace ("terminal input is getting enabled in buffered mode");
terminal->is_disabled = false;
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_UNICODE);
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_UNICODE);
terminal->is_disabled = false;
}
if (!terminal->is_unbuffered)
return true;
@ -330,14 +332,15 @@ ply_terminal_set_buffered_input (ply_terminal_t *terminal)
bool
ply_terminal_set_disabled_input (ply_terminal_t *terminal)
{
if (!terminal->is_disabled)
if (!terminal->is_disabled) {
ply_trace ("terminal input is getting disabled from %s mode",
terminal->is_unbuffered? "unbuffered" : "buffered");
terminal->is_disabled = true;
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_OFF);
if (ply_terminal_is_vt (terminal))
ioctl (terminal->fd, KDSKBMODE, K_OFF);
terminal->is_disabled = true;
}
return true;
}