From 606c9337bb2a73933a3af2378fe2436cfb74037e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Mon, 1 Nov 2021 21:15:57 +0100
Subject: [PATCH] set inactive cursor draw function.

---
 src/component/cursors.vue      |  4 ++--
 src/component/main.vue         |  8 +++++++-
 src/component/overlay.vue      |  2 +-
 src/component/types/cursors.ts | 11 ++++++++++-
 src/component/types/overlay.ts | 13 -------------
 5 files changed, 20 insertions(+), 18 deletions(-)
 delete mode 100644 src/component/types/overlay.ts

diff --git a/src/component/cursors.vue b/src/component/cursors.vue
index 332f00e4..314af02e 100644
--- a/src/component/cursors.vue
+++ b/src/component/cursors.vue
@@ -17,7 +17,7 @@
   import { Vue, Component, Ref, Prop, Watch } from 'vue-property-decorator'
 
   import { Cursor, Session } from './types/state'
-  import { CursorDrawFunction, Dimension } from './types/cursors'
+  import { InactiveCursorDrawFunction, Dimension } from './types/cursors'
 
   const CANVAS_SCALE = 2
 
@@ -44,7 +44,7 @@
     private readonly cursors!: Cursor[]
 
     @Prop()
-    private readonly cursorDraw!: CursorDrawFunction | null
+    private readonly cursorDraw!: InactiveCursorDrawFunction | null
 
     mounted() {
       // get canvas overlay context
diff --git a/src/component/main.vue b/src/component/main.vue
index 6856845f..6cc14072 100644
--- a/src/component/main.vue
+++ b/src/component/main.vue
@@ -10,6 +10,7 @@
         :screenSize="state.screen.size"
         :canvasSize="canvasSize"
         :cursors="state.cursors.list"
+        :cursorDraw="inactiveCursorDrawFunction"
       />
       <neko-overlay
         :webrtc="connection.webrtc"
@@ -75,7 +76,7 @@
 
   import { ReconnectorConfig } from './types/reconnector'
   import NekoState from './types/state'
-  import { Dimension, CursorDrawFunction } from './types/overlay'
+  import { CursorDrawFunction, InactiveCursorDrawFunction, Dimension } from './types/cursors'
   import Overlay from './overlay.vue'
   import Screencast from './screencast.vue'
   import Cursors from './cursors.vue'
@@ -97,6 +98,7 @@
     observer = new ResizeObserver(this.onResize.bind(this))
     canvasSize: Dimension = { width: 0, height: 0 }
     cursorDrawFunction: CursorDrawFunction | null = null
+    inactiveCursorDrawFunction: InactiveCursorDrawFunction | null = null
 
     @Prop({ type: String })
     private readonly server!: string
@@ -360,6 +362,10 @@
       Vue.set(this, 'cursorDrawFunction', fn)
     }
 
+    public setInactiveCursorDrawFunction(fn?: InactiveCursorDrawFunction) {
+      Vue.set(this, 'inactiveCursorDrawFunction', fn)
+    }
+
     // TODO: Remove? Use REST API only?
     public setScreenSize(width: number, height: number, rate: number) {
       this.connection.websocket.send(EVENT.SCREEN_SET, { width, height, rate })
diff --git a/src/component/overlay.vue b/src/component/overlay.vue
index 3c3f5f5c..1bd03cf8 100644
--- a/src/component/overlay.vue
+++ b/src/component/overlay.vue
@@ -39,7 +39,7 @@
   import { NekoWebRTC } from './internal/webrtc'
   import { Scroll } from './types/state'
   import { CursorPosition, CursorImage } from './types/webrtc'
-  import { CursorDrawFunction, Dimension, KeyboardModifiers } from './types/overlay'
+  import { CursorDrawFunction, Dimension, KeyboardModifiers } from './types/cursors'
 
   const WHEEL_STEP = 53 // Delta threshold for a mouse wheel step
   const WHEEL_LINE_HEIGHT = 19
diff --git a/src/component/types/cursors.ts b/src/component/types/cursors.ts
index c64a7f91..3e04471c 100644
--- a/src/component/types/cursors.ts
+++ b/src/component/types/cursors.ts
@@ -1,6 +1,15 @@
-export type CursorDrawFunction = (ctx: CanvasRenderingContext2D, x: number, y: number, cursorTag: string) => void
+import { CursorImage } from './webrtc'
+  
+export type CursorDrawFunction = (ctx: CanvasRenderingContext2D, x: number, y: number, cursorElement: HTMLImageElement, cursorImage: CursorImage, cursorTag: string) => void
+
+export type InactiveCursorDrawFunction = (ctx: CanvasRenderingContext2D, x: number, y: number, cursorTag: string) => void
 
 export interface Dimension {
   width: number
   height: number
 }
+
+export interface KeyboardModifiers {
+  capslock: boolean
+  numlock: boolean
+}
diff --git a/src/component/types/overlay.ts b/src/component/types/overlay.ts
deleted file mode 100644
index 57c1d414..00000000
--- a/src/component/types/overlay.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { CursorImage } from './webrtc'
-  
-export type CursorDrawFunction = (ctx: CanvasRenderingContext2D, x: number, y: number, cursorElement: HTMLImageElement, cursorImage: CursorImage, cursorTag: string) => void
-
-export interface Dimension {
-  width: number
-  height: number
-}
-
-export interface KeyboardModifiers {
-  capslock: boolean
-  numlock: boolean
-}