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

Timestamp:

May 8, 2013 9:14:51 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: don't notify event when there is no parent window

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (1 diff)
• crserverlib/server_main.c (modified) (1 diff)
• crserverlib/server_muralfbo.c (modified) (2 diffs)
• crserverlib/server_window.c (modified) (1 diff)

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

@@ -250 +250 @@
     ComPtr<IFramebuffer> pFramebuffer;
     LONG xo, yo;
-    LONG64 winId = 0;
-    ULONG monitorCount, i, w, h;
 
     if (!g_pConsole)

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

@@ -2605 +2605 @@
         crServerVBoxCompositionDisableEnter(pMI);
 
+        pMI->fHasParentWindow = !!cr_server.screen[pMI->screenId].winID;
+
         renderspuReparentWindow(pMI->spuWindow);
 
-        if (pMI->bVisible && (pMI->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+        if (pMI->bVisible && (pMI->fPresentMode & CR_SERVER_REDIR_F_DISPLAY) && pMI->fHasParentWindow)
             crVBoxServerNotifyEvent(pMI->screenId);
 

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

@@ -194 +194 @@
         renderspuSetWindowId(cr_server.screen[0].winID);
 
-        if (mural->bVisible && (mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
+        if (mural->bVisible && (mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY) && mural->fHasParentWindow)
             crVBoxServerNotifyEvent(mural->screenId);
     }
@@ -351 +351 @@
         if (!(mural->fPresentMode & CR_SERVER_REDIR_F_DISPLAY))
         {
-            if  (mural->bVisible)
+            if  (mural->bVisible && mural->fHasParentWindow)
             {
                 cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, GL_TRUE);

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

@@ -808 +808 @@
         cr_server.head_spu->dispatch_table.WindowShow(mural->spuWindow, state);
 
-        if (state)
+        if (state && mural->fHasParentWindow)
             crVBoxServerNotifyEvent(mural->screenId);
     }