From c691b8e48c572e2d5f1c7c16c8f42babd7d706d5 Mon Sep 17 00:00:00 2001 From: Phil Jones Date: Fri, 29 Oct 2021 13:23:44 +0100 Subject: Basic text entry working. --- src/client.h | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) (limited to 'src/client.h') diff --git a/src/client.h b/src/client.h index 4814fdb..934d4d3 100644 --- a/src/client.h +++ b/src/client.h @@ -3,30 +3,9 @@ #include #include -#include "egl.h" -#include "gl.h" - -struct surface { - struct egl egl; - struct gl gl; - struct wl_surface *wl_surface; - int32_t width; - int32_t height; - bool redraw; -}; - -struct image { - uint8_t *buffer; - uint32_t width; - uint32_t height; -}; - -struct color { - float r; - float g; - float b; - float a; -}; +#include "entry.h" +#include "surface.h" +#include "util.h" struct client_state { /* Globals */ @@ -57,11 +36,7 @@ struct client_state { struct xdg_toplevel *xdg_toplevel; struct image background_image; struct color background_color; - struct { - struct surface surface; - struct wl_subsurface *wl_subsurface; - struct image image; - } entry; + struct entry entry; uint32_t scale; } window; -- cgit v1.2.3