Compare commits
No commits in common. "master" and "v1.4.0" have entirely different histories.
24 changed files with 259 additions and 928 deletions
43
.github/workflows/test.yaml
vendored
43
.github/workflows/test.yaml
vendored
|
|
@ -1,43 +0,0 @@
|
|||
name: Test
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
os: [linux]
|
||||
tags: [[], ['null'], [portal], [uinput], [x11],
|
||||
['null', portal, uinput, x11]]
|
||||
include:
|
||||
- os: windows
|
||||
tags: []
|
||||
- os: windows
|
||||
tags: ['null']
|
||||
env:
|
||||
GOOS: ${{ matrix.os }}
|
||||
GOFLAGS: -tags=${{ join(matrix.tags, ',') }}
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: stable
|
||||
check-latest: true
|
||||
- run: sudo apt install libxrandr-dev libxtst-dev libxt-dev
|
||||
if: ${{ contains(matrix.tags, 'x11') }}
|
||||
|
||||
- name: Go Format
|
||||
run: gofmt -s -w . && git diff --exit-code
|
||||
|
||||
- name: Go Mod Tidy
|
||||
run: go mod tidy && git diff --exit-code
|
||||
|
||||
- name: Go Vet
|
||||
run: go vet ./...
|
||||
|
||||
- name: Go Build
|
||||
run: go build ./...
|
||||
|
||||
- name: Go Test (with data race detection)
|
||||
run: go test -race ./...
|
||||
if: ${{ matrix.os == 'linux' }}
|
||||
11
.gitignore
vendored
11
.gitignore
vendored
|
|
@ -1,11 +0,0 @@
|
|||
# Binaries
|
||||
remote-touchpad
|
||||
|
||||
# Systemd service state
|
||||
.remote-touchpad.service.state
|
||||
|
||||
# Logs and run files
|
||||
.rts-log
|
||||
|
||||
# Environment files
|
||||
.env
|
||||
56
CHANGELOG.md
56
CHANGELOG.md
|
|
@ -1,61 +1,5 @@
|
|||
# Changelog
|
||||
|
||||
## 1.5.4 (2026-08-02)
|
||||
|
||||
* Improve X11 keyboard input
|
||||
* Update dependencies
|
||||
|
||||
## 1.5.3 (2025-12-24)
|
||||
|
||||
* Update dependencies
|
||||
|
||||
## 1.5.2 (2025-10-12)
|
||||
|
||||
* Update dependencies
|
||||
|
||||
## 1.5.0 (2025-03-18)
|
||||
|
||||
* Add restore token support for the remote desktop portal
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.8 (2024-09-01)
|
||||
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.7 (2024-08-30)
|
||||
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.6 (2024-02-06)
|
||||
|
||||
* Prevent incorrect MIME types
|
||||
|
||||
## 1.4.5 (2024-01-31)
|
||||
|
||||
* Keep text input open after sending
|
||||
* Workaround for virtual keyboard covering buttons (Chromium & iOS)
|
||||
* Enable hardware keyboard input in mouse mode
|
||||
|
||||
## 1.4.4 (2024-01-23)
|
||||
|
||||
* Fix Xwayland detection on newer servers
|
||||
* Fix support for the KDE remote desktop portal
|
||||
* Set correct minimum version for Go
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.3 (2023-10-03)
|
||||
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.2 (2023-05-20)
|
||||
|
||||
* Fix Windows support
|
||||
|
||||
## 1.4.1 (2023-05-11)
|
||||
|
||||
* uinput: Fix vertical scroll direction
|
||||
* Update dependencies
|
||||
|
||||
## 1.4.0 (2023-04-25)
|
||||
|
||||
* Add feedback to buttons
|
||||
|
|
|
|||
41
README.md
41
README.md
|
|
@ -12,45 +12,8 @@ Supports Flatpak's RemoteDesktop portal (for Wayland), Windows and X11.
|
|||
* [Snap](https://snapcraft.io/remote-touchpad)
|
||||
* [Windows](https://github.com/Unrud/remote-touchpad/releases/latest)
|
||||
* Golang:
|
||||
* Portal & uinput & X11:
|
||||
|
||||
```sh
|
||||
go install -tags portal,uinput,x11 github.com/unrud/remote-touchpad@latest
|
||||
```
|
||||
* Windows:
|
||||
|
||||
```sh
|
||||
go install github.com/unrud/remote-touchpad@latest
|
||||
```
|
||||
|
||||
## Linux User Service Installation
|
||||
|
||||
To install remote-touchpad as a user-specific systemd service (no root access required):
|
||||
|
||||
1. Clone the repository and navigate to the project directory:
|
||||
|
||||
```sh
|
||||
git clone https://github.com/Unrud/remote-touchpad.git
|
||||
cd remote-touchpad
|
||||
```
|
||||
|
||||
2. Install the service using the provided wrapper script (no sudo required):
|
||||
|
||||
```sh
|
||||
./rts install
|
||||
```
|
||||
|
||||
3. Access the service:
|
||||
|
||||
* View service status: `./rts status`
|
||||
* Get URL: `./rts url`
|
||||
* View logs: `./rts log`
|
||||
* Stop service: `./rts stop`
|
||||
* Start service: `./rts start`
|
||||
* Restart service: `./rts restart`
|
||||
* Uninstall: `./rts uninstall`
|
||||
|
||||
The service will run in the background and maintain a persistent connection with URL and QR code accessible via the `url` command.
|
||||
* Portal & uinput & X11: `go install -tags portal,uinput,x11 github.com/unrud/remote-touchpad@latest`
|
||||
* Windows: `go install github.com/unrud/remote-touchpad@latest`
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
|||
|
|
@ -17,104 +17,8 @@
|
|||
<launchable type="desktop-id">com.github.unrud.RemoteTouchpad.desktop</launchable>
|
||||
<url type="bugtracker">https://github.com/Unrud/remote-touchpad/issues</url>
|
||||
<url type="homepage">https://github.com/Unrud/remote-touchpad</url>
|
||||
<url type="vcs-browser">https://github.com/Unrud/remote-touchpad</url>
|
||||
<developer_name translate="no">Unrud</developer_name>
|
||||
<developer id="io.github.unrud">
|
||||
<name translate="no">Unrud</name>
|
||||
</developer>
|
||||
<developer_name>Unrud</developer_name>
|
||||
<releases>
|
||||
<release version="1.5.4" date="2026-08-02">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Improve X11 keyboard input</li>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.5.3" date="2025-12-24">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.5.2" date="2025-10-12">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.5.0" date="2025-03-18">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Add restore token support for the remote desktop portal</li>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.8" date="2024-09-01">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.7" date="2024-08-30">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.6" date="2024-02-06">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Prevent incorrect MIME types</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.5" date="2024-01-31">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Keep text input open after sending</li>
|
||||
<li>Workaround for virtual keyboard covering buttons (Chromium & iOS)</li>
|
||||
<li>Enable hardware keyboard input in mouse mode</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.4" date="2024-01-23">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Fix Xwayland detection on newer servers</li>
|
||||
<li>Fix support for the KDE remote desktop portal</li>
|
||||
<li>Set correct minimum version for Go</li>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.3" date="2023-10-03">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.2" date="2023-05-20">
|
||||
<description>
|
||||
<ul>
|
||||
<li>Fix Windows support</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.1" date="2023-05-11">
|
||||
<description>
|
||||
<ul>
|
||||
<li>uinput: Fix vertical scroll direction</li>
|
||||
<li>Update dependencies</li>
|
||||
</ul>
|
||||
</description>
|
||||
</release>
|
||||
<release version="1.4.0" date="2023-04-25">
|
||||
<description>
|
||||
<ul>
|
||||
|
|
@ -373,16 +277,16 @@
|
|||
</releases>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.5.4/screenshots/1.png</image>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.4.0/screenshots/1.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.5.4/screenshots/2.png</image>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.4.0/screenshots/2.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.5.4/screenshots/3.png</image>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.4.0/screenshots/3.png</image>
|
||||
</screenshot>
|
||||
<screenshot>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.5.4/screenshots/4.png</image>
|
||||
<image>https://raw.githubusercontent.com/Unrud/remote-touchpad/v1.4.0/screenshots/4.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<content_rating type="oars-1.1"/>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
app-id: com.github.unrud.RemoteTouchpad
|
||||
runtime: org.freedesktop.Platform
|
||||
runtime-version: '25.08'
|
||||
runtime-version: '22.08'
|
||||
sdk: org.freedesktop.Sdk
|
||||
command: remote-touchpad
|
||||
sdk-extensions:
|
||||
|
|
@ -8,17 +8,19 @@ sdk-extensions:
|
|||
finish-args:
|
||||
- --socket=fallback-x11
|
||||
- --socket=wayland
|
||||
- --share=ipc # Required by Flathub linter
|
||||
- --share=network
|
||||
modules:
|
||||
- name: remote-touchpad
|
||||
sources:
|
||||
- type: git
|
||||
path: ..
|
||||
- type: shell
|
||||
commands:
|
||||
- . /usr/lib/sdk/golang/enable.sh; go mod vendor -e
|
||||
- type: git
|
||||
url: https://github.com/godbus/dbus
|
||||
tag: v5.2.2
|
||||
commit: a8ac15ba63645f02ffd57f4b443203279ab40b30
|
||||
tag: v5.1.0
|
||||
commit: e523abc905595cf17fb0001a7d77eaaddfaa216d
|
||||
dest: vendor/github.com/godbus/dbus/v5
|
||||
- type: git
|
||||
url: https://github.com/skip2/go-qrcode
|
||||
|
|
@ -26,17 +28,9 @@ modules:
|
|||
dest: vendor/github.com/skip2/go-qrcode
|
||||
- type: git
|
||||
url: https://github.com/golang/net
|
||||
tag: v0.57.0
|
||||
commit: b8f09f6f062ceb4531b7af4bd17a5c8fe9c4b2b5
|
||||
tag: v0.9.0
|
||||
commit: 694cff8668bac64e0864b552bffc280cd27f21b1
|
||||
dest: vendor/golang.org/x/net
|
||||
- type: git
|
||||
url: https://github.com/golang/sys
|
||||
tag: v0.47.0
|
||||
commit: 9e7e939dcafac07e8ab4cffa6e5fc74908413f00
|
||||
dest: vendor/golang.org/x/sys
|
||||
- type: file
|
||||
path: modules.txt
|
||||
dest: vendor
|
||||
buildsystem: simple
|
||||
build-commands:
|
||||
- . /usr/lib/sdk/golang/enable.sh; go build -tags portal,x11
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
# github.com/bendahl/uinput v1.7.0
|
||||
## explicit; go 1.13
|
||||
github.com/bendahl/uinput
|
||||
# github.com/godbus/dbus/v5 v5.2.2
|
||||
## explicit; go 1.20
|
||||
github.com/godbus/dbus/v5
|
||||
# github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||
## explicit; go 1.13
|
||||
github.com/skip2/go-qrcode
|
||||
github.com/skip2/go-qrcode/bitset
|
||||
github.com/skip2/go-qrcode/reedsolomon
|
||||
# golang.org/x/net v0.57.0
|
||||
## explicit; go 1.25.0
|
||||
golang.org/x/net/websocket
|
||||
# golang.org/x/sys v0.47.0
|
||||
## explicit; go 1.25.0
|
||||
golang.org/x/sys/unix
|
||||
10
go.mod
10
go.mod
|
|
@ -1,12 +1,10 @@
|
|||
module github.com/unrud/remote-touchpad
|
||||
|
||||
go 1.25.5
|
||||
go 1.18
|
||||
|
||||
require (
|
||||
github.com/bendahl/uinput v1.7.0
|
||||
github.com/godbus/dbus/v5 v5.2.2
|
||||
github.com/bendahl/uinput v1.6.0
|
||||
github.com/godbus/dbus/v5 v5.1.0
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
|
||||
golang.org/x/net v0.57.0
|
||||
golang.org/x/net v0.9.0
|
||||
)
|
||||
|
||||
require golang.org/x/sys v0.47.0 // indirect
|
||||
|
|
|
|||
14
go.sum
14
go.sum
|
|
@ -1,10 +1,8 @@
|
|||
github.com/bendahl/uinput v1.7.0 h1:nA4fm8Wu8UYNOPykIZm66nkWEyvxzfmJ8YC02PM40jg=
|
||||
github.com/bendahl/uinput v1.7.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
|
||||
github.com/godbus/dbus/v5 v5.2.2 h1:TUR3TgtSVDmjiXOgAAyaZbYmIeP3DPkld3jgKGV8mXQ=
|
||||
github.com/godbus/dbus/v5 v5.2.2/go.mod h1:3AAv2+hPq5rdnr5txxxRwiGjPXamgoIHgz9FPBfOp3c=
|
||||
github.com/bendahl/uinput v1.6.0 h1:fM6r3OSC17rHh758mizKjSBuqi+XinhiGd4N3pWvZiI=
|
||||
github.com/bendahl/uinput v1.6.0/go.mod h1:Np7w3DINc9wB83p12fTAM3DPPhFnAKP0WTXRqCQJ6Z8=
|
||||
github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
|
||||
github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||
golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
|
||||
golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
|
||||
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
|
||||
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
|
||||
|
|
|
|||
3
host.go
3
host.go
|
|
@ -74,8 +74,7 @@ func findDefaultHost() string {
|
|||
continue
|
||||
}
|
||||
for _, linkLocalPrefix := range []string{
|
||||
"169.254.", "fe8", "fe9", "fea", "feb",
|
||||
} {
|
||||
"169.254.", "fe8", "fe9", "fea", "feb"} {
|
||||
if strings.HasPrefix(ip.String(), linkLocalPrefix) {
|
||||
addIP(20, ip)
|
||||
continue addrs
|
||||
|
|
|
|||
|
|
@ -21,10 +21,8 @@ package inputcontrol
|
|||
|
||||
import "sort"
|
||||
|
||||
type (
|
||||
PointerButton int
|
||||
Key int
|
||||
)
|
||||
type PointerButton int
|
||||
type Key int
|
||||
|
||||
const (
|
||||
PointerButtonLeft PointerButton = iota
|
||||
|
|
|
|||
|
|
@ -22,20 +22,10 @@
|
|||
package inputcontrol
|
||||
|
||||
import (
|
||||
"crypto/aes"
|
||||
"crypto/cipher"
|
||||
"crypto/hkdf"
|
||||
"crypto/rand"
|
||||
"crypto/sha256"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"slices"
|
||||
|
||||
"github.com/godbus/dbus/v5"
|
||||
"sync"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -45,8 +35,6 @@ const (
|
|||
btnReleased uint32 = 0
|
||||
btnPressed uint32 = 1
|
||||
|
||||
untilRevoked uint32 = 2
|
||||
|
||||
// linux/input-event-codes.h
|
||||
btnLeft int32 = 0x110
|
||||
btnRight int32 = 0x111
|
||||
|
|
@ -55,8 +43,9 @@ const (
|
|||
|
||||
type portalController struct {
|
||||
bus *dbus.Conn
|
||||
portalDesktop dbus.BusObject
|
||||
remoteDesktop dbus.BusObject
|
||||
sessionHandle dbus.ObjectPath
|
||||
lock sync.RWMutex
|
||||
}
|
||||
|
||||
func init() {
|
||||
|
|
@ -82,209 +71,85 @@ func InitPortalController() (Controller, error) {
|
|||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{err}
|
||||
}
|
||||
portalDesktop := bus.Object("org.freedesktop.portal.Desktop",
|
||||
remoteDesktop := bus.Object("org.freedesktop.portal.Desktop",
|
||||
"/org/freedesktop/portal/desktop")
|
||||
remoteDesktopVersionV, err := portalDesktop.GetProperty(
|
||||
"org.freedesktop.portal.RemoteDesktop.version")
|
||||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
fmt.Errorf("getting 'version' failed: %w", err),
|
||||
}
|
||||
}
|
||||
remoteDesktopVersion, ok := remoteDesktopVersionV.Value().(uint32)
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("unexpected 'version' type"),
|
||||
}
|
||||
}
|
||||
restoreTokenStore, err := func() (*secretStore, error) {
|
||||
if remoteDesktopVersion < 2 {
|
||||
return nil, nil
|
||||
}
|
||||
cacheDirectory, err := os.UserCacheDir()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := os.MkdirAll(cacheDirectory, 0o700); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
secret, err := retrieveSecret(bus)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return newSecretStore(secret,
|
||||
filepath.Join(cacheDirectory, "remote-touchpad.portal-restore-token.bin"))
|
||||
}()
|
||||
if err != nil {
|
||||
log.Printf("Skipping restore token: %v", err)
|
||||
}
|
||||
availableDeviceTypesV, err := portalDesktop.GetProperty(
|
||||
availableDeviceTypesV, err := remoteDesktop.GetProperty(
|
||||
"org.freedesktop.portal.RemoteDesktop.AvailableDeviceTypes")
|
||||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
fmt.Errorf("getting 'AvailableDeviceTypes' failed: %w", err),
|
||||
}
|
||||
return nil, &UnsupportedPlatformError{err}
|
||||
}
|
||||
availableDeviceTypes, ok := availableDeviceTypesV.Value().(uint32)
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("unexpected 'AvailableDeviceTypes' return type"),
|
||||
}
|
||||
errors.New("unexpected 'AvailableDeviceTypes' return type")}
|
||||
}
|
||||
if availableDeviceTypes&deviceKeyboard == 0 ||
|
||||
availableDeviceTypes&devicePointer == 0 {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("keyboard or pointer source type not supported"),
|
||||
errors.New("keyboard or pointer source type not supported")}
|
||||
}
|
||||
}
|
||||
createSessionResults, err := checkResponse(getResponse(bus, portalDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.CreateSession", 0,
|
||||
map[string]dbus.Variant{"session_handle_token": dbus.MakeVariant("t")},
|
||||
))
|
||||
inVardict := make(map[string]dbus.Variant)
|
||||
inVardict["session_handle_token"] = dbus.MakeVariant("t")
|
||||
result, outVardict, err := getResponse(bus, remoteDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.CreateSession", 0, inVardict)
|
||||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{err}
|
||||
}
|
||||
if result != 0 {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
fmt.Errorf("calling 'CreateSession' failed: %w", err),
|
||||
fmt.Errorf("Calling 'CreateSession' failed (%v)", result)}
|
||||
}
|
||||
}
|
||||
sessionHandleString, ok := createSessionResults["session_handle"].Value().(string)
|
||||
sessionHandleV, ok := outVardict["session_handle"]
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("unexpected 'session_handle' type in 'CreateSession' return value"),
|
||||
errors.New("'session_handle' missing from 'CreateSession' return value")}
|
||||
}
|
||||
}
|
||||
sessionHandle := dbus.ObjectPath(sessionHandleString)
|
||||
selectDevicesOptions := map[string]dbus.Variant{
|
||||
"types": dbus.MakeVariant(deviceKeyboard | devicePointer),
|
||||
}
|
||||
if restoreTokenStore != nil {
|
||||
if restoreToken, err := restoreTokenStore.Load(); err != nil {
|
||||
if !errors.Is(err, os.ErrNotExist) {
|
||||
log.Printf("Failed to load restore token: %v", err)
|
||||
}
|
||||
} else if len(restoreToken) > 0 {
|
||||
selectDevicesOptions["restore_token"] = dbus.MakeVariant(string(restoreToken))
|
||||
}
|
||||
selectDevicesOptions["persist_mode"] = dbus.MakeVariant(untilRevoked)
|
||||
}
|
||||
_, err = checkResponse(getResponse(bus, portalDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.SelectDevices", 0,
|
||||
sessionHandle, selectDevicesOptions,
|
||||
))
|
||||
if err != nil {
|
||||
sessionHandleS, ok := sessionHandleV.Value().(string)
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
fmt.Errorf("calling 'SelectDevices' failed: %w", err),
|
||||
errors.New("unexpected 'session_handle' type in 'CreateSession' return value")}
|
||||
}
|
||||
}
|
||||
startResponseStatus, startResults, err := getResponse(bus, portalDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.Start", 0,
|
||||
sessionHandle, "", map[string]dbus.Variant{},
|
||||
)
|
||||
sessionHandle := dbus.ObjectPath(sessionHandleS)
|
||||
inVardict = make(map[string]dbus.Variant)
|
||||
inVardict["type"] = dbus.MakeVariant(deviceKeyboard | devicePointer)
|
||||
result, outVardict, err = getResponse(bus, remoteDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.SelectDevices", 0, sessionHandle, inVardict)
|
||||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{err}
|
||||
}
|
||||
if result != 0 {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
fmt.Errorf("calling 'Start' failed: %w", err),
|
||||
fmt.Errorf("Calling 'SelectDevices' failed (%v)", result)}
|
||||
}
|
||||
inVardict = make(map[string]dbus.Variant)
|
||||
result, outVardict, err = getResponse(bus, remoteDesktop,
|
||||
"org.freedesktop.portal.RemoteDesktop.Start", 0, sessionHandle, "", inVardict)
|
||||
if err != nil {
|
||||
return nil, &UnsupportedPlatformError{err}
|
||||
}
|
||||
if startResponseStatus != 0 {
|
||||
if result != 0 {
|
||||
return nil, errors.New("keyboard or pointer access denied")
|
||||
}
|
||||
if restoreToken, _ := startResults["restore_token"].Value().(string); restoreTokenStore != nil {
|
||||
if err := restoreTokenStore.Store([]byte(restoreToken)); err != nil {
|
||||
log.Printf("Failed to store restore token: %v", err)
|
||||
}
|
||||
}
|
||||
devices, ok := startResults["devices"].Value().(uint32)
|
||||
devicesV, ok := outVardict["devices"]
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("unexpected 'devices' type in 'Start' return value"),
|
||||
errors.New("'devices' missing from 'Start' return value")}
|
||||
}
|
||||
devices, ok := devicesV.Value().(uint32)
|
||||
if !ok {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("unexpected 'devices' type in 'Start' return value")}
|
||||
}
|
||||
if devices&deviceKeyboard == 0 || devices&devicePointer == 0 {
|
||||
return nil, errors.New("keyboard or pointer access denied")
|
||||
}
|
||||
cleanupBus = false
|
||||
return &portalController{
|
||||
bus: bus, portalDesktop: portalDesktop,
|
||||
sessionHandle: sessionHandle,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func retrieveSecret(bus *dbus.Conn) ([]byte, error) {
|
||||
portalDesktop := bus.Object("org.freedesktop.portal.Desktop",
|
||||
"/org/freedesktop/portal/desktop")
|
||||
secretReader, secretWriter, err := os.Pipe()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer secretReader.Close()
|
||||
defer secretWriter.Close()
|
||||
if _, err := checkResponse(getResponse(bus, portalDesktop,
|
||||
"org.freedesktop.portal.Secret.RetrieveSecret", 0,
|
||||
dbus.UnixFD(secretWriter.Fd()), map[string]dbus.Variant{},
|
||||
)); err != nil {
|
||||
return nil, fmt.Errorf("calling 'RetrieveSecret' failed: %w", err)
|
||||
}
|
||||
if err := secretWriter.Close(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
secret, err := io.ReadAll(secretReader)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(secret) < 16 {
|
||||
return nil, fmt.Errorf("'RetrieveSecret' returned too few bytes (%d)", len(secret))
|
||||
}
|
||||
return secret, err
|
||||
}
|
||||
|
||||
type secretStore struct {
|
||||
aesgcm cipher.AEAD
|
||||
filename string
|
||||
}
|
||||
|
||||
func newSecretStore(key []byte, filename string) (*secretStore, error) {
|
||||
derivedKey, err := hkdf.Key(sha256.New, key, nil, "", 32)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
block, err := aes.NewCipher(derivedKey)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
aesgcm, err := cipher.NewGCM(block)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &secretStore{
|
||||
aesgcm: aesgcm,
|
||||
filename: filename,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *secretStore) Load() ([]byte, error) {
|
||||
data, err := os.ReadFile(s.filename)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(data) < s.aesgcm.NonceSize() {
|
||||
return nil, errors.New("invalid ciphertext")
|
||||
}
|
||||
nonce := data[:s.aesgcm.NonceSize()]
|
||||
ciphertext := data[len(nonce):]
|
||||
return s.aesgcm.Open(nil, nonce, ciphertext, nil)
|
||||
}
|
||||
|
||||
func (s *secretStore) Store(data []byte) error {
|
||||
nonce := make([]byte, s.aesgcm.NonceSize())
|
||||
if _, err := io.ReadFull(rand.Reader, nonce); err != nil {
|
||||
return err
|
||||
}
|
||||
ciphertext := s.aesgcm.Seal(nil, nonce, data, nil)
|
||||
return os.WriteFile(s.filename, slices.Concat(nonce, ciphertext), 0o600)
|
||||
return &portalController{bus: bus, remoteDesktop: remoteDesktop,
|
||||
sessionHandle: sessionHandle}, nil
|
||||
}
|
||||
|
||||
func getResponse(bus *dbus.Conn, object dbus.BusObject, method string,
|
||||
flags dbus.Flags, args ...interface{},
|
||||
) (uint32, map[string]dbus.Variant, error) {
|
||||
flags dbus.Flags, args ...interface{}) (uint32, map[string]dbus.Variant, error) {
|
||||
ch := make(chan *dbus.Signal, 512)
|
||||
bus.Signal(ch)
|
||||
defer bus.RemoveSignal(ch)
|
||||
|
|
@ -296,39 +161,47 @@ func getResponse(bus *dbus.Conn, object dbus.BusObject, method string,
|
|||
s := <-ch
|
||||
if s.Path == requestPath && s.Name == "org.freedesktop.portal.Request.Response" {
|
||||
if len(s.Body) != 2 {
|
||||
return 0, nil, fmt.Errorf("unexpected 'Response' return length (%d)", len(s.Body))
|
||||
return 0, nil, errors.New("unexpected 'Response' return length")
|
||||
}
|
||||
responseStatus, ok := s.Body[0].(uint32)
|
||||
result, ok := s.Body[0].(uint32)
|
||||
if !ok {
|
||||
return 0, nil, errors.New("unexpected 'Response' return type")
|
||||
}
|
||||
results, ok := s.Body[1].(map[string]dbus.Variant)
|
||||
outVardict, ok := s.Body[1].(map[string]dbus.Variant)
|
||||
if !ok {
|
||||
return 0, nil, errors.New("unexpected 'Response' return type")
|
||||
}
|
||||
return responseStatus, results, nil
|
||||
return result, outVardict, nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func checkResponse(responseStatus uint32, results map[string]dbus.Variant, err error) (map[string]dbus.Variant, error) {
|
||||
if err == nil && responseStatus != 0 {
|
||||
err = fmt.Errorf("unexpected 'Response' status (%d)", responseStatus)
|
||||
}
|
||||
return results, err
|
||||
}
|
||||
|
||||
func (p *portalController) Close() error {
|
||||
return p.bus.Close()
|
||||
p.lock.Lock()
|
||||
defer p.lock.Unlock()
|
||||
if p.bus == nil {
|
||||
return errors.New("dbus connection closed")
|
||||
}
|
||||
if err := p.bus.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
p.bus = nil
|
||||
p.remoteDesktop = nil
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *portalController) keyboardKeys(keys []Keysym) error {
|
||||
p.lock.RLock()
|
||||
defer p.lock.RUnlock()
|
||||
if p.bus == nil {
|
||||
return errors.New("dbus connection closed")
|
||||
}
|
||||
inVardict := make(map[string]dbus.Variant)
|
||||
for _, keysym := range keys {
|
||||
for _, state := range [...]uint32{btnPressed, btnReleased} {
|
||||
if err := p.portalDesktop.Call(
|
||||
"org.freedesktop.portal.RemoteDesktop.NotifyKeyboardKeysym", 0,
|
||||
p.sessionHandle, map[string]dbus.Variant{}, keysym, state,
|
||||
).Store(); err != nil {
|
||||
if err := p.remoteDesktop.Call(
|
||||
"org.freedesktop.portal.RemoteDesktop.NotifyKeyboardKeysym",
|
||||
0, p.sessionHandle, inVardict, keysym, state).Store(); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
@ -358,6 +231,11 @@ func (p *portalController) KeyboardKey(key Key) error {
|
|||
}
|
||||
|
||||
func (p *portalController) PointerButton(button PointerButton, press bool) error {
|
||||
p.lock.RLock()
|
||||
defer p.lock.RUnlock()
|
||||
if p.bus == nil {
|
||||
return errors.New("dbus connection closed")
|
||||
}
|
||||
var btn int32
|
||||
switch button {
|
||||
case PointerButtonLeft:
|
||||
|
|
@ -373,27 +251,38 @@ func (p *portalController) PointerButton(button PointerButton, press bool) error
|
|||
if press {
|
||||
state = btnPressed
|
||||
}
|
||||
if err := p.portalDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerButton", 0,
|
||||
p.sessionHandle, map[string]dbus.Variant{}, btn, state,
|
||||
).Store(); err != nil {
|
||||
inVardict := make(map[string]dbus.Variant)
|
||||
if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerButton",
|
||||
0, p.sessionHandle, inVardict, btn, state).Store(); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *portalController) PointerMove(deltaX, deltaY int) error {
|
||||
if err := p.portalDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerMotion", 0,
|
||||
p.sessionHandle, map[string]dbus.Variant{}, float64(deltaX), float64(deltaY),
|
||||
).Store(); err != nil {
|
||||
p.lock.RLock()
|
||||
defer p.lock.RUnlock()
|
||||
if p.bus == nil {
|
||||
return errors.New("dbus connection closed")
|
||||
}
|
||||
inVardict := make(map[string]dbus.Variant)
|
||||
if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerMotion",
|
||||
0, p.sessionHandle, inVardict, float64(deltaX), float64(deltaY)).Store(); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *portalController) PointerScroll(deltaHorizontal, deltaVertical int, finish bool) error {
|
||||
if err := p.portalDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerAxis", 0,
|
||||
p.sessionHandle, map[string]dbus.Variant{"finish": dbus.MakeVariant(finish)}, float64(deltaHorizontal), float64(deltaVertical),
|
||||
).Store(); err != nil {
|
||||
p.lock.RLock()
|
||||
defer p.lock.RUnlock()
|
||||
if p.bus == nil {
|
||||
return errors.New("dbus connection closed")
|
||||
}
|
||||
inVardict := make(map[string]dbus.Variant)
|
||||
inVardict["finish"] = dbus.MakeVariant(finish)
|
||||
if err := p.remoteDesktop.Call("org.freedesktop.portal.RemoteDesktop.NotifyPointerAxis",
|
||||
0, p.sessionHandle, inVardict, float64(deltaHorizontal), float64(deltaVertical)).Store(); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -25,11 +25,10 @@ package inputcontrol
|
|||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/bendahl/uinput"
|
||||
"log"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/bendahl/uinput"
|
||||
)
|
||||
|
||||
const shiftKeysDelay time.Duration = 50 * time.Millisecond
|
||||
|
|
@ -75,7 +74,11 @@ func InitUinputController() (Controller, error) {
|
|||
}
|
||||
|
||||
func (p *uinputController) Close() error {
|
||||
return errors.Join(p.keyboard.Close(), p.mouse.Close())
|
||||
if err := p.keyboard.Close(); err != nil {
|
||||
p.mouse.Close()
|
||||
return err
|
||||
}
|
||||
return p.mouse.Close()
|
||||
}
|
||||
|
||||
func (p *uinputController) KeyboardText(text string) error {
|
||||
|
|
@ -196,5 +199,8 @@ func (p *uinputController) PointerMove(deltaX, deltaY int) error {
|
|||
}
|
||||
|
||||
func (p *uinputController) PointerScroll(deltaHorizontal, deltaVertical int, finish bool) error {
|
||||
return errors.Join(p.mouse.Wheel(false, int32(-deltaVertical)), p.mouse.Wheel(true, int32(deltaHorizontal)))
|
||||
if err := p.mouse.Wheel(false, int32(deltaVertical)); err != nil {
|
||||
return err
|
||||
}
|
||||
return p.mouse.Wheel(true, int32(deltaHorizontal))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,8 +111,9 @@ func (p *windowsController) sendInput(inputs []keybdInput) error {
|
|||
if len(inputs) == 0 {
|
||||
return nil
|
||||
}
|
||||
if sent, _, err := sendInputProc.Call(uintptr(len(inputs)),
|
||||
uintptr(unsafe.Pointer(&inputs[0])), unsafe.Sizeof(inputs[0])); int(sent) != len(inputs) {
|
||||
if r, _, err := sendInputProc.Call(uintptr(len(inputs)),
|
||||
uintptr(unsafe.Pointer(&inputs[0])),
|
||||
unsafe.Sizeof(inputs[0])); int(r) != len(inputs) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
@ -196,8 +197,8 @@ func (p *windowsController) PointerButton(button PointerButton, press bool) erro
|
|||
} else {
|
||||
return fmt.Errorf("unsupported pointer button: %#v", button)
|
||||
}
|
||||
if sent, _, err := sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)),
|
||||
unsafe.Sizeof(input)); int(sent) != 1 {
|
||||
if r, _, err := sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)),
|
||||
unsafe.Sizeof(input)); int(r) != 1 {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
@ -210,8 +211,8 @@ func (p *windowsController) PointerMove(deltaX, deltaY int) error {
|
|||
dy: int32(deltaY),
|
||||
dwFlags: mouseeventfMove,
|
||||
}
|
||||
if sent, _, err := sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)),
|
||||
unsafe.Sizeof(input)); int(sent) != 1 {
|
||||
if r, _, err := sendInputProc.Call(1, uintptr(unsafe.Pointer(&input)),
|
||||
unsafe.Sizeof(input)); int(r) != 1 {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
@ -236,8 +237,9 @@ func (p *windowsController) PointerScroll(deltaHorizontal, deltaVertical int, fi
|
|||
if len(inputs) == 0 {
|
||||
return nil
|
||||
}
|
||||
if sent, _, err := sendInputProc.Call(uintptr(len(inputs)),
|
||||
uintptr(unsafe.Pointer(&inputs[0])), unsafe.Sizeof(inputs[0])); int(sent) != len(inputs) {
|
||||
if r, _, err := sendInputProc.Call(uintptr(len(inputs)),
|
||||
uintptr(unsafe.Pointer(&inputs[0])),
|
||||
unsafe.Sizeof(inputs[0])); int(r) != len(inputs) {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
package inputcontrol
|
||||
|
||||
// #cgo LDFLAGS: -lX11 -lXrandr -lXtst
|
||||
// #include <stdlib.h>
|
||||
// #include <X11/Xlib.h>
|
||||
// #include <X11/Intrinsic.h>
|
||||
// #include <X11/extensions/Xrandr.h>
|
||||
|
|
@ -32,12 +31,9 @@ package inputcontrol
|
|||
// return DefaultRootWindow(dpy);
|
||||
// }
|
||||
import "C"
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"maps"
|
||||
"slices"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
|
@ -45,18 +41,12 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
keyboardMappingDelay time.Duration = 200 * time.Millisecond
|
||||
keyboardMappingDelay time.Duration = 500 * time.Millisecond
|
||||
scrollDiv int = 20
|
||||
)
|
||||
|
||||
var modifierIndexes = [...]int{
|
||||
C.ShiftMapIndex,
|
||||
C.Mod1MapIndex,
|
||||
C.Mod2MapIndex,
|
||||
C.Mod3MapIndex,
|
||||
C.Mod4MapIndex,
|
||||
C.Mod5MapIndex,
|
||||
}
|
||||
var modifierIndices [6]uint = [...]uint{C.ShiftMapIndex, C.Mod1MapIndex,
|
||||
C.Mod2MapIndex, C.Mod3MapIndex, C.Mod4MapIndex, C.Mod5MapIndex}
|
||||
|
||||
type x11Controller struct {
|
||||
display *C.Display
|
||||
|
|
@ -72,31 +62,18 @@ func InitX11Controller() (Controller, error) {
|
|||
display := C.XOpenDisplay(nil)
|
||||
if display == nil {
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("failed to connect to X server"),
|
||||
}
|
||||
errors.New("failed to connect to X server")}
|
||||
}
|
||||
p := &x11Controller{display: display}
|
||||
if p.xIsXwayland() {
|
||||
p.Close()
|
||||
return nil, &UnsupportedPlatformError{
|
||||
errors.New("X server is Xwayland"),
|
||||
}
|
||||
errors.New("X server is Xwayland")}
|
||||
}
|
||||
return p, nil
|
||||
}
|
||||
|
||||
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))
|
||||
if resources == nil {
|
||||
return false
|
||||
|
|
@ -124,68 +101,53 @@ func (p *x11Controller) Close() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (p *x11Controller) findEmptyKeycodeLocked() (keycode C.KeyCode, keysymsPerKeycode int, err error) {
|
||||
func (p *x11Controller) findEmptyKeycodeLocked() (C.KeyCode, C.int, error) {
|
||||
var minKeycodes, maxKeycodes C.int
|
||||
C.XDisplayKeycodes(p.display, &minKeycodes, &maxKeycodes)
|
||||
var keysymsPerKeycodeC C.int
|
||||
keysyms := C.XGetKeyboardMapping(
|
||||
p.display,
|
||||
C.KeyCode(minKeycodes),
|
||||
maxKeycodes-minKeycodes+1,
|
||||
&keysymsPerKeycodeC,
|
||||
)
|
||||
var keysymsPerKeycode C.int
|
||||
keysyms := C.XGetKeyboardMapping(p.display, C.KeyCode(minKeycodes),
|
||||
maxKeycodes-minKeycodes+1, &keysymsPerKeycode)
|
||||
if keysyms == nil {
|
||||
return 0, 0, errors.New("failed to get keyboard mapping")
|
||||
}
|
||||
defer C.XFree(unsafe.Pointer(keysyms))
|
||||
keysymsPerKeycode = int(keysymsPerKeycodeC)
|
||||
keycodes:
|
||||
for keycode := int(minKeycodes); keycode <= int(maxKeycodes); keycode++ {
|
||||
for i := range keysymsPerKeycode {
|
||||
keysymsIndex := (keycode-int(minKeycodes))*keysymsPerKeycode + i
|
||||
keysym := *(*C.KeySym)(unsafe.Pointer(
|
||||
uintptr(unsafe.Pointer(keysyms)) +
|
||||
uintptr(keysymsIndex)*unsafe.Sizeof(*keysyms),
|
||||
))
|
||||
for keycode := C.KeyCode(minKeycodes); keycode <= C.KeyCode(maxKeycodes); keycode++ {
|
||||
for i := 0; i < int(keysymsPerKeycode); i++ {
|
||||
keysymsIndex := int(keycode-
|
||||
C.KeyCode(minKeycodes))*int(keysymsPerKeycode) + i
|
||||
keysym := *(*C.KeySym)(unsafe.Pointer(uintptr(unsafe.Pointer(keysyms)) +
|
||||
uintptr(keysymsIndex)*unsafe.Sizeof(*keysyms)))
|
||||
if keysym != 0 {
|
||||
continue keycodes
|
||||
}
|
||||
}
|
||||
return C.KeyCode(keycode), keysymsPerKeycode, nil
|
||||
return keycode, keysymsPerKeycode, nil
|
||||
}
|
||||
return 0, 0, errors.New("no empty keycode found")
|
||||
}
|
||||
|
||||
func (p *x11Controller) changeKeyMappingLocked(
|
||||
keycode C.KeyCode, keysymsPerKeycode int, keysym Keysym,
|
||||
) {
|
||||
func (p *x11Controller) changeKeyMappingLocked(keysymsPerKeycode C.int,
|
||||
keycode C.KeyCode, keysym Keysym) {
|
||||
keycodeMapping := make([]C.KeySym, keysymsPerKeycode)
|
||||
for i := range keycodeMapping {
|
||||
keycodeMapping[i] = C.KeySym(keysym)
|
||||
}
|
||||
C.XChangeKeyboardMapping(
|
||||
p.display,
|
||||
C.int(keycode),
|
||||
C.int(keysymsPerKeycode),
|
||||
(*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])),
|
||||
1,
|
||||
)
|
||||
C.XSync(p.display, C.False)
|
||||
C.XChangeKeyboardMapping(p.display, C.int(keycode), keysymsPerKeycode,
|
||||
(*C.KeySym)(unsafe.Pointer(&keycodeMapping[0])), 1)
|
||||
C.XFlush(p.display)
|
||||
}
|
||||
|
||||
func (p *x11Controller) getModKeycodesLocked() map[uint]C.KeyCode {
|
||||
modKeymap := C.XGetModifierMapping(p.display)
|
||||
defer C.XFreeModifiermap(modKeymap)
|
||||
modKeycodes := make(map[uint]C.KeyCode)
|
||||
for _, modIndex := range modifierIndexes {
|
||||
for i := range int(modKeymap.max_keypermod) {
|
||||
keycodeIndex := modIndex*int(modKeymap.max_keypermod) + i
|
||||
keycode := *(*C.KeyCode)(unsafe.Pointer(
|
||||
uintptr(unsafe.Pointer(modKeymap.modifiermap)) +
|
||||
uintptr(keycodeIndex)*unsafe.Sizeof(*modKeymap.modifiermap),
|
||||
))
|
||||
for _, modIndex := range modifierIndices {
|
||||
for i := 0; i < int(modKeymap.max_keypermod); i++ {
|
||||
keycode := *(*C.KeyCode)(unsafe.Pointer(uintptr(unsafe.Pointer(modKeymap.modifiermap)) +
|
||||
uintptr(uint(modIndex)*uint(modKeymap.max_keypermod)+uint(i))))
|
||||
if keycode != 0 {
|
||||
modKeycodes[1<<modIndex] = keycode
|
||||
modKeycodes[1<<uint(modIndex)] = keycode
|
||||
break
|
||||
}
|
||||
}
|
||||
|
|
@ -193,39 +155,50 @@ func (p *x11Controller) getModKeycodesLocked() map[uint]C.KeyCode {
|
|||
return modKeycodes
|
||||
}
|
||||
|
||||
func (p *x11Controller) findKeycodeLocked(
|
||||
keyboard C.XkbDescPtr, modKeycodes map[uint]C.KeyCode, activeMods uint, keysym Keysym,
|
||||
) (keycode C.KeyCode, mods uint) {
|
||||
keycode = C.XKeysymToKeycode(p.display, C.KeySym(keysym))
|
||||
func (p *x11Controller) findKeycodeLocked(keyboard C.XkbDescPtr,
|
||||
modKeycodes map[uint]C.KeyCode, activeMods C.uint,
|
||||
keysym Keysym) (C.KeyCode, C.uint) {
|
||||
keycode := C.XKeysymToKeycode(p.display, C.KeySym(keysym))
|
||||
if keycode == 0 {
|
||||
return 0, 0
|
||||
}
|
||||
for activeModBitmap := range uint(1) << len(modKeycodes) {
|
||||
mods := activeMods
|
||||
for i, mod := range slices.Sorted(maps.Keys(modKeycodes)) {
|
||||
if activeModBitmap&(1<<i) != 0 {
|
||||
mods ^= mod
|
||||
var alwaysActiveMods C.uint
|
||||
for modIndex := uint(0); modIndex < 8; modIndex++ {
|
||||
mod := uint(1) << modIndex
|
||||
if _, modAvailable := modKeycodes[mod]; !modAvailable {
|
||||
alwaysActiveMods |= activeMods & C.uint(mod)
|
||||
}
|
||||
}
|
||||
_, shiftModAvailable := modKeycodes[C.ShiftMask]
|
||||
for _, modIndex := range modifierIndices {
|
||||
var mod C.uint
|
||||
if modIndex != C.ShiftMapIndex {
|
||||
mod = 1 << modIndex
|
||||
}
|
||||
for _, shiftMod := range [...]C.uint{0, C.ShiftMask} {
|
||||
if shiftMod != 0 && !shiftModAvailable {
|
||||
continue
|
||||
}
|
||||
mods := alwaysActiveMods | shiftMod | mod
|
||||
var retMods C.uint
|
||||
var retKeysym C.KeySym
|
||||
C.XkbTranslateKeyCode(keyboard, keycode, C.uint(mods), &retMods, &retKeysym)
|
||||
C.XkbTranslateKeyCode(keyboard, keycode, mods, &retMods, &retKeysym)
|
||||
if retKeysym == C.KeySym(keysym) {
|
||||
return keycode, mods
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0, 0
|
||||
}
|
||||
|
||||
func (p *x11Controller) sendModsLocked(
|
||||
modKeycodes map[uint]C.KeyCode, mods uint, press bool,
|
||||
) {
|
||||
func (p *x11Controller) sendModsLocked(modKeycodes map[uint]C.KeyCode, mods C.uint,
|
||||
press bool) {
|
||||
var pressC C.int = C.False
|
||||
if press {
|
||||
pressC = C.True
|
||||
}
|
||||
for mod, keycode := range modKeycodes {
|
||||
if mods&mod != 0 {
|
||||
if mods&C.uint(mod) != 0 {
|
||||
C.XTestFakeKeyEvent(p.display, C.uint(keycode), pressC, 0)
|
||||
}
|
||||
}
|
||||
|
|
@ -246,22 +219,17 @@ func (p *x11Controller) keyboardKeys(keys []Keysym) error {
|
|||
C.XkbCompatMapMask|C.XkbGeometryMask, C.XkbUseCoreKbd)
|
||||
defer C.XkbFreeKeyboard(keyboard, C.XkbAllComponentsMask, C.True)
|
||||
var emptyKeycode C.KeyCode
|
||||
var keysymsPerKeycode int
|
||||
var keysymsPerKeycode C.int
|
||||
for _, keysym := range keys {
|
||||
var root, child C.Window
|
||||
var rootX, rootY, x, y C.int
|
||||
var activeModsC C.uint
|
||||
C.XQueryPointer(
|
||||
p.display,
|
||||
rootWindow,
|
||||
&root, &child,
|
||||
&rootX, &rootY,
|
||||
&x, &y,
|
||||
&activeModsC,
|
||||
)
|
||||
activeMods := uint(activeModsC)
|
||||
keycode, mods := p.findKeycodeLocked(keyboard, modKeycodes, activeMods, keysym)
|
||||
var pressMods, releaseMods uint
|
||||
var activeMods C.uint
|
||||
C.XSync(p.display, C.False)
|
||||
C.XQueryPointer(p.display, rootWindow, &root, &child, &rootX, &rootY,
|
||||
&x, &y, &activeMods)
|
||||
keycode, mods := p.findKeycodeLocked(keyboard, modKeycodes, activeMods,
|
||||
keysym)
|
||||
var pressMods, releaseMods C.uint
|
||||
if keycode == 0 {
|
||||
if emptyKeycode == 0 {
|
||||
var err error
|
||||
|
|
@ -269,10 +237,12 @@ func (p *x11Controller) keyboardKeys(keys []Keysym) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer p.changeKeyMappingLocked(emptyKeycode, keysymsPerKeycode, 0)
|
||||
defer p.changeKeyMappingLocked(keysymsPerKeycode, emptyKeycode, 0)
|
||||
}
|
||||
keycode = emptyKeycode
|
||||
p.changeKeyMappingLocked(keycode, keysymsPerKeycode, keysym)
|
||||
p.changeKeyMappingLocked(keysymsPerKeycode, keycode, keysym)
|
||||
// race condition!
|
||||
time.Sleep(keyboardMappingDelay)
|
||||
} else {
|
||||
pressMods = mods & ^activeMods
|
||||
releaseMods = activeMods & ^mods
|
||||
|
|
@ -283,7 +253,7 @@ func (p *x11Controller) keyboardKeys(keys []Keysym) error {
|
|||
C.XTestFakeKeyEvent(p.display, C.uint(keycode), C.False, 0)
|
||||
p.sendModsLocked(modKeycodes, pressMods, false)
|
||||
p.sendModsLocked(modKeycodes, releaseMods, true)
|
||||
C.XSync(p.display, C.False)
|
||||
C.XFlush(p.display)
|
||||
if keycode == emptyKeycode {
|
||||
// race condition!
|
||||
time.Sleep(keyboardMappingDelay)
|
||||
|
|
@ -327,7 +297,7 @@ func (p *x11Controller) sendButton(button uint, press bool) error {
|
|||
pressC = C.True
|
||||
}
|
||||
C.XTestFakeButtonEvent(p.display, C.uint(button), pressC, 0)
|
||||
C.XSync(p.display, C.False)
|
||||
C.XFlush(p.display)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -351,7 +321,7 @@ func (p *x11Controller) PointerMove(deltaX, deltaY int) error {
|
|||
return errors.New("X server connection closed")
|
||||
}
|
||||
C.XTestFakeRelativeMotionEvent(p.display, C.int(deltaX), C.int(deltaY), 0)
|
||||
C.XSync(p.display, C.False)
|
||||
C.XFlush(p.display)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -372,7 +342,7 @@ func (p *x11Controller) PointerScroll(deltaHorizontal, deltaVertical int, finish
|
|||
buttonHorizontal = 6
|
||||
stepsHorizontal = -stepsHorizontal
|
||||
}
|
||||
for range stepsHorizontal {
|
||||
for i := 0; i < stepsHorizontal; i++ {
|
||||
if err := p.sendButton(buttonHorizontal, true); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -385,7 +355,7 @@ func (p *x11Controller) PointerScroll(deltaHorizontal, deltaVertical int, finish
|
|||
buttonVertical = 4
|
||||
stepsVertical = -stepsVertical
|
||||
}
|
||||
for range stepsVertical {
|
||||
for i := 0; i < stepsVertical; i++ {
|
||||
if err := p.sendButton(buttonVertical, true); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
9
main.go
9
main.go
|
|
@ -27,6 +27,9 @@ import (
|
|||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"github.com/unrud/remote-touchpad/inputcontrol"
|
||||
"github.com/unrud/remote-touchpad/terminal"
|
||||
"golang.org/x/net/websocket"
|
||||
"log"
|
||||
mathrand "math/rand"
|
||||
"net"
|
||||
|
|
@ -36,10 +39,6 @@ import (
|
|||
"strings"
|
||||
"time"
|
||||
"unicode/utf8"
|
||||
|
||||
"github.com/unrud/remote-touchpad/inputcontrol"
|
||||
"github.com/unrud/remote-touchpad/terminal"
|
||||
"golang.org/x/net/websocket"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -48,7 +47,7 @@ const (
|
|||
authenticationRateBurst int = 10
|
||||
challengeLength int = 8
|
||||
defaultBind string = ":0"
|
||||
version string = "1.5.4"
|
||||
version string = "1.4.0"
|
||||
prettyAppName string = "Remote Touchpad"
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
[Unit]
|
||||
Description=Remote Touchpad Service
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=%h/.local/bin/remote-touchpad
|
||||
Restart=always
|
||||
RestartSec=5s
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
149
rts
149
rts
|
|
@ -1,149 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Remote Touchpad CLI Wrapper
|
||||
# Provides easy access to remote-touchpad service
|
||||
|
||||
SERVICE_NAME="remote-touchpad"
|
||||
SERVICE_USER="$USER"
|
||||
|
||||
install() {
|
||||
echo "Installing remote-touchpad as a user systemd service..."
|
||||
|
||||
# Check if Go is installed
|
||||
if ! command -v go &> /dev/null; then
|
||||
echo "Error: Go is not installed. Please install Go first."
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "Building remote-touchpad binary..."
|
||||
go build -tags portal,uinput,x11 -o remote-touchpad
|
||||
|
||||
if [ ! -f "remote-touchpad" ]; then
|
||||
echo "Error: Failed to build remote-touchpad binary"
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Setup directories
|
||||
mkdir -p ~/.local/bin ~/.config/systemd/user
|
||||
|
||||
echo "Installing service files..."
|
||||
cp remote-touchpad ~/.local/bin/ || echo "Error: cp to ~/.local/bin failed"
|
||||
cp remote-touchpad.service ~/.config/systemd/user/ || echo "Error: cp to ~/.config/systemd/user failed"
|
||||
|
||||
echo "Enabling and starting service..."
|
||||
systemctl --user daemon-reload
|
||||
systemctl --user enable --now ${SERVICE_NAME}.service
|
||||
|
||||
echo "✓ remote-touchpad user service installed and started"
|
||||
echo ""
|
||||
echo "Use './rts status' to check the service"
|
||||
echo "Use './rts url' to get the connection URL"
|
||||
}
|
||||
|
||||
start() {
|
||||
systemctl --user start ${SERVICE_NAME}.service
|
||||
echo "Started remote-touchpad service"
|
||||
}
|
||||
|
||||
stop() {
|
||||
systemctl --user stop ${SERVICE_NAME}.service
|
||||
echo "Stopped remote-touchpad service"
|
||||
}
|
||||
|
||||
status() {
|
||||
systemctl --user status ${SERVICE_NAME}.service --no-pager
|
||||
}
|
||||
|
||||
restart() {
|
||||
systemctl --user restart ${SERVICE_NAME}.service
|
||||
echo "Restarted remote-touchpad service"
|
||||
}
|
||||
|
||||
url() {
|
||||
# Extract URL from service logs
|
||||
echo "Fetching remote-touchpad URL..."
|
||||
local url=$(journalctl --user -u ${SERVICE_NAME}.service -n 100 --no-pager 2>/dev/null | grep -oE "http://[^ ]+|https://[^ ]+" | tail -1)
|
||||
if [ -n "$url" ]; then
|
||||
echo "Remote Touchpad URL: $url"
|
||||
# Generate QR code if qrencode is available
|
||||
if command -v qrencode &> /dev/null; then
|
||||
echo "Generating QR code..."
|
||||
echo "$url" | qrencode -t ansiutf8
|
||||
else
|
||||
echo "QR code generation requires qrencode. Install it with:"
|
||||
echo " sudo apt-get install qrencode # Debian/Ubuntu"
|
||||
echo " sudo dnf install qrencode # Fedora"
|
||||
echo " brew install qrencode # macOS"
|
||||
fi
|
||||
else
|
||||
echo "Could not find URL in service logs. Is the service running?"
|
||||
fi
|
||||
}
|
||||
|
||||
log() {
|
||||
echo "Viewing remote-touchpad service logs..."
|
||||
journalctl --user -u ${SERVICE_NAME}.service --no-pager
|
||||
}
|
||||
|
||||
uninstall() {
|
||||
echo "Uninstalling remote-touchpad..."
|
||||
systemctl --user stop ${SERVICE_NAME}.service
|
||||
systemctl --user disable ${SERVICE_NAME}.service
|
||||
rm -f ~/.config/systemd/user/${SERVICE_NAME}.service
|
||||
rm -f ~/.local/bin/remote-touchpad
|
||||
systemctl --user daemon-reload
|
||||
echo "✓ remote-touchpad uninstalled"
|
||||
}
|
||||
|
||||
help() {
|
||||
echo "Remote Touchpad CLI Wrapper"
|
||||
echo ""
|
||||
echo "Usage: rts [command]"
|
||||
echo ""
|
||||
echo "Commands:"
|
||||
echo " install - Install remote-touchpad as a systemd user service"
|
||||
echo " start - Start the remote-touchpad service"
|
||||
echo " stop - Stop the remote-touchpad service"
|
||||
echo " status - Check service status"
|
||||
echo " restart - Restart the service"
|
||||
echo " url - Show the remote-touchpad URL"
|
||||
echo " log - View service logs"
|
||||
echo " uninstall - Uninstall the service"
|
||||
echo " help - Show this help message"
|
||||
}
|
||||
|
||||
# Main command handler
|
||||
case "$1" in
|
||||
install)
|
||||
install
|
||||
;;
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
status
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
url)
|
||||
url
|
||||
;;
|
||||
log)
|
||||
log
|
||||
;;
|
||||
uninstall)
|
||||
uninstall
|
||||
;;
|
||||
help|--help|-h|"")
|
||||
help
|
||||
;;
|
||||
*)
|
||||
echo "Unknown command: $1"
|
||||
help
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,21 +1,17 @@
|
|||
# Build by running `snapcraft`.
|
||||
# Build by running "snapcraft".
|
||||
|
||||
# WARNING:
|
||||
# Snapcraft uses caching for already build steps but it's buggy and can cause strange problems.
|
||||
# Clean the cache by running `snapcraft clean`.
|
||||
# Clean the cache by running "snapcraft clean".
|
||||
|
||||
name: remote-touchpad
|
||||
license: GPL-3.0+
|
||||
grade: stable
|
||||
adopt-info: remote-touchpad
|
||||
|
||||
base: core24
|
||||
base: core20
|
||||
confinement: strict
|
||||
|
||||
platforms:
|
||||
amd64:
|
||||
arm64:
|
||||
|
||||
apps:
|
||||
remote-touchpad:
|
||||
command: bin/remote-touchpad
|
||||
|
|
@ -30,7 +26,7 @@ apps:
|
|||
- desktop
|
||||
- x11
|
||||
common-id: com.github.unrud.RemoteTouchpad
|
||||
desktop: usr/share/applications/com.github.unrud.RemoteTouchpad.desktop
|
||||
desktop: share/applications/com.github.unrud.RemoteTouchpad.desktop
|
||||
|
||||
parts:
|
||||
remote-touchpad:
|
||||
|
|
@ -40,8 +36,6 @@ parts:
|
|||
- x11
|
||||
source: .
|
||||
source-type: git
|
||||
build-snaps:
|
||||
- go
|
||||
build-packages:
|
||||
- gcc
|
||||
- libc6-dev
|
||||
|
|
@ -52,10 +46,14 @@ parts:
|
|||
- libxt6
|
||||
- libxrandr2
|
||||
- libxtst6
|
||||
override-pull: |
|
||||
snapcraftctl pull
|
||||
# WORKAROUND: Point icon directly to SVG otherwise snapcraft can't find it
|
||||
sed -e 's|Icon=com.github.unrud.RemoteTouchpad|Icon=/usr/share/icons/hicolor/scalable/apps/com.github.unrud.RemoteTouchpad.svg|' -i desktop/com.github.unrud.RemoteTouchpad.desktop
|
||||
override-build: |
|
||||
craftctl default
|
||||
install -Dm0755 -t "${CRAFT_PART_INSTALL}/bin" desktop/remote-touchpad-wait-on-error
|
||||
install -Dm0644 -t "${CRAFT_PART_INSTALL}/usr/share/metainfo" desktop/com.github.unrud.RemoteTouchpad.metainfo.xml
|
||||
install -Dm0644 -t "${CRAFT_PART_INSTALL}/usr/share/applications" desktop/com.github.unrud.RemoteTouchpad.desktop
|
||||
install -Dm0644 -t "${CRAFT_PART_INSTALL}/usr/share/icons/hicolor/scalable/apps" desktop/com.github.unrud.RemoteTouchpad.svg
|
||||
snapcraftctl build
|
||||
install -Dm0755 -t "${SNAPCRAFT_PART_INSTALL}/bin" desktop/remote-touchpad-wait-on-error
|
||||
install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/metainfo" desktop/com.github.unrud.RemoteTouchpad.metainfo.xml
|
||||
install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/applications" desktop/com.github.unrud.RemoteTouchpad.desktop
|
||||
install -Dm0644 -t "${SNAPCRAFT_PART_INSTALL}/usr/share/icons/hicolor/scalable/apps" desktop/com.github.unrud.RemoteTouchpad.svg
|
||||
parse-info: [usr/share/metainfo/com.github.unrud.RemoteTouchpad.metainfo.xml]
|
||||
|
|
|
|||
33
webdata.go
33
webdata.go
|
|
@ -1,52 +1,19 @@
|
|||
/*
|
||||
* Copyright (c) 2024 Unrud <unrud@outlook.com>
|
||||
*
|
||||
* This file is part of Remote-Touchpad.
|
||||
*
|
||||
* Remote-Touchpad is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Remote-Touchpad is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Remote-Touchpad. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"io/fs"
|
||||
"log"
|
||||
"mime"
|
||||
)
|
||||
|
||||
//go:embed webdata/*
|
||||
var webdataFSWithPrefix embed.FS
|
||||
var webdataFS fs.FS
|
||||
|
||||
var webdataTypes = map[string]string{
|
||||
".css": "text/css; charset=utf-8",
|
||||
".html": "text/html; charset=utf-8",
|
||||
".mjs": "text/javascript; charset=utf-8",
|
||||
".png": "image/png",
|
||||
".woff": "font/woff",
|
||||
}
|
||||
|
||||
func init() {
|
||||
var err error
|
||||
webdataFS, err = fs.Sub(webdataFSWithPrefix, "webdata")
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
for ext, typ := range webdataTypes {
|
||||
if err := mime.AddExtensionType(ext, typ); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,13 +57,12 @@ export default class UI {
|
|||
(target) => target.classList.contains("touch-input"));
|
||||
document.addEventListener("mousedown", this.#handleMousedown.bind(this));
|
||||
document.addEventListener("touchend", this.#handleTouchend.bind(this));
|
||||
textInput.addEventListener("input", () => { this.#updateTextInput(); });
|
||||
textInput.addEventListener("input", this.#handleTextInput.bind(this));
|
||||
sendText.addEventListener("click", this.#handleSendText.bind(this));
|
||||
window.addEventListener("popstate", () => { this.#update(); });
|
||||
compat.addFullscreenchangeEventListener(() => { this.#update(); });
|
||||
compat.addPointerlockchangeEventListener(() => { this.#update(); });
|
||||
for (const button of buttons) {
|
||||
button.setAttribute("tabindex", "-1");
|
||||
button.addEventListener("click", this.#handleButtonClick.bind(this));
|
||||
}
|
||||
this.#update();
|
||||
|
|
@ -98,13 +97,8 @@ export default class UI {
|
|||
}
|
||||
}
|
||||
|
||||
#updateTextInput(newValue = null) {
|
||||
if (newValue != null) {
|
||||
textInput.value = newValue;
|
||||
}
|
||||
#handleTextInput() {
|
||||
sessionStorage.setItem("text-input", textInput.value);
|
||||
sendText.textContent = sendText.getAttribute(`data-${textInput.value ? "send" : "back"}-content`);
|
||||
textInput.focus();
|
||||
}
|
||||
|
||||
#handleButtonClick(event) {
|
||||
|
|
@ -118,10 +112,10 @@ export default class UI {
|
|||
// normalize line endings
|
||||
const text = textInput.value.replace(/\r\n?/g, "\n");
|
||||
this.#inputController.keyboardText(text);
|
||||
this.#updateTextInput("");
|
||||
} else {
|
||||
history.back();
|
||||
textInput.value = "";
|
||||
this.#handleTextInput();
|
||||
}
|
||||
history.back();
|
||||
}
|
||||
|
||||
#showScene(scene) {
|
||||
|
|
@ -165,7 +159,8 @@ export default class UI {
|
|||
|
||||
showTextInput() {
|
||||
this.#showScene(textInputScene);
|
||||
this.#updateTextInput(sessionStorage.getItem("text-input") || "");
|
||||
textInput.value = sessionStorage.getItem("text-input") || "";
|
||||
textInput.focus();
|
||||
if (history.state != "text-input") {
|
||||
history.pushState("text-input", "");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, interactive-widget=resizes-content">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">
|
||||
<script src="app/main.mjs" type="module"></script>
|
||||
<title>Remote Touchpad</title>
|
||||
<link href="main.css" media="screen" rel="stylesheet">
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
<textarea class="grow" cols=1 rows=1></textarea>
|
||||
<div class="buttons">
|
||||
<button onclick="app.showKeys('text-input', 1)">≡</button>
|
||||
<button class="grow" id="send-text" data-send-content="➣" data-back-content="⯇"></button>
|
||||
<button class="grow" id="send-text">➣</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -95,6 +95,6 @@
|
|||
<button class="top left" onclick="history.back()">⯇</button>
|
||||
</div>
|
||||
|
||||
<div id="mouse" class="scene keyboard-input allow-fullscreen">
|
||||
<div id="mouse" class="scene allow-keyboard allow-fullscreen">
|
||||
<p class="background">Mouse</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -153,10 +153,6 @@ textarea {
|
|||
padding: 0 0.5rem;
|
||||
}
|
||||
|
||||
textarea:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
#keys {
|
||||
padding: 0;
|
||||
justify-content: end;
|
||||
|
|
@ -181,48 +177,33 @@ textarea:focus {
|
|||
align-items: stretch;
|
||||
padding: 0;
|
||||
gap: 0;
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
#text-input .buttons {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#text-input .buttons > button {
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
#text-input .buttons > button:last-child {
|
||||
border-bottom: none;
|
||||
#text-input .buttons > button:first-child {
|
||||
border-left: none;
|
||||
}
|
||||
|
||||
/* Only Safari for iOS */
|
||||
@supports (-webkit-touch-callout: none) {
|
||||
/* Virtual keyboard can overlay content */
|
||||
#text-input .buttons > button:last-child {
|
||||
display: flex;
|
||||
padding-top: 0.2em;
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
/* Portrait orientation (not for Safari on iOS) */
|
||||
@supports not (-webkit-touch-callout: none) { @media (max-aspect-ratio: 4/3) {
|
||||
@media (min-aspect-ratio: 4/3) {
|
||||
#text-input {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#text-input .buttons {
|
||||
flex-direction: row;
|
||||
}
|
||||
|
||||
#text-input .buttons > button {
|
||||
#text-input .buttons {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
#text-input .buttons > button,
|
||||
#text-input .buttons > button:first-child {
|
||||
border-top: 1px solid black;
|
||||
border-bottom: none;
|
||||
border-left: 1px solid black;
|
||||
}
|
||||
|
||||
#text-input .buttons > button:first-child {
|
||||
border-left: none;
|
||||
border-top: none;
|
||||
}
|
||||
} }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2024 Unrud <unrud@outlook.com>
|
||||
*
|
||||
* This file is part of Remote-Touchpad.
|
||||
*
|
||||
* Remote-Touchpad is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Remote-Touchpad is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Remote-Touchpad. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"path/filepath"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestWebdataTypesCompleteness(t *testing.T) {
|
||||
if err := fs.WalkDir(webdataFS, ".", func(_ string, d fs.DirEntry, err error) error {
|
||||
if err != nil || d.IsDir() {
|
||||
return err
|
||||
}
|
||||
ext := filepath.Ext(d.Name())
|
||||
if _, haveType := webdataTypes[ext]; !haveType {
|
||||
return fmt.Errorf("missing mime type for extension %#v", ext)
|
||||
}
|
||||
return nil
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue