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

Timestamp:

Mar 14, 2013 11:25:56 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/glx: do not allow zero window sizes

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (2 diffs)
• renderspu_agl.c (modified) (1 diff)
• renderspu_glx.c (modified) (4 diffs)
• renderspu_wgl.c (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -613 +613 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
+        GLboolean visible;
         if (window->nativeWindow) {
             /* We're rendering back to the native app window instead of the
@@ -620 +621 @@
             flag = 0;
         }
-        renderspu_SystemShowWindow( window, (GLboolean) flag );
+        
+        visible = !!flag;
+        
+        if (window->visible != visible)
+        {
+            renderspu_SystemShowWindow( window, visible );
+            window->visible != visible;
+        }
     }
     else {

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_agl.c

@@ -603 +603 @@
         CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU (renderspu_SystemShowWindow): PostEventToQueue Failed");
     }
-    /* Save the new value */
-    window->visible = showIt;
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_glx.c

@@ -1754 +1754 @@
     }
     else {
+        if (!w || !h)
+        {
+            /* X can not handle zero sizes */
+            if (window->visible)
+            {
+                renderspu_SystemShowWindow( window, GL_FALSE );
+                return;
+            }
+        }
         /* Resize ordinary X window */
         /*
@@ -1767 +1776 @@
         XResizeWindow(window->visual->dpy, window->window, w, h);
         XSync(window->visual->dpy, 0);
+        
+        if (!window->BltInfo.width || !window->BltInfo.height)
+        {
+            /* we have hidden the window instead of sizing it to (0;0) since X is unable to handle zero sizes */
+            if (window->visible)
+            {
+                renderspu_SystemShowWindow( window, GL_TRUE );
+                return;
+            }
+        }
 #if 0
         for (attempt = 0; attempt < 3; attempt++) { /* try three times max */
@@ -1779 +1798 @@
 #endif
     }
-
-    /* finally, save the new size */
-    window->BltInfo.width = w;
-    window->BltInfo.height = h;
 }
 
@@ -1952 +1967 @@
             XSync(window->visual->dpy, 0);
         }
-        window->visible = showIt;
     }
 }

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -1242 +1242 @@
         DeleteObject(hRgn);
     }
-    window->visible = showIt;
 }