isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-26 04:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

backends: Avoid orientation changes around suspend/resume if locked

Browse Source 
We currently lock the capability of the MetaOrientationManager to emit
the ::orientation-changed signal, but otherwise keep reading the current
orientation and returning it if we are asked politely through
meta_orientation_manager_get_orientation().

This may bring issues e.g. around suspend/resume, since there may be other
parts of the code trying to get the current orientation without receiving
::orientation-changed signals, this may result in the display orientation
being effectively rotated, then stay locked after that.

In order to fix this, make the MetaOrientationManager return a fixed
orientation while locked, only updated after changes in the lock state.

Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/2600
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3021>
This commit is contained in:
Carlos Garnacho 2023-05-24 18:02:17 +02:00 committed by Marge Bot
parent 410c08e1e2
commit b5900dd97a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backends/meta-orientation-manager.c
View File

@ -56,6 +56,7 @@ struct _MetaOrientationManager
GDBusProxy *iio_proxy; GDBusProxy *iio_proxy;
MetaOrientation prev_orientation; MetaOrientation prev_orientation;
MetaOrientation curr_orientation; MetaOrientation curr_orientation;
MetaOrientation effective_orientation;
guint has_accel : 1; guint has_accel : 1;
GSettings *settings; GSettings *settings;
@ -130,6 +131,7 @@ sync_state (MetaOrientationManager *self)
return; return;
self->prev_orientation = self->curr_orientation; self->prev_orientation = self->curr_orientation;
self->effective_orientation = self->curr_orientation;
if (self->curr_orientation == META_ORIENTATION_UNDEFINED) if (self->curr_orientation == META_ORIENTATION_UNDEFINED)
return; return;
@ -293,6 +295,8 @@ meta_orientation_manager_init (MetaOrientationManager *self)
G_CALLBACK (orientation_lock_changed), self, 0); G_CALLBACK (orientation_lock_changed), self, 0);
sync_state (self); sync_state (self);
} }
self->effective_orientation = META_ORIENTATION_UNDEFINED;
} }
static void static void
@ -361,7 +365,7 @@ meta_orientation_manager_class_init (MetaOrientationManagerClass *klass)
MetaOrientation MetaOrientation
meta_orientation_manager_get_orientation (MetaOrientationManager *self) meta_orientation_manager_get_orientation (MetaOrientationManager *self)
{ {
return self->curr_orientation; return self->effective_orientation;
} }
gboolean gboolean