From 22c48221a3117a7a8ac5b983767d8de5ec5fd599 Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Tue, 6 Oct 2015 21:16:18 +0200

Subject: [PATCH 1/9] monitor-manager-xrandr: Work around spurious hotplugs on

 Xvnc

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.

---

 .../x11/meta-monitor-manager-xrandr.c         | 21 ++++++++++++++++++-

 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c

index 489a9b424..1ddc2a787 100644

--- a/src/backends/x11/meta-monitor-manager-xrandr.c

+++ b/src/backends/x11/meta-monitor-manager-xrandr.c

@@ -1100,6 +1100,20 @@ meta_monitor_manager_xrandr_class_init (MetaMonitorManagerXrandrClass *klass)

     g_quark_from_static_string ("-meta-monitor-xrandr-data");

 }

+static gboolean

+is_xvnc (MetaMonitorManager *manager)

+{

+  MetaMonitorManagerXrandr *manager_xrandr = META_MONITOR_MANAGER_XRANDR (manager);

+  MetaGpu *gpu = meta_monitor_manager_xrandr_get_gpu (manager_xrandr);

+  GList *l;

+

+  for (l = meta_gpu_get_outputs (gpu); l; l = l->next)

+    if (g_str_has_prefix (meta_output_get_name (l->data), "VNC-"))

+      return TRUE;

+

+  return FALSE;

+}

+

 gboolean

 meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr,

 					   XEvent                   *event)

@@ -1110,6 +1124,7 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra

   XRRScreenResources *resources;

   gboolean is_hotplug;

   gboolean is_our_configuration;

+  unsigned int timestamp;

   if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)

     return FALSE;

@@ -1121,7 +1136,11 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra

   gpu_xrandr = META_GPU_XRANDR (gpu);

   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 ==

                           manager_xrandr->last_xrandr_set_timestamp);

   if (is_hotplug)

-- 

2.33.1

From 1092dfec7b096e6ad3208dba362623faf26c564c Mon Sep 17 00:00:00 2001

From: Rui Matos <tiagomatos@gmail.com>

Date: Mon, 4 Jun 2018 16:35:04 -0400

Subject: [PATCH 2/9] monitor-manager-xrandr: Force an update when resuming

 from suspend

The stack below us isn't as reliable as we'd like and in some cases

doesn't generate RRScreenChangeNotify events when e.g. resuming a

laptop on a dock, meaning that we'd miss newly attached outputs.

---

 src/backends/meta-gpu.c                       |  7 ++

 src/backends/meta-gpu.h                       |  4 +

 src/backends/x11/meta-gpu-xrandr.c            | 26 ++++-

 .../x11/meta-monitor-manager-xrandr.c         | 98 +++++++++++++++++--

 4 files changed, 125 insertions(+), 10 deletions(-)

diff --git a/src/backends/meta-gpu.c b/src/backends/meta-gpu.c

index ce4353bf0..6b3086e74 100644

--- a/src/backends/meta-gpu.c

+++ b/src/backends/meta-gpu.c

@@ -66,6 +66,13 @@ meta_gpu_has_hotplug_mode_update (MetaGpu *gpu)

   return FALSE;

 }

+void

+meta_gpu_poll_hardware (MetaGpu *gpu)

+{

+  if (META_GPU_GET_CLASS (gpu)->poll_hardware)

+    META_GPU_GET_CLASS (gpu)->poll_hardware (gpu);

+}

+

 gboolean

 meta_gpu_read_current (MetaGpu  *gpu,

                        GError  **error)

diff --git a/src/backends/meta-gpu.h b/src/backends/meta-gpu.h

index 9d12f95a7..37b76bd0f 100644

--- a/src/backends/meta-gpu.h

+++ b/src/backends/meta-gpu.h

@@ -36,8 +36,12 @@ struct _MetaGpuClass

   gboolean (* read_current) (MetaGpu  *gpu,

                              GError  **error);

+  void     (* poll_hardware) (MetaGpu *gpu);

 };

+META_EXPORT_TEST

+void meta_gpu_poll_hardware (MetaGpu *gpu);

+

 META_EXPORT_TEST

 gboolean meta_gpu_read_current (MetaGpu  *gpu,

                                 GError  **error);

diff --git a/src/backends/x11/meta-gpu-xrandr.c b/src/backends/x11/meta-gpu-xrandr.c

index 6c84be6ce..573df7a90 100644

--- a/src/backends/x11/meta-gpu-xrandr.c

+++ b/src/backends/x11/meta-gpu-xrandr.c

@@ -46,6 +46,8 @@ struct _MetaGpuXrandr

   int max_screen_width;

   int max_screen_height;

+

+  gboolean need_hardware_poll;

 };

 G_DEFINE_TYPE (MetaGpuXrandr, meta_gpu_xrandr, META_TYPE_GPU)

@@ -104,6 +106,14 @@ calculate_xrandr_refresh_rate (XRRModeInfo *xmode)

   return xmode->dotClock / (h_total * v_total);

 }

+static void

+meta_gpu_xrandr_poll_hardware (MetaGpu *gpu)

+{

+  MetaGpuXrandr *gpu_xrandr = META_GPU_XRANDR (gpu);

+

+  gpu_xrandr->need_hardware_poll = TRUE;

+}

+

 static gboolean

 meta_gpu_xrandr_read_current (MetaGpu  *gpu,

                               GError  **error)

@@ -141,8 +151,18 @@ meta_gpu_xrandr_read_current (MetaGpu  *gpu,

   monitor_manager->screen_width = WidthOfScreen (screen);

   monitor_manager->screen_height = HeightOfScreen (screen);

-  resources = XRRGetScreenResourcesCurrent (xdisplay,

-                                            DefaultRootWindow (xdisplay));

+  if (gpu_xrandr->need_hardware_poll)

+    {

+      resources = XRRGetScreenResources (xdisplay,

+                                         DefaultRootWindow (xdisplay));

+      gpu_xrandr->need_hardware_poll = FALSE;

+    }

+  else

+    {

+      resources = XRRGetScreenResourcesCurrent (xdisplay,

+                                                DefaultRootWindow (xdisplay));

+    }

+

   if (!resources)

     {

       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,

@@ -280,6 +300,7 @@ meta_gpu_xrandr_finalize (GObject *object)

 static void

 meta_gpu_xrandr_init (MetaGpuXrandr *gpu_xrandr)

 {

+  gpu_xrandr->need_hardware_poll = TRUE;

 }

 static void

@@ -291,4 +312,5 @@ meta_gpu_xrandr_class_init (MetaGpuXrandrClass *klass)

   object_class->finalize = meta_gpu_xrandr_finalize;

   gpu_class->read_current = meta_gpu_xrandr_read_current;

+  gpu_class->poll_hardware = meta_gpu_xrandr_poll_hardware;

 }

diff --git a/src/backends/x11/meta-monitor-manager-xrandr.c b/src/backends/x11/meta-monitor-manager-xrandr.c

index 1ddc2a787..61e13f459 100644

--- a/src/backends/x11/meta-monitor-manager-xrandr.c

+++ b/src/backends/x11/meta-monitor-manager-xrandr.c

@@ -72,6 +72,10 @@ struct _MetaMonitorManagerXrandr

   Display *xdisplay;

   int rr_event_base;

   int rr_error_base;

+

+  guint logind_watch_id;

+  guint logind_signal_sub_id;

+

   gboolean has_randr15;

   xcb_timestamp_t last_xrandr_set_timestamp;

@@ -96,6 +100,8 @@ typedef struct _MetaMonitorXrandrData

 GQuark quark_meta_monitor_xrandr_data;

+static void meta_monitor_manager_xrandr_update (MetaMonitorManagerXrandr *manager_xrandr);

+

 Display *

 meta_monitor_manager_xrandr_get_xdisplay (MetaMonitorManagerXrandr *manager_xrandr)

 {

@@ -1009,6 +1015,64 @@ meta_monitor_manager_xrandr_set_output_ctm (MetaOutput          *output,

   meta_output_xrandr_set_ctm (META_OUTPUT_XRANDR (output), ctm);

 }

+static void

+logind_signal_handler (GDBusConnection *connection,

+                       const gchar     *sender_name,

+                       const gchar     *object_path,

+                       const gchar     *interface_name,

+                       const gchar     *signal_name,

+                       GVariant        *parameters,

+                       gpointer         user_data)

+{

+  MetaMonitorManagerXrandr *manager_xrandr = user_data;

+  gboolean suspending;

+

+  if (!g_str_equal (signal_name, "PrepareForSleep"))

+    return;

+

+  g_variant_get (parameters, "(b)", &suspending);

+  if (!suspending)

+    {

+      MetaGpu *gpu = meta_monitor_manager_xrandr_get_gpu (manager_xrandr);

+

+      meta_gpu_poll_hardware (gpu);

+      meta_monitor_manager_xrandr_update (manager_xrandr);

+    }

+}

+

+static void

+logind_appeared (GDBusConnection *connection,

+                 const gchar     *name,

+                 const gchar     *name_owner,

+                 gpointer         user_data)

+{

+  MetaMonitorManagerXrandr *manager_xrandr = user_data;

+

+  manager_xrandr->logind_signal_sub_id = g_dbus_connection_signal_subscribe (connection,

+                                                                             "org.freedesktop.login1",

+                                                                             "org.freedesktop.login1.Manager",

+                                                                             "PrepareForSleep",

+                                                                             "/org/freedesktop/login1",

+                                                                             NULL,

+                                                                             G_DBUS_SIGNAL_FLAGS_NONE,

+                                                                             logind_signal_handler,

+                                                                             manager_xrandr,

+                                                                             NULL);

+}

+

+static void

+logind_vanished (GDBusConnection *connection,

+                 const gchar     *name,

+                 gpointer         user_data)

+{

+  MetaMonitorManagerXrandr *manager_xrandr = user_data;

+

+  if (connection && manager_xrandr->logind_signal_sub_id > 0)

+    g_dbus_connection_signal_unsubscribe (connection, manager_xrandr->logind_signal_sub_id);

+

+  manager_xrandr->logind_signal_sub_id = 0;

+}

+

 static void

 meta_monitor_manager_xrandr_constructed (GObject *object)

 {

@@ -1061,12 +1125,23 @@ meta_monitor_manager_xrandr_finalize (GObject *object)

   g_hash_table_destroy (manager_xrandr->tiled_monitor_atoms);

   g_free (manager_xrandr->supported_scales);

+  if (manager_xrandr->logind_watch_id > 0)

+    g_bus_unwatch_name (manager_xrandr->logind_watch_id);

+  manager_xrandr->logind_watch_id = 0;

+

   G_OBJECT_CLASS (meta_monitor_manager_xrandr_parent_class)->finalize (object);

 }

 static void

 meta_monitor_manager_xrandr_init (MetaMonitorManagerXrandr *manager_xrandr)

 {

+  manager_xrandr->logind_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,

+                                                      "org.freedesktop.login1",

+                                                      G_BUS_NAME_WATCHER_FLAGS_NONE,

+                                                      logind_appeared,

+                                                      logind_vanished,

+                                                      manager_xrandr,

+                                                      NULL);

 }

 static void

@@ -1114,9 +1189,8 @@ is_xvnc (MetaMonitorManager *manager)

   return FALSE;

 }

-gboolean

-meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr,

-					   XEvent                   *event)

+static void

+meta_monitor_manager_xrandr_update (MetaMonitorManagerXrandr *manager_xrandr)

 {

   MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_xrandr);

   MetaGpu *gpu = meta_monitor_manager_xrandr_get_gpu (manager_xrandr);

@@ -1126,11 +1200,6 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra

   gboolean is_our_configuration;

   unsigned int timestamp;

-  if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)

-    return FALSE;

-

-  XRRUpdateConfiguration (event);

-

   meta_monitor_manager_read_current_state (manager);

   gpu_xrandr = META_GPU_XRANDR (gpu);

@@ -1165,6 +1234,19 @@ meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xra

       meta_monitor_manager_xrandr_rebuild_derived (manager, config);

     }

+}

+

+gboolean

+meta_monitor_manager_xrandr_handle_xevent (MetaMonitorManagerXrandr *manager_xrandr,

+					   XEvent                   *event)

+{

+

+  if ((event->type - manager_xrandr->rr_event_base) != RRScreenChangeNotify)

+    return FALSE;

+

+  XRRUpdateConfiguration (event);

+

+  meta_monitor_manager_xrandr_update (manager_xrandr);

   return TRUE;

 }

-- 

2.33.1

From a4e09fe21fc77188c99fb41650eb18c171e39f36 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Mon, 24 Feb 2020 16:09:59 +0100

Subject: [PATCH 3/9] Revert "MetaMonitorManager: ignore hotplug_mode_update at

 startup"

This reverts commit 183f4b0c13f3dc9565bf5f693f2e5d61ca0199c9.

---

 src/backends/meta-monitor-manager.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c

index a75da9329..c291ddb5d 100644

--- a/src/backends/meta-monitor-manager.c

+++ b/src/backends/meta-monitor-manager.c

@@ -609,8 +609,7 @@ meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager)

 static gboolean

 should_use_stored_config (MetaMonitorManager *manager)

 {

-  return (manager->in_init ||

-          !meta_monitor_manager_has_hotplug_mode_update (manager));

+  return !meta_monitor_manager_has_hotplug_mode_update (manager);

 }

 MetaMonitorsConfig *

-- 

2.33.1

From 2dbf32b591c004fc996ff16d0b6622659185f2b3 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>

Date: Thu, 28 Jan 2016 15:26:33 +0100

Subject: [PATCH 4/9] monitor-manager: Consider external layout before default

 linear config

In case of no existing configuration, we use a default layout of

aligning attached displays horizontally. This sidesteps any layout

configuration that is done externally, for instance via xorg.conf,

which is not desirable. Instead, base the initial configuration on

the existing layout if it passes some sanity checks before falling

back to the default linear config.

---

 src/backends/meta-monitor-config-manager.c | 86 ++++++++++++++++++++++

 src/backends/meta-monitor-config-manager.h |  2 +

 src/backends/meta-monitor-manager.c        | 19 +++++

 3 files changed, 107 insertions(+)

diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c

index 0253e072f..2f6cc3856 100644

--- a/src/backends/meta-monitor-config-manager.c

+++ b/src/backends/meta-monitor-config-manager.c

@@ -739,6 +739,92 @@ create_preferred_logical_monitor_config (MetaMonitorManager          *monitor_ma

   return logical_monitor_config;

 }

+static MetaLogicalMonitorConfig *

+create_logical_monitor_config_from_output (MetaMonitorManager           *monitor_manager,

+                                           MetaMonitor                  *monitor,

+                                           MetaLogicalMonitorConfig     *primary_logical_monitor_config,

+                                           MetaLogicalMonitorLayoutMode  layout_mode)

+{

+  MetaOutput *output;

+  MetaCrtc *crtc;

+  const MetaCrtcConfig *crtc_config;

+

+  output = meta_monitor_get_main_output (monitor);

+  crtc = meta_output_get_assigned_crtc (output);

+  crtc_config = meta_crtc_get_config (crtc);

+  if (!crtc_config)

+    return NULL;

+

+  return create_preferred_logical_monitor_config (monitor_manager,

+                                                  monitor,

+                                                  (int) crtc_config->layout.origin.x,

+                                                  (int) crtc_config->layout.origin.y,

+                                                  primary_logical_monitor_config,

+                                                  layout_mode);

+}

+

+MetaMonitorsConfig *

+meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_manager)

+{

+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;

+  GList *logical_monitor_configs;

+  MetaMonitor *primary_monitor;

+  MetaLogicalMonitorLayoutMode layout_mode;

+  MetaLogicalMonitorConfig *primary_logical_monitor_config;

+  GList *monitors;

+  GList *l;

+

+  if (meta_monitor_config_store_get_config_count (config_manager->config_store) > 0)

+    return NULL;

+

+  primary_monitor = find_primary_monitor (monitor_manager);

+  if (!primary_monitor || !meta_monitor_is_active (primary_monitor))

+    return NULL;

+

+  layout_mode = meta_monitor_manager_get_default_layout_mode (monitor_manager);

+

+  primary_logical_monitor_config =

+    create_logical_monitor_config_from_output (monitor_manager,

+                                               primary_monitor,

+                                               NULL,

+                                               layout_mode);

+  if (!primary_logical_monitor_config)

+    return NULL;

+

+  primary_logical_monitor_config->is_primary = TRUE;

+  logical_monitor_configs = g_list_append (NULL,

+                                           primary_logical_monitor_config);

+

+  monitors = meta_monitor_manager_get_monitors (monitor_manager);

+  for (l = monitors; l; l = l->next)

+    {

+      MetaMonitor *monitor = l->data;

+      MetaLogicalMonitorConfig *logical_monitor_config;

+

+      if (monitor == primary_monitor)

+        continue;

+

+      if (!meta_monitor_is_active (monitor))

+        continue;

+

+      logical_monitor_config =

+        create_logical_monitor_config_from_output (monitor_manager,

+                                                   monitor,

+                                                   primary_logical_monitor_config,

+                                                   layout_mode);

+      if (!logical_monitor_config)

+        continue;

+

+      logical_monitor_configs = g_list_append (logical_monitor_configs,

+                                               logical_monitor_config);

+    }

+

+  return meta_monitors_config_new (monitor_manager,

+                                   logical_monitor_configs,

+                                   layout_mode,

+                                   META_MONITORS_CONFIG_FLAG_NONE);

+}

+

 MetaMonitorsConfig *

 meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager)

 {

diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h

index 86756a7e3..961d604bd 100644

--- a/src/backends/meta-monitor-config-manager.h

+++ b/src/backends/meta-monitor-config-manager.h

@@ -94,6 +94,8 @@ gboolean meta_monitor_config_manager_assign (MetaMonitorManager *manager,

 META_EXPORT_TEST

 MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager);

+META_EXPORT_TEST

+MetaMonitorsConfig * meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_manager);

 META_EXPORT_TEST

 MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);

diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c

index c291ddb5d..96f0d6b84 100644

--- a/src/backends/meta-monitor-manager.c

+++ b/src/backends/meta-monitor-manager.c

@@ -695,6 +695,25 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)

       g_clear_object (&config);

     }

+  config = meta_monitor_config_manager_create_current (manager->config_manager);

+  if (config)

+    {

+      if (!meta_monitor_manager_apply_monitors_config (manager,

+                                                       config,

+                                                       method,

+                                                       &error))

+        {

+          g_clear_object (&config);

+          g_warning ("Failed to use current monitor configuration: %s",

+                     error->message);

+          g_clear_error (&error);

+        }

+      else

+        {

+          goto done;

+        }

+    }

+

   config = meta_monitor_config_manager_create_linear (manager->config_manager);

   if (config)

     {

-- 

2.33.1

From 7a55398c0d108921af8d4fecdf9034ca94ef783c Mon Sep 17 00:00:00 2001

From: rpm-build <rpm-build>

Date: Tue, 11 Sep 2018 10:19:44 -0400

Subject: [PATCH 5/9] monitor-manager: only reuse initial-config if monitor

 topology matches startup

Right now we try to apply the current monitor config when a new

monitor is attached.  The current config obviously doesn't include the

new monitor, so the new monitor isn't lit up.

The only reason we apply the current config at all is to handle the

startup case:  We want to reuse the config set in Xorg when first

logging in.

This commit changes the code to look at the *initial config* instead

of the current config, and only if the new monitor topology matches

the start up topology.

---

 src/backends/meta-monitor-config-manager.c | 20 +++++++++++++++-----

 src/backends/meta-monitor-config-manager.h |  2 +-

 src/backends/meta-monitor-manager.c        | 16 +++++++++++++++-

 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c

index 2f6cc3856..46249755b 100644

--- a/src/backends/meta-monitor-config-manager.c

+++ b/src/backends/meta-monitor-config-manager.c

@@ -42,6 +42,7 @@ struct _MetaMonitorConfigManager

   MetaMonitorConfigStore *config_store;

   MetaMonitorsConfig *current_config;

+  MetaMonitorsConfig *initial_config;

   GQueue config_history;

 };

@@ -764,9 +765,10 @@ create_logical_monitor_config_from_output (MetaMonitorManager           *monitor

 }

 MetaMonitorsConfig *

-meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_manager)

+meta_monitor_config_manager_create_initial (MetaMonitorConfigManager *config_manager)

 {

   MetaMonitorManager *monitor_manager = config_manager->monitor_manager;

+  MetaMonitorsConfig *initial_config;

   GList *logical_monitor_configs;

   MetaMonitor *primary_monitor;

   MetaLogicalMonitorLayoutMode layout_mode;

@@ -774,6 +776,9 @@ meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_man

   GList *monitors;

   GList *l;

+  if (config_manager->initial_config != NULL)

+    return g_object_ref (config_manager->initial_config);

+

   if (meta_monitor_config_store_get_config_count (config_manager->config_store) > 0)

     return NULL;

@@ -819,10 +824,14 @@ meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_man

                                                logical_monitor_config);

     }

-  return meta_monitors_config_new (monitor_manager,

-                                   logical_monitor_configs,

-                                   layout_mode,

-                                   META_MONITORS_CONFIG_FLAG_NONE);

+  initial_config = meta_monitors_config_new (monitor_manager,

+                                             logical_monitor_configs,

+                                             layout_mode,

+                                             META_MONITORS_CONFIG_FLAG_NONE);

+

+  config_manager->initial_config = g_object_ref (initial_config);

+

+  return initial_config;

 }

 MetaMonitorsConfig *

@@ -1453,6 +1462,7 @@ meta_monitor_config_manager_dispose (GObject *object)

     META_MONITOR_CONFIG_MANAGER (object);

   g_clear_object (&config_manager->current_config);

+  g_clear_object (&config_manager->initial_config);

   meta_monitor_config_manager_clear_history (config_manager);

   G_OBJECT_CLASS (meta_monitor_config_manager_parent_class)->dispose (object);

diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h

index 961d604bd..dc273c961 100644

--- a/src/backends/meta-monitor-config-manager.h

+++ b/src/backends/meta-monitor-config-manager.h

@@ -95,7 +95,7 @@ META_EXPORT_TEST

 MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager);

 META_EXPORT_TEST

-MetaMonitorsConfig * meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_manager);

+MetaMonitorsConfig * meta_monitor_config_manager_create_initial (MetaMonitorConfigManager *config_manager);

 META_EXPORT_TEST

 MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);

diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c

index 96f0d6b84..baf5bf2f9 100644

--- a/src/backends/meta-monitor-manager.c

+++ b/src/backends/meta-monitor-manager.c

@@ -615,9 +615,11 @@ should_use_stored_config (MetaMonitorManager *manager)

 MetaMonitorsConfig *

 meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)

 {

+  g_autoptr (MetaMonitorsConfig) initial_config = NULL;

   MetaMonitorsConfig *config = NULL;

   GError *error = NULL;

   gboolean use_stored_config;

+  MetaMonitorsConfigKey *current_state_key;

   MetaMonitorsConfigMethod method;

   MetaMonitorsConfigMethod fallback_method =

     META_MONITORS_CONFIG_METHOD_TEMPORARY;

@@ -628,6 +630,18 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)

   else

     method = META_MONITORS_CONFIG_METHOD_TEMPORARY;

+  initial_config = meta_monitor_config_manager_create_initial (manager->config_manager);

+

+  if (initial_config)

+    {

+      current_state_key = meta_create_monitors_config_key_for_current_state (manager);

+

+      /* don't ever reuse initial configuration, if the monitor topology changed

+       */

+      if (current_state_key && !meta_monitors_config_key_equal (current_state_key, initial_config->key))

+        g_clear_object (&initial_config);

+    }

+

   if (use_stored_config)

     {

       config = meta_monitor_config_manager_get_stored (manager->config_manager);

@@ -695,7 +709,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)

       g_clear_object (&config);

     }

-  config = meta_monitor_config_manager_create_current (manager->config_manager);

+  config = g_steal_pointer (&initial_config);

   if (config)

     {

       if (!meta_monitor_manager_apply_monitors_config (manager,

-- 

2.33.1

From 26ef9d3b2f407ec87388789b04f553d13289e6e0 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>

Date: Mon, 18 Mar 2019 17:08:11 +0100

Subject: [PATCH 6/9] monitor-config-manager: Use current mode when deriving

 current config

Instead of overriding the existing mode with the preferred mode of the monitor,

use the one already configured. Also use the MetaMonitor API for deriving the

position of the monitor in the screen coordinate space.

---

 src/backends/meta-monitor-config-manager.c | 80 +++++++++++++---------

 1 file changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c

index 46249755b..f355879c3 100644

--- a/src/backends/meta-monitor-config-manager.c

+++ b/src/backends/meta-monitor-config-manager.c

@@ -678,21 +678,20 @@ get_monitor_transform (MetaMonitorManager *monitor_manager,

 }

 static MetaLogicalMonitorConfig *

-create_preferred_logical_monitor_config (MetaMonitorManager          *monitor_manager,

-                                         MetaMonitor                 *monitor,

-                                         int                          x,

-                                         int                          y,

-                                         MetaLogicalMonitorConfig    *primary_logical_monitor_config,

-                                         MetaLogicalMonitorLayoutMode layout_mode)

+create_logical_monitor_config (MetaMonitorManager           *monitor_manager,

+                               MetaMonitor                  *monitor,

+                               MetaMonitorMode              *mode,

+                               int                           x,

+                               int                           y,

+                               MetaLogicalMonitorConfig     *primary_logical_monitor_config,

+                               MetaLogicalMonitorLayoutMode  layout_mode)

 {

-  MetaMonitorMode *mode;

   int width, height;

   float scale;

   MetaMonitorTransform transform;

   MetaMonitorConfig *monitor_config;

   MetaLogicalMonitorConfig *logical_monitor_config;

-  mode = meta_monitor_get_preferred_mode (monitor);