From 69e2aaa41ac74f522ce43d8f7b72dbbb82a5a062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= Date: Thu, 13 May 2010 18:31:22 +0300 Subject: [PATCH] Qt4: remove the no-ARGB visual hack, remove embedded video mode This patch restores usage of X11 visuals with alpha channels. This is needed to get a transparent status "tray" icon for instance. /!\ /!\ IMPORTANT NOTE /!\ /!\ This patch is known to cause the Xlib/XVideo and Xlib/X11 video output plugins to crash when the "embedded video" mode is used (i.e. the video is shown inside the VLC Qt4 interface). The XCB/XVideo and XCB/X11 plugins will also fail albeit without crashing. As a consequence, this patch also disables embedded video support from the Qt4 interface. Videos will be rendered in a separate window instead. The VideoLAN project recommends against use of X11 compositing until the Qt4 GUI library provide a solution to this incompatibility. --- modules/gui/qt4/qt4.cpp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 2793f5e..e081d90 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -242,7 +242,7 @@ vlc_module_begin () set_callbacks( OpenDialogs, Close ) #if defined (Q_WS_X11) -# define WID_CAPABILITY "xwindow" +//# define WID_CAPABILITY "xwindow" #elif defined (WIN32) # define WID_CAPABILITY "hwnd" #endif @@ -284,7 +284,6 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } XCloseDisplay( p_display ); - putenv( (char *)"XLIB_SKIP_ARGB_VISUALS=1" ); #endif /* Allocations of p_sys */ -- 1.7.1