ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-06 10:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[X11] Workaround for issue #146

Browse source 
Windows are now unmapped before being destroyed.
This commit is contained in:
thefiddler 2014-07-18 17:16:27 +02:00
parent 786273dd19
commit a13a2f8e66
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -825,7 +825,7 @@ namespace OpenTK.Platform.X11
case XEventName.ClientMessage: case XEventName.ClientMessage:
if (!isExiting && e.ClientMessageEvent.ptr1 == _atom_wm_destroy) if (!isExiting && e.ClientMessageEvent.ptr1 == _atom_wm_destroy)
{ {
Debug.WriteLine("Exit message received."); Debug.Print("[X11] Exit message received for window {0:X} on display {1:X}", window.Handle, window.Display);
CancelEventArgs ce = new CancelEventArgs(); CancelEventArgs ce = new CancelEventArgs();
OnClosing(ce); OnClosing(ce);
@ -1624,6 +1624,8 @@ namespace OpenTK.Platform.X11
public void Exit() public void Exit()
{ {
Debug.Print("[X11] Sending exit message window {0:X} on display {1:X}", window.Handle, window.Display);
XEvent ev = new XEvent(); XEvent ev = new XEvent();
ev.type = XEventName.ClientMessage; ev.type = XEventName.ClientMessage;
ev.ClientMessageEvent.format = 32; ev.ClientMessageEvent.format = 32;
@ -1644,10 +1646,12 @@ namespace OpenTK.Platform.X11
public void DestroyWindow() public void DestroyWindow()
{ {
Debug.WriteLine("X11GLNative shutdown sequence initiated."); Debug.Print("[X11] Destroying window {0:X} on display {1:X}", window.Handle, window.Display);
using (new XLock(window.Display)) using (new XLock(window.Display))
{ {
Functions.XSync(window.Display, true); Functions.XUnmapWindow(window.Display, window.Handle);
Functions.XSync(window.Display, false);
Functions.XDestroyWindow(window.Display, window.Handle); Functions.XDestroyWindow(window.Display, window.Handle);
exists = false; exists = false;
} }