diff --git a/include/Mw/LowLevel/Wayland.h b/include/Mw/LowLevel/Wayland.h index 9c60693..efb0279 100644 --- a/include/Mw/LowLevel/Wayland.h +++ b/include/Mw/LowLevel/Wayland.h @@ -60,7 +60,7 @@ struct _MwLLWaylandSublevel { MwLL topmost_parent; /* The parent at the top of all the other parents. Usually a toplevel. */ }; -/* Shared set of anything needed for a shm buffer. Used both for surface framebuffers, and cursors. */ +/* Shared set of anything needed for a shm buffer. */ struct _MwLLWaylandShmBuffer { struct wl_shm* shm; struct wl_shm_pool* shm_pool; @@ -111,11 +111,8 @@ struct _MwLLWayland { struct wl_pointer* pointer; MwU32 pointer_serial; - MwBool active; /* Whether or not the surface is the one being hovered over. */ - MwU32 mod_state; - MwLL* sublevels; /* stb_ds managed array of any sublevels */ MwBool configured; /* Whether or not xdg_toplevel_configure has run once */ MwU32 x, y, ww, wh; /* Window position */ @@ -123,8 +120,6 @@ struct _MwLLWayland { MwU32 mw, mh; /* Monitor width and height as advertised by wl_output.mode */ - char* cur_selection; - struct _MwLLWaylandShmBuffer framebuffer; struct _MwLLWaylandShmBuffer cursor; struct _MwLLWaylandShmBuffer* icon; diff --git a/src/backend/wayland.c b/src/backend/wayland.c index 0c262b9..5d6144d 100644 --- a/src/backend/wayland.c +++ b/src/backend/wayland.c @@ -9,6 +9,16 @@ #include #include +/* TODO: + * - MwLLMakeToolWindowImpl + * - MwLLSetClipboardImpl + * - MwLLGrabPointerImpl + * - MwLLFocusImpl + * - MwLLMakePopupImpl + * - MwLLShowImpl + * - MwLLDetachImpl + */ + /* TODO: find out what FreeBSD and such wants us to include */ #ifdef __FreeBSD__ /* XXX: Untested (nishi) */ @@ -501,11 +511,6 @@ static void xdg_toplevel_configure(void* data, MwLLDispatch(self, resize, NULL); MwLLDispatch(self, draw, NULL); - for(i = 0; i < arrlen(self->wayland.sublevels); i++) { - MwLL handle = self->wayland.sublevels[i]; - region_setup(handle); - } - /*if(!self->wayland.egl_setup) { self->wayland.egl_setup = egl_setup(self, self->wayland.x, self->wayland.y, width, height); } else { @@ -856,8 +861,6 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) { r->wayland.x = x; r->wayland.y = y; - r->wayland.sublevels = NULL; - if(parent == NULL) { setup_toplevel(r, x, y); } else {