Changeset 18565 in vbox for trunk/src/VBox/HostServices

Timestamp:

Mar 31, 2009 12:24:11 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL-OSX: initial fix for compiz enabled linux guest

File:

• trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_agl.c (modified) (14 diffs)

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

@@ -29 +29 @@
 {
     /* Event classes */
-    kEventClassVBox        = 'vbox',
+    kEventClassVBox         = 'vbox',
     /* Event kinds */
-    kEventVBoxShowWindow   = 'swin',
-    kEventVBoxMoveWindow   = 'mwin',
-    kEventVBoxResizeWindow = 'rwin',
-    kEventVBoxUpdateDock   = 'udck'
+    kEventVBoxShowWindow    = 'swin',
+    kEventVBoxHideWindow    = 'hwin',
+    kEventVBoxMoveWindow    = 'mwin',
+    kEventVBoxResizeWindow  = 'rwin',
+    kEventVBoxDisposeWindow = 'dwin',
+    kEventVBoxUpdateDock    = 'udck'
 };
 
@@ -50 +52 @@
 
 /* Debug macros */
+#ifdef DEBUG_poetzsch
+#define DEBUG_MSG_POETZSCH(text) \
+    printf text
+#endif
+
 #define DEBUG_MSG_RESULT(result, text) \
         crDebug(text" (%d; %s:%d)", (int)(result), __FILE__, __LINE__)
@@ -268 +275 @@
         return render_spu.ws.aglSetCurrentContext( NULL );
 
+    DEBUG_MSG_POETZSCH (("WindowAttachContext %d\n", wi->id));
+
     /* Flush old context first */
     if (context->currentWindow->window != window)
@@ -275 +284 @@
     if (wi->bufferName == -1)
     {
+        DEBUG_MSG_POETZSCH (("WindowAttachContext: create context %d\n", wi->id));
         /* Use the same visual bits as those in the context structure */
         AGLPixelFormat pix;
@@ -357 +367 @@
 
     if(!window->nativeWindow)
-        DisposeWindow(window->window);
+    {
+        EventRef evt;
+        OSStatus status = CreateEvent(NULL, kEventClassVBox, kEventVBoxDisposeWindow, 0, kEventAttributeNone, &evt);
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: CreateEvent Failed");
+        status = SetEventParameter(evt, kEventParamWindowRef, typeWindowRef, sizeof (window->window), &window->window);
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: SetEventParameter Failed");
+        status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: PostEventToQueue Failed");
+    }
 
     /* Delete the dummy context */
@@ -390 +408 @@
     status = SetEventParameter(evt, kEventParamDimensions, typeHISize, sizeof (s), &s);
     CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: SetEventParameter Failed");
-    status = PostEventToQueue(GetMainEventQueue(), evt, kEventPriorityStandard);
+    status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
     CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: PostEventToQueue Failed");
 
@@ -399 +417 @@
         context->context)
     {
+        DEBUG_MSG_POETZSCH (("Size %d context %x visible %d\n", window->id, context->context, IsWindowVisible (window->window)));
         result = render_spu.ws.aglUpdateContext(context->context);
         CHECK_AGL_RC (result, "Render SPU: UpdateContext Failed");
+        render_spu.self.Flush();
     }
     /* save the new size */
@@ -464 +484 @@
     status = SetEventParameter(evt, kEventParamOrigin, typeHIPoint, sizeof (p), &p);
     CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: SetEventParameter Failed");
-    status = PostEventToQueue(GetMainEventQueue(), evt, kEventPriorityStandard);
+    status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
     CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: PostEventToQueue Failed");
 
@@ -473 +493 @@
         context->context)
     {
+        DEBUG_MSG_POETZSCH (("Position %d context %x visible %d\n", window->id, context->context, IsWindowVisible (window->window)));
         result = render_spu.ws.aglUpdateContext(context->context);
         CHECK_AGL_RC (result, "Render SPU: UpdateContext Failed");
+        render_spu.self.Flush();
     }
 }
@@ -500 +522 @@
         status = SetEventParameter(evt, kEventParamWindowRef, typeWindowRef, sizeof (window->window), &window->window);
         CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: SetEventParameter Failed");
-        status = PostEventToQueue(GetMainEventQueue(), evt, kEventPriorityStandard);
+        status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
         CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: PostEventToQueue Failed");
     }
     else
-        HideWindow(window->window);
+    {
+        EventRef evt;
+        OSStatus status = CreateEvent(NULL, kEventClassVBox, kEventVBoxHideWindow, 0, kEventAttributeNone, &evt);
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: CreateEvent Failed");
+        status = SetEventParameter(evt, kEventParamWindowRef, typeWindowRef, sizeof (window->window), &window->window);
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: SetEventParameter Failed");
+        status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
+        CHECK_CARBON_RC_RETURN_VOID (status, "Render SPU: PostEventToQueue Failed");
+    }
 
     /* Update the context */
@@ -512 +542 @@
         context->context)
     {
+        DEBUG_MSG_POETZSCH (("Showed %d context %x visible %d\n", window->id, context->context, IsWindowVisible (window->window)));
         result = render_spu.ws.aglUpdateContext(context->context);
         CHECK_AGL_RC (result, "Render SPU: UpdateContext Failed");
+        render_spu.self.Flush();
     }
 
@@ -524 +556 @@
 {
     Boolean result;
+    DEBUG_MSG_POETZSCH (("makecurrent %d: \n", window->id));
 
     CRASSERT(render_spu.ws.aglSetCurrentContext);
-/*  crDebug( "renderspu_SystemMakeCurrent( %x, %i, %x )", window, nativeWindow, context );*/
+    crDebug( "renderspu_SystemMakeCurrent( %x, %i, %x )", window, nativeWindow, context );
 
     if(window && context)
@@ -578 +611 @@
         crError("Render SPU: SwapBuffers got a null context from the window");
 
+    DEBUG_MSG_POETZSCH (("Swapped %d context %x visible: %d\n", window->id, context->context, IsWindowVisible (window->window)));
     render_spu.ws.aglSwapBuffers(context->context);
-
 
     /* This method seems called very often. To prevent the dock using all free
@@ -650 +683 @@
 
     if(window->window && IsValidWindowPtr(window->window))
-        /* Destroy the old one */
-        DisposeWindow(window->window);
+    {
+        EventRef evt;
+        status = CreateEvent(NULL, kEventClassVBox, kEventVBoxDisposeWindow, 0, kEventAttributeNone, &evt);
+        CHECK_CARBON_RC_RETURN (status, "Render SPU: CreateEvent Failed", false);
+        status = SetEventParameter(evt, kEventParamWindowRef, typeWindowRef, sizeof (window->window), &window->window);
+        CHECK_CARBON_RC_RETURN (status, "Render SPU: SetEventParameter Failed", false);
+        status = SendEventToEventTarget (evt, GetWindowEventTarget (HIViewGetWindow ((HIViewRef)render_spu_parent_window_id)));
+        CHECK_CARBON_RC_RETURN (status, "Render SPU: PostEventToQueue Failed", false);
+    }
 
     windowRect.left = window->x;