Changeset 27753 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 26, 2010 4:18:45 PM (15 years ago)

Author:

vboxsync

Message:

Merged VNC contribution; disabled by default and currently not finished (not externally visible yet either)

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxHeadless.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

@@ -63 +63 @@
  VBoxHeadless_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxHeadless.dylib
 endif
+ifdef VBOX_WITH_VNC
+ VBoxHeadless_DEFS     += VBOX_WITH_VNC
+ VBoxHeadless_SOURCES  += FramebufferVNC.cpp
+endif
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -529 +529 @@
     RTPrintf("Usage:\n"
              "   -s, -startvm, --startvm <name|uuid>   Start given VM (required argument)\n"
+#ifdef VBOX_WITH_VNC
+             "   -n, -vnc                              Enable the built in VNC server\n"
+             "   -m, -vncport                          TCP port number to use for the VNC server\n"
+             "   -o, -vncpass <pw>                     Set the VNC server password\n"
+#endif
 #ifdef VBOX_WITH_VRDP
              "   -v, -vrdp, --vrdp on|off|config       Enable (default) or disable the VRDP\n"
@@ -605 +610 @@
     const char *vrdpEnabled = NULL;
 #endif
+#ifdef VBOX_WITH_VNC
+    bool        fVNCEnable      = false;
+    unsigned    uVNCPort        = 0;          /* default port */
+    char       *pszVNCPassword  = NULL;       /* no password */
+#endif
     unsigned fRawR0 = ~0U;
     unsigned fRawR3 = ~0U;
@@ -662 +672 @@
         { "--vrdp", 'v', RTGETOPT_REQ_STRING },
 #endif /* VBOX_WITH_VRDP defined */
+#ifdef VBOX_WITH_VNC
+        { "-vncport", 'm', RTGETOPT_REQ_INT32 },
+        { "-vncpass", 'o', RTGETOPT_REQ_STRING },
+        { "-vnc", 'n', 0 },
+#endif /* VBOX_WITH_VNC */
         { "-rawr0", OPT_RAW_R0, 0 },
         { "--rawr0", OPT_RAW_R0, 0 },
@@ -716 +731 @@
                 break;
 #endif /* VBOX_WITH_VRDP defined */
+#ifdef VBOX_WITH_VNC
+            case 'n': 
+                fVNCEnable = true; 
+                break;
+            case 'm': 
+                uVNCPort = ValueUnion.i32; 
+                break;
+            case 'o': 
+                pszVNCPassword = (char*)ValueUnion.psz; 
+                break;
+#endif /* VBOX_WITH_VNC */
             case OPT_RAW_R0:
                 fRawR0 = true;
@@ -933 +959 @@
         }
 #endif /* defined(VBOX_FFMPEG) */
-
+#ifdef VBOX_WITH_VNC
+            if (fVNCEnable) 
+        {
+            VNCFB           *pFramebuffer;
+            RTLDRMOD         hLdrVNC;
+                PFNREGISTERVNCFB pfnRegisterVNCFB;
+
+                pFramebuffer = new VNCFB(console, uVNCPort, pszVNCPassword);
+                rc = pFramebuffer->init();
+                if (rc != S_OK) 
+            {
+                LogError("Failed to load the vnc server extension, possibly due to a damaged file\n", rrc);
+                delete pFramebuffer;
+                break;
+                }
+
+            Log2(("VBoxHeadless: Registering VNC framebuffer\n"));
+            pFramebuffer->AddRef();
+            display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
+        }
+        if (rc != S_OK)
+            break;
+#endif
         ULONG cMonitors = 1;
         machine->COMGETTER(MonitorCount)(&cMonitors);