[mutter] window: Move constructors to the respective header files
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] window: Move constructors to the respective header files
- Date: Tue, 20 May 2014 20:04:26 +0000 (UTC)
commit 5b7dff7a57c1248528552aeb8833ec3e4e2bb85c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue May 20 09:18:45 2014 -0400
window: Move constructors to the respective header files
src/core/screen.c | 1 +
src/core/window-private.h | 7 -------
src/wayland/window-wayland.h | 4 ++++
src/x11/window-x11.h | 6 ++++++
4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/src/core/screen.c b/src/core/screen.c
index bdd16d4..96a1343 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -52,6 +52,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include "x11/window-x11.h"
#include "x11/xprops.h"
static char* get_screen_name (MetaDisplay *display,
diff --git a/src/core/window-private.h b/src/core/window-private.h
index f0bcc4d..4a9f8ff 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -524,13 +524,6 @@ MetaWindow * _meta_window_shared_new (MetaDisplay *display,
MetaCompEffect effect,
XWindowAttributes *attrs);
-MetaWindow * meta_window_x11_new (MetaDisplay *display,
- Window xwindow,
- gboolean must_be_viewable,
- MetaCompEffect effect);
-MetaWindow * meta_window_wayland_new (MetaDisplay *display,
- MetaWaylandSurface *surface);
-
void meta_window_unmanage (MetaWindow *window,
guint32 timestamp);
void meta_window_calc_showing (MetaWindow *window);
diff --git a/src/wayland/window-wayland.h b/src/wayland/window-wayland.h
index 361035f..1eb9200 100644
--- a/src/wayland/window-wayland.h
+++ b/src/wayland/window-wayland.h
@@ -26,6 +26,7 @@
#define META_WINDOW_WAYLAND_H
#include <meta/window.h>
+#include "wayland/meta-wayland-types.h"
G_BEGIN_DECLS
@@ -41,6 +42,9 @@ GType meta_window_wayland_get_type (void);
typedef struct _MetaWindowWayland MetaWindowWayland;
typedef struct _MetaWindowWaylandClass MetaWindowWaylandClass;
+MetaWindow * meta_window_wayland_new (MetaDisplay *display,
+ MetaWaylandSurface *surface);
+
void meta_window_wayland_move_resize (MetaWindow *window,
int width,
int height,
diff --git a/src/x11/window-x11.h b/src/x11/window-x11.h
index 8bda6c7..fc15ff7 100644
--- a/src/x11/window-x11.h
+++ b/src/x11/window-x11.h
@@ -24,6 +24,7 @@
#define META_WINDOW_X11_H
#include <meta/window.h>
+#include <meta/compositor.h>
#include <X11/Xlib.h>
G_BEGIN_DECLS
@@ -40,6 +41,11 @@ GType meta_window_x11_get_type (void);
typedef struct _MetaWindowX11 MetaWindowX11;
typedef struct _MetaWindowX11Class MetaWindowX11Class;
+MetaWindow * meta_window_x11_new (MetaDisplay *display,
+ Window xwindow,
+ gboolean must_be_viewable,
+ MetaCompEffect effect);
+
void meta_window_x11_set_net_wm_state (MetaWindow *window);
void meta_window_x11_set_wm_state (MetaWindow *window);
void meta_window_x11_set_allowed_actions_hint (MetaWindow *window);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]