Changeset 21216 in vbox for trunk/src

Timestamp:

Jul 3, 2009 11:13:33 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: fix resizing of shaped windows

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• seamless-x11.cpp (modified) (7 diffs)
• seamless-x11.h (modified) (1 diff)
• testcase/tstSeamlessX11-auto.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp

@@ -293 +293 @@
     {
     case ConfigureNotify:
-        doConfigureEvent(&event.xconfigure);
+        doConfigureEvent(event.xconfigure.window);
         break;
     case MapNotify:
-        doMapEvent(&event.xmap);
+        doMapEvent(event.xmap.window);
         break;
     case VBoxShapeNotify:  /* This is defined wrong in my X11 header files! */
-        doShapeEvent(reinterpret_cast<XShapeEvent *>(&event));
+    /* the window member in xany is in the same place as in the shape event */
+        doShapeEvent(event.xany.window);
         break;
     case UnmapNotify:
-        doUnmapEvent(&event.xunmap);
+        doUnmapEvent(event.xunmap.window);
         break;
     default:
@@ -315 +316 @@
  * @param event the X11 event structure
  */
-void VBoxGuestSeamlessX11::doConfigureEvent(const XConfigureEvent *event)
+void VBoxGuestSeamlessX11::doConfigureEvent(Window hWin)
 {
     LogFlowThisFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
-    iter = mGuestWindows.find(event->window);
+    iter = mGuestWindows.find(hWin);
     if (iter != mGuestWindows.end())
     {
         XWindowAttributes winAttrib;
 
-        if (XGetWindowAttributes(mDisplay, event->window, &winAttrib))
+        if (XGetWindowAttributes(mDisplay, hWin, &winAttrib))
         {
             iter->second->mX = winAttrib.x;
@@ -332 +333 @@
             iter->second->mHeight = winAttrib.height;
         }
+        if (iter->second->mhasShape)
+        {
+            VBoxGuestX11Pointer<XRectangle> rects;
+            int cRects = 0, iOrdering;
+
+            rects = XShapeGetRectangles(mDisplay, hWin, ShapeBounding,
+                                        &cRects, &iOrdering);
+            iter->second->mcRects = cRects;
+            iter->second->mapRects = rects;
+        }
     }
     LogFlowThisFunc(("returning\n"));
@@ -341 +352 @@
  * @param event the X11 event structure
  */
-void VBoxGuestSeamlessX11::doMapEvent(const XMapEvent *event)
+void VBoxGuestSeamlessX11::doMapEvent(Window hWin)
 {
     LogFlowThisFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
-    iter = mGuestWindows.find(event->window);
+    iter = mGuestWindows.find(hWin);
     if (mGuestWindows.end() == iter)
     {
-        addClientWindow(event->window);
+        addClientWindow(hWin);
     }
     LogFlowThisFunc(("returning\n"));
@@ -360 +371 @@
  * @param event the X11 event structure
  */
-void VBoxGuestSeamlessX11::doShapeEvent(const XShapeEvent *event)
+void VBoxGuestSeamlessX11::doShapeEvent(Window hWin)
 {
     LogFlowThisFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
-    iter = mGuestWindows.find(event->window);
+    iter = mGuestWindows.find(hWin);
     if (iter != mGuestWindows.end())
     {
@@ -371 +382 @@
         int cRects = 0, iOrdering;
 
-        rects = XShapeGetRectangles(mDisplay, event->window, ShapeBounding, &cRects, &iOrdering);
+        rects = XShapeGetRectangles(mDisplay, hWin, ShapeBounding, &cRects,
+                                    &iOrdering);
         iter->second->mhasShape = true;
         iter->second->mcRects = cRects;
@@ -384 +396 @@
  * @param event the X11 event structure
  */
-void VBoxGuestSeamlessX11::doUnmapEvent(const XUnmapEvent *event)
+void VBoxGuestSeamlessX11::doUnmapEvent(Window hWin)
 {
     LogFlowThisFunc(("\n"));
     VBoxGuestWindowList::iterator iter;
 
-    iter = mGuestWindows.find(event->window);
+    iter = mGuestWindows.find(hWin);
     if (mGuestWindows.end() != iter)
     {

trunk/src/VBox/Additions/x11/VBoxClient/seamless-x11.h

@@ -349 +349 @@
     /* Methods to handle X11 events.  These are public so that the unit test
      * can call them. */
-    void doConfigureEvent(const XConfigureEvent *event);
-    void doMapEvent(const XMapEvent *event);
-    void doUnmapEvent(const XUnmapEvent *event);
-    void doShapeEvent(const XShapeEvent *event);
+    void doConfigureEvent(Window hWin);
+    void doMapEvent(Window hWin);
+    void doUnmapEvent(Window hWin);
+    void doShapeEvent(Window hWin);
 
     VBoxGuestSeamlessX11(void)

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp

@@ -426 +426 @@
     RT_ELEMENTS(g_aRectangle1),
     g_aRectangle1,
-    MapNotify,
+    ConfigureNotify,
     20,
     RT_ELEMENTS(g_aRects1),
@@ -563 +563 @@
                            pFixture->cShapeRectsAfter,
                            pFixture->paShapeRectsAfter);
-    XEvent event = { 0 };
     switch(pFixture->x11EventType)
     {
         case ConfigureNotify:
-            event.xconfigure.window = pFixture->hEventWindow;
-            subject.doConfigureEvent(&event.xconfigure);
+            subject.doConfigureEvent(pFixture->hEventWindow);
             break;
         case MapNotify:
-            event.xmap.window = pFixture->hEventWindow;
-            subject.doMapEvent(&event.xmap);
+            subject.doMapEvent(pFixture->hEventWindow);
             break;
         case UnmapNotify:
-            event.xunmap.window = pFixture->hEventWindow;
-            subject.doUnmapEvent(&event.xunmap);
+            subject.doUnmapEvent(pFixture->hEventWindow);
             break;
         case VBoxShapeNotify:
-            event.xany.window = pFixture->hEventWindow;
-            subject.doShapeEvent((XShapeEvent *)&event);
+            subject.doShapeEvent(pFixture->hEventWindow);
             break;
         default:
@@ -637 +632 @@
                            "ConfigureNotify event (window moved)");
     // Currently not working
-    // cErrs += smlsDoFixture(&g_testResize,
-    //                        "ConfigureNotify event (window resized)");
+    cErrs += smlsDoFixture(&g_testResize,
+                           "ConfigureNotify event (window resized)");
     cErrs += smlsDoFixture(&g_testMap, "MapNotify event");
     cErrs += smlsDoFixture(&g_testUnmap, "UnmapNotify event");