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

backends: Make MetaBackend available to introspection

Browse Source 
This moves meta-backend.h under meta/ and, for now, just exposes to
introspection the methods that we actually need in gnome-shell.

https://bugzilla.gnome.org/show_bug.cgi?id=734301
This commit is contained in:
Rui Matos 2014-08-05 14:11:59 +02:00
parent 513628e4ad
commit 7d54631ebf
17 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -49,7 +49,7 @@ wayland_protocols = \
libmutter_la_SOURCES = \
backends/meta-backend.c \
backends/meta-backend.h \
meta/meta-backend.h \
backends/meta-backend-private.h \
backends/meta-cursor.c \
backends/meta-cursor.h \
@ -274,6 +274,7 @@ libmutterinclude_headers = \
meta/group.h \
meta/keybindings.h \
meta/main.h \
meta/meta-backend.h \
meta/meta-background-actor.h \
meta/meta-background-group.h \
meta/meta-background.h \

25
src/backends/meta-backend-private.h
View File

@ -28,7 +28,12 @@
#include <glib-object.h>
#include "meta-backend.h"
#include <xkbcommon/xkbcommon.h>
#include <meta/meta-backend.h>
#include <meta/meta-idle-monitor.h>
#include "meta-cursor-renderer.h"
#include "meta-monitor-manager.h"
#define DEFAULT_XKB_RULES_FILE "evdev"
#define DEFAULT_XKB_MODEL "pc105+inet"
@ -81,4 +86,22 @@ struct _MetaBackendClass
guint idx);
};
MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
int device_id);
MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
gboolean meta_backend_grab_device (MetaBackend *backend,
int device_id,
uint32_t timestamp);
gboolean meta_backend_ungrab_device (MetaBackend *backend,
int device_id,
uint32_t timestamp);
void meta_backend_warp_pointer (MetaBackend *backend,
int x,
int y);
struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
#endif /* META_BACKEND_PRIVATE_H */

33
src/backends/meta-backend.c
View File

@ -24,7 +24,7 @@
#include "config.h"
#include "meta-backend.h"
#include <meta/meta-backend.h>
#include "meta-backend-private.h"
#include <clutter/clutter.h>
@ -37,6 +37,13 @@
static MetaBackend *_backend;
/**
* meta_get_backend:
*
* Accessor for the singleton MetaBackend.
*
* Returns: (transfer none): The only #MetaBackend there is.
*/
MetaBackend *
meta_get_backend (void)
{
@ -145,6 +152,9 @@ meta_backend_post_init (MetaBackend *backend)
META_BACKEND_GET_CLASS (backend)->post_init (backend);
}
/**
* meta_backend_get_idle_monitor: (skip)
*/
MetaIdleMonitor *
meta_backend_get_idle_monitor (MetaBackend *backend,
int device_id)
@ -160,6 +170,9 @@ meta_backend_get_idle_monitor (MetaBackend *backend,
return backend->device_monitors[device_id];
}
/**
* meta_backend_get_monitor_manager: (skip)
*/
MetaMonitorManager *
meta_backend_get_monitor_manager (MetaBackend *backend)
{
@ -168,6 +181,9 @@ meta_backend_get_monitor_manager (MetaBackend *backend)
return priv->monitor_manager;
}
/**
* meta_backend_get_cursor_renderer: (skip)
*/
MetaCursorRenderer *
meta_backend_get_cursor_renderer (MetaBackend *backend)
{
@ -176,6 +192,9 @@ meta_backend_get_cursor_renderer (MetaBackend *backend)
return priv->cursor_renderer;
}
/**
* meta_backend_grab_device: (skip)
*/
gboolean
meta_backend_grab_device (MetaBackend *backend,
int device_id,
@ -184,6 +203,9 @@ meta_backend_grab_device (MetaBackend *backend,
return META_BACKEND_GET_CLASS (backend)->grab_device (backend, device_id, timestamp);
}
/**
* meta_backend_ungrab_device: (skip)
*/
gboolean
meta_backend_ungrab_device (MetaBackend *backend,
int device_id,
@ -192,6 +214,9 @@ meta_backend_ungrab_device (MetaBackend *backend,
return META_BACKEND_GET_CLASS (backend)->ungrab_device (backend, device_id, timestamp);
}
/**
* meta_backend_warp_pointer: (skip)
*/
void
meta_backend_warp_pointer (MetaBackend *backend,
int x,
@ -209,6 +234,9 @@ meta_backend_set_keymap (MetaBackend *backend,
META_BACKEND_GET_CLASS (backend)->set_keymap (backend, layouts, variants, options);
}
/**
* meta_backend_get_keymap: (skip)
*/
struct xkb_keymap *
meta_backend_get_keymap (MetaBackend *backend)
@ -295,6 +323,9 @@ static GSourceFuncs event_funcs = {
event_dispatch
};
/**
* meta_clutter_init: (skip)
*/
void
meta_clutter_init (void)
{

2
src/backends/meta-cursor-tracker.c
View File

@ -40,7 +40,7 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include "meta-backend.h"
#include "meta-backend-private.h"
#include "meta-cursor-private.h"
#include "meta-cursor-tracker-private.h"

2
src/backends/meta-cursor.c
View File

@ -27,7 +27,7 @@
#include "display-private.h"
#include "screen-private.h"
#include "meta-backend.h"
#include "meta-backend-private.h"
#ifdef HAVE_NATIVE_BACKEND
#include "backends/native/meta-cursor-renderer-native.h"

2
src/backends/meta-idle-monitor.c
View File

@ -38,7 +38,7 @@
#include <meta/meta-idle-monitor.h>
#include "meta-idle-monitor-private.h"
#include "meta-idle-monitor-dbus.h"
#include "meta-backend.h"
#include "meta-backend-private.h"
G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));

2
src/backends/meta-monitor-manager.c
View File

@ -37,7 +37,7 @@
#include <meta/errors.h>
#include "meta-monitor-config.h"
#include "backends/x11/meta-monitor-manager-xrandr.h"
#include "meta-backend.h"
#include "meta-backend-private.h"
enum {
CONFIRM_DISPLAY_CHANGE,

2
src/backends/native/meta-launcher.c
View File

@ -42,7 +42,7 @@
#include "meta-dbus-login1.h"
#include "wayland/meta-wayland-private.h"
#include "backends/meta-backend.h"
#include "backends/meta-backend-private.h"
#include "meta-cursor-renderer-native.h"
struct _MetaLauncher

2
src/compositor/compositor.c
View File

@ -67,6 +67,7 @@
#include <meta/compositor-mutter.h>
#include <meta/prefs.h>
#include <meta/main.h>
#include <meta/meta-backend.h>
#include <meta/meta-background-actor.h>
#include <meta/meta-background-group.h>
#include <meta/meta-shadow-factory.h>
@ -80,7 +81,6 @@
#include <X11/extensions/shape.h>
#include <X11/extensions/Xcomposite.h>
#include "backends/meta-backend.h"
#include "backends/x11/meta-backend-x11.h"
#include "wayland/meta-wayland-private.h"

2
src/compositor/meta-stage.c
View File

@ -25,7 +25,7 @@
#include "meta-stage.h"
#include "meta-cursor-private.h"
#include "meta-backend.h"
#include <meta/meta-backend.h>
#include <meta/util.h>
struct _MetaStagePrivate {

2
src/core/display.c
View File

@ -49,7 +49,7 @@
#include "mutter-enum-types.h"
#include "meta-idle-monitor-dbus.h"
#include "meta-cursor-tracker-private.h"
#include "meta-backend.h"
#include <meta/meta-backend.h>
#include "backends/x11/meta-backend-x11.h"
#include <clutter/x11/clutter-x11.h>

3
src/core/events.c
View File

@ -23,9 +23,10 @@
#include "config.h"
#include "events.h"
#include <meta/meta-backend.h>
#include "display-private.h"
#include "window-private.h"
#include "backends/meta-backend.h"
#include "backends/x11/meta-backend-x11.h"
#ifdef HAVE_NATIVE_BACKEND

2
src/core/main.c
View File

@ -52,6 +52,7 @@
#include "ui.h"
#include <meta/prefs.h>
#include <meta/compositor.h>
#include <meta/meta-backend.h>
#include <glib-object.h>
#include <glib-unix.h>
@ -78,7 +79,6 @@
#include "x11/session.h"
#include "wayland/meta-wayland.h"
#include "backends/meta-backend.h"
/*
* The exit code we'll return to our parent process when we eventually die.

2
src/core/window.c
View File

@ -58,7 +58,7 @@
#include "wayland/window-wayland.h"
#include "wayland/meta-wayland-private.h"
#include "backends/meta-backend.h"
#include "backends/meta-backend-private.h"
/* Windows that unmaximize to a size bigger than that fraction of the workarea
* will be scaled down to that size (while maintaining aspect ratio).

24
src/backends/meta-backend.h → src/meta/meta-backend.h
View File

@ -27,12 +27,6 @@
#include <glib-object.h>
#include <xkbcommon/xkbcommon.h>
#include <meta/meta-idle-monitor.h>
#include "meta-monitor-manager.h"
#include "meta-cursor-renderer.h"
typedef struct _MetaBackend MetaBackend;
typedef struct _MetaBackendClass MetaBackendClass;
@ -40,29 +34,11 @@ GType meta_backend_get_type (void);
MetaBackend * meta_get_backend (void);
MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
int device_id);
MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
gboolean meta_backend_grab_device (MetaBackend *backend,
int device_id,
uint32_t timestamp);
gboolean meta_backend_ungrab_device (MetaBackend *backend,
int device_id,
uint32_t timestamp);
void meta_backend_warp_pointer (MetaBackend *backend,
int x,
int y);
void meta_backend_set_keymap (MetaBackend *backend,
const char *layouts,
const char *variants,
const char *options);
struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
void meta_backend_lock_layout_group (MetaBackend *backend,
guint idx);

3
src/wayland/meta-wayland-keyboard.c
View File

@ -57,7 +57,8 @@
#include <unistd.h>
#include <sys/mman.h>
#include "backends/meta-backend.h"
#include "backends/meta-backend-private.h"
#include "meta-wayland-private.h"
static void meta_wayland_keyboard_update_xkb_state (MetaWaylandKeyboard *keyboard);

2
src/wayland/meta-wayland.c
View File

@ -37,7 +37,7 @@
#include <wayland-server.h>
#include "backends/meta-backend.h"
#include <meta/meta-backend.h>
#include "meta-wayland-private.h"
#include "meta-xwayland-private.h"