wvkbd

commit efd00ad31bb7b623016eeef7becfd411f183f5bf
parent b65ea995f10e75fa6c499723af68f24bfc0c2334
Author: Stacy Harper <contact@stacyharper.net>
Date:   Wed, 25 Aug 2021 22:08:28 +0200

Remove useless duplication

Diffstat:
M
drw.h
 | 
38
+++++++++++++++++---------------------

1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/drw.h b/drw.h
@@ -4,8 +4,23 @@
 #include <pango/pangocairo.h>
 #include <stdbool.h>
 
-struct drw;
-struct drwsurf;
+struct drw {
+	struct wl_shm *shm;
+	PangoFontDescription *font_description;
+};
+struct drwsurf {
+	uint32_t width, height, scale, size;
+	bool dirty;
+
+	struct drw *ctx;
+	struct wl_surface *surf;
+	struct wl_buffer *buf;
+	struct wl_shm *shm;
+	unsigned char *pool_data;
+
+	cairo_t *cairo;
+	PangoLayout *layout;
+};
 struct kbd;
 
 void drwsurf_resize(struct drwsurf *ds, uint32_t w, uint32_t h, uint32_t s);
@@ -29,23 +44,4 @@ drw_draw_text(struct drwsurf *d, Color color,
 uint32_t
 setup_buffer(struct drwsurf *drwsurf);
 
-struct drw {
-	struct wl_shm *shm;
-	PangoFontDescription *font_description;
-};
-
-struct drwsurf {
-	uint32_t width, height, scale, size;
-	bool dirty;
-
-	struct drw *ctx;
-	struct wl_surface *surf;
-	struct wl_buffer *buf;
-	struct wl_shm *shm;
-	unsigned char *pool_data;
-
-	cairo_t *cairo;
-	PangoLayout *layout;
-};
-
 #endif