mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-09-11 21:27:20 +03:00
internal: ioctl use /dev/tty instead of fd 0 for VT_GETSTATE (#2989)
* fix: ioctl use /dev/tty instead of fd 0 for VT_GETSTATE ioctl VT_GETSTATE on stdin fails if it is not console, such as when using GDM. `/dev/tty` should be used instead. - `/dev/tty` is a synonym for the controlling terminal of a process, if there is one. --------- Co-authored-by: Jan Beich <jbeich@FreeBSD.org>
This commit is contained in:
parent
4986d74ef2
commit
63b266cf65
@ -3,6 +3,7 @@
|
||||
#include <regex>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#if defined(__linux__)
|
||||
#include <linux/vt.h>
|
||||
#elif defined(__NetBSD__) || defined(__OpenBSD__)
|
||||
@ -518,15 +519,19 @@ bool CKeybindManager::handleVT(xkb_keysym_t keysym) {
|
||||
|
||||
// vtnr is bugged for some reason.
|
||||
unsigned int ttynum = 0;
|
||||
int fd;
|
||||
if ((fd = open("/dev/tty", O_RDONLY | O_NOCTTY)) >= 0) {
|
||||
#if defined(VT_GETSTATE)
|
||||
struct vt_stat st;
|
||||
if (!ioctl(0, VT_GETSTATE, &st))
|
||||
ttynum = st.v_active;
|
||||
struct vt_stat st;
|
||||
if (!ioctl(fd, VT_GETSTATE, &st))
|
||||
ttynum = st.v_active;
|
||||
#elif defined(VT_GETACTIVE)
|
||||
int vt;
|
||||
if (!ioctl(0, VT_GETACTIVE, &vt))
|
||||
ttynum = vt;
|
||||
int vt;
|
||||
if (!ioctl(fd, VT_GETACTIVE, &vt))
|
||||
ttynum = vt;
|
||||
#endif
|
||||
close(fd);
|
||||
}
|
||||
|
||||
if (ttynum == TTY)
|
||||
return true;
|
||||
|
Loading…
Reference in New Issue
Block a user