1 files changed, 5 insertions, 52 deletions

diff --git a/matchbox2/mb-wm-types.h b/matchbox2/mb-wm-types.h
index 4b73603..26272db 100644
--- a/matchbox2/mb-wm-types.h
+++ b/matchbox2/mb-wm-types.h
@@ -29,6 +29,11 @@
 
 #include <X11/Xlib.h>
 
+/* XXX: The plan is to eventually move this into mb-wm-window-manager.h
+ * the way we expose private struct members currently ends up resulting
+ * in *lots* of circular typedef dependencies! */
+typedef struct MBWindowManager        MBWindowManager;
+
 typedef struct MBWMFuncInfo
 {
   void *func;
@@ -83,35 +88,6 @@ typedef struct MBWMRgbaIcon
   unsigned long *pixels;
 } MBWMRgbaIcon;
 
-typedef struct MBWindowManager             MBWindowManager;
-typedef struct MBWindowManagerClientClass  MBWindowManagerClientClass;
-typedef struct MBWindowManagerClientPriv   MBWindowManagerClientPriv;
-typedef struct MBWMClientWindow            MBWMClientWindow;
-typedef struct MBWMClientWindowClass       MBWMClientWindowClass;
-typedef struct MBWMTheme                   MBWMTheme;
-typedef struct MBWMThemeClass              MBWMThemeClass;
-typedef struct MBWMThemePng                MBWMThemePng;
-typedef struct MBWMThemePngClass           MBWMThemePngClass;
-typedef enum   MBWMThemeCaps               MBWMThemeCaps;
-typedef struct MBWMDecor                   MBWMDecor;
-typedef struct MBWMDecorClass              MBWMDecorClass;
-typedef struct MBWMDecorButton             MBWMDecorButton;
-typedef struct MBWMDecorButtonClass        MBWMDecorButtonClass;
-typedef struct MBWMLayout                  MBWMLayout;
-typedef struct MBWMLayoutClass             MBWMLayoutClass;
-typedef struct MBWMMainContext             MBWMMainContext;
-typedef struct MBWMMainContextClass        MBWMMainContextClass;
-typedef struct MBWMCompMgr                 MBWMCompMgr;
-typedef struct MBWMCompMgrClass            MBWMCompMgrClass;
-typedef struct MBWMCompMgrDefault          MBWMCompMgrDefault;
-typedef struct MBWMCompMgrDefaultPrivate   MBWMCompMgrDefaultPrivate;
-typedef struct MBWMCompMgrDefaultClass     MBWMCompMgrDefaultClass;
-typedef struct MBWMCompMgrClient           MBWMCompMgrClient;
-typedef struct MBWMCompMgrClientClass      MBWMCompMgrClientClass;
-typedef struct MBWMCompMgrDefaultClient    MBWMCompMgrDefaultClient;
-typedef struct MBWMCompMgrDefaultClientClass MBWMCompMgrDefaultClientClass;
-typedef struct MBWMCompMgrDefaultClentPrivate MBWMCompMgrDefaultClientPrivate;
-
 typedef enum MBWMClientType
 {
   MBWMClientTypeApp      = (1 << 0),
@@ -274,29 +250,6 @@ typedef enum MBWMAtom
 
 } MBWMAtom;
 
-/* Keys */
-
-typedef struct MBWMKeyBinding MBWMKeyBinding;
-typedef struct MBWMKeys       MBWMKeys;
-
-typedef void (*MBWMKeyPressedFunc) (MBWindowManager   *wm,
-				    MBWMKeyBinding    *binding,
-				    void              *userdata);
-
-typedef void (*MBWMKeyDestroyFunc) (MBWindowManager   *wm,
-				    MBWMKeyBinding    *binding,
-				    void              *userdata);
-
-struct MBWMKeyBinding
-{
-  KeySym                   keysym;
-  int                      modifier_mask;
-  MBWMKeyPressedFunc       pressed;
-  MBWMKeyDestroyFunc       destroy;
-  void                    *userdata;
-  /* FIXME: free func */
-};
-
 /* Event Callbacks */
 
 typedef Bool (*MBWMXEventFunc)