From e8e38b509537911b3f69df278bdb23ba22534dd4 Mon Sep 17 00:00:00 2001 From: cutealien Date: Mon, 21 Dec 2020 21:59:34 +0000 Subject: [PATCH] Slightly changed close window handling on X11 Optimized and avoids problems on Phosh shell Thanks @TheBrokenRail for a patch (was a tiny part of patch #322). https://sourceforge.net/p/irrlicht/patches/322 Changed patch slighlty to unify with rest of Irrlicht code. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6174 dfc29bdd-3216-0410-991c-e03cc46cb475 --- changes.txt | 1 + source/Irrlicht/CIrrDeviceLinux.cpp | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/changes.txt b/changes.txt index 70ba3a06..e21bbb72 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,6 @@ -------------------------- Changes in 1.9 (not yet released) +- Slightly changed close window handling on X11 (optimized and avoids problems on some shells). Thanks @TheBrokenRail for a patch (was part of patch #322). - Add getActiveColor functions to IGUIStaticText and IGUIButton (get currently used color). - Add IGUIEnvironment::addToDeletionQueue to allow save removal of gui elements while iterating over them (like the same named function in ISceneManager). - IGUIEnvironment::drawAll has now a parameter to allow disabling automatic resize to screensize. Makes it easier to use partial screens with full alignment support. diff --git a/source/Irrlicht/CIrrDeviceLinux.cpp b/source/Irrlicht/CIrrDeviceLinux.cpp index 73f463ee..48f96c99 100644 --- a/source/Irrlicht/CIrrDeviceLinux.cpp +++ b/source/Irrlicht/CIrrDeviceLinux.cpp @@ -72,13 +72,12 @@ namespace Atom X_ATOM_NETWM_MAXIMIZE_VERT; Atom X_ATOM_NETWM_MAXIMIZE_HORZ; Atom X_ATOM_NETWM_STATE; + + Atom X_ATOM_WM_DELETE_WINDOW; }; namespace irr { - -const char wmDeleteWindow[] = "WM_DELETE_WINDOW"; - //! constructor CIrrDeviceLinux::CIrrDeviceLinux(const SIrrlichtCreationParameters& param) : CIrrDeviceStub(param), @@ -489,9 +488,8 @@ bool CIrrDeviceLinux::createWindow() XMapRaised(XDisplay, XWindow); CreationParams.WindowId = (void*)XWindow; - Atom wmDelete; - wmDelete = XInternAtom(XDisplay, wmDeleteWindow, True); - XSetWMProtocols(XDisplay, XWindow, &wmDelete, 1); + X_ATOM_WM_DELETE_WINDOW = XInternAtom(XDisplay, "WM_DELETE_WINDOW", True); + XSetWMProtocols(XDisplay, XWindow, &X_ATOM_WM_DELETE_WINDOW, 1); if (CreationParams.Fullscreen) { XSetInputFocus(XDisplay, XWindow, RevertToParent, CurrentTime); @@ -998,8 +996,7 @@ bool CIrrDeviceLinux::run() case ClientMessage: { - char *atom = XGetAtomName(XDisplay, event.xclient.message_type); - if (*atom == *wmDeleteWindow) + if (static_cast(event.xclient.data.l[0]) == X_ATOM_WM_DELETE_WINDOW && X_ATOM_WM_DELETE_WINDOW != None) { os::Printer::log("Quit message received.", ELL_INFORMATION); Close = true; @@ -1012,7 +1009,6 @@ bool CIrrDeviceLinux::run() irrevent.UserEvent.UserData2 = static_cast(event.xclient.data.l[1]); postEventFromUser(irrevent); } - XFree(atom); } break;