brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor-manager: Ignore tablet-mode-switch on initial config of native portrait mode panels

Browse Source 
Many tablets have a native portrait mode panel, yet come with a keyboard dock,
where the device gets docked in landscape mode. To avoid the display being
on its side when mutter starts while the tablet is docked, we need to take
the accelerometer reported orientation into account even if there is a
tablet-mode-switch which indicates that the device is NOT in tablet-mode
(because it is docked).

Add special handling for the first time the "orientation-changed"
signal gets signalled by the orientation-manager, which happens after it
has successfully claimed the accelerometer with iio-sensor-proxy.

The added special handling of the initial "orientation-changed" signal
does a number of checks:

1. panel_orientation_managed is false because of the tablet-mode-switch and not
   because of other reasons.

2. The device has a native portrait mode panel (and thus likely needs rotation
   to display the image the right way up when docked).

If all these checks succeed then it continues with creating a new
monitors-config based on the orientation ignoring the panel_orientation_managed
value (for the initial/first "orientation-changed" signal only).

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1506
This commit is contained in:
Hans de Goede 2020-10-15 16:09:04 +02:00 committed by Carlos Garnacho
parent 1b13f50582
commit ec18a559c6
1 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,6 +100,7 @@ static int signals[SIGNALS_LAST];
typedef struct _MetaMonitorManagerPrivate
{
MetaPowerSave power_save_mode;
gboolean initial_orient_change_done;
} MetaMonitorManagerPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (MetaMonitorManager, meta_monitor_manager,
@ -723,10 +724,64 @@ handle_orientation_change (MetaOrientationManager *orientation_manager,
g_object_unref (config);
}
/*
* Special case for tablets with a native portrait mode and a keyboard dock,
* where the device gets docked in landscape mode. For this combo to work
* properly with mutter starting while the tablet is docked, we need to take
* the accelerometer reported orientation into account (at mutter startup)
* even if there is a tablet-mode-switch which indicates that the device is
* NOT in tablet-mode (because it is docked).
*/
static gboolean
handle_initial_orientation_change (MetaOrientationManager *orientation_manager,
MetaMonitorManager *manager)
{
ClutterBackend *clutter_backend;
ClutterSeat *seat;
MetaMonitor *monitor;
MetaMonitorMode *mode;
int width, height;
clutter_backend = meta_backend_get_clutter_backend (manager->backend);
seat = clutter_backend_get_default_seat (clutter_backend);
/*
* This is a workaround to ignore the tablet mode switch on the initial config
* of devices with a native portrait mode panel. The touchscreen and
* accelerometer requirements for applying the orientation must still be met.
*/
if (!clutter_seat_has_touchscreen (seat) ||
!meta_orientation_manager_has_accelerometer (orientation_manager))
return FALSE;
/* Check for a portrait mode panel */
monitor = meta_monitor_manager_get_laptop_panel (manager);
if (!monitor)
return FALSE;
mode = meta_monitor_get_preferred_mode (monitor);
meta_monitor_mode_get_resolution (mode, &width, &height);
if (width > height)
return FALSE;
handle_orientation_change (orientation_manager, manager);
return TRUE;
}
static void
orientation_changed (MetaOrientationManager *orientation_manager,
MetaMonitorManager *manager)
{
MetaMonitorManagerPrivate *priv =
meta_monitor_manager_get_instance_private (manager);
if (!priv->initial_orient_change_done)
{
priv->initial_orient_change_done = TRUE;
if (handle_initial_orientation_change (orientation_manager, manager))
return;
}
if (!manager->panel_orientation_managed)
return;