Changeset 47158 in vbox

Timestamp:

Jul 15, 2013 12:37:15 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

87260

Message:

VRDP,Main,SharedOpenGL: enable 3d redirection if a RDP client connects

Location:

trunk/src/VBox

Files:

• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (1 diff)
• Main/include/ConsoleVRDPServer.h (modified) (2 diffs)
• Main/src-client/ConsoleVRDPServer.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1243 +1243 @@
                 else /* Execute the function. */
                 {
-                    rc = crVBoxServerSetOffscreenRendering(GL_TRUE);
-
-                    if (RT_SUCCESS(rc))
+                    if (pOutputRedirect->H3DORBegin != NULL)
                     {
-                        CROutputRedirect outputRedirect;
-                        outputRedirect.pvContext = pOutputRedirect->pvContext;
-                        outputRedirect.CRORBegin = pOutputRedirect->H3DORBegin;
-                        outputRedirect.CRORGeometry = pOutputRedirect->H3DORGeometry;
-                        outputRedirect.CRORVisibleRegion = pOutputRedirect->H3DORVisibleRegion;
-                        outputRedirect.CRORFrame = pOutputRedirect->H3DORFrame;
-                        outputRedirect.CROREnd = pOutputRedirect->H3DOREnd;
-                        outputRedirect.CRORContextProperty = pOutputRedirect->H3DORContextProperty;
-                        rc = crVBoxServerOutputRedirectSet(&outputRedirect);
+                        rc = crVBoxServerSetOffscreenRendering(GL_TRUE);
+
+                        if (RT_SUCCESS(rc))
+                        {
+                            CROutputRedirect outputRedirect;
+                            outputRedirect.pvContext = pOutputRedirect->pvContext;
+                            outputRedirect.CRORBegin = pOutputRedirect->H3DORBegin;
+                            outputRedirect.CRORGeometry = pOutputRedirect->H3DORGeometry;
+                            outputRedirect.CRORVisibleRegion = pOutputRedirect->H3DORVisibleRegion;
+                            outputRedirect.CRORFrame = pOutputRedirect->H3DORFrame;
+                            outputRedirect.CROREnd = pOutputRedirect->H3DOREnd;
+                            outputRedirect.CRORContextProperty = pOutputRedirect->H3DORContextProperty;
+                            rc = crVBoxServerOutputRedirectSet(&outputRedirect);
+                        }
+                    }
+                    else
+                    {
+                        /* Redirection is disabled. */
+                        crVBoxServerSetOffscreenRendering(GL_FALSE);
+                        crVBoxServerOutputRedirectSet(NULL);
                     }
                 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -2941 +2941 @@
 }
 
+static void crVBoxServerOutputRedirectCB(unsigned long key, void *data1, void *data2)
+{
+    CRMuralInfo *mural = (CRMuralInfo*) data1;
+
+    crServerSetupOutputRedirect(mural);
+}
+
 DECLEXPORT(int32_t) crVBoxServerOutputRedirectSet(const CROutputRedirect *pCallbacks)
 {
@@ -2954 +2961 @@
     }
 
-    // @todo dynamically intercept already existing output:
-    // crHashtableWalk(cr_server.muralTable, crVBoxServerOutputRedirectCB, NULL);
+    /* dynamically intercept already existing output */
+    crHashtableWalk(cr_server.muralTable, crVBoxServerOutputRedirectCB, NULL);
 
     return VINF_SUCCESS;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -103 +103 @@
             cr_server.outputRedirect.CRORVisibleRegion(mural->pvOutputRedirectInstance,
                                                        mural->cVisibleRects, (RTRECT *)mural->pVisibleRects);
+
+            crServerPresentFBO(mural);
         }
     }

trunk/src/VBox/Main/include/ConsoleVRDPServer.h

@@ -248 +248 @@
     uint32_t volatile mu32AudioInputClientId;
 
+    int32_t volatile mcClients;
+
     static DECLCALLBACK(void) H3DORBegin(const void *pvContext, void **ppvInstance,
                                          const char *pszFormat);
@@ -260 +262 @@
                                                    void *pvBuffer, uint32_t cbBuffer, uint32_t *pcbOut);
 
-    void remote3DRedirect(void);
+    void remote3DRedirect(bool fEnable);
 
     /*

trunk/src/VBox/Main/src-client/ConsoleVRDPServer.cpp

@@ -926 +926 @@
 
     server->mConsole->VRDPClientConnect(u32ClientId);
+
+    /* Should the server report usage of an interface for each client?
+     * Similar to Intercept.
+     */
+    int c = ASMAtomicIncS32(&server->mcClients);
+    if (c == 1)
+    {
+        /* Features which should be enabled only if there is a client. */
+        server->remote3DRedirect(true);
+    }
 }
 
@@ -948 +958 @@
             AssertFailed();
         }
+    }
+
+    int c = ASMAtomicDecS32(&server->mcClients);
+    if (c == 0)
+    {
+        /* Features which should be enabled only if there is a client. */
+        server->remote3DRedirect(false);
     }
 }
@@ -1372 +1389 @@
 
     mu32AudioInputClientId = 0;
+    mcClients = 0;
 
     /*
@@ -1996 +2014 @@
 }
 
-void ConsoleVRDPServer::remote3DRedirect(void)
+void ConsoleVRDPServer::remote3DRedirect(bool fEnable)
 {
     if (!m_fInterfaceImage)
@@ -2004 +2022 @@
     }
 
-    /* Check if 3D redirection has been enabled. */
+    /* Check if 3D redirection has been enabled. It is enabled by default. */
     com::Bstr bstr;
     HRESULT hrc = mConsole->getVRDEServer()->GetVRDEProperty(Bstr("H3DRedirect/Enabled").raw(), bstr.asOutParam());
 
-    if (hrc != S_OK)
-    {
-        bstr = "";
-    }
-
-    com::Utf8Str value = bstr;
-
-    bool fEnabled =    RTStrICmp(value.c_str(), "true") == 0
-                    || RTStrICmp(value.c_str(), "1") == 0;
-
-    if (!fEnabled)
+    com::Utf8Str value = hrc == S_OK? bstr: "";
+
+    bool fAllowed =    RTStrICmp(value.c_str(), "true") == 0
+                    || RTStrICmp(value.c_str(), "1") == 0
+                    || value.c_str()[0] == 0;
+
+    if (!fAllowed && fEnable)
     {
         return;
@@ -2035 +2049 @@
     };
 
+    if (!fEnable)
+    {
+        /* This will tell the service to disable rediection. */
+        RT_ZERO(outputRedirect);
+    }
+
     VBOXHGCMSVCPARM parm;
 
@@ -2060 +2080 @@
     }
 
-    LogRel(("VRDE: Enabled 3D redirect.\n"));
+    LogRel(("VRDE: %s 3D redirect.\n", fEnable? "Enabled": "Disabled"));
 
     return;
@@ -2746 +2766 @@
     {
         mpEntryPoints->VRDEEnableConnections(mhServer, true);
-
-        /* Redirect 3D output if it is enabled. */
-        remote3DRedirect();
 
         /* Setup the generic TSMF channel. */