iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

ws control buttons & keys add optional pos.

Browse Source
This commit is contained in:
Miroslav Šedivý 2022-07-23 00:33:26 +02:00
parent 7d5ec0190a
commit a6813f994c
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
internal/websocket/handler/control.go
View File

@ -80,7 +80,11 @@ func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *messag
} }
func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *message.ControlButton) error { func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *message.ControlButton) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }
@ -88,7 +92,11 @@ func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *m
} }
func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *message.ControlButton) error { func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *message.ControlButton) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }
@ -96,7 +104,11 @@ func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *me
} }
func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *message.ControlButton) error { func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *message.ControlButton) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }
@ -104,7 +116,11 @@ func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *mess
} }
func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error { func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *message.ControlKey) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }
@ -112,7 +128,11 @@ func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *mess
} }
func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *message.ControlKey) error { func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *message.ControlKey) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }
@ -120,7 +140,11 @@ func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *messa
} }
func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message.ControlKey) error { func (h *MessageHandlerCtx) controlKeyUp(session types.Session, payload *message.ControlKey) error {
if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) { if payload.ControlPos != nil {
if err := h.controlMove(session, payload.ControlPos); err != nil {
return err
}
} else if err := h.controlRequest(session); err != nil && !errors.Is(err, ErrIsAlreadyTheHost) {
return err return err
} }

2
pkg/types/message/messages.go
View File

@ -107,10 +107,12 @@ type ControlPos struct {
} }
type ControlButton struct { type ControlButton struct {
*ControlPos
Code uint32 `json:"code"` Code uint32 `json:"code"`
} }
type ControlKey struct { type ControlKey struct {
*ControlPos
Keysym uint32 `json:"keysym"` Keysym uint32 `json:"keysym"`
} }