callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "gdkscreen-x11: Enable RandR on VirtualBox"

Browse Source 
This reverts commit f2ba6ca473.

This change was causing problems with several X servers,
see https://bugzilla.gnome.org/show_bug.cgi?id=780101
This commit is contained in:
Matthias Clasen 2017-10-28 10:22:30 -04:00
parent 81d1aaa062
commit 74720117c9
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gdk/x11/gdkscreen-x11.c
View File

@ -408,6 +408,7 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
RROutput primary_output = None; RROutput primary_output = None;
RROutput first_output = None; RROutput first_output = None;
int i; int i;
gboolean randr12_compat = FALSE;
XRRMonitorInfo *rr_monitors; XRRMonitorInfo *rr_monitors;
int num_rr_monitors; int num_rr_monitors;
int old_primary; int old_primary;
@ -452,6 +453,9 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
if (output_info == NULL) if (output_info == NULL)
continue; continue;
/* Non RandR1.2+ X driver have output name "default" */
randr12_compat |= !g_strcmp0 (output_info->name, "default");
if (output_info->connection == RR_Disconnected) if (output_info->connection == RR_Disconnected)
{ {
XRRFreeOutputInfo (output_info); XRRFreeOutputInfo (output_info);
@ -531,6 +535,19 @@ init_randr15 (GdkScreen *screen, gboolean *changed)
XRRFreeMonitors (rr_monitors); XRRFreeMonitors (rr_monitors);
XRRFreeScreenResources (resources); XRRFreeScreenResources (resources);
/* non RandR 1.2+ X driver doesn't return any usable multihead data */
if (randr12_compat)
{
for (i = 0; i < x11_display->monitors->len; i++)
{
GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
if (monitor->remove)
gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
}
g_ptr_array_remove_range (x11_display->monitors, 0, x11_display->monitors->len);
return FALSE;
}
for (i = x11_display->monitors->len - 1; i >= 0; i--) for (i = x11_display->monitors->len - 1; i >= 0; i--)
{ {
GdkX11Monitor *monitor = x11_display->monitors->pdata[i]; GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
@ -593,6 +610,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
RROutput primary_output = None; RROutput primary_output = None;
RROutput first_output = None; RROutput first_output = None;
int i; int i;
gboolean randr12_compat = FALSE;
int old_primary; int old_primary;
if (!x11_display->have_randr13) if (!x11_display->have_randr13)
@ -616,6 +634,9 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
XRROutputInfo *output_info = XRROutputInfo *output_info =
XRRGetOutputInfo (x11_screen->xdisplay, resources, output); XRRGetOutputInfo (x11_screen->xdisplay, resources, output);
/* Non RandR1.2+ X driver have output name "default" */
randr12_compat |= !g_strcmp0 (output_info->name, "default");
if (output_info->connection == RR_Disconnected) if (output_info->connection == RR_Disconnected)
{ {
XRRFreeOutputInfo (output_info); XRRFreeOutputInfo (output_info);
@ -696,7 +717,17 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
XRRFreeScreenResources (resources); XRRFreeScreenResources (resources);
/* Which usable multihead data is not returned in non RandR 1.2+ X driver? */ if (randr12_compat)
{
for (i = 0; i < x11_display->monitors->len; i++)
{
GdkX11Monitor *monitor = x11_display->monitors->pdata[i];
if (monitor->remove)
gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
}
g_ptr_array_remove_range (x11_display->monitors, 0, x11_display->monitors->len);
return FALSE;
}
for (i = x11_display->monitors->len - 1; i >= 0; i--) for (i = x11_display->monitors->len - 1; i >= 0; i--)
{ {