ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 16:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #567 from Frassle/issue259

Browse source 
Wait for XEvents when changing window size
This commit is contained in:
Jarl Gullberg 2017-07-12 15:20:15 +02:00 committed by GitHub
parent 1c5643f703 a7f43f3f05
commit 0c585b685c
1 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -147,6 +147,12 @@ namespace OpenTK.Platform.X11
readonly int xi2_version; readonly int xi2_version;
#pragma warning restore 414 #pragma warning restore 414
// Used to wait for a specific type of event in ProcessEvents.
// Currently this is just used by ClientSize to wait for a
// ConfigureNotify event to ensure our size change has actually taken
// effect, see issue #259.
XEventName _waitForEvent = (XEventName)0;
public X11GLNative(int x, int y, int width, int height, string title, public X11GLNative(int x, int y, int width, int height, string title,
GraphicsMode mode, GameWindowFlags options, DisplayDevice device) GraphicsMode mode, GameWindowFlags options, DisplayDevice device)
: this() : this()
@ -801,8 +807,22 @@ namespace OpenTK.Platform.X11
if (!Functions.XCheckWindowEvent(window.Display, window.Handle, window.EventMask, ref e) && if (!Functions.XCheckWindowEvent(window.Display, window.Handle, window.EventMask, ref e) &&
!Functions.XCheckTypedWindowEvent(window.Display, window.Handle, XEventName.ClientMessage, ref e) && !Functions.XCheckTypedWindowEvent(window.Display, window.Handle, XEventName.ClientMessage, ref e) &&
!Functions.XCheckTypedWindowEvent(window.Display, window.Handle, XEventName.SelectionNotify, ref e)) !Functions.XCheckTypedWindowEvent(window.Display, window.Handle, XEventName.SelectionNotify, ref e))
{
if (_waitForEvent != (XEventName)0)
{
continue;
}
else
{
break; break;
} }
}
}
if (_waitForEvent == e.type)
{
_waitForEvent = (XEventName)0;
}
// Respond to the event e // Respond to the event e
switch (e.type) switch (e.type)
@ -1212,7 +1232,8 @@ namespace OpenTK.Platform.X11
set set
{ {
bool is_size_changed = client_rectangle.Size != value; bool is_size_changed = client_rectangle.Size != value;
if (is_size_changed)
{
int width = value.Width; int width = value.Width;
int height = value.Height; int height = value.Height;
@ -1222,17 +1243,16 @@ namespace OpenTK.Platform.X11
} }
using (new XLock(window.Display)) using (new XLock(window.Display))
{
if (is_size_changed)
{ {
Functions.XResizeWindow(window.Display, window.Handle, Functions.XResizeWindow(window.Display, window.Handle,
width, height); width, height);
} }
}
_waitForEvent = XEventName.ConfigureNotify;
ProcessEvents(); ProcessEvents();
} }
} }
}
public override Icon Icon public override Icon Icon
{ {