isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-02 23:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

monitor-manager-xrandr: Refactor handle_xevent once more

Browse Source 
Make the flow a bit clearer, and inline a method only used once.
This commit is contained in:
Jasper St. Pierre 2014-10-12 13:29:25 -07:00
parent a460f88b31
commit 1dbda68839
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1001,16 +1001,6 @@ meta_monitor_manager_xrandr_set_crtc_gamma (MetaMonitorManager *manager,
XRRFreeGamma (gamma); XRRFreeGamma (gamma);
} }
static void
meta_monitor_manager_xrandr_rebuild_derived (MetaMonitorManager *manager)
{
/* This will be a no-op if the change was from our side, as
we already called it in the DBus method handler */
meta_monitor_config_update_current (manager->config, manager);
meta_monitor_manager_rebuild_derived (manager);
}
static void static void
meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr) meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr)
{ {
@ -1092,14 +1082,18 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
manager->serial++; manager->serial++;
meta_monitor_manager_xrandr_read_current (manager); meta_monitor_manager_xrandr_read_current (manager);
/* If this config matches our existing one, don't bother doing anything. */
if (meta_monitor_config_match_current (manager->config, manager))
goto out;
new_config = manager_xrandr->resources->timestamp >= manager_xrandr->resources->configTimestamp; new_config = manager_xrandr->resources->timestamp >= manager_xrandr->resources->configTimestamp;
/* If this is the X server telling us we set a new configuration, /* If this is the X server telling us we set a new configuration,
* we can simply short-cut to rebuilding our logical configuration. * we can simply short-cut to rebuilding our logical configuration.
*/ */
if (new_config || meta_monitor_config_match_current (manager->config, manager)) if (new_config)
{ {
meta_monitor_manager_xrandr_rebuild_derived (manager); meta_monitor_manager_rebuild_derived (manager);
goto out; goto out;
} }