Merge branch 'master' into chaz

[chaz/openbox] / openbox / frame.h

diff --git a/openbox/frame.h b/openbox/frame.h
index b0d996906bd47e908ca1001519745ad11c738822..915c08db73ffabf79f46f14ba08030b15b660296 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -53,6 +53,7 @@ typedef enum {
     /*! This is a special context, which occurs while dragging a window in
       a move/resize */
     OB_FRAME_CONTEXT_MOVE_RESIZE,
+    OB_FRAME_CONTEXT_DOCK,
     OB_FRAME_NUM_CONTEXTS
 } ObFrameContext;
 
@@ -84,7 +85,8 @@ struct _ObFrame
 
     Window    window;
 
-    Strut     size;
+    Strut     size;    /* the size of the frame */
+    Strut     oldsize; /* the size of the frame last told to the client */
     Rect      area;
     gboolean  visible;