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

Rename MetaDisplayPolicy to MetaX11DisplayPolicy

Browse Source 
This lack of X11 in the name was a bit confusing, since this is about
the X11 policy, not some policy of MetaDisplay.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1833>
This commit is contained in:
Jonas Ådahl
2021-02-25 16:19:51 +01:00
committed by Marge Bot
parent f677e0cbfb
commit 6c1793b7d3
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/display.c
View File

@@ -890,7 +890,7 @@ meta_display_open (void)
#ifdef HAVE_WAYLAND
if (meta_is_wayland_compositor ())
{
if (meta_get_x11_display_policy () == META_DISPLAY_POLICY_MANDATORY)
if (meta_get_x11_display_policy () == META_X11_DISPLAY_POLICY_MANDATORY)
{
meta_display_init_x11 (display, NULL,
(GAsyncReadyCallback) on_x11_initialized,

14
src/core/main-private.h
View File

@@ -30,12 +30,12 @@ typedef enum _MetaCompositorType
META_COMPOSITOR_TYPE_X11,
} MetaCompositorType;
typedef enum _MetaDisplayPolicy
typedef enum _MetaX11DisplayPolicy
{
META_DISPLAY_POLICY_MANDATORY,
META_DISPLAY_POLICY_ON_DEMAND,
META_DISPLAY_POLICY_DISABLED,
} MetaDisplayPolicy;
META_X11_DISPLAY_POLICY_MANDATORY,
META_X11_DISPLAY_POLICY_ON_DEMAND,
META_X11_DISPLAY_POLICY_DISABLED,
} MetaX11DisplayPolicy;
#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \
@@ -52,9 +52,9 @@ void meta_override_compositor_configuration (MetaCompositorType compositor_type,
...);
META_EXPORT_TEST
MetaDisplayPolicy meta_get_x11_display_policy (void);
MetaX11DisplayPolicy meta_get_x11_display_policy (void);
META_EXPORT_TEST
void meta_override_x11_display_policy (MetaDisplayPolicy x11_display_policy);
void meta_override_x11_display_policy (MetaX11DisplayPolicy x11_display_policy);
#endif /* META_MAIN_PRIVATE_H */

16
src/core/main.c
View File

@@ -906,21 +906,21 @@ meta_get_exit_code (void)
return meta_exit_code;
}
static MetaDisplayPolicy x11_display_policy_override = -1;
static MetaX11DisplayPolicy x11_display_policy_override = -1;
void
meta_override_x11_display_policy (MetaDisplayPolicy x11_display_policy)
meta_override_x11_display_policy (MetaX11DisplayPolicy x11_display_policy)
{
x11_display_policy_override = x11_display_policy;
}
MetaDisplayPolicy
MetaX11DisplayPolicy
meta_get_x11_display_policy (void)
{
MetaBackend *backend = meta_get_backend ();
if (META_IS_BACKEND_X11_CM (backend))
return META_DISPLAY_POLICY_MANDATORY;
return META_X11_DISPLAY_POLICY_MANDATORY;
if (x11_display_policy_override != -1)
return x11_display_policy_override;
@@ -933,18 +933,18 @@ meta_get_x11_display_policy (void)
#endif
if (opt_no_x11)
return META_DISPLAY_POLICY_DISABLED;
return META_X11_DISPLAY_POLICY_DISABLED;
#ifdef HAVE_XWAYLAND_INITFD
if (sd_pid_get_user_unit (0, &unit) < 0)
return META_DISPLAY_POLICY_MANDATORY;
return META_X11_DISPLAY_POLICY_MANDATORY;
else
return META_DISPLAY_POLICY_ON_DEMAND;
return META_X11_DISPLAY_POLICY_ON_DEMAND;
#endif
}
#endif
return META_DISPLAY_POLICY_MANDATORY;
return META_X11_DISPLAY_POLICY_MANDATORY;
}
void