#4403 use visual with transparency for the tray

but not for the docking window
Xpra-org · Oct 26, 2024 · ce124c6 · ce124c6
1 parent 6f5f514
commit ce124c6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/xpra/x11/bindings/window.pyx b/xpra/x11/bindings/window.pyx
@@ -10,7 +10,7 @@ from xpra.gtk.error import XError
 from xpra.x11.bindings.xlib cimport (
     Display, Drawable, Visual, Window, Bool, Pixmap, XID, Status, Atom, Time, CurrentTime, Cursor, XPointer,
     VisualID, XVisualInfo,
-    XGetVisualInfo, VisualIDMask,
+    XGetVisualInfo, VisualIDMask, XDefaultVisual,
     GrabModeAsync, XGrabPointer,
     Expose,
     XRectangle, XEvent, XClassHint,
@@ -998,7 +998,13 @@ cdef class X11WindowBindingsInstance(X11CoreBindingsInstance):
             XFree(vinfo)
         return visual
 
-    def get_rgba_visualid(self, depth=32):
+    def get_default_visualid(self) -> int:
+        cdef Visual *visual = XDefaultVisual(self.display, 0)
+        if not visual:
+            return 0
+        return visual.visualid
+
+    def get_rgba_visualid(self, depth=32) -> int:
         cdef XVisualInfo vinfo_template
         cdef int count
         cdef XVisualInfo *vinfo = XGetVisualInfo(self.display, 0, &vinfo_template, &count)

diff --git a/xpra/x11/bindings/xlib.pxd b/xpra/x11/bindings/xlib.pxd
@@ -149,7 +149,7 @@ cdef extern from "X11/Xlib.h":
         VisualID visualid
         int screen
         unsigned int depth
-        int c_class
+        int c_class "class"
         unsigned long red_mask
         unsigned long green_mask
         unsigned long blue_mask
@@ -301,6 +301,7 @@ cdef extern from "X11/Xlib.h":
     int XAddToSaveSet(Display *, Window w)
     int XRemoveFromSaveSet(Display *, Window w)
 
+    Visual *XDefaultVisual(Display *display, int screen_number)
     XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return)
 
     # windows:

diff --git a/xpra/x11/gtk/tray.py b/xpra/x11/gtk/tray.py
@@ -147,11 +147,15 @@ def setup_tray_window(self) -> None:
                 if owner != XNone:
                     raise RuntimeError(f"{SELECTION} already owned by {owner:x}")
                 root_xid = X11Window.get_root_xid()
-                depth = X11Window.get_depth(root_xid)
-                visualid = X11Window.get_rgba_visualid(depth) if TRANSPARENCY else 0
+                root_depth = X11Window.get_depth(root_xid)
+                visualid = 0
+                if TRANSPARENCY:
+                    depth = root_depth if root_depth != 24 else 32
+                    visualid = X11Window.get_rgba_visualid(depth)
                 event_mask = PropertyChangeMask
-                self.xid = X11Window.CreateWindow(root_xid, depth=depth, event_mask=event_mask, visualid=visualid)
-                log("tray dock window: {visualid=} geometry=%s", X11Window.getGeometry(self.xid))
+                win_vid = X11Window.get_default_visualid()
+                self.xid = X11Window.CreateWindow(root_xid, depth=root_depth, event_mask=event_mask, visualid=win_vid)
+                log(f"tray dock window: visualid=0x{visualid:x} geometry=%s", X11Window.getGeometry(self.xid))
                 prop_set(self.xid, "WM_TITLE", "latin1", "Xpra-SystemTray")
                 set_tray_visual(self.xid, visualid)
                 set_tray_orientation(self.xid, TRAY_ORIENTATION.HORZ)