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

fix buggy x11 behavior

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@415 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-10-19 09:00:04 +00:00
parent 67299e4c8d
commit 39101dbe08
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/backend/x11.c
View File

@@ -1,6 +1,8 @@
/* $Id$ */ /* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include "../../external/stb_ds.h"
typedef struct mwm_hints { typedef struct mwm_hints {
unsigned long flags; unsigned long flags;
unsigned long functions; unsigned long functions;
@@ -91,6 +93,7 @@ MwLL MwLLCreate(MwLL parent, int x, int y, int width, int height) {
r->window = XCreateSimpleWindow(r->display, p, x, y, width, height, 0, 0, WhitePixel(r->display, DefaultScreen(r->display))); r->window = XCreateSimpleWindow(r->display, p, x, y, width, height, 0, 0, WhitePixel(r->display, DefaultScreen(r->display)));
r->visual = get_visual_info(r->display); r->visual = get_visual_info(r->display);
r->wait_map = 1;
XSetLocaleModifiers(""); XSetLocaleModifiers("");
if((r->xim = XOpenIM(r->display, 0, 0, 0)) == NULL) { if((r->xim = XOpenIM(r->display, 0, 0, 0)) == NULL) {
@@ -232,9 +235,20 @@ int MwLLPending(MwLL handle) {
void MwLLNextEvent(MwLL handle) { void MwLLNextEvent(MwLL handle) {
XEvent ev; XEvent ev;
XEvent* queue = NULL;
while(XCheckTypedWindowEvent(handle->display, handle->window, ClientMessage, &ev) || XCheckWindowEvent(handle->display, handle->window, mask, &ev)) { while(XCheckTypedWindowEvent(handle->display, handle->window, ClientMessage, &ev) || XCheckWindowEvent(handle->display, handle->window, mask, &ev)) {
int render = 0; int render = 0;
if(ev.type == Expose) { if(ev.type == MapNotify){
handle->wait_map = 0;
while(arrlen(queue) > 0){
XPutBackEvent(handle->display, &queue[0]);
arrdel(queue, 0);
}
arrfree(queue);
}else if(handle->wait_map){
arrput(queue, ev);
}else if(ev.type == Expose) {
render = 1; render = 1;
} else if(ev.type == ButtonPress) { } else if(ev.type == ButtonPress) {
MwLLMouse p; MwLLMouse p;
@@ -371,6 +385,8 @@ void MwLLNextEvent(MwLL handle) {
if(handle->copy_buffer) XCopyArea(handle->display, handle->pixmap, handle->window, handle->gc, 0, 0, w, h, 0, 0); if(handle->copy_buffer) XCopyArea(handle->display, handle->pixmap, handle->window, handle->gc, 0, 0, w, h, 0, 0);
} }
} }
arrfree(queue);
} }
void MwLLSleep(int ms) { void MwLLSleep(int ms) {
@@ -664,6 +680,11 @@ void MwLLSetSizeHints(MwLL handle, int minx, int miny, int maxx, int maxy) {
XUnmapWindow(handle->display, handle->window); XUnmapWindow(handle->display, handle->window);
XMapWindow(handle->display, handle->window); XMapWindow(handle->display, handle->window);
XFlush(handle->display);
XSync(handle->display, False);
handle->wait_map = 1;
} }
void MwLLMakeBorderless(MwLL handle, int toggle) { void MwLLMakeBorderless(MwLL handle, int toggle) {
@@ -676,6 +697,11 @@ void MwLLMakeBorderless(MwLL handle, int toggle) {
XUnmapWindow(handle->display, handle->window); XUnmapWindow(handle->display, handle->window);
XMapWindow(handle->display, handle->window); XMapWindow(handle->display, handle->window);
XFlush(handle->display);
XSync(handle->display, False);
handle->wait_map = 1;
} }
long MwLLGetTick(void) { long MwLLGetTick(void) {

1
src/backend/x11.h
View File

@@ -31,6 +31,7 @@ struct _MwLL {
MwLLHandler handler; MwLLHandler handler;
int grabbed; int grabbed;
int wait_map;
}; };
struct _MwLLColor { struct _MwLLColor {