Attachment 1446790 Details for Bug 1581806 – Possible replacement for 0001-monitor-config-Consider-external-layout-before-defau.patch

[patch] Possible replacement for 0001-monitor-config-Consider-external-layout-before-defau.patch

MMC.patch (text/plain), 5.54 KB, created by Timm Gleason on 2018-06-01 19:46:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timm Gleason

Created: 2018-06-01 19:46:10 UTC

Size: 5.54 KB

patch

obsolete

>diff -up mutter-3.26.2/src/backends/meta-monitor-config-manager.c.orig mutter-3.26.2/src/backends/meta-monitor-config-manager.c
>--- mutter-3.26.2/src/backends/meta-monitor-config-manager.c.orig	2017-10-30 15:24:49.000000000 -0700
>+++ mutter-3.26.2/src/backends/meta-monitor-config-manager.c	2018-06-01 10:47:37.700819868 -0700
>@@ -558,6 +558,80 @@ create_preferred_logical_monitor_config
>   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;
>+
>+    output = meta_monitor_get_main_output (monitor);
>+    return create_preferred_logical_monitor_config (monitor_manager,
>+                                                    monitor,
>+                                                    output->crtc->rect.x,
>+                                                    output->crtc->rect.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);
>+
>+  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);
>+
>+      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 -up mutter-3.26.2/src/backends/meta-monitor-config-manager.h.orig mutter-3.26.2/src/backends/meta-monitor-config-manager.h
>--- mutter-3.26.2/src/backends/meta-monitor-config-manager.h.orig	2017-10-05 12:10:45.000000000 -0700
>+++ mutter-3.26.2/src/backends/meta-monitor-config-manager.h	2018-06-01 10:45:59.849595648 -0700
>@@ -87,6 +87,7 @@ gboolean meta_monitor_config_manager_ass
> 
> MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager);
> 
>+MetaMonitorsConfig * meta_monitor_config_manager_create_current (MetaMonitorConfigManager *config_manager);
> MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
> 
> MetaMonitorsConfig * meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_manager);
>diff -up mutter-3.26.2/src/backends/meta-monitor-manager.c.orig mutter-3.26.2/src/backends/meta-monitor-manager.c
>--- mutter-3.26.2/src/backends/meta-monitor-manager.c.orig	2017-10-30 15:24:54.000000000 -0700
>+++ mutter-3.26.2/src/backends/meta-monitor-manager.c	2018-06-01 10:45:59.849595648 -0700
>@@ -553,6 +553,25 @@ meta_monitor_manager_ensure_configured (
>       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)
>     {

Actions: View | Diff

Attachments on bug 1581806: 1446790