Merge 06bb4b80b6 into 21e30c60ea

.golangci.yml

@@ -4,6 +4,7 @@ linters:
     - forbidigo
     - misspell
     - whitespace
+    - gochecknoinits
   settings:
     forbidigo:
       forbid:
@@ -22,6 +23,9 @@ linters:
       - linters:
           - errcheck
         path: _test.go
+      - linters:
+          - gochecknoinits
+        path: internal/logging/sse.go
     paths:
       - third_party$
       - builtin$

display.go

@@ -370,9 +370,7 @@ func startBacklightTickers() {
 	}
 }
 
-func init() {
+func initDisplay() {
-	ensureConfigLoaded()
-
 	go func() {
 		waitCtrlClientConnected()
 		displayLogger.Info().Msg("setting initial display contents")

jiggler.go

@@ -15,9 +15,7 @@ func rpcGetJigglerState() bool {
 	return jigglerEnabled
 }
 
-func init() {
+func initJiggler() {
-	ensureConfigLoaded()
-
 	go runJiggler()
 }
 

main.go

@@ -75,8 +75,8 @@ func Main() {
 		}
 	}()
 
+	// initialize usb gadget
 	initUsbGadget()
-
 	if err := setInitialVirtualMediaState(); err != nil {
 		logger.Warn().Err(err).Msg("failed to set initial virtual media state")
 	}
@@ -84,6 +84,10 @@ func Main() {
 	if err := initImagesFolder(); err != nil {
 		logger.Warn().Err(err).Msg("failed to init images folder")
 	}
+	initJiggler()
+
+	// initialize display
+	initDisplay()
 
 	go func() {
 		time.Sleep(15 * time.Minute)

ui/src/components/WebRTCVideo.tsx

@@ -674,7 +674,6 @@ export default function WebRTCVideo() {
                 <div className="grid grow grid-rows-(--grid-bodyFooter) overflow-hidden">
                   <div className="relative mx-4 my-2 flex items-center justify-center overflow-hidden">
                     <div className="relative flex h-full w-full items-center justify-center">
-                      <div className="relative inline-block">
                         {/* In relative mouse mode and under https, we enable the pointer lock, and to do so we need a bar to show the user to click on the video to enable mouse control */}
                         <PointerLockBar show={showPointerLockBar} />
                         <video
@@ -688,7 +687,7 @@ export default function WebRTCVideo() {
                           disablePictureInPicture
                           controlsList="nofullscreen"
                           className={cx(
-                            "z-30 max-h-full min-h-[384px] max-w-full min-w-[512px] bg-black/50 object-contain transition-all duration-1000",
+                            "max-h-full min-h-[384px] max-w-full min-w-[512px] bg-black/50 object-contain transition-all duration-1000",
                             {
                               "cursor-none": settings.isCursorHidden,
                               "opacity-0":
@@ -720,7 +719,6 @@ export default function WebRTCVideo() {
                         )}
                     </div>
                   </div>
-                  </div>
                   <VirtualKeyboard />
                 </div>
               </div>