6267732bec
When constructing MetaMonitorsConfig objects, store which type of switch_config they are for (or UNKNOWN if it is not such type of config). Stop unconditionally setting current_switch_config to UNKNOWN when handling monitors changed events. Instead, set it to the switch_config type stored in the MonitorsConfig in the codepath that updates logical state. In addition to being called in the hotplug case along the same code flow that generates monitors changed events, this is also called in the coldplug case where a secondary monitor was connected before mutter was started. When creating the default linear display config, create it as a switch_config so that internal state gets updated to represent linear mode when this config is used. The previous behaviour of unconditionally resetting current_switch_config to UNKNOWN was breaking the internal state machine for display config switching, causing misbehaviour in gnome-shell's switchMonitor UI when using display switch hotkeys. The lack of internal tracking when the displays are already in the default "Join Displays" linear mode was then causing the first display switch hotkey press to do nothing (it would attempt to select "Join Displays" mode, but that was already active). Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/281 https://gitlab.gnome.org/GNOME/mutter/merge_requests/213
168 lines
7.2 KiB
C
168 lines
7.2 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
|
|
/*
|
|
* Copyright (C) 2016 Red Hat
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
|
* 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef META_MONITOR_CONFIG_MANAGER_H
|
|
#define META_MONITOR_CONFIG_MANAGER_H
|
|
|
|
#include "backends/meta-monitor.h"
|
|
#include "backends/meta-monitor-manager-private.h"
|
|
|
|
#define META_TYPE_MONITOR_CONFIG_MANAGER (meta_monitor_config_manager_get_type ())
|
|
G_DECLARE_FINAL_TYPE (MetaMonitorConfigManager, meta_monitor_config_manager,
|
|
META, MONITOR_CONFIG_MANAGER, GObject)
|
|
|
|
typedef struct _MetaMonitorConfig
|
|
{
|
|
MetaMonitorSpec *monitor_spec;
|
|
MetaMonitorModeSpec *mode_spec;
|
|
gboolean enable_underscanning;
|
|
} MetaMonitorConfig;
|
|
|
|
typedef struct _MetaLogicalMonitorConfig
|
|
{
|
|
MetaRectangle layout;
|
|
GList *monitor_configs;
|
|
MetaMonitorTransform transform;
|
|
float scale;
|
|
gboolean is_primary;
|
|
gboolean is_presentation;
|
|
} MetaLogicalMonitorConfig;
|
|
|
|
typedef struct _MetaMonitorsConfigKey
|
|
{
|
|
GList *monitor_specs;
|
|
} MetaMonitorsConfigKey;
|
|
|
|
typedef enum _MetaMonitorsConfigFlag
|
|
{
|
|
META_MONITORS_CONFIG_FLAG_NONE = 0,
|
|
META_MONITORS_CONFIG_FLAG_MIGRATED = (1 << 0),
|
|
} MetaMonitorsConfigFlag;
|
|
|
|
struct _MetaMonitorsConfig
|
|
{
|
|
GObject parent;
|
|
|
|
MetaMonitorsConfigKey *key;
|
|
GList *logical_monitor_configs;
|
|
|
|
GList *disabled_monitor_specs;
|
|
|
|
MetaMonitorsConfigFlag flags;
|
|
|
|
MetaLogicalMonitorLayoutMode layout_mode;
|
|
|
|
MetaMonitorSwitchConfigType switch_config;
|
|
};
|
|
|
|
#define META_TYPE_MONITORS_CONFIG (meta_monitors_config_get_type ())
|
|
G_DECLARE_FINAL_TYPE (MetaMonitorsConfig, meta_monitors_config,
|
|
META, MONITORS_CONFIG, GObject)
|
|
|
|
MetaMonitorConfigManager * meta_monitor_config_manager_new (MetaMonitorManager *monitor_manager);
|
|
|
|
MetaMonitorConfigStore * meta_monitor_config_manager_get_store (MetaMonitorConfigManager *config_manager);
|
|
|
|
gboolean meta_monitor_config_manager_assign (MetaMonitorManager *manager,
|
|
MetaMonitorsConfig *config,
|
|
GPtrArray **crtc_infos,
|
|
GPtrArray **output_infos,
|
|
GError **error);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_for_orientation (MetaMonitorConfigManager *config_manager,
|
|
MetaMonitorTransform transform);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_for_rotate_monitor (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager *config_manager,
|
|
MetaMonitorSwitchConfigType config_type);
|
|
|
|
void meta_monitor_config_manager_set_current (MetaMonitorConfigManager *config_manager,
|
|
MetaMonitorsConfig *config);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_get_current (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_pop_previous (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitor_config_manager_get_previous (MetaMonitorConfigManager *config_manager);
|
|
|
|
void meta_monitor_config_manager_clear_history (MetaMonitorConfigManager *config_manager);
|
|
|
|
void meta_monitor_config_manager_save_current (MetaMonitorConfigManager *config_manager);
|
|
|
|
MetaMonitorsConfig * meta_monitors_config_new_full (GList *logical_monitor_configs,
|
|
GList *disabled_monitors,
|
|
MetaLogicalMonitorLayoutMode layout_mode,
|
|
MetaMonitorsConfigFlag flags);
|
|
|
|
MetaMonitorsConfig * meta_monitors_config_new (MetaMonitorManager *monitor_manager,
|
|
GList *logical_monitor_configs,
|
|
MetaLogicalMonitorLayoutMode layout_mode,
|
|
MetaMonitorsConfigFlag flags);
|
|
|
|
MetaMonitorSwitchConfigType meta_monitors_config_get_switch_config (MetaMonitorsConfig *config);
|
|
|
|
void meta_monitors_config_set_switch_config (MetaMonitorsConfig *config,
|
|
MetaMonitorSwitchConfigType switch_config);
|
|
|
|
unsigned int meta_monitors_config_key_hash (gconstpointer config_key);
|
|
|
|
gboolean meta_monitors_config_key_equal (gconstpointer config_key_a,
|
|
gconstpointer config_key_b);
|
|
|
|
void meta_monitors_config_key_free (MetaMonitorsConfigKey *config_key);
|
|
|
|
void meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_config);
|
|
|
|
void meta_monitor_config_free (MetaMonitorConfig *monitor_config);
|
|
|
|
MetaMonitorsConfigKey * meta_create_monitors_config_key_for_current_state (MetaMonitorManager *monitor_manager);
|
|
|
|
gboolean meta_logical_monitor_configs_have_monitor (GList *logical_monitor_configs,
|
|
MetaMonitorSpec *monitor_spec);
|
|
|
|
gboolean meta_verify_monitor_mode_spec (MetaMonitorModeSpec *monitor_mode_spec,
|
|
GError **error);
|
|
|
|
gboolean meta_verify_monitor_spec (MetaMonitorSpec *monitor_spec,
|
|
GError **error);
|
|
|
|
gboolean meta_verify_monitor_config (MetaMonitorConfig *monitor_config,
|
|
GError **error);
|
|
|
|
gboolean meta_verify_logical_monitor_config (MetaLogicalMonitorConfig *logical_monitor_config,
|
|
MetaLogicalMonitorLayoutMode layout_mode,
|
|
MetaMonitorManager *monitor_manager,
|
|
GError **error);
|
|
|
|
gboolean meta_verify_monitors_config (MetaMonitorsConfig *config,
|
|
MetaMonitorManager *monitor_manager,
|
|
GError **error);
|
|
|
|
#endif /* META_MONITOR_CONFIG_MANAGER_H */
|