pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 5 Pull requests Projects Releases 7 Packages Wiki Activity Actions

wayland: MwLLShowImpl

Browse source
This commit is contained in:
IoI_xD 2026-03-26 23:32:24 -07:00
commit 78ee4033b5
2 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Mw/LowLevel/Wayland.h
View file

@ -329,7 +329,7 @@ struct _MwLLWaylandSublevel {
MwLL parent; MwLL parent;
struct xdg_surface* parent_xdg_surface; struct xdg_surface* xdg_surface;
}; };
struct _MwLLWaylandPopup { struct _MwLLWaylandPopup {

32
src/backend/wayland.c
View file

@ -1512,12 +1512,6 @@ static void setup_sublevel(MwLL parent, MwLL r, int x, int y) {
r->wayland.sublevel = malloc(sizeof(struct _MwLLWaylandSublevel)); r->wayland.sublevel = malloc(sizeof(struct _MwLLWaylandSublevel));
r->wayland.sublevel->parent = parent; r->wayland.sublevel->parent = parent;
if(parent->wayland.type == MWLL_WAYLAND_TOPLEVEL) {
r->wayland.sublevel->parent_xdg_surface = parent->wayland.toplevel->xdg_surface;
} else {
r->wayland.sublevel->parent_xdg_surface = parent->wayland.sublevel->parent_xdg_surface;
}
r->wayland.type = MWLL_WAYLAND_SUBLEVEL; r->wayland.type = MWLL_WAYLAND_SUBLEVEL;
r->wayland.display = parent->wayland.display; r->wayland.display = parent->wayland.display;
@ -1536,6 +1530,10 @@ static void setup_sublevel(MwLL parent, MwLL r, int x, int y) {
r->wayland.framebuffer.surface = wl_compositor_create_surface(compositor); r->wayland.framebuffer.surface = wl_compositor_create_surface(compositor);
if(WAYLAND_GET_INTERFACE(r->wayland, xdg_wm_base))
r->wayland.sublevel->xdg_surface =
xdg_wm_base_get_xdg_surface(WAYLAND_GET_INTERFACE(r->wayland, xdg_wm_base)->context, r->wayland.framebuffer.surface);
r->wayland.sublevel->subsurface = wl_subcompositor_get_subsurface(r->wayland.sublevel->subcompositor, r->wayland.framebuffer.surface, parent_surface); r->wayland.sublevel->subsurface = wl_subcompositor_get_subsurface(r->wayland.sublevel->subcompositor, r->wayland.framebuffer.surface, parent_surface);
wl_subsurface_set_desync(r->wayland.sublevel->subsurface); wl_subsurface_set_desync(r->wayland.sublevel->subsurface);
@ -2309,15 +2307,14 @@ static void MwLLDetachImpl(MwLL handle, MwPoint* point) {
} }
static void MwLLShowImpl(MwLL handle, int show) { static void MwLLShowImpl(MwLL handle, int show) {
(void)show; /* Some guy on a mailing list said that "abusing" wl_surface_attach for this purpose is bad? This is documented behavior so please I beg of you let me know if there's a compositor that actually has a problem with this. */
switch(handle->wayland.type) { if(handle->wayland.framebuffer.surface) {
case MWLL_WAYLAND_UNKNOWN: wl_surface_attach(handle->wayland.framebuffer.surface, show ? handle->wayland.framebuffer.shm_buffer : NULL, 0, 0);
case MWLL_WAYLAND_TOPLEVEL: wl_surface_commit(handle->wayland.framebuffer.surface);
break; }
case MWLL_WAYLAND_SUBLEVEL: if(handle->wayland.backbuffer.surface) {
break; wl_surface_attach(handle->wayland.backbuffer.surface, show ? handle->wayland.backbuffer.shm_buffer : NULL, 0, 0);
case MWLL_WAYLAND_POPUP: wl_surface_commit(handle->wayland.backbuffer.surface);
break;
} }
} }
@ -2442,8 +2439,9 @@ static void MwLLEndStateChangeImpl(MwLL handle) {
int i; int i;
for(i = 0; i < arrlen(w->children); i++) { for(i = 0; i < arrlen(w->children); i++) {
if(w->children[i]->lowlevel->wayland.type == MWLL_WAYLAND_SUBLEVEL) { if(w->children[i]->lowlevel->wayland.type == MWLL_WAYLAND_SUBLEVEL) {
MwLL child = w->children[i]->lowlevel; MwLL child = w->children[i]->lowlevel;
child->wayland.sublevel->parent_xdg_surface = handle->wayland.popup->xdg_surface; child->wayland.sublevel->xdg_surface =
xdg_wm_base_get_xdg_surface(WAYLAND_GET_INTERFACE(handle->wayland, xdg_wm_base)->context, handle->wayland.framebuffer.surface);
wl_subsurface_destroy(child->wayland.sublevel->subsurface); wl_subsurface_destroy(child->wayland.sublevel->subsurface);
wl_flush(handle); wl_flush(handle);