isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-02 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

kms/connector: Simplify privacy screen tracking

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3552>
This commit is contained in:
Sebastian Wick 2024-01-29 16:52:13 +01:00 committed by Marge Bot
parent 3e14edb00c
commit 420c8cb37f
2 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/backends/native/meta-kms-connector.c
View File

@ -181,13 +181,6 @@ meta_kms_connector_get_current_state (MetaKmsConnector *connector)
return connector->current_state; return connector->current_state;
} }
gboolean
meta_kms_connector_is_privacy_screen_supported (MetaKmsConnector *connector)
{
return meta_kms_connector_get_prop_id (connector,
META_KMS_CONNECTOR_PROP_PRIVACY_SCREEN_HW_STATE) != 0;
}
static gboolean static gboolean
has_privacy_screen_software_toggle (MetaKmsConnector *connector) has_privacy_screen_software_toggle (MetaKmsConnector *connector)
{ {
@ -270,39 +263,23 @@ set_panel_orientation (MetaKmsConnectorState *state,
state->panel_orientation_transform = transform; state->panel_orientation_transform = transform;
} }
static void static MetaPrivacyScreenState
set_privacy_screen (MetaKmsConnectorState *state, privacy_screen_state_hw (MetaKmsConnectorPrivacyScreen privacy_screen)
MetaKmsConnector *connector,
MetaKmsProp *hw_state)
{ {
MetaKmsConnectorPrivacyScreen privacy_screen = hw_state->value;
if (!meta_kms_connector_is_privacy_screen_supported (connector))
return;
switch (privacy_screen) switch (privacy_screen)
{ {
case META_KMS_PRIVACY_SCREEN_HW_STATE_DISABLED: case META_KMS_PRIVACY_SCREEN_HW_STATE_DISABLED:
state->privacy_screen_state = META_PRIVACY_SCREEN_DISABLED; return META_PRIVACY_SCREEN_DISABLED;
break;
case META_KMS_PRIVACY_SCREEN_HW_STATE_DISABLED_LOCKED: case META_KMS_PRIVACY_SCREEN_HW_STATE_DISABLED_LOCKED:
state->privacy_screen_state = META_PRIVACY_SCREEN_DISABLED; return META_PRIVACY_SCREEN_DISABLED | META_PRIVACY_SCREEN_LOCKED;
state->privacy_screen_state |= META_PRIVACY_SCREEN_LOCKED;
break;
case META_KMS_PRIVACY_SCREEN_HW_STATE_ENABLED: case META_KMS_PRIVACY_SCREEN_HW_STATE_ENABLED:
state->privacy_screen_state = META_PRIVACY_SCREEN_ENABLED; return META_PRIVACY_SCREEN_ENABLED;
break;
case META_KMS_PRIVACY_SCREEN_HW_STATE_ENABLED_LOCKED: case META_KMS_PRIVACY_SCREEN_HW_STATE_ENABLED_LOCKED:
state->privacy_screen_state = META_PRIVACY_SCREEN_ENABLED; return META_PRIVACY_SCREEN_ENABLED | META_PRIVACY_SCREEN_LOCKED;
state->privacy_screen_state |= META_PRIVACY_SCREEN_LOCKED;
break;
default: default:
state->privacy_screen_state = META_PRIVACY_SCREEN_DISABLED;
g_warning ("Unknown privacy screen state: %u", privacy_screen); g_warning ("Unknown privacy screen state: %u", privacy_screen);
return META_PRIVACY_SCREEN_DISABLED;
} }
if (!has_privacy_screen_software_toggle (connector))
state->privacy_screen_state |= META_PRIVACY_SCREEN_LOCKED;
} }
static MetaOutputColorspace static MetaOutputColorspace
@ -428,7 +405,12 @@ state_set_properties (MetaKmsConnectorState *state,
prop = &props[META_KMS_CONNECTOR_PROP_PRIVACY_SCREEN_HW_STATE]; prop = &props[META_KMS_CONNECTOR_PROP_PRIVACY_SCREEN_HW_STATE];
if (prop->prop_id) if (prop->prop_id)
set_privacy_screen (state, connector, prop); {
state->privacy_screen_state = privacy_screen_state_hw (prop->value);
if (!has_privacy_screen_software_toggle (connector))
state->privacy_screen_state |= META_PRIVACY_SCREEN_LOCKED;
}
prop = &props[META_KMS_CONNECTOR_PROP_MAX_BPC]; prop = &props[META_KMS_CONNECTOR_PROP_MAX_BPC];
if (prop->prop_id) if (prop->prop_id)

2
src/backends/native/meta-kms-connector.h
View File

@ -103,8 +103,6 @@ MetaKmsMode * meta_kms_connector_get_preferred_mode (MetaKmsConnector *connector
META_EXPORT_TEST META_EXPORT_TEST
const MetaKmsConnectorState * meta_kms_connector_get_current_state (MetaKmsConnector *connector); const MetaKmsConnectorState * meta_kms_connector_get_current_state (MetaKmsConnector *connector);
gboolean meta_kms_connector_is_privacy_screen_supported (MetaKmsConnector *connector);
gboolean meta_kms_connector_is_color_space_supported (MetaKmsConnector *connector, gboolean meta_kms_connector_is_color_space_supported (MetaKmsConnector *connector,
MetaOutputColorspace color_space); MetaOutputColorspace color_space);