From 2410295ad4413ad0906e966e51582805997d8115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Thu, 25 Feb 2021 14:24:17 +0100
Subject: [PATCH] cursor CreatePNGImage in event emitter.

---
 internal/types/webrtc.go   |  2 +-
 internal/webrtc/manager.go | 25 +++++++++++++++++++------
 internal/webrtc/send.go    |  8 +-------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/internal/types/webrtc.go b/internal/types/webrtc.go
index 3a19b837..4560d681 100644
--- a/internal/types/webrtc.go
+++ b/internal/types/webrtc.go
@@ -8,7 +8,7 @@ type WebRTCPeer interface {
 
 	SetVideoID(videoID string) error
 	SendCursorPosition(x, y int) error
-	SendCursorImage(cur *CursorImage) error
+	SendCursorImage(cur *CursorImage, img []byte) error
 
 	Destroy() error
 }
diff --git a/internal/webrtc/manager.go b/internal/webrtc/manager.go
index 9a0f6ce9..2604bfaa 100644
--- a/internal/webrtc/manager.go
+++ b/internal/webrtc/manager.go
@@ -16,6 +16,7 @@ import (
 	"demodesk/neko/internal/types"
 	"demodesk/neko/internal/types/event"
 	"demodesk/neko/internal/types/message"
+	"demodesk/neko/internal/utils"
 )
 
 func New(desktop types.DesktopManager, capture types.CaptureManager, config *config.WebRTC) *WebRTCManagerCtx {
@@ -26,7 +27,7 @@ func New(desktop types.DesktopManager, capture types.CaptureManager, config *con
 		config:       config,
 		participants: 0,
 		// TODO: Refactor.
-		curImgListeners: map[uintptr]*func(cur *types.CursorImage){},
+		curImgListeners: map[uintptr]*func(cur *types.CursorImage, img []byte){},
 		curPosListeners: map[uintptr]*func(x, y int){},
 	}
 }
@@ -41,7 +42,7 @@ type WebRTCManagerCtx struct {
 	config       *config.WebRTC
 	participants uint32
 	// TODO: Refactor.
-	curImgListeners map[uintptr]*func(cur *types.CursorImage)
+	curImgListeners map[uintptr]*func(cur *types.CursorImage, img []byte)
 	curPosListeners map[uintptr]*func(x, y int)
 }
 
@@ -77,8 +78,15 @@ func (manager *WebRTCManagerCtx) Start() {
 	// TODO: Refactor.
 	manager.desktop.OnCursorChanged(func(serial uint64) {
 		cur := manager.desktop.GetCursorImage()
+
+		img, err := utils.CreatePNGImage(cur.Image)
+		if err != nil {
+			manager.logger.Warn().Err(err).Msg("failed to create cursor image")
+			return
+		}
+
 		for _, emit := range manager.curImgListeners {
-			(*emit)(cur)
+			(*emit)(cur, img)
 		}
 	})
 
@@ -256,8 +264,8 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin
 		dataChannel: dataChannel,
 	}
 
-	cursorChange := func(cur *types.CursorImage) {
-		if err := peer.SendCursorImage(cur); err != nil {
+	cursorChange := func(cur *types.CursorImage, img []byte) {
+		if err := peer.SendCursorImage(cur, img); err != nil {
 			manager.logger.Warn().Err(err).Msg("could not send cursor image")
 		}
 	}
@@ -322,7 +330,12 @@ func (manager *WebRTCManagerCtx) CreatePeer(session types.Session, videoID strin
 
 		// send initial cursor image
 		cur := manager.desktop.GetCursorImage()
-		cursorChange(cur)
+		img, err := utils.CreatePNGImage(cur.Image)
+		if err == nil {
+			cursorChange(cur, img)
+		} else {
+			manager.logger.Warn().Err(err).Msg("failed to create cursor image")
+		}
 
 		// send initial cursor position
 		x, y := manager.desktop.GetCursorPosition()
diff --git a/internal/webrtc/send.go b/internal/webrtc/send.go
index 573b22d6..31d07c1a 100644
--- a/internal/webrtc/send.go
+++ b/internal/webrtc/send.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 
 	"demodesk/neko/internal/types"
-	"demodesk/neko/internal/utils"
 )
 
 const (
@@ -50,16 +49,11 @@ func (peer *WebRTCPeerCtx) SendCursorPosition(x, y int) error {
 	return peer.dataChannel.Send(buffer.Bytes())
 }
 
-func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage) error {
+func (peer *WebRTCPeerCtx) SendCursorImage(cur *types.CursorImage, img []byte) error {
 	if peer.dataChannel == nil {
 		return fmt.Errorf("no data channel")
 	}
 
-	img, err := utils.CreatePNGImage(cur.Image)
-	if err != nil {
-		return err
-	}
-
 	data := PayloadCursorImage{
 		PayloadHeader: PayloadHeader{
 			Event:  OP_CURSOR_IMAGE,