Changeset 45940 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

May 7, 2013 8:16:31 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL->Fe/Qt notification mechanism

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_config.c (modified) (1 diff)
• crserverlib/server_main.c (modified) (3 diffs)
• crserverlib/server_muralfbo.c (modified) (5 diffs)
• crserverlib/server_window.c (modified) (1 diff)

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

@@ -244 +244 @@
     return rc;
 }
+
+static DECLCALLBACK(void) svcNotifyEventCB(int32_t screenId, uint32_t uEvent, void*pvData)
+{
+    ComPtr<IDisplay> pDisplay;
+    ComPtr<IFramebuffer> pFramebuffer;
+    LONG xo, yo;
+    LONG64 winId = 0;
+    ULONG monitorCount, i, w, h;
+
+    if (!g_pConsole)
+    {
+        crWarning("Console not defined!");
+        return;
+    }
+
+    CHECK_ERROR2_STMT(g_pConsole, COMGETTER(Display)(pDisplay.asOutParam()), return);
+
+    CHECK_ERROR2_STMT(pDisplay, GetFramebuffer(screenId, pFramebuffer.asOutParam(), &xo, &yo), return);
+
+    if (!pFramebuffer)
+        return;
+
+    CHECK_ERROR2_STMT(pFramebuffer, Notify3DEvent(VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL), return);
+}
+
 
 static DECLCALLBACK(int) svcUnload (void *)
@@ -1281 +1306 @@
 
             rc = svcPresentFBOInit();
+
+            crServerVBoxSetNotifyEventCB(svcNotifyEventCB);
         }
     }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -129 +129 @@
 void crServerCheckMuralGeometry(CRMuralInfo *mural);
 GLboolean crServerSupportRedirMuralFBO(void);
+
+void crVBoxServerNotifyEvent(int32_t idScreen);
 
 #define CR_SERVER_REDIR_F_NONE     0x00

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

@@ -58 +58 @@
     cr_server.bUseOutputRedirect = GL_FALSE;
     cr_server.bWindowsInitiallyHidden = GL_FALSE;
+
+    memset(cr_server.NotifyEventMap, 0, sizeof (cr_server.NotifyEventMap));
+    cr_server.cDisableEvent = 0;
+    cr_server.pfnNotifyEventCB = NULL;
 }
 

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

@@ -2574 +2574 @@
 #define MAPPED(screen) ((screen).winID != 0)
 
+extern DECLEXPORT(void) crServerVBoxSetNotifyEventCB(PFNCRSERVERNOTIFYEVENT pfnCb)
+{
+    cr_server.pfnNotifyEventCB = pfnCb;
+}
+
+void crVBoxServerNotifyEvent(int32_t idScreen)
+{
+    /* this is something unexpected, but just in case */
+    if (idScreen >= cr_server.screenCount)
+    {
+        crWarning("invalid screen id %d", idScreen);
+        return;
+    }
+
+    if (!cr_server.cDisableEvent)
+        cr_server.pfnNotifyEventCB(idScreen, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL);
+    else
+        ASMBitSet(cr_server.NotifyEventMap, idScreen);
+}
+
 static void crVBoxServerReparentMuralCB(unsigned long key, void *data1, void *data2)
 {
@@ -2586 +2606 @@
 
         renderspuReparentWindow(pMI->spuWindow);
+
+        if (pMI->bVisible && (pMI->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+            crVBoxServerNotifyEvent(pMI->screenId);
 
         crServerVBoxCompositionDisableLeave(pMI, GL_FALSE);
@@ -2722 +2745 @@
     uint32_t cRects;
     const RTRECT *pRects;
-    int rc;
+    int rc = VINF_SUCCESS;
 
     fForcePresent = crServerVBoxCompositionPresentNeeded(pMI);

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

@@ -193 +193 @@
         renderspuReparentWindow(mural->spuWindow);
         renderspuSetWindowId(cr_server.screen[0].winID);
+
+        if (mural->bVisible && (mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+            crVBoxServerNotifyEvent(mural->screenId);
     }
 
@@ -349 +352 @@
         {
             if  (mural->bVisible)
+            {
                 cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, GL_TRUE);
+                crVBoxServerNotifyEvent(mural->screenId);
+            }
             mural->fPresentMode |= CR_SERVER_REDIR_F_DISPLAY;
         }
@@ -748 +754 @@
 DECLEXPORT(void) crServerVBoxCompositionSetEnableStateGlobal(GLboolean fEnable)
 {
+    if (!fEnable)
+        ++cr_server.cDisableEvent;
+
     crHashtableWalk(cr_server.muralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)fEnable);
 
     crHashtableWalk(cr_server.dummyMuralTable, crServerVBoxCompositionSetEnableStateGlobalCB, (void*)fEnable);
+
+    if (fEnable)
+    {
+        --cr_server.cDisableEvent;
+        CRASSERT(cr_server.cDisableEvent < UINT32_MAX/2);
+        if(!cr_server.cDisableEvent)
+        {
+            int i;
+            for (i = 0; i < cr_server.screenCount; ++i)
+            {
+                if (!ASMBitTest(cr_server.NotifyEventMap, i))
+                    continue;
+
+                cr_server.pfnNotifyEventCB(i, VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_WINDOW, NULL);
+
+                ASMBitClear(cr_server.NotifyEventMap, i);
+            }
+        }
+    }
 }
 
@@ -907 +935 @@
         cr_serverCtxSwitchPostprocess(&CtxSwitch);
 
+#if 1
         if (RT_SUCCESS(rc))
         {
@@ -916 +945 @@
             }
         }
-
+#endif
         return;
     }

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

@@ -807 +807 @@
     {
         cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, state);
-    }
-
-    mural->bVisible = state;
+
+        if (state)
+            crVBoxServerNotifyEvent(mural->screenId);
+    }
+
+    mural->bVisible = !!state;
 }