aboutsummaryrefslogtreecommitdiffstats
path: root/matchbox2/mb-window-manager.h
diff options
context:
space:
mode:
Diffstat (limited to 'matchbox2/mb-window-manager.h')
-rw-r--r--matchbox2/mb-window-manager.h21
1 files changed, 19 insertions, 2 deletions
diff --git a/matchbox2/mb-window-manager.h b/matchbox2/mb-window-manager.h
index ff22fe5..7f9643f 100644
--- a/matchbox2/mb-window-manager.h
+++ b/matchbox2/mb-window-manager.h
@@ -23,16 +23,30 @@
#include <matchbox2/mb-wm-config.h>
#include <matchbox2/mb-wm-object.h>
+#include <matchbox2/mb-wm-keys.h>
#include <matchbox2/mb-wm-root-window.h>
+#include <matchbox2/mb-wm-theme.h>
+#include <matchbox2/mb-wm-layout.h>
+#include <matchbox2/mb-wm-main-context.h>
+#if ENABLE_COMPOSITE
+#include <matchbox2/mb-wm-comp-mgr.h>
+#endif
#include <matchbox2/xas.h>
-typedef struct MBWindowManagerClass MBWindowManagerClass;
-typedef struct MBWindowManagerPriv MBWindowManagerPriv;
+/* XXX: we have a circular dependency between mb-wm-main-context.h
+ * and mb-window-manager.h */
+#ifndef MB_WM_MAIN_CONTEXT_TYPEDEF_DEFINED
+typedef struct MBWMMainContext MBWMMainContext;
+#define MB_WM_MAIN_CONTEXT_TYPEDEF_DEFINED
+#endif
#define MB_WINDOW_MANAGER(c) ((MBWindowManager*)(c))
#define MB_WINDOW_MANAGER_CLASS(c) ((MBWindowManagerClass*)(c))
#define MB_TYPE_WINDOW_MANAGER (mb_wm_class_type ())
+typedef struct MBWindowManagerClass MBWindowManagerClass;
+typedef struct MBWindowManagerPriv MBWindowManagerPriv;
+
typedef enum MBWindowManagerFlag
{
MBWindowManagerFlagDesktop = (1<<0),
@@ -238,4 +252,7 @@ mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops);
void
mb_wm_select_desktop (MBWindowManager *wm, int desktop);
+int
+mb_wm_util_pixels_to_points (MBWindowManager *wm, int pixels);
+
#endif