From fc76100fd5804092b769e373056b7d3dba6c3fd0 Mon Sep 17 00:00:00 2001
From: Johan Malm <jgm323@gmail.com>
Date: Sun, 21 Mar 2021 20:54:55 +0000
Subject: [PATCH] Add ssd.h

---
 include/labwc.h | 18 ------------------
 include/ssd.h   | 24 ++++++++++++++++++++++++
 src/cursor.c    |  1 +
 src/desktop.c   |  1 +
 src/output.c    |  1 +
 src/ssd.c       |  7 +++++--
 src/view.c      |  1 +
 src/xdg.c       |  1 +
 src/xwayland.c  |  1 +
 9 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 include/ssd.h

diff --git a/include/labwc.h b/include/labwc.h
index 82106602..eb6e0c4e 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -145,19 +145,6 @@ enum view_type {
 #endif
 };
 
-enum ssd_part {
-	LAB_SSD_NONE = 0,
-	LAB_SSD_BUTTON_CLOSE,
-	LAB_SSD_BUTTON_MAXIMIZE,
-	LAB_SSD_BUTTON_ICONIFY,
-	LAB_SSD_PART_TITLE,
-	LAB_SSD_PART_TOP,
-	LAB_SSD_PART_RIGHT,
-	LAB_SSD_PART_BOTTOM,
-	LAB_SSD_PART_LEFT,
-	LAB_SSD_END_MARKER
-};
-
 struct view_impl {
 	void (*configure)(struct view *view, struct wlr_box geo);
 	void (*close)(struct view *view);
@@ -345,11 +332,6 @@ void server_init(struct server *server);
 void server_start(struct server *server);
 void server_finish(struct server *server);
 
-struct border ssd_thickness(struct view *view);
-struct wlr_box ssd_max_extents(struct view *view);
-struct wlr_box ssd_box(struct view *view, enum ssd_part ssd_part);
-enum ssd_part ssd_at(struct view *view, double lx, double ly);
-
 void action(struct server *server, const char *action, const char *command);
 
 void dbg_show_one_view(struct view *view);
diff --git a/include/ssd.h b/include/ssd.h
new file mode 100644
index 00000000..76544cf3
--- /dev/null
+++ b/include/ssd.h
@@ -0,0 +1,24 @@
+#ifndef __LABWC_SSD_H
+#define __LABWC_SSD_H
+
+enum ssd_part {
+	LAB_SSD_NONE = 0,
+	LAB_SSD_BUTTON_CLOSE,
+	LAB_SSD_BUTTON_MAXIMIZE,
+	LAB_SSD_BUTTON_ICONIFY,
+	LAB_SSD_PART_TITLE,
+	LAB_SSD_PART_TOP,
+	LAB_SSD_PART_RIGHT,
+	LAB_SSD_PART_BOTTOM,
+	LAB_SSD_PART_LEFT,
+	LAB_SSD_END_MARKER
+};
+
+struct view;
+
+struct border ssd_thickness(struct view *view);
+struct wlr_box ssd_max_extents(struct view *view);
+struct wlr_box ssd_box(struct view *view, enum ssd_part ssd_part);
+enum ssd_part ssd_at(struct view *view, double lx, double ly);
+
+#endif /* __LABWC_SSD_H */
diff --git a/src/cursor.c b/src/cursor.c
index 217b5215..80928e79 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include "labwc.h"
 #include "menu/menu.h"
+#include "ssd.h"
 
 #define RESIZE_BORDER_WIDTH 2
 
diff --git a/src/desktop.c b/src/desktop.c
index 58a62543..bb1a8c89 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -1,6 +1,7 @@
 #include "config.h"
 #include <assert.h>
 #include "labwc.h"
+#include "ssd.h"
 
 static void
 move_to_front(struct view *view)
diff --git a/src/output.c b/src/output.c
index 4fcd7d96..b9377fb9 100644
--- a/src/output.c
+++ b/src/output.c
@@ -13,6 +13,7 @@
 #include "labwc.h"
 #include "layers.h"
 #include "menu/menu.h"
+#include "ssd.h"
 #include "theme.h"
 
 //#define DEBUG 1
diff --git a/src/ssd.c b/src/ssd.c
index 35bbfb05..0d89cebe 100644
--- a/src/ssd.c
+++ b/src/ssd.c
@@ -1,12 +1,13 @@
 /*
- * Helpers for handling window decorations
+ * Helpers for view server side decorations
  *
- * Copyright Johan Malm 2020
+ * Copyright (C) 2020 Johan Malm
  */
 
 #include <assert.h>
 #include "config/rcxml.h"
 #include "labwc.h"
+#include "ssd.h"
 
 #define BORDER_WIDTH (2)
 
@@ -107,3 +108,5 @@ ssd_at(struct view *view, double lx, double ly)
 	}
 	return LAB_SSD_NONE;
 }
+
+
diff --git a/src/view.c b/src/view.c
index 68946301..810dd65c 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include "labwc.h"
+#include "ssd.h"
 
 void
 view_move_resize(struct view *view, struct wlr_box geo)
diff --git a/src/xdg.c b/src/xdg.c
index d80c269d..2ac771cd 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include "labwc.h"
+#include "ssd.h"
 
 /*
  * xdg_popup_create() and subsurface_create() are only called for the
diff --git a/src/xwayland.c b/src/xwayland.c
index c8187f5a..1a8b4061 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include "labwc.h"
+#include "ssd.h"
 
 static void
 handle_commit(struct wl_listener *listener, void *data)
-- 
2.52.0