From a6813f994cfc2b055bab6366c82301497cf615ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Sat, 23 Jul 2022 00:33:26 +0200
Subject: [PATCH] ws control buttons & keys add optional pos.

---
 internal/websocket/handler/control.go | 36 ++++++++++++++++++++++-----
 pkg/types/message/messages.go         |  2 ++
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/internal/websocket/handler/control.go b/internal/websocket/handler/control.go
index 729d962b..67cfcfa4 100644
--- a/internal/websocket/handler/control.go
+++ b/internal/websocket/handler/control.go
@@ -80,7 +80,11 @@ func (h *MessageHandlerCtx) controlScroll(session types.Session, payload *messag
 }
 
 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
 	}
 
@@ -88,7 +92,11 @@ func (h *MessageHandlerCtx) controlButtonPress(session types.Session, payload *m
 }
 
 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
 	}
 
@@ -96,7 +104,11 @@ func (h *MessageHandlerCtx) controlButtonDown(session types.Session, payload *me
 }
 
 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
 	}
 
@@ -104,7 +116,11 @@ func (h *MessageHandlerCtx) controlButtonUp(session types.Session, payload *mess
 }
 
 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
 	}
 
@@ -112,7 +128,11 @@ func (h *MessageHandlerCtx) controlKeyPress(session types.Session, payload *mess
 }
 
 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
 	}
 
@@ -120,7 +140,11 @@ func (h *MessageHandlerCtx) controlKeyDown(session types.Session, payload *messa
 }
 
 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
 	}
 
diff --git a/pkg/types/message/messages.go b/pkg/types/message/messages.go
index 0319be32..cc4172f9 100644
--- a/pkg/types/message/messages.go
+++ b/pkg/types/message/messages.go
@@ -107,10 +107,12 @@ type ControlPos struct {
 }
 
 type ControlButton struct {
+	*ControlPos
 	Code uint32 `json:"code"`
 }
 
 type ControlKey struct {
+	*ControlPos
 	Keysym uint32 `json:"keysym"`
 }