d6
/
uxn11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle WM_DELETE_WINDOW

This commit is contained in:
phoebos 2022-03-27 06:38:03 +01:00 committed by neauoire
parent 59886ce34b
commit ceb7bfff0b
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/uxn11.c
View File

@ -17,6 +17,7 @@
#include "devices/datetime.h" #include "devices/datetime.h"
static Device *devscreen, *devctrl, *devmouse; static Device *devscreen, *devctrl, *devmouse;
static XImage *ximage;
static int static int
error(char *msg, const char *err) error(char *msg, const char *err)
@ -72,11 +73,8 @@ load(Uxn *u, char *filepath)
void void
redraw(Display *display, Visual *visual, Window window) redraw(Display *display, Visual *visual, Window window)
{ {
XImage *ximage;
screen_redraw(&uxn_screen, uxn_screen.pixels); screen_redraw(&uxn_screen, uxn_screen.pixels);
ximage = XCreateImage(display, visual, DefaultDepth(display, DefaultScreen(display)), ZPixmap, 0, (char *)uxn_screen.pixels, uxn_screen.width, uxn_screen.height, 32, 0);
XPutImage(display, window, DefaultGC(display, 0), ximage, 0, 0, 0, 0, uxn_screen.width, uxn_screen.height); XPutImage(display, window, DefaultGC(display, 0), ximage, 0, 0, 0, 0, uxn_screen.width, uxn_screen.height);
/* XDestroyImage(ximage); */
} }
/* /usr/include/X11/keysymdef.h */ /* /usr/include/X11/keysymdef.h */
@ -138,6 +136,13 @@ processEvent(Display *display, Visual *visual, Window window)
XMotionEvent *e = (XMotionEvent *)&ev; XMotionEvent *e = (XMotionEvent *)&ev;
mouse_pos(devmouse, e->x, e->y); mouse_pos(devmouse, e->x, e->y);
} break; } break;
case ClientMessage: {
XClientMessageEvent *e = (XClientMessageEvent *)&ev;
XDestroyImage(ximage);
XDestroyWindow(display, window);
XCloseDisplay(display);
exit(0);
} break;
} }
if(uxn_screen.fg.changed || uxn_screen.bg.changed) { if(uxn_screen.fg.changed || uxn_screen.bg.changed) {
redraw(display, visual, window); redraw(display, visual, window);
@ -194,11 +199,15 @@ main(int argc, char **argv)
} }
XSelectInput(display, window, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | KeyPressMask | KeyReleaseMask); XSelectInput(display, window, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ExposureMask | KeyPressMask | KeyReleaseMask);
Atom wmDelete = XInternAtom(display, "WM_DELETE_WINDOW", True);
XSetWMProtocols(display, window, &wmDelete, 1);
XMapWindow(display, window); XMapWindow(display, window);
ximage = XCreateImage(display, visual, DefaultDepth(display, DefaultScreen(display)), ZPixmap, 0, (char *)uxn_screen.pixels, uxn_screen.width, uxn_screen.height, 32, 0);
while(1) { while(1) {
processEvent(display, visual, window); processEvent(display, visual, window);
uxn_eval(&u, GETVECTOR(devscreen)); uxn_eval(&u, GETVECTOR(devscreen));
/* sleep(0.01); */ /* sleep(0.01); */
} }
XDestroyImage(ximage);
return 0; return 0;
} }