summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan@xfce.org>2021-02-06 10:48:16 +0100
committerOlivier Fourdan <fourdan@xfce.org>2021-02-06 10:48:16 +0100
commit798b1d4de63729ca108c23b1c670dff1a1871a65 (patch)
treed8b5603e57f4f6e8f4b357b57819d5cfbedf2cba /src
parentdbfe88de692af138f124c83ceaed87e87f324f38 (diff)
downloadxfwm4-798b1d4de63729ca108c23b1c670dff1a1871a65.tar.gz
compositor: Disable GLX on mutli-screen (Zaphod)
Zaphod mode support was removed in GTK3 a while ago, support for multiple-screen in xfwm4 is only on a best effort basis. GLX doesn't seem to work reliably when using multiple X11 screens (aka Zaphod) and produces a black image on all but one screen. Disable GLX on the additional X11 screens. Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
Diffstat (limited to 'src')
-rw-r--r--src/compositor.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/compositor.c b/src/compositor.c
index 94a0dd819..d08b23f5e 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -18,7 +18,7 @@
xcompmgr - (c) 2003 Keith Packard
metacity - (c) 2003, 2004 Red Hat, Inc.
- xfwm4 - (c) 2005-2020 Olivier Fourdan
+ xfwm4 - (c) 2005-2021 Olivier Fourdan
*/
@@ -1400,6 +1400,12 @@ init_glx (ScreenInfo *screen_info)
g_return_val_if_fail (screen_info != NULL, FALSE);
TRACE ("entering");
+ if (!xfwm_is_default_screen (screen_info->gscr))
+ {
+ g_warning ("GLX not enabled in multi-screen setups");
+ return FALSE;
+ }
+
if (!glXQueryExtension (myScreenGetXDisplay (screen_info), &error_base, &event_base))
{
g_warning ("GLX extension missing, GLX support disabled.");