lukajankovic/remote-touchpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Xwayland detection with newer servers

Browse source 
Fixes #63
This commit is contained in:
Unrud 2024-01-23 19:24:22 +01:00
parent 48ff3d67a0
commit 0ca1431594
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
inputcontrol/controller_x11.go
View file

@ -22,6 +22,7 @@
package inputcontrol package inputcontrol
// #cgo LDFLAGS: -lX11 -lXrandr -lXtst // #cgo LDFLAGS: -lX11 -lXrandr -lXtst
// #include <stdlib.h>
// #include <X11/Xlib.h> // #include <X11/Xlib.h>
// #include <X11/Intrinsic.h> // #include <X11/Intrinsic.h>
// #include <X11/extensions/Xrandr.h> // #include <X11/extensions/Xrandr.h>
@ -74,6 +75,17 @@ func InitX11Controller() (Controller, error) {
} }
func (p *x11Controller) xIsXwayland() bool { func (p *x11Controller) xIsXwayland() bool {
// Detection method from https://gitlab.freedesktop.org/xorg/app/xisxwayland/-/blob/xisxwayland-2/xisxwayland.c
var opcode, event, error, major, minor C.int
xwaylandExtensionName := C.CString("XWAYLAND")
defer C.free(unsafe.Pointer(xwaylandExtensionName))
if C.XQueryExtension(p.display, xwaylandExtensionName, &opcode, &event, &error) != 0 {
return true
}
if C.XRRQueryExtension(p.display, &event, &error) == 0 ||
C.XRRQueryVersion(p.display, &major, &minor) == 0 {
return false
}
resources := C.XRRGetScreenResourcesCurrent(p.display, C.MacroDefaultRootWindow(p.display)) resources := C.XRRGetScreenResourcesCurrent(p.display, C.MacroDefaultRootWindow(p.display))
if resources == nil { if resources == nil {
return false return false