Changeset 64336 in vbox for trunk/src/VBox

Timestamp:

Oct 20, 2016 3:16:06 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8631: FE/Qt: resizing problems with tiled window manager: include some ICCCM definitions directly to build on systems without xcb_icccm.h.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -51 +51 @@
 #  include <QScreen>
 #  include <xcb/xcb.h>
-#  include <xcb/xcb_icccm.h>
 # endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
 
@@ -3705 +3704 @@
 }
 
+typedef struct {
+/** User specified flags */
+uint32_t flags;
+/** User-specified position */
+int32_t x, y;
+/** User-specified size */
+int32_t width, height;
+/** Program-specified minimum size */
+int32_t min_width, min_height;
+/** Program-specified maximum size */
+int32_t max_width, max_height;
+/** Program-specified resize increments */
+int32_t width_inc, height_inc;
+/** Program-specified minimum aspect ratios */
+int32_t min_aspect_num, min_aspect_den;
+/** Program-specified maximum aspect ratios */
+int32_t max_aspect_num, max_aspect_den;
+/** Program-specified base size */
+int32_t base_width, base_height;
+/** Program-specified window gravity */
+uint32_t win_gravity;
+} xcb_size_hints_t;
+
 /* static */
 void VBoxGlobal::setTopLevelGeometry(QWidget *pWidget, int x, int y, int w, int h)
@@ -3724 +3746 @@
                              fMask, values);
         xcb_size_hints_t hints;
-        hints.flags = XCB_ICCCM_SIZE_HINT_US_POSITION | XCB_ICCCM_SIZE_HINT_US_SIZE;
+        hints.flags =   1 /* XCB_ICCCM_SIZE_HINT_US_POSITION */
+                      | 2 /* XCB_ICCCM_SIZE_HINT_US_SIZE */;
         hints.x          = x;
         hints.y          = y;
@@ -3734 +3757 @@
         hints.max_height = pWidget->maximumSize().height();
         if (hints.min_width > 0 || hints.min_height > 0)
-            hints.flags |= XCB_ICCCM_SIZE_HINT_P_MIN_SIZE;
+            hints.flags |= 16 /* XCB_ICCCM_SIZE_HINT_P_MIN_SIZE */;
         if (hints.max_width < QWINDOWSIZE_MAX || hints.max_height < QWINDOWSIZE_MAX)
-            hints.flags |= XCB_ICCCM_SIZE_HINT_P_MAX_SIZE;
+            hints.flags |= 32 /* XCB_ICCCM_SIZE_HINT_P_MAX_SIZE */;
         xcb_change_property(QX11Info::connection(), XCB_PROP_MODE_REPLACE,
                             (xcb_window_t)pWidget->winId(), XCB_ATOM_WM_NORMAL_HINTS,