]> git.sesse.net Git - vlc/commitdiff
XCB: no need to create a color map for default visual
authorRémi Denis-Courmont <remi@remlab.net>
Fri, 17 Apr 2009 17:44:35 +0000 (20:44 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Fri, 17 Apr 2009 17:48:59 +0000 (20:48 +0300)
modules/video_output/xcb/x11.c

index c794d334b8f81b0a6def5dadecc21ed291ef6050..155cae1c8807ded5fea13dfddddbb4099aab1875 100644 (file)
@@ -259,9 +259,14 @@ static int Open (vlc_object_t *obj)
              p_sys->bpp, p_sys->pad);
 
     /* Create colormap (needed to select non-default visual) */
-    p_sys->cmap = xcb_generate_id (p_sys->conn);
-    xcb_create_colormap (p_sys->conn, XCB_COLORMAP_ALLOC_NONE,
-                         p_sys->cmap, scr->root, p_sys->vid);
+    if (p_sys->vid != scr->root_visual)
+    {
+        p_sys->cmap = xcb_generate_id (p_sys->conn);
+        xcb_create_colormap (p_sys->conn, XCB_COLORMAP_ALLOC_NONE,
+                             p_sys->cmap, scr->root, p_sys->vid);
+    }
+    else
+        p_sys->cmap = scr->default_colormap;
 
     /* Check shared memory support */
     p_sys->shm = var_CreateGetBool (vout, "x11-shm") > 0;