mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 09:30:45 -05:00
main: Move MetaCompositorType to a new meta-enums.h
It'll be part of and owned by MetaContext, intending to replace `meta_is_wayland_compositor()`, but place it in a new file for public enums so that it can be used from wherever. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1861>
This commit is contained in:
parent
e17bf88d5e
commit
bf84b2423d
@ -21,14 +21,7 @@
|
||||
#define META_MAIN_PRIVATE_H
|
||||
|
||||
#include "core/util-private.h"
|
||||
|
||||
typedef enum _MetaCompositorType
|
||||
{
|
||||
#ifdef HAVE_WAYLAND
|
||||
META_COMPOSITOR_TYPE_WAYLAND,
|
||||
#endif
|
||||
META_COMPOSITOR_TYPE_X11,
|
||||
} MetaCompositorType;
|
||||
#include "meta/meta-enums.h"
|
||||
|
||||
typedef enum _MetaX11DisplayPolicy
|
||||
{
|
||||
|
@ -83,6 +83,7 @@
|
||||
#include "core/util-private.h"
|
||||
#include "meta/compositor.h"
|
||||
#include "meta/meta-backend.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "meta/meta-x11-errors.h"
|
||||
#include "ui/ui.h"
|
||||
#include "x11/session.h"
|
||||
|
@ -25,6 +25,7 @@
|
||||
|
||||
#include "compositor/meta-plugin-manager.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "meta/util.h"
|
||||
|
||||
static gboolean
|
||||
|
@ -18,6 +18,7 @@ mutter_public_headers = [
|
||||
'meta-cursor-tracker.h',
|
||||
'meta-context.h',
|
||||
'meta-dnd.h',
|
||||
'meta-enums.h',
|
||||
'meta-idle-monitor.h',
|
||||
'meta-inhibit-shortcuts-dialog.h',
|
||||
'meta-launch-context.h',
|
||||
|
30
src/meta/meta-enums.h
Normal file
30
src/meta/meta-enums.h
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* Copyright (C) 2016-2021 Red Hat Inc.
|
||||
*
|
||||
* 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_ENUMS_H
|
||||
#define META_ENUMS_H
|
||||
|
||||
typedef enum _MetaCompositorType
|
||||
{
|
||||
META_COMPOSITOR_TYPE_WAYLAND,
|
||||
META_COMPOSITOR_TYPE_X11,
|
||||
} MetaCompositorType;
|
||||
|
||||
#endif /* META_ENUMS_H */
|
@ -8,6 +8,7 @@
|
||||
#include "backends/x11/nested/meta-backend-x11-nested.h"
|
||||
#include "core/main-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "wayland/meta-wayland.h"
|
||||
#include "wayland/meta-xwayland.h"
|
||||
#include "test-unit-names.h"
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "core/display-private.h"
|
||||
#include "core/main-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "tests/meta-backend-test.h"
|
||||
#include "tests/meta-monitor-manager-test.h"
|
||||
#include "tests/test-utils.h"
|
||||
|
@ -26,6 +26,7 @@
|
||||
#include "core/main-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-backend.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "tests/native-screen-cast.h"
|
||||
#include "tests/native-virtual-monitor.h"
|
||||
#include "tests/test-utils.h"
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include "compositor/meta-plugin-manager.h"
|
||||
#include "core/main-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "tests/meta-ref-test.h"
|
||||
#include "tests/test-utils.h"
|
||||
|
||||
|
@ -22,6 +22,7 @@
|
||||
#include "compositor/meta-plugin-manager.h"
|
||||
#include "core/main-private.h"
|
||||
#include "meta/main.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "tests/meta-backend-test.h"
|
||||
#include "tests/monitor-test-utils.h"
|
||||
#include "tests/test-utils.h"
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include "compositor/meta-plugin-manager.h"
|
||||
#include "core/boxes-private.h"
|
||||
#include "core/main-private.h"
|
||||
#include "meta/meta-enums.h"
|
||||
#include "tests/boxes-tests.h"
|
||||
#include "tests/meta-backend-test.h"
|
||||
#include "tests/monitor-config-migration-unit-tests.h"
|
||||
|
Loading…
Reference in New Issue
Block a user