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

monitor-manager: Clean up hot-plug paths slightly

Browse Source 
Make the API used more shared and better named.

meta_monitor_manager_on_hotplug() was renamed
meta_monitor_manager_reconfigure(), and meta_monitor_manager_reload()
was introduced to combine reading the current state and reconfiguring.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1689>
This commit is contained in:
Jonas Ådahl 2021-01-25 21:10:53 +01:00 committed by Marge Bot
parent e48be709f8
commit 432682f305
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/meta-monitor-manager-private.h
View File

@ -325,11 +325,12 @@ void meta_monitor_manager_confirm_configuration (MetaMonitorManag
gboolean meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager); gboolean meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
META_EXPORT_TEST
void meta_monitor_manager_read_current_state (MetaMonitorManager *manager); void meta_monitor_manager_read_current_state (MetaMonitorManager *manager);
void meta_monitor_manager_reconfigure (MetaMonitorManager *manager);
META_EXPORT_TEST META_EXPORT_TEST
void meta_monitor_manager_on_hotplug (MetaMonitorManager *manager); void meta_monitor_manager_reload (MetaMonitorManager *manager);
gboolean meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager, gboolean meta_monitor_manager_get_monitor_matrix (MetaMonitorManager *manager,
MetaMonitor *monitor, MetaMonitor *monitor,

11
src/backends/meta-monitor-manager.c
View File

@ -809,7 +809,7 @@ experimental_features_changed (MetaSettings *settings,
should_reconfigure = TRUE; should_reconfigure = TRUE;
if (should_reconfigure) if (should_reconfigure)
meta_monitor_manager_on_hotplug (manager); meta_monitor_manager_reconfigure (manager);
meta_settings_update_ui_scaling_factor (settings); meta_settings_update_ui_scaling_factor (settings);
} }
@ -3098,11 +3098,18 @@ meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
} }
void void
meta_monitor_manager_on_hotplug (MetaMonitorManager *manager) meta_monitor_manager_reconfigure (MetaMonitorManager *manager)
{ {
meta_monitor_manager_ensure_configured (manager); meta_monitor_manager_ensure_configured (manager);
} }
void
meta_monitor_manager_reload (MetaMonitorManager *manager)
{
meta_monitor_manager_read_current_state (manager);
meta_monitor_manager_reconfigure (manager);
}
static gboolean static gboolean
calculate_viewport_matrix (MetaMonitorManager *manager, calculate_viewport_matrix (MetaMonitorManager *manager,
MetaLogicalMonitor *logical_monitor, MetaLogicalMonitor *logical_monitor,

3
src/backends/native/meta-monitor-manager-kms.c
View File

@ -463,8 +463,7 @@ meta_monitor_manager_kms_set_crtc_gamma (MetaMonitorManager *manager,
static void static void
handle_hotplug_event (MetaMonitorManager *manager) handle_hotplug_event (MetaMonitorManager *manager)
{ {
meta_monitor_manager_read_current_state (manager); meta_monitor_manager_reload (manager);
meta_monitor_manager_on_hotplug (manager);
} }
static void static void

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

@ -1126,7 +1126,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra
manager_xrandr->last_xrandr_set_timestamp); manager_xrandr->last_xrandr_set_timestamp);
if (is_hotplug) if (is_hotplug)
{ {
meta_monitor_manager_on_hotplug (manager); meta_monitor_manager_reconfigure (manager);
} }
else else
{ {

3
src/tests/meta-monitor-manager-test.c
View File

@ -63,8 +63,7 @@ meta_monitor_manager_test_emulate_hotplug (MetaMonitorManagerTest *manager_test,
old_test_setup = manager_test->test_setup; old_test_setup = manager_test->test_setup;
manager_test->test_setup = test_setup; manager_test->test_setup = test_setup;
meta_monitor_manager_read_current_state (manager); meta_monitor_manager_reload (manager);
meta_monitor_manager_on_hotplug (manager);
g_free (old_test_setup); g_free (old_test_setup);
} }