iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

muxed interactions with xserver, fix for #28?

Browse Source
This commit is contained in:
Craig
2020-02-03 14:49:27 +00:00
parent 3fc7737442
commit 2680a1f702
8 changed files with 71 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/websocket/control.go
View File

@ -1,7 +1,7 @@
package websocket
import (
"n.eko.moe/neko/internal/clip"
"n.eko.moe/neko/internal/hid"
"n.eko.moe/neko/internal/types"
"n.eko.moe/neko/internal/types/event"
"n.eko.moe/neko/internal/types/message"
@ -113,6 +113,6 @@ func (h *MessageHandler) controlClipboard(id string, session types.Session, payl
return nil
}
clip.Write(payload.Text)
hid.WriteClipboard(payload.Text)
return nil
}

6
server/internal/websocket/websocket.go
View File

@ -9,7 +9,7 @@ import (
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"n.eko.moe/neko/internal/clip"
"n.eko.moe/neko/internal/hid"
"n.eko.moe/neko/internal/types"
"n.eko.moe/neko/internal/types/config"
"n.eko.moe/neko/internal/types/event"
@ -81,7 +81,7 @@ func (ws *WebSocketHandler) Start() error {
ws.logger.Info().Msg("shutdown")
}()
current := clip.Read()
current := hid.ReadClipboard()
for {
select {
@ -89,7 +89,7 @@ func (ws *WebSocketHandler) Start() error {
return
default:
if ws.sessions.HasHost() {
text := clip.Read()
text := hid.ReadClipboard()
if text != current {
session, ok := ws.sessions.GetHost()
if ok {