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

backend/x11: Make nested and cm subclasses final

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4018>
This commit is contained in:
Sebastian Wick 2024-09-10 18:25:11 +02:00
parent e47379faad
commit 7a4a2ebd36
4 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/x11/cm/meta-backend-x11-cm.c
View File

@ -63,7 +63,9 @@ struct _MetaBackendX11Cm
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
}; };
G_DEFINE_TYPE (MetaBackendX11Cm, meta_backend_x11_cm, META_TYPE_BACKEND_X11) G_DEFINE_FINAL_TYPE (MetaBackendX11Cm,
meta_backend_x11_cm,
META_TYPE_BACKEND_X11)
static void static void
apply_keymap (MetaBackendX11 *x11); apply_keymap (MetaBackendX11 *x11);

6
src/backends/x11/cm/meta-backend-x11-cm.h
View File

@ -22,5 +22,7 @@
#include "backends/x11/meta-backend-x11.h" #include "backends/x11/meta-backend-x11.h"
#define META_TYPE_BACKEND_X11_CM (meta_backend_x11_cm_get_type ()) #define META_TYPE_BACKEND_X11_CM (meta_backend_x11_cm_get_type ())
G_DECLARE_FINAL_TYPE (MetaBackendX11Cm, meta_backend_x11_cm, G_DECLARE_FINAL_TYPE (MetaBackendX11Cm,
META, BACKEND_X11_CM, MetaBackendX11) meta_backend_x11_cm,
META, BACKEND_X11_CM,
MetaBackendX11)

46
src/backends/x11/nested/meta-backend-x11-nested.c
View File

@ -29,16 +29,18 @@
#include "wayland/meta-wayland.h" #include "wayland/meta-wayland.h"
#endif #endif
typedef struct _MetaBackendX11NestedPrivate struct _MetaBackendX11Nested
{ {
MetaBackendX11 parent;
MetaGpu *gpu; MetaGpu *gpu;
MetaCursorRenderer *cursor_renderer; MetaCursorRenderer *cursor_renderer;
MetaInputSettings *input_settings; MetaInputSettings *input_settings;
} MetaBackendX11NestedPrivate; };
G_DEFINE_TYPE_WITH_PRIVATE (MetaBackendX11Nested, G_DEFINE_FINAL_TYPE (MetaBackendX11Nested,
meta_backend_x11_nested, meta_backend_x11_nested,
META_TYPE_BACKEND_X11) META_TYPE_BACKEND_X11)
static MetaRenderer * static MetaRenderer *
meta_backend_x11_nested_create_renderer (MetaBackend *backend, meta_backend_x11_nested_create_renderer (MetaBackend *backend,
@ -63,37 +65,33 @@ meta_backend_x11_nested_get_cursor_renderer (MetaBackend *backend,
ClutterInputDevice *device) ClutterInputDevice *device)
{ {
MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend); MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend);
MetaBackendX11NestedPrivate *priv =
meta_backend_x11_nested_get_instance_private (backend_x11_nested);
if (!priv->cursor_renderer) if (!backend_x11_nested->cursor_renderer)
{ {
priv->cursor_renderer = backend_x11_nested->cursor_renderer =
g_object_new (META_TYPE_CURSOR_RENDERER_X11_NESTED, g_object_new (META_TYPE_CURSOR_RENDERER_X11_NESTED,
"backend", backend, "backend", backend,
"device", device, "device", device,
NULL); NULL);
} }
return priv->cursor_renderer; return backend_x11_nested->cursor_renderer;
} }
static MetaInputSettings * static MetaInputSettings *
meta_backend_x11_nested_get_input_settings (MetaBackend *backend) meta_backend_x11_nested_get_input_settings (MetaBackend *backend)
{ {
MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend); MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (backend);
MetaBackendX11NestedPrivate *priv =
meta_backend_x11_nested_get_instance_private (backend_x11_nested);
if (!priv->input_settings) if (!backend_x11_nested->input_settings)
{ {
priv->input_settings = backend_x11_nested->input_settings =
g_object_new (META_TYPE_INPUT_SETTINGS_DUMMY, g_object_new (META_TYPE_INPUT_SETTINGS_DUMMY,
"backend", backend, "backend", backend,
NULL); NULL);
} }
return priv->input_settings; return backend_x11_nested->input_settings;
} }
static void static void
@ -232,13 +230,11 @@ meta_backend_x11_nested_translate_device_event (MetaBackendX11 *x11,
static void static void
init_gpus (MetaBackendX11Nested *backend_x11_nested) init_gpus (MetaBackendX11Nested *backend_x11_nested)
{ {
MetaBackendX11NestedPrivate *priv = backend_x11_nested->gpu = g_object_new (META_TYPE_GPU_DUMMY,
meta_backend_x11_nested_get_instance_private (backend_x11_nested); "backend", backend_x11_nested,
NULL);
priv->gpu = g_object_new (META_TYPE_GPU_DUMMY, meta_backend_add_gpu (META_BACKEND (backend_x11_nested),
"backend", backend_x11_nested, backend_x11_nested->gpu);
NULL);
meta_backend_add_gpu (META_BACKEND (backend_x11_nested), priv->gpu);
} }
static MetaBackendCapabilities static MetaBackendCapabilities
@ -267,11 +263,9 @@ static void
meta_backend_x11_nested_dispose (GObject *object) meta_backend_x11_nested_dispose (GObject *object)
{ {
MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (object); MetaBackendX11Nested *backend_x11_nested = META_BACKEND_X11_NESTED (object);
MetaBackendX11NestedPrivate *priv =
meta_backend_x11_nested_get_instance_private (backend_x11_nested);
g_clear_object (&priv->input_settings); g_clear_object (&backend_x11_nested->input_settings);
g_clear_object (&priv->cursor_renderer); g_clear_object (&backend_x11_nested->cursor_renderer);
G_OBJECT_CLASS (meta_backend_x11_nested_parent_class)->dispose (object); G_OBJECT_CLASS (meta_backend_x11_nested_parent_class)->dispose (object);
} }

14
src/backends/x11/nested/meta-backend-x11-nested.h
View File

@ -23,13 +23,7 @@
#include "core/util-private.h" #include "core/util-private.h"
#define META_TYPE_BACKEND_X11_NESTED (meta_backend_x11_nested_get_type ()) #define META_TYPE_BACKEND_X11_NESTED (meta_backend_x11_nested_get_type ())
META_EXPORT_TEST G_DECLARE_FINAL_TYPE (MetaBackendX11Nested,
G_DECLARE_DERIVABLE_TYPE (MetaBackendX11Nested, meta_backend_x11_nested, meta_backend_x11_nested,
META, BACKEND_X11_NESTED, MetaBackendX11) META, BACKEND_X11_NESTED,
MetaBackendX11)
struct _MetaBackendX11NestedClass
{
MetaBackendX11Class parent_class;
void (* init_gpus) (MetaBackendX11Nested *backend_x11_nested);
};