Updates to GameWindow shutdown and X11 locking behavior.

Source/OpenTK/GameWindow.cs

@@ -276,6 +276,7 @@ namespace OpenTK
         /// </remarks>
         public virtual void Exit()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             //glWindow.DestroyWindow();
             //while (glWindow.Exists)
             //    glWindow.ProcessEvents();
@@ -302,6 +303,7 @@ namespace OpenTK
         public virtual void ExitAsync()
         {
             //isExiting = true;
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             UpdateFrame += CallExitInternal;
         }
 
@@ -315,7 +317,7 @@ namespace OpenTK
         /// </summary>
         public bool IsIdle
         {
-            get { return glWindow.IsIdle; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return glWindow.IsIdle; }
         }
 
         #endregion
@@ -328,8 +330,8 @@ namespace OpenTK
         /// </summary>
         public bool Fullscreen
         {
-            get { return glWindow.Fullscreen; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return glWindow.Fullscreen; }
-            set { glWindow.Fullscreen = value; }
+            set { if (disposed) throw new ObjectDisposedException("GameWindow"); glWindow.Fullscreen = value; }
         }
 
         #endregion
@@ -337,12 +339,15 @@ namespace OpenTK
         #region public IGraphicsContext Context
 
         /// <summary>
-        /// Returns the opengl IGLontext associated with the current GameWindow.
+        /// Returns the opengl IGraphicsContext associated with the current GameWindow.
-        /// Forces window creation.
         /// </summary>
         public IGraphicsContext Context
         {
-            get { return glContext; }
+            get
+            {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
+                return glContext;
+            }
         }
 
         #endregion
@@ -368,10 +373,12 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return glWindow.Title;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 glWindow.Title = value;
             }
         }
@@ -404,7 +411,7 @@ namespace OpenTK
 
         public IWindowInfo WindowInfo
         {
-            get { return glWindow.WindowInfo; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return glWindow.WindowInfo; }
         }
 
         #endregion
@@ -437,6 +444,7 @@ namespace OpenTK
         /// </summary>
         public void DestroyWindow()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             if (Exists)
                 glWindow.DestroyWindow();
             else
@@ -453,6 +461,7 @@ namespace OpenTK
         /// <see cref="public virtual void Run(double update_frequency, double render_frequency)"/>
         public void Run()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             Run(0.0, 0.0);
         }
 
@@ -463,6 +472,7 @@ namespace OpenTK
         /// <see cref="public virtual void Run(double updateFrequency, double renderFrequency)"/>
         public void Run(double updateFrequency)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             Run(updateFrequency, 0.0);
         }
 
@@ -473,6 +483,7 @@ namespace OpenTK
         /// <param name="frames_per_second">The frequency of RenderFrame events.</param>
         public void Run(double updates_per_second, double frames_per_second)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             try
             {
                 if (updates_per_second < 0.0 || updates_per_second > 200.0)
@@ -618,6 +629,7 @@ namespace OpenTK
                 if (Exists)
                 {
                     glContext.Dispose();
+                    glContext = null;
                     glWindow.DestroyWindow();
                 }
                 while (this.Exists)
@@ -642,6 +654,7 @@ namespace OpenTK
         /// </remarks>
         public void ProcessEvents()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             if (!isExiting)
                 glWindow.InputDriver.Poll();
             glWindow.ProcessEvents();
@@ -680,6 +693,7 @@ namespace OpenTK
         /// </remarks>
         public virtual void OnRenderFrame(RenderFrameEventArgs e)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
         }
 
         /// <summary>
@@ -718,6 +732,7 @@ namespace OpenTK
         /// </remarks>
         public virtual void OnUpdateFrame(UpdateFrameEventArgs e)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
         }
 
         /// <summary>
@@ -768,6 +783,7 @@ namespace OpenTK
         /// <param name="e">Not used.</param>
         public virtual void OnLoad(EventArgs e)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
         }
 
         #endregion
@@ -800,6 +816,7 @@ namespace OpenTK
         /// <param name="e">Not used.</param>
         public virtual void OnUnload(EventArgs e)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
         }
 
         #endregion
@@ -814,7 +831,7 @@ namespace OpenTK
         /// </summary>
         public bool IsExiting
         {
-            get { return isExiting; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return isExiting; }
         }
 
         #endregion
@@ -828,6 +845,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 //if (input_driver.Keyboard.Count > 0)
                 //    return input_driver.Keyboard[0];
                 //else
@@ -851,6 +869,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 //if (input_driver.Mouse.Count > 0)
                 //    return input_driver.Mouse[0];
                 //else
@@ -874,10 +893,12 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return vsync;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value == VSyncMode.Off)
                     Context.VSync = false;
                 else
@@ -898,6 +919,7 @@ namespace OpenTK
         /// <remarks>Calling this function is equivalent to calling Context.SwapBuffers()</remarks>
         public void SwapBuffers()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
             this.Context.SwapBuffers();
         }
 
@@ -931,10 +953,12 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return target_render_period;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value <= 0.005)
                 {
                     target_render_period = target_render_period_doubled = 0.0;
@@ -963,12 +987,14 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (TargetRenderPeriod == 0.0)
                     return 0.0;
                 return 1.0 / TargetRenderPeriod;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value < 1.0)
                 {
                     TargetRenderPeriod = 0.0;
@@ -996,10 +1022,12 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return target_update_period;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value <= 0.005)
                 {
                     target_update_period = 0.0;
@@ -1027,12 +1055,14 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (TargetUpdatePeriod == 0.0)
                     return 0.0;
                 return 1.0 / TargetUpdatePeriod;
             }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value < 1.0)
                 {
                     TargetUpdatePeriod = 0.0;
@@ -1056,6 +1086,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (render_period == 0.0)
                     return 1.0;
                 return 1.0 / render_period;
@@ -1073,6 +1104,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return render_period;
             }
         }
@@ -1088,6 +1120,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (update_period == 0.0)
                     return 1.0;
                 return 1.0 / update_period;
@@ -1105,6 +1138,7 @@ namespace OpenTK
         {
             get
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 return update_period;
             }
         }
@@ -1118,8 +1152,8 @@ namespace OpenTK
         /// </summary>
         public double RenderTime
         {
-            get { return render_time; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return render_time; }
-            protected set { render_time = value; }
+            protected set { if (disposed) throw new ObjectDisposedException("GameWindow"); render_time = value; }
         }
 
         #endregion
@@ -1131,7 +1165,7 @@ namespace OpenTK
         /// </summary>
         public double UpdateTime
         {
-            get { return update_time; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return update_time; }
         }
 
         #endregion
@@ -1147,9 +1181,10 @@ namespace OpenTK
         /// </summary>
         public int Width
         {
-            get { return width; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return width; }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value == this.Width)
                 {
                     return;
@@ -1174,9 +1209,10 @@ namespace OpenTK
         /// </summary>
         public int Height
         {
-            get { return height; }
+            get { if (disposed) throw new ObjectDisposedException("GameWindow"); return height; }
             set
             {
+                if (disposed) throw new ObjectDisposedException("GameWindow");
                 if (value == this.Height)
                 {
                     return;
@@ -1205,8 +1241,8 @@ namespace OpenTK
         /// </summary>
         public event ResizeEvent Resize
         {
-            add { glWindow.Resize += value; }
+            add { if (disposed) throw new ObjectDisposedException("GameWindow"); glWindow.Resize += value; }
-            remove { glWindow.Resize -= value; }
+            remove { if (disposed) throw new ObjectDisposedException("GameWindow"); glWindow.Resize -= value; }
         }
 
         /// <summary>
@@ -1232,6 +1268,7 @@ namespace OpenTK
         /// <param name="e">Contains information about the Resize event.</param>
         protected virtual void OnResize(ResizeEventArgs e)
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
         }
 
         #endregion
@@ -1303,21 +1340,14 @@ namespace OpenTK
 #endif
         #region --- IDisposable Members ---
 
-        /// <summary>
-        /// Not used yet.
-        /// </summary>
-        private void DisposeInternal()
-        {
-            Dispose();                  // User overridable Dispose method.
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
         /// <summary>
         /// Disposes of the GameWindow, releasing all resources consumed by it.
         /// </summary>
         public virtual void Dispose()
         {
+            if (disposed) throw new ObjectDisposedException("GameWindow");
+            Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         private void Dispose(bool manual)
@@ -1327,7 +1357,10 @@ namespace OpenTK
                 if (manual)
                 {
                     if (glContext != null)
+                    {
                         glContext.Dispose();
+                        glContext = null;
+                    }
 
                     if (glWindow != null)
                     {
@@ -1340,10 +1373,10 @@ namespace OpenTK
         }
 
         /// <summary>Finalizes unmanaged resources consumed by the GameWindow.</summary>
-        ~GameWindow()
+        //~GameWindow()
-        {
+        //{
-            Dispose(false);
+        //    Dispose(false);
-        }
+        //}
 
         #endregion
     }

Source/OpenTK/Graphics/GraphicsContext.cs

@@ -84,7 +84,10 @@ namespace OpenTK.Graphics
             else
                 throw new PlatformNotSupportedException("Please, refer to http://www.opentk.com for more information.");
 
+            lock (context_lock)
+            {
                 available_contexts.Add((this as IGraphicsContextInternal).Context, new WeakReference(this));
+            }
             //(implementation as IGraphicsContextInternal).LoadAll();
         }
 
@@ -118,6 +121,8 @@ namespace OpenTK.Graphics
         public static GraphicsContext CurrentContext
         {
             get
+            {
+                lock (context_lock)
                 {
                     if (available_contexts.Count > 0)
                     {
@@ -127,6 +132,7 @@ namespace OpenTK.Graphics
                     }
                     return null;
                 }
+            }
             //set
             //{
             //    if (value != null)
@@ -200,7 +206,10 @@ namespace OpenTK.Graphics
         {
             this.Destroy += ContextDestroyed;
 
+            lock (context_lock)
+            {
                 available_contexts.Add((this as IGraphicsContextInternal).Context, new WeakReference(this));
+            }
 
             //OpenTK.Graphics.OpenGL.GL.Clear(OpenTK.Graphics.OpenGL.ClearBufferMask.ColorBufferBit);
             //if (StaticGetCurrentContext == null)
@@ -364,12 +373,14 @@ namespace OpenTK.Graphics
         {
             if (!disposed)
             {
+                Debug.WriteLine("Disposing context {0}.", (this as IGraphicsContextInternal).Context.ToString());
+                lock (context_lock)
+                {
+                    available_contexts.Remove((this as IGraphicsContextInternal).Context);
+                }
+
                 if (manual)
                 {
-                    Debug.WriteLine("Disposing context.");
-                    available_contexts.Remove((this as IGraphicsContextInternal).Context);
-
-                    // TODO: Check if this is safe
                     if (implementation != null)
                         implementation.Dispose();
                 }
@@ -377,10 +388,10 @@ namespace OpenTK.Graphics
             }
         }
 
-        ~GraphicsContext()
+        //~GraphicsContext()
-        {
+        //{
-            this.Dispose(false);
+        //    this.Dispose(false);
-        }
+        //}
 
         #endregion
     }

Source/OpenTK/Platform/X11/API.cs

@@ -67,6 +67,8 @@ namespace OpenTK.Platform.X11
 
         static API()
         {
+            Debug.Print("Initializing threaded X11: {0}.", Functions.XInitThreads().ToString());
+        
             AppDomain.CurrentDomain.ProcessExit += new EventHandler(CurrentDomain_ProcessExit);
             
             // Bad idea - Windows.Forms will steal our events!

Source/OpenTK/Platform/X11/Functions.cs

@@ -42,6 +42,35 @@ namespace OpenTK.Platform.X11
 
     #endregion
     
+    #region DisplayLock
+    
+    /*
+    internal class DisplayLock : IDisposable
+    {
+        IntPtr display;
+        
+        public DisplayLock(IntPtr display)
+        {
+            if (display == IntPtr.Zero) throw new ArgumentException("display", "Must be a valid X11 display connection.");
+            this.display = display;
+            Functions.XLockDisplay(display);
+        }
+    
+        publc void Dispose()
+        {
+            Functions.XUnlockDisplay(display);
+            GC.SuppressFinalize(this);
+        }
+        
+        ~DisplayLock()
+        {
+            Functions.XUnlockDisplay(display);
+        }
+    }
+    */
+
+    #endregion
+
     internal static partial class Functions
     {
         public static readonly object Lock = new object();
@@ -384,5 +413,10 @@ namespace OpenTK.Platform.X11
         [DllImport("libX11")]
         public static extern IntPtr XCreateColormap(Display display, Window window, IntPtr visual, int alloc);
         
+        [DllImport("libX11")]
+        public static extern void XLockDisplay(Display display);
+
+        [DllImport("libX11")]
+        public static extern void XUnlockDisplay(Display display);
     }
 }

Source/OpenTK/Platform/X11/X11GLContext.cs

@@ -64,12 +64,17 @@ namespace OpenTK.Platform.X11
             info.visualid = (IntPtr)mode.Index;
             info.screen = currentWindow.Screen;
             int items;
+            
+            lock (API.Lock)
+            {
                 IntPtr vs = Functions.XGetVisualInfo(currentWindow.Display, XVisualInfoMask.ID | XVisualInfoMask.Screen, ref info, out items);
                 if (items == 0)
                     throw new GraphicsModeException(String.Format("Invalid GraphicsMode specified ({0}).", mode));
 
                 info = (XVisualInfo)Marshal.PtrToStructure(vs, typeof(XVisualInfo));
                 Functions.XFree(vs);
+            }
+
             return info;
         }
 
@@ -89,6 +94,8 @@ namespace OpenTK.Platform.X11
                 Debug.Write(shareHandle.Handle == IntPtr.Zero ? "not shared... " :
                     String.Format("shared with ({0})... ", shareHandle));
 
+                lock (API.Lock)
+                {
                     XVisualInfo info = window.VisualInfo;   // Cannot pass a Property by reference.
                     context = Glx.CreateContext(window.Display, ref info, shareHandle.Handle, direct);
 
@@ -108,6 +115,7 @@ namespace OpenTK.Platform.X11
                         Debug.Print("done! (id: {0})", context);
                         return;
                     }
+                }
 
                 Debug.Print("failed.");
                 throw new GraphicsModeException("Failed to create OpenGL context. Glx.CreateContext call returned 0.");
@@ -307,14 +315,20 @@ namespace OpenTK.Platform.X11
             if (!disposed)
             {
                 // Clean unmanaged resources:
-
+                try
+                {
+                    Functions.XLockDisplay(currentWindow.Display);
                     Glx.MakeCurrent(currentWindow.Display, IntPtr.Zero, IntPtr.Zero);
                     Glx.DestroyContext(currentWindow.Display, context);
-                //API.Free(visual);
+                    //Functions.XFree(visual);
+                }
+                finally
+                {
+                    Functions.XUnlockDisplay(currentWindow.Display);               
+                }
 
                 if (manuallyCalled)
                 {
-                    // Safe to clean managed resources, too
                 }
             }
             disposed = true;

Source/OpenTK/Platform/X11/X11GLNative.cs

@@ -98,8 +98,18 @@ namespace OpenTK.Platform.X11
                 window.Display = API.DefaultDisplay;//Functions.XOpenDisplay(IntPtr.Zero); // IntPtr.Zero == default display
                 if (window.Display == IntPtr.Zero)
                     throw new Exception("Could not open connection to X");
+
+                try
+                {
+                    Functions.XLockDisplay(window.Display);
                     window.Screen = Functions.XDefaultScreen(window.Display); //API.DefaultScreen;
                     window.RootWindow = Functions.XRootWindow(window.Display, window.Screen); // API.RootWindow;
+                }
+                finally
+                {
+                    Functions.XUnlockDisplay(window.Display);
+                }
+                
                 Debug.Print("Display: {0}, Screen {1}, Root window: {2}", window.Display, window.Screen, window.RootWindow);
 
                 RegisterAtoms(window);
@@ -145,9 +155,12 @@ namespace OpenTK.Platform.X11
             if (height <= 0) throw new ArgumentOutOfRangeException("height", "Must be higher than zero.");
             if (exists) throw new InvalidOperationException("A render window already exists.");
 
+            XVisualInfo info = new XVisualInfo();
+
             Debug.Indent();
             
-            XVisualInfo info = new XVisualInfo();
+            lock (API.Lock)
+            {
                 info.visualid = mode.Index;
                 int dummy;
                 window.VisualInfo = (XVisualInfo)Marshal.PtrToStructure(
@@ -178,7 +191,7 @@ namespace OpenTK.Platform.X11
 
                 //XVisualInfo vis = window.VisualInfo;
                 //Glx.CreateContext(window.Display, ref vis, IntPtr.Zero, true);
-
+            }
             context = new GraphicsContext(mode, window);
 
             // Set the window hints
@@ -188,13 +201,14 @@ namespace OpenTK.Platform.X11
             hints.width = width;
             hints.height = height;
             hints.flags = (IntPtr)(XSizeHintsFlags.USSize | XSizeHintsFlags.USPosition);
+            lock (API.Lock)
+            {
                 Functions.XSetWMNormalHints(window.Display, window.WindowHandle, ref hints);
 
                 // Register for window destroy notification
                 IntPtr wm_destroy_atom = Functions.XInternAtom(window.Display, "WM_DELETE_WINDOW", true);
-            //XWMHints hint = new XWMHints();
                 Functions.XSetWMProtocols(window.Display, window.WindowHandle, new IntPtr[] { wm_destroy_atom }, 1);
-
+            }
             Top = Left = 0;
             Right = Width;
             Bottom = Height;
@@ -207,9 +221,10 @@ namespace OpenTK.Platform.X11
 
             Debug.Print("done! (id: {0})", window.WindowHandle);
 
-            //(glContext as IGLContextCreationHack).SetWindowHandle(window.Handle);
+            lock (API.Lock)
-
+            {
                 API.MapRaised(window.Display, window.WindowHandle);
+            }
             mapped = true;
 
             //context.CreateContext(true, null);
@@ -664,12 +679,18 @@ namespace OpenTK.Platform.X11
         {
             if (!disposed)
             {
-                if (window != null)
+                if (window != null && window.WindowHandle != IntPtr.Zero)
                 {
-                    if (window.WindowHandle != IntPtr.Zero)
+                    try
+                    {
+                        Functions.XLockDisplay(window.Display);
                         Functions.XDestroyWindow(window.Display, window.WindowHandle);
-                    //if (window.Display != IntPtr.Zero)
+                    }
-                    //    Functions.XCloseDisplay(window.Display);
+                    finally
+                    {
+                        Functions.XUnlockDisplay(window.Display);
+                    }
+
                     window = null;
                 }
 

Source/OpenTK/Platform/X11/X11GraphicsMode.cs

@@ -80,9 +80,12 @@ namespace OpenTK.Platform.X11
             visualAttributes.Add((int)0);
 
             // Select a visual that matches the parameters set by the user.
-            lock (API.Lock)
-            {
             IntPtr display = API.DefaultDisplay; //Functions.XOpenDisplay(IntPtr.Zero);
+
+            try
+            {
+                Functions.XLockDisplay(display);
+
                 int screen = Functions.XDefaultScreen(display);
                 IntPtr root = Functions.XRootWindow(display, screen);
                 Debug.Print("Display: {0}, Screen: {1}, RootWindow: {2}", display, screen, root);
@@ -116,20 +119,22 @@ namespace OpenTK.Platform.X11
                 
                 gfx = new GraphicsMode(info.visualid, new ColorFormat(r, g, b, a), depth, stencil, samples,
                                        new ColorFormat(ar, ag, ab, aa), buffers, stereo);
-
+            }
-                //Functions.XCloseDisplay(display);
+            finally
+            {
+                Functions.XUnlockDisplay(display);
             }
 
             // Prepare Windows.Forms for creating OpenGL drawables.
-            lock (API.Lock)
+            //lock (API.Lock)
-            {
+            //{
-                Type xplatui = Type.GetType("System.Windows.Forms.XplatUIX11, System.Windows.Forms");
+            //    Type xplatui = Type.GetType("System.Windows.Forms.XplatUIX11, System.Windows.Forms");
-                IntPtr display = (IntPtr)xplatui.GetField("DisplayHandle",
+            //    IntPtr display = (IntPtr)xplatui.GetField("DisplayHandle",
-                    System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
+            //        System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
-                IntPtr root = (IntPtr)xplatui.GetField("RootWindow",
+            //    IntPtr root = (IntPtr)xplatui.GetField("RootWindow",
-                    System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
+            //        System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
-                int screen = (int)xplatui.GetField("ScreenNo",
+            //    int screen = (int)xplatui.GetField("ScreenNo",
-                    System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
+            //        System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic).GetValue(null);
 
 
                 //xplatui.GetField("CustomVisual", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)
@@ -137,9 +142,17 @@ namespace OpenTK.Platform.X11
                 //xplatui.GetField("CustomColormap", System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic)
                 //    .SetValue(null, Functions.XCreateColormap(display, root, visual, 0));
 
-            }
+            //}
             
+            try
+            {
+                Functions.XLockDisplay(display);
                 Functions.XFree(visual);
+            }
+            finally
+            {
+                Functions.XUnlockDisplay(display);
+            }
             
             return gfx;
         }