nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-11 11:53:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix x11 bug

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@661 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-11-11 11:17:06 +00:00
parent d96b74c1b1
commit a7fa520027
1 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/backend/x11.c
View File

@@ -41,22 +41,51 @@ static void destroy_pixmap(MwLL handle) {
} }
static void wait_map(MwLL handle, int move_back, int nomap) { static void wait_map(MwLL handle, int move_back, int nomap) {
XEvent* queue = NULL; XEvent* queue = NULL;
XEvent ev; XEvent ev;
int x, y; int x, y;
unsigned int w, h; unsigned int w, h;
XWindowAttributes xwa;
MwLLGetXYWH(handle, &x, &y, &w, &h); MwLLGetXYWH(handle, &x, &y, &w, &h);
if(move_back) MwLLSetXY(handle, x, y); if(move_back) MwLLSetXY(handle, x, y);
if(!nomap) XMapWindow(handle->display, handle->window); XGetWindowAttributes(handle->display, handle->window, &xwa);
if(xwa.map_state != IsViewable) {
if(!nomap) XMapWindow(handle->display, handle->window);
XSync(handle->display, False);
while(1) {
XNextEvent(handle->display, &ev);
if(ev.type == MapNotify && ev.xmap.window == handle->window) {
break;
} else {
arrput(queue, ev);
}
}
while(arrlen(queue) > 0) {
XPutBackEvent(handle->display, &queue[0]);
arrdel(queue, 0);
}
arrfree(queue);
}
if(move_back) MwLLSetXY(handle, x, y);
}
static void wait_unmap(MwLL handle) {
XEvent* queue = NULL;
XEvent ev;
XUnmapWindow(handle->display, handle->window);
XSync(handle->display, False); XSync(handle->display, False);
while(1) { while(1) {
XNextEvent(handle->display, &ev); XNextEvent(handle->display, &ev);
if(ev.type == MapNotify && ev.xmap.window == handle->window) { if(ev.type == UnmapNotify && ev.xunmap.window == handle->window) {
break; break;
} else { } else {
arrput(queue, ev); arrput(queue, ev);
@@ -781,11 +810,9 @@ void MwLLDetach(MwLL handle, MwPoint* point) {
XTranslateCoordinates(handle->display, parent, RootWindow(handle->display, DefaultScreen(handle->display)), 0, 0, &x, &y, &child); XTranslateCoordinates(handle->display, parent, RootWindow(handle->display, DefaultScreen(handle->display)), 0, 0, &x, &y, &child);
XUnmapWindow(handle->display, handle->window); wait_unmap(handle);
XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y); XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y);
wait_map(handle, 0, 0);
} }
void MwLLShow(MwLL handle, int show) { void MwLLShow(MwLL handle, int show) {