X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=engines%2Fengineinterface.h;h=080e301e2f64f0a95794ea74430332814f826010;hb=8a4e27bdc362e3781ac947ff5536c1f0dbd3ba60;hp=2a364e22558e1609e68edd9716bf1279297a2377;hpb=432ac0983e058133e03885171f266dc4ba07f488;p=chaz%2Fopenbox

diff --git a/engines/engineinterface.h b/engines/engineinterface.h
index 2a364e22..080e301e 100644
--- a/engines/engineinterface.h
+++ b/engines/engineinterface.h
@@ -1,7 +1,9 @@
 #ifndef __engineinterface_h
 #define __engineinterface_h
 
-#include "../kernel/frame.h"
+#include "kernel/frame.h"
+#include "kernel/geom.h"
+#include <X11/Xlib.h>
 #include <glib.h>
 
 /* startup */
@@ -18,12 +20,10 @@ typedef void EngineFrameGrabClient(Frame *self, Client *client);
 /* frame_release_client */
 typedef void EngineFrameReleaseClient(Frame *self, Client *client);
 
-/* frame_adjust_size */
-/*! Update the frame's size to match the client */
-typedef void EngineFrameAdjustSize(Frame *self);
-/* frame_adjust_position */
-/*! Update the frame's position to match the client */
-typedef void EngineFrameAdjustPosition(Frame *self);
+/* frame_adjust_area */
+/*! Update the frame's size/position to match the client */
+typedef void EngineFrameAdjustArea(Frame *self, gboolean moved,
+                                   gboolean resized);
 /* frame_adjust_shape */
 /*! Shape the frame window to the client window */
 typedef void EngineFrameAdjustShape(Frame *self);
@@ -48,15 +48,12 @@ typedef void EngineFrameShow(Frame *self);
 typedef void EngineFrameHide(Frame *self);
 
 /* get_context */
-typedef GQuark EngineGetContext(Client *client, Window win);
-
-/* frame_mouse_enter */
-typedef void EngineMouseEnter(Frame *self, Window win);
-/* frame_mouse_leave */
-typedef void EngineMouseLeave(Frame *self, Window win);
-/* frame_mouse_press */
-typedef void EngineMousePress(Frame *self, Window win, int x, int y);
-/* frame_mouse_release */
-typedef void EngineMouseRelease(Frame *self, Window win, int x, int y);
+typedef Context EngineGetContext(Client *client, Window win);
+
+typedef void EngineRenderLabel(Window win, Rect *area, char *text,
+                               gboolean hilight, gboolean toplevel);
+
+typedef void EngineSizeLabel(char *text, gboolean hilight, gboolean toplevel,
+                             Size *s);
 
 #endif