isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-28 02:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager-xrandr: Work around spurious hotplugs on Xvnc

Browse Source 
Xvnc turns its outputs off/on on every mode set which makes us believe
there was an hotplug when there actually wasn't. Work around this by
requiring new randr configuration timestamps to be ahead of the last
set timestamp by at least 100 ms for us to consider them an actual
hotplug.
This commit is contained in:
Rui Matos 2015-10-06 21:16:18 +02:00 committed by Ray Strode
parent 7aed7293e3
commit 064788cbc9
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/backends/x11/meta-monitor-manager-xrandr.c
View File

@ -1063,6 +1063,19 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)
g_quark_from_static_string ("-meta-monitor-xrandr-data"); g_quark_from_static_string ("-meta-monitor-xrandr-data");
} }
static gboolean
is_xvnc (MetaMonitorManager *manager)
{
MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);
GList *l;
for (l = meta_gpu_get_outputs (manager_xrandr->gpu); l; l = l->next)
if (g_str_has_prefix (((MetaOutput *)l->data)->name, "VNC-"))
return TRUE;
return FALSE;
}
gboolean gboolean
meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr, meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr,
XEvent *event) XEvent *event)
@ -1072,6 +1085,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
XRRScreenResources *resources; XRRScreenResources *resources;
gboolean is_hotplug; gboolean is_hotplug;
gboolean is_our_configuration; gboolean is_our_configuration;
unsigned int timestamp;
if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify) if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)
return FALSE; return FALSE;
@ -1083,7 +1097,11 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
gpu_xrandr = META_GPU_XRANDR (manager_xrandr->gpu); gpu_xrandr = META_GPU_XRANDR (manager_xrandr->gpu);
resources = meta_gpu_xrandr_get_resources (gpu_xrandr); resources = meta_gpu_xrandr_get_resources (gpu_xrandr);
is_hotplug = resources->timestamp < resources->configTimestamp; timestamp = resources->timestamp;
if (is_xvnc (manager))
timestamp += 100;
is_hotplug = (timestamp < resources->configTimestamp);
is_our_configuration = (resources->timestamp == is_our_configuration = (resources->timestamp ==
manager_xrandr->last_xrandr_set_timestamp); manager_xrandr->last_xrandr_set_timestamp);
if (is_hotplug) if (is_hotplug)