uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

X bug fix so application closes properly when there is a window manager

Browse source
This commit is contained in:
inmarket 2014-09-29 16:08:10 +10:00
parent e2f3a68c3b
commit 4cf198aad2
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/multiple/X/gdisp_lld_X.c
View file

@ -44,6 +44,7 @@ static XEvent evt;
static Colormap cmap; static Colormap cmap;
static XVisualInfo vis; static XVisualInfo vis;
static XContext cxt; static XContext cxt;
static Atom wmDelete;
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
static coord_t mousex, mousey; static coord_t mousex, mousey;
static uint16_t mousebuttons; static uint16_t mousebuttons;
@ -65,6 +66,12 @@ static void ProcessEvent(GDisplay *g, xPriv *priv) {
XCloseDisplay(dis); XCloseDisplay(dis);
exit(0); exit(0);
break; break;
case ClientMessage:
if ((Atom)evt.xclient.data.l[0] == wmDelete) {
XCloseDisplay(dis);
exit(0);
}
break;
case Expose: case Expose:
XCopyArea(dis, priv->pix, evt.xexpose.window, priv->gc, XCopyArea(dis, priv->pix, evt.xexpose.window, priv->gc,
evt.xexpose.x, evt.xexpose.y, evt.xexpose.x, evt.xexpose.y,
@ -152,6 +159,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
dis = XOpenDisplay(0); dis = XOpenDisplay(0);
scr = DefaultScreen(dis); scr = DefaultScreen(dis);
cxt = XUniqueContext(); cxt = XUniqueContext();
wmDelete = XInternAtom(dis, "WM_DELETE_WINDOW", False);
XSetIOErrorHandler(FatalXIOError); XSetIOErrorHandler(FatalXIOError);
#if GDISP_FORCE_24BIT #if GDISP_FORCE_24BIT
@ -195,6 +203,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
XSync(dis, TRUE); XSync(dis, TRUE);
XSaveContext(dis, priv->win, cxt, (XPointer)g); XSaveContext(dis, priv->win, cxt, (XPointer)g);
XSetWMProtocols(dis, priv->win, &wmDelete, 1);
{ {
char buf[132]; char buf[132];
@ -236,6 +245,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
g->g.Contrast = 50; g->g.Contrast = 50;
g->g.Width = GDISP_SCREEN_WIDTH; g->g.Width = GDISP_SCREEN_WIDTH;
g->g.Height = GDISP_SCREEN_HEIGHT; g->g.Height = GDISP_SCREEN_HEIGHT;
return TRUE; return TRUE;
} }