Merge pull request #20 from rdp/blank_screen

wake up screen on connect [and if no sleep is set]
stweil · Sep 24, 2019 · 2e3fa27 · 2e3fa27
2 parents 287a50e + 40f6827
commit 2e3fa27
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/OSXvnc-server/dimming.c b/OSXvnc-server/dimming.c
@@ -11,6 +11,7 @@
 
 Bool rfbNoDimming = FALSE;
 Bool rfbNoSleep   = TRUE;
+IOPMAssertionID userActivityLastAssertionId;
 
 static pthread_mutex_t  dimming_mutex;
 static unsigned long    dim_time;
@@ -25,11 +26,13 @@ static Bool sleep_time_saved       = FALSE;
 void rfbScreensaverTimer(EventLoopTimerRef timer, void *userData)
 {
 #pragma unused (timer, userData)
-    if (rfbNoSleep && rfbClientsConnected())
+    if (rfbNoSleep && rfbClientsConnected()) {
         UpdateSystemActivity(IdleActivity);
+        // UpdateSystemActivity's seeming replacement:
+        IOPMAssertionDeclareUserActivity(CFSTR("VNC user is logged in"), kIOPMUserActiveLocal, &userActivityLastAssertionId);
+    }
 }
 
-
 static int
 saveDimSettings(void)
 {

diff --git a/OSXvnc-server/rfb.h b/OSXvnc-server/rfb.h
@@ -45,6 +45,8 @@
 
 #include "CoreGraphics/CGGeometry.h"
 
+#include <IOKit/pwr_mgt/IOPMLib.h>
+
 #define MAX_ENCODINGS 17
 
 /*
@@ -602,6 +604,7 @@ extern void rfbPrintStats(rfbClientPtr cl);
 
 extern Bool rfbNoDimming;
 extern Bool rfbNoSleep;
+extern IOPMAssertionID userActivityLastAssertionId;
 
 extern int rfbDimmingInit(void);
 extern int rfbUndim(void);

diff --git a/OSXvnc-server/rfbserver.c b/OSXvnc-server/rfbserver.c
@@ -365,6 +365,10 @@ rfbClientPtr rfbNewClient(int sock) {
         rfbCloseClient(cl);
         return NULL;
     }
+
+    // wake up screen in case monitor off (avoid blank VNC screen):
+    IOPMAssertionDeclareUserActivity(CFSTR("VNC user is logged in"),
+        kIOPMUserActiveLocal, &userActivityLastAssertionId);
 
     return cl;
 }