introduce screen "view" area and "work" area (gap applied) to simplify

various blocks that require understanding the screen geometry.

1 files changed, 10 insertions, 1 deletions

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 3383663c2..1bc20d222 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: calmwm.h,v 1.149 2012/07/06 14:18:00 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.150 2012/07/13 14:18:04 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -96,6 +96,13 @@ struct color {
 	unsigned long	 pixel;
 };
 
+struct geom {
+	int		 x;
+	int		 y;
+	int		 w;
+	int		 h;
+};
+
 struct gap {
 	int		 top;
 	int		 bottom;
@@ -206,6 +213,8 @@ struct screen_ctx {
 	int			 cycling;
 	int			 xmax;
 	int			 ymax;
+	struct geom		 view; /* viewable area */
+	struct geom		 work; /* workable area, gap-applied */
 	struct gap		 gap;
 	struct cycle_entry_q	 mruq;
 	XftColor		 xftcolor;