From 3f8f9b09e3ba883bbe87eabc6bdcb0b217c799f9 Mon Sep 17 00:00:00 2001 From: the_fiddler Date: Thu, 11 Mar 2010 22:53:11 +0000 Subject: [PATCH] Synced with 1.0 branch. --- Build.exe | Bin 270336 -> 339968 bytes Documentation/Changelog.txt | 369 ++++ Documentation/License.txt | 2 +- Documentation/Release.txt | 74 +- Documentation/Todo.txt | 1 - Source/Bind/Specifications/csharp.tm | 1 + Source/Build/Build.cs | 122 +- Source/Build/Properties/Resources.Designer.cs | 28 +- Source/Build/Properties/Resources.resx | 3 + Source/Build/Resources/DoxyFile.txt | 1601 +++++++++++++++++ Source/Examples/Main.cs | 29 +- .../Examples/OpenGL/1.5/VertexBufferObject.cs | 18 - .../OpenTK/GameWindow/ThreadedRendering.cs | 275 +++ .../Examples/OpenTK/Test/GameWindowStates.cs | 119 +- Source/Examples/Shapes/VertexPositionColor.cs | 51 + Source/OpenTK/GameWindow.cs | 84 +- Source/OpenTK/Graphics/OpenGL/GLHelper.cs | 193 +- Source/OpenTK/NativeWindow.cs | 2 +- .../OpenTK/Platform/Dummy/DummyGLContext.cs | 1 + .../OpenTK/Platform/MacOS/CarbonWindowInfo.cs | 1 + Source/OpenTK/Platform/Windows/API.cs | 27 +- .../OpenTK/Platform/Windows/WinGLContext.cs | 1 + Source/OpenTK/Platform/Windows/WinGLNative.cs | 106 +- Source/OpenTK/Platform/Windows/WinRawMouse.cs | 1 + .../OpenTK/Platform/Windows/WinWindowInfo.cs | 1 + Source/OpenTK/Platform/X11/API.cs | 5 +- Source/OpenTK/Platform/X11/Bindings/Glx.cs | 12 +- Source/OpenTK/Platform/X11/Functions.cs | 32 +- Source/OpenTK/Platform/X11/X11GLContext.cs | 137 +- Source/OpenTK/Platform/X11/X11GLNative.cs | 302 +++- Source/OpenTK/Platform/X11/X11GraphicsMode.cs | 54 +- Source/OpenTK/Properties/AssemblyInfo.cs | 4 +- 32 files changed, 3203 insertions(+), 453 deletions(-) create mode 100644 Source/Build/Resources/DoxyFile.txt create mode 100644 Source/Examples/OpenTK/GameWindow/ThreadedRendering.cs create mode 100644 Source/Examples/Shapes/VertexPositionColor.cs diff --git a/Build.exe b/Build.exe index 706254cc03286d1fded44d24fdc7f7b7fe7db18d..d9d09f11a7c058834adc01ef8a59a4ec8d006e8d 100644 GIT binary patch delta 76823 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 QKis)yMFLmb&ZR>i0Z}OjmjD0& delta 6547 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 diff --git a/Documentation/Changelog.txt b/Documentation/Changelog.txt index 869a66d2..29d621aa 100644 --- a/Documentation/Changelog.txt +++ b/Documentation/Changelog.txt @@ -1,3 +1,372 @@ +--------------------------------- + OpenTK 1.0 beta-2 -> 1.0 beta-3 +--------------------------------- + +2010-03-09 the_fiddler + + * Source/Compatibility/Properties/AssemblyInfo.cs, + Source/Examples/Properties/AssemblyInfo.cs, + Source/GLControl/Properties/AssemblyInfo.cs, + Source/OpenTK/Properties/AssemblyInfo.cs: Updated version numbers + for 1.0-beta3 release. + +2010-03-05 the_fiddler + + * Build.exe: Added error messages for missing doxygen or latex + installations. + + * Source/Build/Build.cs: Added error messages for missing doxygen + or latex installations. + + * Source/OpenTK/Platform/X11/Functions.cs: Removed unused code. + + * Source/OpenTK/Platform/X11/API.cs, + Source/OpenTK/Platform/X11/X11GLContext.cs, + Source/OpenTK/Platform/X11/X11GLNative.cs, + Source/OpenTK/Platform/X11/X11GraphicsMode.cs: Ensure that all X + function calls are protected by XLockDisplay/XUnlockDisplay. + Fixed nasty deadlock bug due to (incorrectly) nested XLockDisplay + calls. Removed XLockDisplay from methods that do not use a + display connection. + + * Source/OpenTK/GameWindow.cs: Do not access VSync property without + checking for a current context (avoids + GraphicsContextMissingException when the user moves the context + to its own rendering thread.) + + * Source/Examples/OpenGL/1.5/VertexBufferObject.cs, + Source/Examples/OpenTK/GameWindow/ThreadedRendering.cs, + Source/Examples/Shapes/VertexPositionColor.cs: Added example for + threaded rendering (where OpenGL rendering is performed on its + own thread.) Moved VertexPositionColor struct to its own file, to + simplify sharing between samples. + + * Source/Examples/Main.cs: Added missing license information. + + * Source/OpenTK/Platform/X11/Bindings/Glx.cs: * Glx.cs: Do not use + ContextHandle directly as a p/invoke parameter (not portable). + + * Source/OpenTK/Platform/Dummy/DummyGLContext.cs, + Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs, + Source/OpenTK/Platform/Windows/API.cs, + Source/OpenTK/Platform/Windows/WinGLContext.cs, + Source/OpenTK/Platform/Windows/WinGLNative.cs, + Source/OpenTK/Platform/Windows/WinRawMouse.cs, + Source/OpenTK/Platform/Windows/WinWindowInfo.cs: Marked internal + documentation as such, to avoid littering doxygen output. + + * Source/Examples/OpenTK/Test/GameWindowStates.cs: * Minor code + cleanup and reorganization. * Added support for changing the + window size via + and - keys. * Moved key handling to the KeyDown + event. The user can now press and hold a key to observe how the + GameWindow reacts. + + * Source/OpenTK/Platform/X11/X11GLNative.cs: * Protect all xlib + calls by XLockDisplay/XUnlockDisplay. * Remove + SubstructureNotifyMask, as we are not creating any child windows. + * Return ClientSize instead of Bounds.Size and Location instead + of Bounds.Location for the Size and Location properties + respectively. This aligns the implementation of these properties + on win32 and x11. + +2010-03-02 the_fiddler + + * Source/Compatibility/Properties/AssemblyInfo.cs, + Source/Examples/Properties/AssemblyInfo.cs, + Source/GLControl/Properties/AssemblyInfo.cs, + Source/OpenTK/Properties/AssemblyInfo.cs: Bumped version numbers + for release. + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: X and Y properties + now correctly get and set the window location on screen. + + * Source/Examples/OpenTK/Test/GameWindowStates.cs: Allow arrow keys + to move the window around the screen. + + * Source/OpenTK/Graphics/OpenGL/GLHelper.cs: Added overloads for + Vector[234]d and Matrix4d for a large number of helper functions. + Fixes issue [#1596]: "Vector3d and Vector2d support in Functions + like GL.Vertex3(), GL.Color3(), GL.TexCoord2() etc.". + + * Source/OpenTK/GameWindow.cs: Replaced tabs with spaces. + + GameWindow no longer raises a Resize event before Load. This was + a hack that was introduced to work around some design limitations + in the early days of the library. These limitations no longer + hold (INativeWindow size is now set independently of the Resize + event), so the hack is no longer necessary. The To avoid breaking + existing applications, a Resize event is still raised + unconditionally after Load is complete. + + * Source/Examples/OpenTK/Test/GameWindowStates.cs: Display + information on mouse location and window position/size. + + * Source/OpenTK/NativeWindow.cs: Use retainEvents parameter + according to the documentation (parameter was left unused + before). + + * Source/OpenTK/Platform/Windows/API.cs, + Source/OpenTK/Platform/Windows/WinGLNative.cs: Ensure window is + brought to the top of the z-order when it becomes visible for the + first time (typically when GameWindow.Run() is called.) Ensure + window bounds are correctly restored after leaving fullscreen + mode, by restoring window border before setting the bounds. + +2010-02-06 the_fiddler + + * Source/Build/Build.cs: * Build.cs: Corrected filename casing for + default doxygen target (should be Doxyfile, not DoxyFile). + +2010-02-04 the_fiddler + + * Build.exe: Updated with documentation support. + + * Source/Build/Build.cs: Improved output messages when generating + documentation. + + * Source/Build/Build.cs, Source/Build/Resources/DoxyFile.txt: Do + not report doxygen warnings. Run pdflatex and makeindex in quiet + mode. + + * Source/Build/Build.cs, + Source/Build/Properties/Resources.Designer.cs, + Source/Build/Properties/Resources.resx, + Source/Build/Resources/DoxyFile.txt: Added support for 'doc' + target, which generates html and pdf documentation (requires + doxygen and latex). Fixed implementation of DeleteFiles and + DeleteDirectories. + + * Documentation/Source: Removed empty source documentation + directory from source control. This directory is created as + necessary when generating documentation. + +2010-02-03 the_fiddler + + * Source/Bind/Specifications/GL2/enumext.spec, + Source/Bind/Specifications/GL2/gloverrides.xml, + Source/OpenTK/Graphics/OpenGL/GL.cs, + Source/OpenTK/Graphics/OpenGL/GLCore.cs, + Source/OpenTK/Graphics/OpenGL/GLDelegates.cs, + Source/OpenTK/Graphics/OpenGL/GLEnums.cs, + Source/OpenTK/Graphics/OpenGL/GLHelper.cs: Added explicit + ActiveUniformParameter enum for GetActiveUniforms function. Fixes + issue [#1443]: "GetActiveUniforms parameter name". + + * Source/Bind/Specifications/GL2/enumext.spec, + Source/OpenTK/Graphics/OpenGL/GLEnums.cs: Added missing + TEXTURE_LOD_BIAS token to TextureParameterName. Fixes issue + [#1531]: "TextureParameterName enum missing TEXTURE_LOD_BIAS + element". + + * Source/Bind/Specifications/GL2/enumext.spec, + Source/Bind/Specifications/GL2/gloverrides.xml, + Source/OpenTK/Graphics/OpenGL/GL.cs, + Source/OpenTK/Graphics/OpenGL/GLCore.cs, + Source/OpenTK/Graphics/OpenGL/GLDelegates.cs, + Source/OpenTK/Graphics/OpenGL/GLEnums.cs, + Source/OpenTK/Graphics/OpenGL/GLHelper.cs: Added specific + ArrayCap enum for Enable/DisableClientState. Fixes issue [#1538]: + "GLCore.cs: EnableClientState()". + + * Source/OpenTK/Graphics/Color4.cs: Color4.ToArgb() should scale + components from clamped floats [0.0, 1.0] to unsigned bytes [0, + 255]. Fixes issue [#1504]: "Color4.ToArgb returns wrong results". + + * Source/OpenTK/Math/Vector2d.cs, Source/OpenTK/Math/Vector3d.cs, + Source/OpenTK/Math/Vector4d.cs: Converted single-precision + constants to double-precision in double-precision calculations. + + * Source/OpenTK/Math/Vector2d.cs, Source/OpenTK/Math/Vector3d.cs, + Source/OpenTK/Math/Vector4d.cs: Do not cast to float when + calculating double-precision vector Length. Fixes issue [#1542]: + "Vector3d.Length casts result to float". + +2010-01-28 kanato + + * Source/OpenTK/Platform/MacOS/AglContext.cs, + Source/OpenTK/Platform/MacOS/CarbonGLNative.cs: Fix reported + Width, Height properties for full screen window. + + * Source/OpenTK/GameWindow.cs: Correct NullReferenceException when + initializing GameWindow with GameWindowFlags.FullScreen. + +2010-01-21 the_fiddler + + * Source/OpenTK/Graphics/GraphicsContext.cs: Use the correct + GetCurrentContext() implementation depending on whether we are + using native or embedded (EGL) contexts. + +2010-01-20 the_fiddler + + * Source/OpenTK/Platform/Egl/EglWinPlatformFactory.cs, + Source/OpenTK/Platform/Egl/EglX11PlatformFactory.cs: Use + Egl.GetCurrentContext() instead of Wgl/Glx.GetCurrentContext() in + EglContext. + +2010-01-11 kanato + + * Source/OpenTK/Platform/MacOS/CarbonGLNative.cs: Backport + Width/Height fix (rev. 2577) for MacOS implementation. + +2009-12-27 the_fiddler + + * Source/OpenTK/Platform/Egl/EglContext.cs: Use the graphics mode + that was selected by EglGraphicsMode.SelectGraphicsMode() instead + of the native, platform-specific one. Fixes issue [#1483]: "ES20 + application problem, Graphicmode with stencil buffer?" + + * Source/OpenTK/Platform/Egl/EglWinPlatformFactory.cs: Try to + retrieve the EGL display for the current DC before falling back + to the default display. + + * Source/OpenTK/Platform/Egl/Egl.cs, + Source/OpenTK/Platform/Egl/EglContext.cs, + Source/OpenTK/Platform/Egl/EglGraphicsMode.cs, + Source/OpenTK/Platform/Egl/EglWinPlatformFactory.cs, + Source/OpenTK/Platform/Egl/EglWindowInfo.cs, + Source/OpenTK/Platform/Egl/EglX11PlatformFactory.cs: Replaced + struct wrappers over IntPtr by plain IntPtr types. This should + ensure correct p/invoke behavior regardless of the OS/CPU. + + * Source/OpenTK/GameWindow.cs: Avoid enabling VSync repeatedly, + when VSyncMode is Adaptive and TargetRenderPeriod is 0. Should + remove jitter observed on specific configurations. Solves issue + [#1482]: "OnRenderFrame elapsed time". + + * Source/Examples/OpenGLES/2.0/SimpleWindow20.cs: Renamed, since + example doesn't use immediate mode. Removed unused code. + +2009-12-26 the_fiddler + + * Source/OpenTK/Audio/AudioContext.cs, + Source/OpenTK/Platform/X11/Bindings/Glx.cs, + Source/OpenTK/Platform/X11/X11GLContext.cs, + Source/OpenTK/Platform/X11/X11GLNative.cs, + Source/OpenTK/Platform/X11/X11Input.cs, + Source/OpenTK/Platform/X11/X11WindowInfo.cs: Marked as internal + so they don't appear in doxygen documentation. + +2009-12-22 the_fiddler + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Avoid NRE when + setting the foreground window in WindowMessage.CREATE. Fixes + issue [#1467]: "Failure to initialize on Windows." + + * Source/OpenTK/Input/MouseDevice.cs: Corrected rounding of + negative delta values. Fixes issue [#1446]: + "MouseWheelEventArgs.Delta". + +2009-12-18 the_fiddler + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Calculate the + correct client rectangle when modifying width or height. Fixes + issue [#1457]: "GameWindow Width and Height properties are + inconsistent". + +2009-12-15 the_fiddler + + * Source/OpenTK/OpenTK.dll.config: Added missing OpenCL dllmap for + Mac OS X (thanks chrisse27). + +2009-12-14 the_fiddler + + * Source/OpenTK/Graphics/OpenGL/GLHelper.cs: * GLHelper.cs: Fixed + StackOverflowException in TexCoordPointer overload. (Issue + [#1444]: "TexCoordPointer creates StackOverflow"). + +2009-12-09 the_fiddler + + * Source/Examples/OpenGLES/1.1/SimpleWindow.cs, + Source/Examples/OpenGLES/2.0/SimpleWindow20.cs: ClearColor takes + a clamped float in the range 0.0-1.0, instead of a byte argument. + + * Source/OpenTK/Platform/EmbeddedGraphicsContext.cs: Do not attempt + to load ES10 and ES11 entry points, as these are disabled in + 1.0.0. + +2009-12-06 the_fiddler + + * Source/OpenTK/Audio/OpenAL/AL/AL.cs: Clarified documentation for + alGetListener3f parameters. + + * Source/Bind/Specifications/GL2/enumext.spec, + Source/OpenTK/Graphics/OpenGL/GLEnums.cs: Added missing 3.1 core + PRIMITIVE_RESTART token. Fixes issue [#1422]: "Missing + EnableCap.PrimitiveRestart". + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Removed IME class + style. Fixes the alt-tab order issue, where NativeWindows would + always appear last in the tab order (issue [#1244]: "Alt+Tab + weirdness"). Removed VRedraw and HRedraw class styles (not + necessary, since we are not relying on WM_PAINT messages). + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Removed unused + code. + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Ensure window is + activated and focused when created. + + * Source/OpenTK/GameWindow.cs, + Source/OpenTK/Platform/X11/X11GLContext.cs, + Source/OpenTK/Platform/X11/X11GLNative.cs: Do not call Dispose() + automatically on GameWindow.Close(). Ensure that Unload event is + raised before window destruction, Ensure that Render and + UpdateFrame events are not called once the shutdown sequence is + initiated. + + * Source/OpenTK/Platform/Windows/API.cs, + Source/OpenTK/Platform/Windows/WinGLNative.cs: * + OpenTK/Platform/Windows/API.cs: added SetForegroundWindow + dllimport. + + * OpenTK/Platform/Windows/WinGLNative.cs: Move window to the + foreground before entering fullscreen mode. + +2009-11-25 the_fiddler + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Correctly reset + Visible state when changing WindowBorder. Fixes issue [#1418]: + "[OpenTK] Invisible window when changing from Fullscreen to + Normal WIndowState on Windows 7". + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Fixed build + breakage introduced in r2551. + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Removed stale + code. + + * Source/OpenTK/Platform/Windows/WinGLNative.cs: Use + TrackMouseEvent function for generating MouseEnter/MouseLeave + events. Resolves issues associated with SetCapture and windows + focus (bug [#1419]: "[OpenTK] NativeWindow reported as focused + whenever mouse enters its area, even without clicking (win32)"). + + * Source/OpenTK/Platform/X11/X11GLNative.cs: * X11GLNative.cs: Only + raise WindowStateChanged when the relevant PropertyNotify event + arrives. Fixes issue [#966]: "[GameWindow] Changing WindowBorder + from Hidden to Normal/Fixed does not update the relevant property + on KDE4.2". + + * Source/Examples/OpenGL/1.1/VertexArrays.cs, + Source/Examples/OpenGL/1.1/VertexLighting.cs, + Source/Examples/OpenGL/GLSL/SimpleGLSL.cs, + Source/Examples/OpenTK/GameWindow/FullscreenAntialias.cs, + Source/Examples/OpenTK/GameWindow/SimpleWindow.cs, + Source/Examples/OpenTK/Test/Multithreading.cs, + Source/Examples/Utilities.cs: Normalized keyboard handling to use + F11 for fullscreen/normal switches. + +2009-11-23 kanato + + * Source/OpenTK/Platform/MacOS/AglContext.cs: MacOS: Fix context + sharing. + + * Source/OpenTK/GameWindow.cs, Source/OpenTK/NativeWindow.cs, + Source/OpenTK/Platform/MacOS/AglContext.cs, + Source/OpenTK/Platform/MacOS/CarbonGLNative.cs, + Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs: MacOS: + Implement CarbonWindowInfo hack for going fullscreen. + --------------------------------- OpenTK 1.0 beta-1 -> 1.0 beta-2 --------------------------------- diff --git a/Documentation/License.txt b/Documentation/License.txt index 35066bd4..c803ab75 100644 --- a/Documentation/License.txt +++ b/Documentation/License.txt @@ -1,6 +1,6 @@ The Open Toolkit library license -Copyright (c) 2006 - 2009 The Open Toolkit library. +Copyright (c) 2006 - 2010 The Open Toolkit library. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/Documentation/Release.txt b/Documentation/Release.txt index 0f6cbfda..1f3f54e3 100644 --- a/Documentation/Release.txt +++ b/Documentation/Release.txt @@ -1,18 +1,19 @@ -The Open Toolkit 1.0 beta 2 +The Open Toolkit 1.0 beta 3 [Overview] -This is the second beta release of OpenTK 1.0. This release a laarge number of issues identified in the first beta. Additionally, it: -* improves support for Mac OS × (multiple monitors, dock integration, input focus and more). -* allows OpenTK to run on *BSD, Solaris and other Unix variants. -* fixes a timing issue that caused UpdateFrame events to be raised up to 50% faster than necessary. -* adds a number of missing tokens for OpenGL 3.1 and 3.2. -* fixes mouse movement on windows and adds support for fractional wheel values (available in high-precision mice). -* fixes and optimizes quaternion-vector transforms. -* further improves multithreading support on Linux. -* works around a Visual Studio bug, which caused a number of OpenGL wrappers to disappear from intellisense. +This is the third beta release of OpenTK 1.0. This release resolves a large number of identified issues: +* adds support for doxygen-based documentation. +* significantly improves GameWindow stability. +* improves stability on multithreaded scenarios. +* fixes a number of input-related bugs. +* improves support for OpenGL 3.2 functions and adds a number of missing OpenGL tokens. +* features a better "GameWindow States" sample and introduces a "Multithreaded Rendering" sample. +* adds new double-precision based OpenGL overloads. +* fixes a number of smaller annoyances and oversights. + Visit http://www.opentk.com for the latest news and information on the Open Toolkit. @@ -20,23 +21,32 @@ Visit http://www.opentk.com for the latest news and information on the Open Tool [Resolved issues] -[#805] -[#1098] -[#1162] -[#1166] -[#1216] -[#1279] -[#1324] -[#1354] -[#1355] -[#1364] -[#1367] -[#1372] -[#1373] -[#1376] -[#1378] -[#1382] -[#1386] +[#966] +[#1244] +[#1343] +[#1417] +[#1418] +[#1419] +[#1422] +[#1443] +[#1444] +[#1446] +[#1457] +[#1467] +[#1468] +[#1483] +[#1492] +[#1498] +[#1504] +[#1508] +[#1531] +[#1538] +[#1542] +[#1593] +[#1596] +[#1598] +[#1600] + Please report any issues you encounter at http://www.opentk.com/node/add/project-issue/opentk @@ -44,16 +54,17 @@ Please report any issues you encounter at http://www.opentk.com/node/add/project [Known issues] -* The Mac OS X port needs testing. If you encounter a bug, please report it at http://www.opentk.com/node/add/project-issue/opentk. +* The Mac OS X port needs more testing. If you encounter a bug, please report it at http://www.opentk.com/node/add/project-issue/opentk. * OpenGL 3.1 and 3.2 fucntions may be missing specific tokens. Please report any such issues at http://www.opentk.com/node/add/project-issue/opentk * Mono 2.2 and 2.4.0 fail to compile OpenTK due to a compiler bug (https://bugzilla.novell.com/show_bug.cgi?id=488960). Please compile with Mono 2.0, 2.4.2+ or use the supplied binaries instead. -* The example browser is a work-in-progress. +* The example browser should list summaries for available samples. * MonoDevelop fails to sign assemblies (bugs https://bugzilla.novell.com/show_bug.cgi?id=484752 and https://bugzilla.novell.com/show_bug.cgi?id=537063). +* XBuild <= 2.6.1 fails to compile OpenTK. This issue has been upstream. [API changes] @@ -63,6 +74,11 @@ Please note that binary compatibility is not preserved between beta releases. If you are upgrading from OpenTK 0.9.9-0 or earlier you can simplify the upgrade process by adding a reference to OpenTK.Compatibility.dll and OpenTK.GLControl.dll (if necessary). OpenTK.Compatibility contains code and APIs that have been deprecated and removed from the core library and supports applications written against the Tao framework (Tao.OpenGl, Tao.OpenAl and Tao.Platform.Windows.SimpleOpenGlControl). +[1.0 beta-3] + +No API changes. + + [1.0 beta-2] 1. NormalPointer(..., int) and FogCoordPointer(..., int) overloads no longer specify a 'size' argument. diff --git a/Documentation/Todo.txt b/Documentation/Todo.txt index 3ff249b5..eaee09c1 100644 --- a/Documentation/Todo.txt +++ b/Documentation/Todo.txt @@ -1,5 +1,4 @@ [General] -+ Split TextPrinter from the core OpenTK. + Change all public APIs to conform to the class library interface guidelines. + Revisit all classes and make sure IDisposable is correctly implemented. + Remove System.Windows.Forms dependency. diff --git a/Source/Bind/Specifications/csharp.tm b/Source/Bind/Specifications/csharp.tm index 1e6011fc..97fa316d 100644 --- a/Source/Bind/Specifications/csharp.tm +++ b/Source/Bind/Specifications/csharp.tm @@ -38,6 +38,7 @@ GLuint64, UInt64 # ARB_sync (introduced in 3.2) sync, IntPtr +GLsync, IntPtr # Wgl types. PROC, IntPtr diff --git a/Source/Build/Build.cs b/Source/Build/Build.cs index c6a5d18f..489d969c 100644 --- a/Source/Build/Build.cs +++ b/Source/Build/Build.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ @@ -21,23 +21,27 @@ namespace OpenTK.Build { class Project { - static string RootPath = Directory.GetCurrentDirectory(); - static string SourcePath = Path.Combine(RootPath, "Source"); + static readonly string RootPath = Directory.GetCurrentDirectory(); + static readonly string SourcePath = Path.Combine(RootPath, "Source"); + static readonly string DocPath = Path.Combine(RootPath, "Documentation"); const string bindings = "Generator.Prebuild.xml"; const string opentk = "OpenTK.Prebuild.xml"; const string quickstart = "QuickStart.Prebuild.xml"; + const string DoxyFile = "Doxyfile"; + const string ReferenceFile = "Reference.pdf"; - const string keyfile = "OpenTK.snk"; // Do not change + const string KeyFile = "OpenTK.snk"; // Do not change const string Usage = @"Usage: Build.exe target - target: one of vs, vs9, clean, distclean, help"; + target: one of vs, vs9, doc, clean, distclean, help"; const string Help = Usage + @" Available targets: vs: Create Visual Studio 2005 project files. vs9: Create Visual Studio 2008 project files. + doc: Builds html and pdf documentation. clean: Delete intermediate files but leave final binaries and project files intact. distclean: Delete intermediate files, final binaries and project files. @@ -60,6 +64,7 @@ Assembly signing: Net, Clean, DistClean, + Docs, } static void PrintUsage() @@ -87,7 +92,7 @@ Assembly signing: try { - PreparePrebuildFiles(); + PrepareBuildFiles(); PrepareEnvironment(); BuildTarget target = SelectTarget(args); @@ -102,7 +107,7 @@ Assembly signing: { // Wait until Prebuild releases the input files. System.Threading.Thread.Sleep(2000); - DeletePrebuildFiles(); + DeleteBuildFiles(); } WaitForExit(); @@ -115,16 +120,26 @@ Assembly signing: Environment.SetEnvironmentVariable("ProgramFiles(x86)", String.Empty, EnvironmentVariableTarget.Process); } - private static void PreparePrebuildFiles() + private static void PrepareBuildFiles() { //string sign_assembly = CheckKeyFile(keyfile) ? "SIGN_ASSEMBLY" : ""; - string sign_assembly = CheckKeyFile(keyfile) ? @"" + keyfile + @"" : ""; + string sign_assembly = CheckKeyFile(KeyFile) ? @"" + KeyFile + @"" : ""; if (sign_assembly != "") - DistributeKeyFile(keyfile); + DistributeKeyFile(KeyFile); File.WriteAllText(bindings, String.Format(Resources.Generator, sign_assembly)); File.WriteAllText(opentk, String.Format(Resources.OpenTK, sign_assembly)); File.WriteAllText(quickstart, String.Format(Resources.QuickStart, sign_assembly)); + + string doxy = Regex.Replace(Resources.DoxyFile, @"(\{\}|\{\w+\})", ""); + File.WriteAllText(DoxyFile, String.Format(doxy, GetVersion())); + } + + // Returns the version of the executing assembly. + static string GetVersion() + { + string version = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + return version; } // Copies keyfile to the various source directories. This is necessary @@ -174,6 +189,11 @@ Assembly signing: target = BuildTarget.VS2008; break; + case "doc": + case "docs": + target = BuildTarget.Docs; + break; + case "clean": target = BuildTarget.Clean; break; @@ -230,13 +250,40 @@ Assembly signing: ExecutePrebuild("/target", "vs2008", "/file", quickstart); break; + case BuildTarget.Docs: + Console.WriteLine("Generating reference documentation (this may take several minutes)..."); + Console.WriteLine("Generating html sources..."); + try { ExecuteCommand("doxygen", null, null); } + catch + { + Console.WriteLine("Failed to run \"doxygen\"."); + Console.WriteLine("Please consult the documentation for more information."); + } + + string latex_path = Path.Combine(Path.Combine(DocPath, "Source"), "latex"); + Console.WriteLine("Compiling sources to pdf..."); + try + { + ExecuteCommand("pdflatex", latex_path, "-interaction=batchmode", "refman.tex"); + ExecuteCommand("makeindex", latex_path, "-q", "refman.idx"); + ExecuteCommand("pdflatex", latex_path, "-interaction=batchmode", "refman.tex"); + } + catch + { + Console.WriteLine("Failed to run \"pdflatex\" or \"makeindex\"."); + Console.WriteLine("Please consult the documentation for more information"); + } + File.Copy(Path.Combine(latex_path, "refman.pdf"), + Path.Combine(DocPath, ReferenceFile), true); + break; + case BuildTarget.Clean: Console.WriteLine("Cleaning intermediate object files."); ExecutePrebuild("/clean", "/yes", "/file", bindings); ExecutePrebuild("/clean", "/yes", "/file", opentk); ExecutePrebuild("/clean", "/yes", "/file", quickstart); DeleteDirectories(RootPath, "obj"); - DeleteFiles(SourcePath, keyfile); + DeleteFiles(SourcePath, KeyFile); break; case BuildTarget.DistClean: @@ -246,11 +293,21 @@ Assembly signing: ExecutePrebuild("/clean", "/yes", "/file", quickstart); DeleteDirectories(RootPath, "obj"); DeleteDirectories(RootPath, "bin"); - DeleteFiles(SourcePath, keyfile); + DeleteDirectories(DocPath, "Source"); + DeleteFiles(DocPath, ReferenceFile); + DeleteFiles(SourcePath, KeyFile); string binaries_path = Path.Combine(RootPath, "Binaries"); - if (Directory.Exists(binaries_path)) - Directory.Delete(binaries_path, true); + try + { + if (Directory.Exists(binaries_path)) + Directory.Delete(binaries_path, true); + } + catch (Exception e) + { + Console.WriteLine("Failed to delete directory \"{0}\".", binaries_path); + Console.WriteLine(e.ToString()); + } break; @@ -265,18 +322,20 @@ Assembly signing: { if (Debugger.IsAttached) { + Console.WriteLine(); Console.WriteLine("Press any key to continue..."); Console.ReadKey(true); } } - static void DeletePrebuildFiles() + static void DeleteBuildFiles() { try { File.Delete(bindings); File.Delete(opentk); File.Delete(quickstart); + File.Delete(DoxyFile); } catch (IOException e) { @@ -296,9 +355,7 @@ Assembly signing: static void DeleteDirectories(string root_path, string search) { Console.WriteLine("Deleting {0} directories", search); - List matches = new List(); - FindDirectories(root_path, search, matches); - foreach (string m in matches) + foreach (string m in Directory.GetDirectories(root_path, search, SearchOption.AllDirectories)) { Directory.Delete(m, true); } @@ -307,9 +364,7 @@ Assembly signing: static void DeleteFiles(string root_path, string search) { Console.WriteLine("Deleting {0} files", search); - List matches = new List(); - FindDirectories(root_path, search, matches); - foreach (string m in matches) + foreach (string m in Directory.GetFiles(root_path, search, SearchOption.AllDirectories)) { File.Delete(m); } @@ -386,6 +441,31 @@ Assembly signing: Prebuild.EntryPoint.Invoke(null, new object[] { options }); } + static void ExecuteCommand(string command, string workingDirectory, params string[] options) + { + ProcessStartInfo psi = new ProcessStartInfo(command); + + if (options != null) + { + StringBuilder sb = new StringBuilder(); + foreach (string opt in options) + { + sb.Append(opt); + sb.Append(" "); + } + psi.Arguments = sb.ToString(); + } + + if (!String.IsNullOrEmpty(workingDirectory)) + { + psi.WorkingDirectory = workingDirectory; + psi.UseShellExecute = false; + } + + Process p = Process.Start(psi); + p.WaitForExit(); + } + static bool CheckKeyFile(string keyfile) { if (!File.Exists(keyfile)) diff --git a/Source/Build/Properties/Resources.Designer.cs b/Source/Build/Properties/Resources.Designer.cs index bd546bbe..46283a8e 100644 --- a/Source/Build/Properties/Resources.Designer.cs +++ b/Source/Build/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4918 +// Runtime Version:2.0.50727.4927 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -60,6 +60,28 @@ namespace OpenTK.Build.Properties { } } + /// + /// Looks up a localized string similar to # Doxyfile 1.6.1 + /// + ///# This file describes the settings to be used by the documentation system + ///# doxygen (www.doxygen.org) for a project + ///# + ///# All text after a hash (#) is considered a comment and will be ignored + ///# The format is: + ///# TAG = value [value, ...] + ///# For lists items can also be appended using: + ///# TAG += value [value, ...] + ///# Values that contain spaces should be placed between quotes (" ") + /// + ///#--------------------------------------------------------------------------- + ///# Project relate [rest of string was truncated]";. + /// + internal static string DoxyFile { + get { + return ResourceManager.GetString("DoxyFile", resourceCulture); + } + } + /// /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8" ?> ///<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd"> @@ -96,13 +118,13 @@ namespace OpenTK.Build.Properties { /// <CompilerDefines>DEBUG;TRACE;</CompilerDefines> /// <OptimizeCode>false</OptimizeCode> /// <DebugInformation>true</DebugInformation> + /// {0} <!-- KeyFile --> /// </Options> /// </Configuration> /// /// <Configuration name="Release"> /// <Options> - /// <CompilerDefines>TRACE;</CompilerDefines> - /// <Optimize [rest of string was truncated]";. + /// <CompilerDefines>TRACE;</Compi [rest of string was truncated]";. /// internal static string OpenTK { get { diff --git a/Source/Build/Properties/Resources.resx b/Source/Build/Properties/Resources.resx index 6d85a8ec..4ad16bb3 100644 --- a/Source/Build/Properties/Resources.resx +++ b/Source/Build/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\DoxyFile.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1253 + ..\Resources\Generator.Prebuild.xml;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/Source/Build/Resources/DoxyFile.txt b/Source/Build/Resources/DoxyFile.txt new file mode 100644 index 00000000..3c789965 --- /dev/null +++ b/Source/Build/Resources/DoxyFile.txt @@ -0,0 +1,1601 @@ +# Doxyfile 1.6.2 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "The Open Toolkit library" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = {0} + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = Documentation/Source + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = YES + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C. Note that for custom extensions you also need to set +# FILE_PATTERNS otherwise the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = YES + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = YES + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = YES + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 28 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = NO + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = NO + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = NO + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = NO + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = NO + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = "Source/OpenTK" \ + "Source/GLControl" + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.d \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.cs \ + *.php \ + *.php3 \ + *.inc \ + *.m \ + *.mm \ + *.dox \ + *.py \ + *.f90 \ + *.f \ + *.vhd \ + *.vhdl + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = YES + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = NO + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. + +GENERATE_TREEVIEW = NO + +# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list. + +USE_INLINE_TREES = NO + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a PHP enabled web server instead of at the web client +# using Javascript. Doxygen will generate the search PHP script and index +# file to put on the web server. The advantage of the server +# based approach is that it scales better to large projects and allows +# full text search. The disadvances is that it is more difficult to setup +# and does not have live searching capabilities. + +SERVER_BASED_SEARCH = NO + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES diff --git a/Source/Examples/Main.cs b/Source/Examples/Main.cs index e111ebed..5aa86cfb 100644 --- a/Source/Examples/Main.cs +++ b/Source/Examples/Main.cs @@ -1,4 +1,31 @@ -using System; +#region License +// +// The Open Toolkit Library License +// +// Copyright (c) 2006 - 2010 the Open Toolkit library, except where noted. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do +// so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// +#endregion + +using System; using System.Collections.Generic; using System.Text; using System.Windows.Forms; diff --git a/Source/Examples/OpenGL/1.5/VertexBufferObject.cs b/Source/Examples/OpenGL/1.5/VertexBufferObject.cs index 3986bc42..fb686370 100644 --- a/Source/Examples/OpenGL/1.5/VertexBufferObject.cs +++ b/Source/Examples/OpenGL/1.5/VertexBufferObject.cs @@ -31,24 +31,6 @@ namespace Examples.Tutorial struct Vbo { public int VboID, EboID, NumElements; } Vbo[] vbo = new Vbo[2]; - [StructLayout(LayoutKind.Sequential, Pack = 1)] - struct VertexPositionColor - { - public Vector3 Position; - public uint Color; - - public VertexPositionColor(float x, float y, float z, Color color) - { - Position = new Vector3(x, y, z); - Color = ToRgba(color); - } - - static uint ToRgba(Color color) - { - return (uint)color.A << 24 | (uint)color.B << 16 | (uint)color.G << 8 | (uint)color.R; - } - } - VertexPositionColor[] CubeVertices = new VertexPositionColor[] { new VertexPositionColor(-1.0f, -1.0f, 1.0f, Color.DarkRed), diff --git a/Source/Examples/OpenTK/GameWindow/ThreadedRendering.cs b/Source/Examples/OpenTK/GameWindow/ThreadedRendering.cs new file mode 100644 index 00000000..2a0f8290 --- /dev/null +++ b/Source/Examples/OpenTK/GameWindow/ThreadedRendering.cs @@ -0,0 +1,275 @@ +#region License +// +// The Open Toolkit Library License +// +// Copyright (c) 2006 - 2010 the Open Toolkit library, except where noted. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do +// so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// +#endregion + +using System; +using System.Diagnostics; +using System.Drawing; +using System.Threading; +using OpenTK; +using OpenTK.Graphics.OpenGL; +using OpenTK.Input; + +namespace Examples.Tutorial +{ + /// + /// Demonstrates how to decouple rendering from the main thread. + /// Note that all OpenGL function calls should take place at the rendering thread - + /// OpenGL will not be available on the main thread at all! + /// + [Example("Threaded Rendering", ExampleCategory.OpenTK, "GameWindow", Documentation = "ThreadedRendering")] + public class ThreadedRendering : GameWindow + { + bool viewport_changed = true; + int viewport_width, viewport_height; + bool exit = false; + Thread rendering_thread; + object update_lock = new object(); + const float rotation_speed = 180.0f; + float angle; + float aspect_ratio; + + readonly VertexPositionColor[] CubeVertices = new VertexPositionColor[] + { + new VertexPositionColor(-1.0f, -1.0f, 1.0f, Color.DarkRed), + new VertexPositionColor( 1.0f, -1.0f, 1.0f, Color.DarkRed), + new VertexPositionColor( 1.0f, 1.0f, 1.0f, Color.Gold), + new VertexPositionColor(-1.0f, 1.0f, 1.0f, Color.Gold), + new VertexPositionColor(-1.0f, -1.0f, -1.0f, Color.DarkRed), + new VertexPositionColor( 1.0f, -1.0f, -1.0f, Color.DarkRed), + new VertexPositionColor( 1.0f, 1.0f, -1.0f, Color.Gold), + new VertexPositionColor(-1.0f, 1.0f, -1.0f, Color.Gold) + }; + + readonly short[] CubeElements = new short[] + { + 0, 1, 2, 2, 3, 0, // front face + 3, 2, 6, 6, 7, 3, // top face + 7, 6, 5, 5, 4, 7, // back face + 4, 0, 3, 3, 7, 4, // left face + 0, 1, 5, 5, 4, 0, // bottom face + 1, 5, 6, 6, 2, 1, // right face + }; + + public ThreadedRendering() + : base(800, 600) + { + Keyboard.KeyDown += Keyboard_KeyDown; + } + + #region Keyboard_KeyDown + + /// + /// Occurs when a key is pressed. + /// + /// The KeyboardDevice which generated this event. + /// The key that was pressed. + void Keyboard_KeyDown(object sender, KeyboardKeyEventArgs e) + { + if (e.Key == Key.Escape) + this.Exit(); + + if (e.Key == Key.F11) + if (this.WindowState == WindowState.Fullscreen) + this.WindowState = WindowState.Normal; + else + this.WindowState = WindowState.Fullscreen; + } + + #endregion + + #region OnLoad + + /// + /// Setup OpenGL and load resources here. + /// + /// Not used. + protected override void OnLoad(EventArgs e) + { + Context.MakeCurrent(null); // Release the OpenGL context so it can be used on the new thread. + + rendering_thread = new Thread(RenderLoop); + rendering_thread.IsBackground = true; + rendering_thread.Start(); + } + + #endregion + + #region OnUnload + + /// + /// Release resources here. + /// + /// Not used. + protected override void OnUnload(EventArgs e) + { + exit = true; // Set a flag that the rendering thread should stop running. + rendering_thread.Join(); + + base.OnUnload(e); + } + + #endregion + + #region OnResize + + /// + /// Respond to resize events here. + /// + /// Contains information on the new GameWindow size. + /// There is no need to call the base implementation. + protected override void OnResize(EventArgs e) + { + // Note that we cannot call any OpenGL methods directly. What we can do is set + // a flag and respond to it from the rendering thread. + lock (update_lock) + { + viewport_changed = true; + viewport_width = Width; + viewport_height = Height; + } + } + + #endregion + + #region OnUpdateFrame + + /// + /// Add your game logic here. + /// + /// Contains timing information. + /// There is no need to call the base implementation. + protected override void OnUpdateFrame(FrameEventArgs e) + { + // Nothing to do! + } + + #endregion + + #region OnRenderFrame + + /// + /// Ignored. All rendering is performed on our own rendering function. + /// + /// Contains timing information. + /// There is no need to call the base implementation. + protected override void OnRenderFrame(FrameEventArgs e) + { + } + + #endregion + + #region RenderLoop + + void RenderLoop() + { + MakeCurrent(); // The context now belongs to this thread. No other thread may use it! + + VSync = VSyncMode.On; + + // Since we don't use OpenTK's timing mechanism, we need to keep time ourselves; + Stopwatch watch = new Stopwatch(); + watch.Start(); + + GL.ClearColor(Color.MidnightBlue); + GL.Enable(EnableCap.DepthTest); + + while (!exit) + { + Render(watch.Elapsed.TotalSeconds); + + watch.Reset(); // Stopwatch may be inaccurate over larger intervals. + watch.Start(); // Plus, timekeeping is easier if we always start counting from 0. + + SwapBuffers(); + } + } + + #endregion + + #region Render + + /// + /// This is our main rendering function, which executes on the rendering thread. + /// + public void Render(double time) + { + lock (update_lock) + { + if (viewport_changed) + { + GL.Viewport(0, 0, viewport_width, viewport_height); + aspect_ratio = viewport_width / (float)viewport_height; + viewport_changed = false; + } + } + + Matrix4 perspective = + Matrix4.CreatePerspectiveFieldOfView(MathHelper.PiOver4, aspect_ratio, 1, 64); + GL.MatrixMode(MatrixMode.Projection); + GL.LoadMatrix(ref perspective); + + Matrix4 lookat = Matrix4.LookAt(0, 5, 5, 0, 0, 0, 0, 1, 0); + GL.MatrixMode(MatrixMode.Modelview); + GL.LoadMatrix(ref lookat); + + GL.Clear(ClearBufferMask.ColorBufferBit | ClearBufferMask.DepthBufferBit); + + angle += rotation_speed * (float)time; + GL.Rotate(angle, 0.0f, 1.0f, 0.0f); + + GL.Begin(BeginMode.Triangles); + for (int i = 0; i < CubeElements.Length; i++) + { + int element = CubeElements[i]; + uint color = CubeVertices[element].Color; + GL.Color4((byte)(color), (byte)(color >> 8), (byte)(color >> 16), (byte)(color >> 24)); + GL.Vertex3(CubeVertices[element].Position); + } + GL.End(); + } + + #endregion + + #region public static void Main() + + /// + /// Entry point of this example. + /// + [STAThread] + public static void Main() + { + using (GameWindow example = new ThreadedRendering()) + { + // Get the title and category of this example using reflection. + Utilities.SetWindowTitle(example); + example.Run(30.0, 0.0); + } + } + + #endregion + } +} diff --git a/Source/Examples/OpenTK/Test/GameWindowStates.cs b/Source/Examples/OpenTK/Test/GameWindowStates.cs index c19eed86..7777c669 100644 --- a/Source/Examples/OpenTK/Test/GameWindowStates.cs +++ b/Source/Examples/OpenTK/Test/GameWindowStates.cs @@ -17,28 +17,34 @@ using OpenTK.Input; namespace Examples.Tests { - [Example("GameWindow states", ExampleCategory.OpenTK, "Test", Documentation="GameWindowStates")] + [Example("GameWindow states", ExampleCategory.OpenTK, "Test", Documentation = "GameWindowStates")] public class GameWindowStates : GameWindow { - readonly Font TextFont = new Font(FontFamily.GenericSansSerif, 16); - readonly Bitmap TextBitmap = new Bitmap(1024, 256); + static readonly Font TextFont = new Font(FontFamily.GenericSansSerif, 12); + Bitmap TextBitmap = new Bitmap(512, 512); int texture; bool mouse_in_window = false; - + bool viewport_changed = true; + bool refresh_text = true; + public GameWindowStates() : base(800, 600) { VSync = VSyncMode.On; - Keyboard.KeyUp += KeyUpHandler; - - WindowBorderChanged += delegate(object sender, EventArgs e) { UpdateText(); }; - WindowStateChanged += delegate(object sender, EventArgs e) { UpdateText(); }; - FocusedChanged += delegate(object sender, EventArgs e) { UpdateText(); }; - MouseEnter += delegate(object sender, EventArgs e) { mouse_in_window = true; UpdateText(); }; - MouseLeave += delegate(object sender, EventArgs e) { mouse_in_window = false; UpdateText(); }; + Keyboard.KeyRepeat = true; + Keyboard.KeyDown += KeyDownHandler; + + MouseEnter += delegate { mouse_in_window = true; }; + MouseLeave += delegate { mouse_in_window = false; }; + + Move += delegate { refresh_text = true; }; + Resize += delegate { refresh_text = true; }; + WindowBorderChanged += delegate { refresh_text = true; }; + WindowStateChanged += delegate { refresh_text = true; }; + Mouse.Move += delegate { refresh_text = true; }; } - void KeyUpHandler(object sender, KeyboardKeyEventArgs e) + void KeyDownHandler(object sender, KeyboardKeyEventArgs e) { switch (e.Key) { @@ -52,60 +58,100 @@ namespace Examples.Tests case Key.Number5: WindowBorder = WindowBorder.Resizable; break; case Key.Number6: WindowBorder = WindowBorder.Fixed; break; case Key.Number7: WindowBorder = WindowBorder.Hidden; break; + + case Key.Left: X = X - 16; break; + case Key.Right: X = X + 16; break; + case Key.Up: Y = Y - 16; break; + case Key.Down: Y = Y + 16; break; + + case Key.KeypadPlus: + case Key.Plus: Size += new Size(16, 16); break; + + case Key.KeypadMinus: + case Key.Minus: Size -= new Size(16, 16); break; } } - - void UpdateText() + + static int Clamp(int val, int min, int max) { - using (Graphics gfx = Graphics.FromImage(TextBitmap)) - { - gfx.Clear(Color.MidnightBlue); - gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + return val > max ? max : val < min ? min : val; + } + + static void DrawString(Graphics gfx, string str, int line) + { + gfx.DrawString(str, TextFont, Brushes.White, new PointF(0, line * TextFont.Height)); + } - gfx.DrawString(String.Format("[1 - 4]: change WindowState (current: {0}).", this.WindowState), TextFont, Brushes.White, new PointF(0, 0)); - gfx.DrawString(String.Format("[5 - 7]: change WindowBorder (current: {0}).", this.WindowBorder), TextFont, Brushes.White, new PointF(0, TextFont.Height)); - gfx.DrawString(String.Format("Focused: {0}.", this.Focused), TextFont, Brushes.White, new PointF(0, 2 * TextFont.Height)); - gfx.DrawString(String.Format("Mouse {0} window.", mouse_in_window ? "inside" : "outside of"), TextFont, Brushes.White, new PointF(0, 3 * TextFont.Height)); + protected override void OnUpdateFrame(FrameEventArgs e) + { + if (refresh_text) + { + refresh_text = false; + + using (Graphics gfx = Graphics.FromImage(TextBitmap)) + { + int line = 0; + + gfx.Clear(Color.MidnightBlue); + gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit; + + DrawString(gfx, String.Format("[1 - 4]: change WindowState (current: {0}).", this.WindowState), line++); + DrawString(gfx, String.Format("[5 - 7]: change WindowBorder (current: {0}).", this.WindowBorder), line++); + DrawString(gfx, String.Format("Focused: {0}.", this.Focused), line++); + DrawString(gfx, String.Format("Mouse {0} window.", mouse_in_window ? "inside" : "outside of"), line++); + DrawString(gfx, String.Format("Mouse position: {0}", new Vector3(Mouse.X, Mouse.Y, Mouse.Wheel)), line++); + DrawString(gfx, String.Format("Window.Bounds: {0}", Bounds), line++); + DrawString(gfx, String.Format("Window.Location: {0}, Size: {1}", Location, Size), line++); + DrawString(gfx, String.Format("Window.{{X={0}, Y={1}, Width={2}, Height={3}}}", X, Y, Width, Height), line++); + DrawString(gfx, String.Format("Window.ClientRectangle: {0}", ClientRectangle), line++); + } } - System.Drawing.Imaging.BitmapData data = TextBitmap.LockBits(new System.Drawing.Rectangle(0, 0, TextBitmap.Width, TextBitmap.Height), + System.Drawing.Imaging.BitmapData data = TextBitmap.LockBits( + new System.Drawing.Rectangle(0, 0, TextBitmap.Width, TextBitmap.Height), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); - GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, TextBitmap.Width, TextBitmap.Height, PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); + GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, TextBitmap.Width, TextBitmap.Height, PixelFormat.Bgra, + PixelType.UnsignedByte, data.Scan0); TextBitmap.UnlockBits(data); } + protected override void OnLoad(EventArgs e) { base.OnLoad(e); - + GL.ClearColor(Color.MidnightBlue); GL.Enable(EnableCap.Texture2D); texture = GL.GenTexture(); GL.BindTexture(TextureTarget.Texture2D, texture); - GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, TextBitmap.Width, TextBitmap.Height, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero); + GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, TextBitmap.Width, TextBitmap.Height, + 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero); GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)All.Nearest); GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)All.Nearest); - - // Make sure text is displayed when the application starts. - UpdateText(); } protected override void OnResize(EventArgs e) { base.OnResize(e); - - GL.Viewport(0, 0, Width, Height); - - Matrix4 ortho_projection = Matrix4.CreateOrthographicOffCenter(0, Width, Height, 0, -1, 1); - GL.MatrixMode(MatrixMode.Projection); - GL.LoadMatrix(ref ortho_projection); + viewport_changed = true; } protected override void OnRenderFrame(FrameEventArgs e) { base.OnRenderFrame(e); + + if (viewport_changed) + { + viewport_changed = false; + + GL.Viewport(0, 0, Width, Height); + + Matrix4 ortho_projection = Matrix4.CreateOrthographicOffCenter(0, Width, Height, 0, -1, 1); + GL.MatrixMode(MatrixMode.Projection); + GL.LoadMatrix(ref ortho_projection); + } GL.Clear(ClearBufferMask.ColorBufferBit); @@ -119,7 +165,6 @@ namespace Examples.Tests GL.End(); SwapBuffers(); - Thread.Sleep(5); } public static void Main() @@ -127,7 +172,7 @@ namespace Examples.Tests using (GameWindowStates ex = new GameWindowStates()) { Utilities.SetWindowTitle(ex); - ex.Run(20.0); + ex.Run(30.0); } } } diff --git a/Source/Examples/Shapes/VertexPositionColor.cs b/Source/Examples/Shapes/VertexPositionColor.cs new file mode 100644 index 00000000..8b248713 --- /dev/null +++ b/Source/Examples/Shapes/VertexPositionColor.cs @@ -0,0 +1,51 @@ +#region License +// +// The Open Toolkit Library License +// +// Copyright (c) 2006 - 2010 the Open Toolkit library, except where noted. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights to +// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +// the Software, and to permit persons to whom the Software is furnished to do +// so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. +// +#endregion + +using System.Drawing; +using System.Runtime.InteropServices; +using OpenTK; + +namespace Examples.Tutorial +{ + [StructLayout(LayoutKind.Sequential, Pack = 1)] + struct VertexPositionColor + { + public Vector3 Position; + public uint Color; + + public VertexPositionColor(float x, float y, float z, Color color) + { + Position = new Vector3(x, y, z); + Color = ToRgba(color); + } + + static uint ToRgba(Color color) + { + return (uint)color.A << 24 | (uint)color.B << 16 | (uint)color.G << 8 | (uint)color.R; + } + } +} diff --git a/Source/OpenTK/GameWindow.cs b/Source/OpenTK/GameWindow.cs index ef204b1c..6e10fa84 100644 --- a/Source/OpenTK/GameWindow.cs +++ b/Source/OpenTK/GameWindow.cs @@ -295,7 +295,7 @@ namespace OpenTK /// /// The for this event. /// Set e.Cancel to true in order to stop the GameWindow from closing. - protected override void OnClosing (System.ComponentModel.CancelEventArgs e) + protected override void OnClosing(System.ComponentModel.CancelEventArgs e) { base.OnClosing(e); if (!e.Cancel) @@ -392,6 +392,7 @@ namespace OpenTK Visible = true; // Make sure the GameWindow is visible. OnLoadInternal(EventArgs.Empty); + OnResize(EventArgs.Empty); // On some platforms, ProcessEvents() does not return while the user is resizing or moving // the window. We can avoid this issue by raising UpdateFrame and RenderFrame events @@ -510,7 +511,9 @@ namespace OpenTK // rises again. // Note 2: calling Context.VSync = true repeatedly seems to cause jitter on // some configurations. If possible, we should avoid repeated calls. - if (VSync == VSyncMode.Adaptive && TargetRenderPeriod != 0) + // Note 3: we may not read/write the VSync property without a current context. + // This may come to pass if the user has moved rendering to his own thread. + if (Context.IsCurrent && VSync == VSyncMode.Adaptive && TargetRenderPeriod != 0) { // Check if we have enough time for a vsync if (RenderTime > 2.0 * TargetRenderPeriod) @@ -896,33 +899,33 @@ namespace OpenTK #endregion - #region WindowState + #region WindowState - /// - /// Gets or states the state of the NativeWindow. - /// - public override WindowState WindowState - { - get - { - return base.WindowState; - } - set - { - base.WindowState = value; - Debug.Print("Updating Context after setting WindowState to {0}", value); + /// + /// Gets or states the state of the NativeWindow. + /// + public override WindowState WindowState + { + get + { + return base.WindowState; + } + set + { + base.WindowState = value; + Debug.Print("Updating Context after setting WindowState to {0}", value); - if (Context != null) - Context.Update(WindowInfo); - } - } - #endregion + if (Context != null) + Context.Update(WindowInfo); + } + } + #endregion - #endregion + #endregion - #region Events + #region Events - /// + /// /// Occurs before the window is displayed for the first time. /// public event EventHandler Load; @@ -1000,25 +1003,24 @@ namespace OpenTK #endregion - #region OnResize + #region OnResize - protected override void OnResize(EventArgs e) - { - base.OnResize(e); - glContext.Update(base.WindowInfo); - } - - #endregion - - #endregion - - #region --- Private Members --- - - #region OnLoadInternal - - private void OnLoadInternal(EventArgs e) + protected override void OnResize(EventArgs e) + { + base.OnResize(e); + glContext.Update(base.WindowInfo); + } + + #endregion + + #endregion + + #region --- Private Members --- + + #region OnLoadInternal + + private void OnLoadInternal(EventArgs e) { - OnResize(EventArgs.Empty); OnLoad(e); } diff --git a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs index aa8c450c..98bd6704 100644 --- a/Source/OpenTK/Graphics/OpenGL/GLHelper.cs +++ b/Source/OpenTK/Graphics/OpenGL/GLHelper.cs @@ -186,7 +186,7 @@ namespace OpenTK.Graphics.OpenGL #endregion - #region --- Overloads for OpenTK.Math --- + #region Normal|RasterPos|Vertex|TexCoord|Rotate|Scale|Translate|*Matrix public static void Normal3(Vector3 normal) { @@ -297,6 +297,82 @@ namespace OpenTK.Graphics.OpenGL } } + public static void UniformMatrix4(int location, bool transpose, ref Matrix4 matrix) + { + unsafe + { + fixed (float* matrix_ptr = &matrix.Row0.X) + { + GL.UniformMatrix4(location, 1, transpose, matrix_ptr); + } + } + } + + public static void Normal3(Vector3d normal) + { + GL.Normal3(normal.X, normal.Y, normal.Z); + } + + public static void RasterPos2(Vector2d pos) + { + GL.RasterPos2(pos.X, pos.Y); + } + + public static void RasterPos3(Vector3d pos) + { + GL.RasterPos3(pos.X, pos.Y, pos.Z); + } + + public static void RasterPos4(Vector4d pos) + { + GL.RasterPos4(pos.X, pos.Y, pos.Z, pos.W); + } + + public static void Vertex2(Vector2d v) + { + GL.Vertex2(v.X, v.Y); + } + + public static void Vertex3(Vector3d v) + { + GL.Vertex3(v.X, v.Y, v.Z); + } + + public static void Vertex4(Vector4d v) + { + GL.Vertex4(v.X, v.Y, v.Z, v.W); + } + + public static void TexCoord2(Vector2d v) + { + GL.TexCoord2(v.X, v.Y); + } + + public static void TexCoord3(Vector3d v) + { + GL.TexCoord3(v.X, v.Y, v.Z); + } + + public static void TexCoord4(Vector4d v) + { + GL.TexCoord4(v.X, v.Y, v.Z, v.W); + } + + public static void Rotate(double angle, Vector3d axis) + { + GL.Rotate((double)angle, axis.X, axis.Y, axis.Z); + } + + public static void Scale(Vector3d scale) + { + GL.Scale(scale.X, scale.Y, scale.Z); + } + + public static void Translate(Vector3d trans) + { + GL.Translate(trans.X, trans.Y, trans.Z); + } + public static void MultMatrix(ref Matrix4d mat) { unsafe @@ -341,17 +417,6 @@ namespace OpenTK.Graphics.OpenGL } } - public static void UniformMatrix4(int location, bool transpose, ref Matrix4 matrix) - { - unsafe - { - fixed (float* matrix_ptr = &matrix.Row0.X) - { - GL.UniformMatrix4(location, 1, transpose, matrix_ptr); - } - } - } - #region Uniform [CLSCompliant(false)] @@ -553,7 +618,7 @@ namespace OpenTK.Graphics.OpenGL #endregion - #region public static void VertexAttrib2(Int32 index, ref Vector2 v) + #region VertexAttrib|MultiTexCoord [CLSCompliant(false)] public static void VertexAttrib2(Int32 index, ref Vector2 v) @@ -561,92 +626,109 @@ namespace OpenTK.Graphics.OpenGL GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, ref Vector3 v) - [CLSCompliant(false)] public static void VertexAttrib3(Int32 index, ref Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, ref Vector4 v) - [CLSCompliant(false)] public static void VertexAttrib4(Int32 index, ref Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region public static void VertexAttrib2(Int32 index, Vector2 v) - public static void VertexAttrib2(Int32 index, Vector2 v) { GL.VertexAttrib2(index, v.X, v.Y); } - #endregion - - #region public static void VertexAttrib3(Int32 index, Vector3 v) - public static void VertexAttrib3(Int32 index, Vector3 v) { GL.VertexAttrib3(index, v.X, v.Y, v.Z); } - #endregion - - #region public static void VertexAttrib4(Int32 index, Vector4 v) - public static void VertexAttrib4(Int32 index, Vector4 v) { GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); } - #endregion - - #region public static void MultiTexCoord2(TextureUnit target, ref Vector2 v) - public static void MultiTexCoord2(TextureUnit target, ref Vector2 v) { GL.MultiTexCoord2(target, v.X, v.Y); } - #endregion - - #region public static void MultiTexCoord3(TextureUnit target, ref Vector3 v) - public static void MultiTexCoord3(TextureUnit target, ref Vector3 v) { GL.MultiTexCoord3(target, v.X, v.Y, v.Z); } - #endregion - - #region public static void MultiTexCoord4(TextureUnit target, ref Vector4 v) - public static void MultiTexCoord4(TextureUnit target, ref Vector4 v) { GL.MultiTexCoord4(target, v.X, v.Y, v.Z, v.W); } + [CLSCompliant(false)] + public static void VertexAttrib2(Int32 index, ref Vector2d v) + { + GL.VertexAttrib2(index, v.X, v.Y); + } + + [CLSCompliant(false)] + public static void VertexAttrib3(Int32 index, ref Vector3d v) + { + GL.VertexAttrib3(index, v.X, v.Y, v.Z); + } + + [CLSCompliant(false)] + public static void VertexAttrib4(Int32 index, ref Vector4d v) + { + GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); + } + + public static void VertexAttrib2(Int32 index, Vector2d v) + { + GL.VertexAttrib2(index, v.X, v.Y); + } + + public static void VertexAttrib3(Int32 index, Vector3d v) + { + GL.VertexAttrib3(index, v.X, v.Y, v.Z); + } + + public static void VertexAttrib4(Int32 index, Vector4d v) + { + GL.VertexAttrib4(index, v.X, v.Y, v.Z, v.W); + } + + public static void MultiTexCoord2(TextureUnit target, ref Vector2d v) + { + GL.MultiTexCoord2(target, v.X, v.Y); + } + + public static void MultiTexCoord3(TextureUnit target, ref Vector3d v) + { + GL.MultiTexCoord3(target, v.X, v.Y, v.Z); + } + + public static void MultiTexCoord4(TextureUnit target, ref Vector4d v) + { + GL.MultiTexCoord4(target, v.X, v.Y, v.Z, v.W); + } + #endregion - #region public static void Rect(System.Drawing.RectangleF rect) + #region Rect public static void Rect(System.Drawing.RectangleF rect) { GL.Rect(rect.Left, rect.Top, rect.Right, rect.Bottom); } - #endregion - - #region public static void Rect(ref System.Drawing.RectangleF rect) + public static void Rect(System.Drawing.Rectangle rect) + { + GL.Rect(rect.Left, rect.Top, rect.Right, rect.Bottom); + } [CLSCompliant(false)] public static void Rect(ref System.Drawing.RectangleF rect) @@ -654,19 +736,6 @@ namespace OpenTK.Graphics.OpenGL GL.Rect(rect.Left, rect.Top, rect.Right, rect.Bottom); } - #endregion - - #region public static void Rect(System.Drawing.Rectangle rect) - - public static void Rect(System.Drawing.Rectangle rect) - { - GL.Rect(rect.Left, rect.Top, rect.Right, rect.Bottom); - } - - #endregion - - #region public static void Rect(ref System.Drawing.Rectangle rect) - [CLSCompliant(false)] public static void Rect(ref System.Drawing.Rectangle rect) { diff --git a/Source/OpenTK/NativeWindow.cs b/Source/OpenTK/NativeWindow.cs index 74d123b7..f6f00857 100644 --- a/Source/OpenTK/NativeWindow.cs +++ b/Source/OpenTK/NativeWindow.cs @@ -872,7 +872,7 @@ namespace OpenTK protected void ProcessEvents(bool retainEvents) { EnsureUndisposed(); - if (!events) Events = true; + if (!retainEvents && !events) Events = true; implementation.ProcessEvents(); } diff --git a/Source/OpenTK/Platform/Dummy/DummyGLContext.cs b/Source/OpenTK/Platform/Dummy/DummyGLContext.cs index 563ccf03..0c0edbac 100644 --- a/Source/OpenTK/Platform/Dummy/DummyGLContext.cs +++ b/Source/OpenTK/Platform/Dummy/DummyGLContext.cs @@ -13,6 +13,7 @@ using OpenTK.Graphics; namespace OpenTK.Platform.Dummy { + /// \internal /// /// An empty IGraphicsContext implementation to be used inside the Visual Studio designer. /// This class supports OpenTK, and is not intended for use by OpenTK programs. diff --git a/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs index 13f2dfe8..7f3eabdf 100644 --- a/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs +++ b/Source/OpenTK/Platform/MacOS/CarbonWindowInfo.cs @@ -32,6 +32,7 @@ using System.Text; namespace OpenTK.Platform.MacOS { + /// \internal /// /// Describes a Carbon window. /// diff --git a/Source/OpenTK/Platform/Windows/API.cs b/Source/OpenTK/Platform/Windows/API.cs index 106b23e5..920d081b 100644 --- a/Source/OpenTK/Platform/Windows/API.cs +++ b/Source/OpenTK/Platform/Windows/API.cs @@ -70,6 +70,7 @@ namespace OpenTK.Platform.Windows #endregion + /// \internal /// /// For internal use by OpenTK only! /// Exposes useful native WINAPI methods and structures. @@ -847,6 +848,9 @@ namespace OpenTK.Platform.Windows [DllImport("user32.dll", SetLastError=true)] public static extern BOOL SetForegroundWindow(HWND hWnd); + [DllImport("user32.dll", SetLastError = true)] + public static extern BOOL BringWindowToTop(HWND hWnd); + #endregion #region Display settings @@ -1679,6 +1683,7 @@ namespace OpenTK.Platform.Windows #region PixelFormatDescriptor + /// \internal /// /// Describes a pixel format. It is used when interfacing with the WINAPI to create a new Context. /// Found in WinGDI.h @@ -1718,6 +1723,7 @@ namespace OpenTK.Platform.Windows #region internal class LayerPlaneDescriptor + /// \internal /// /// Describes the pixel format of a drawing surface. /// @@ -1754,6 +1760,7 @@ namespace OpenTK.Platform.Windows #region GlyphMetricsFloat + /// \internal /// /// The GlyphMetricsFloat structure contains information about the placement and orientation of a glyph in a /// character cell. @@ -1789,6 +1796,7 @@ namespace OpenTK.Platform.Windows #region PointFloat + /// \internal /// /// The PointFloat structure contains the x and y coordinates of a point. /// @@ -1917,7 +1925,8 @@ namespace OpenTK.Platform.Windows #endregion DeviceMode class #region DisplayDevice - + + /// \internal /// /// The DISPLAY_DEVICE structure receives information about the display device specified by the iDevNum parameter of the EnumDisplayDevices function. /// @@ -1995,6 +2004,7 @@ namespace OpenTK.Platform.Windows #region internal struct MinMaxInfo + /// \internal /// /// Struct pointed to by WM_GETMINMAXINFO lParam /// @@ -2012,6 +2022,7 @@ namespace OpenTK.Platform.Windows #region internal struct WindowPosition + /// \internal /// /// The WindowPosition structure contains information about the size and position of a window. /// @@ -2133,6 +2144,7 @@ namespace OpenTK.Platform.Windows #region RawInputDevice + /// \internal /// /// Defines information for the raw input devices. /// @@ -2174,6 +2186,7 @@ namespace OpenTK.Platform.Windows #region RawInputDeviceList + /// \internal /// /// Contains information about a raw input device. /// @@ -2199,6 +2212,7 @@ namespace OpenTK.Platform.Windows #region RawInput + /// \internal /// /// Contains the raw input from a device. /// @@ -2244,6 +2258,7 @@ namespace OpenTK.Platform.Windows #region RawInputHeader + /// \internal /// /// Contains the header information that is part of the raw input data. /// @@ -2275,6 +2290,7 @@ namespace OpenTK.Platform.Windows #region RawKeyboard + /// \internal /// /// Contains information about the state of the keyboard. /// @@ -2321,6 +2337,7 @@ namespace OpenTK.Platform.Windows #region RawMouse + /// \internal /// /// Contains information about the state of the mouse. /// @@ -2436,6 +2453,7 @@ namespace OpenTK.Platform.Windows #region RawHID + /// \internal /// /// The RawHID structure describes the format of the raw input /// from a Human Interface Device (HID). @@ -2466,6 +2484,7 @@ namespace OpenTK.Platform.Windows #region RawInputDeviceInfo + /// \internal /// /// Defines the raw input data coming from any device. /// @@ -2497,6 +2516,7 @@ namespace OpenTK.Platform.Windows #region RawInputHIDDeviceInfo + /// \internal /// /// Defines the raw input data coming from the specified Human Interface Device (HID). /// @@ -2531,6 +2551,7 @@ namespace OpenTK.Platform.Windows #region RawInputKeyboardDeviceInfo + /// \internal /// /// Defines the raw input data coming from the specified keyboard. /// @@ -2570,6 +2591,7 @@ namespace OpenTK.Platform.Windows #region RawInputMouseDeviceInfo + /// \internal /// /// Defines the raw input data coming from the specified mouse. /// @@ -2610,6 +2632,7 @@ namespace OpenTK.Platform.Windows #region Rectangle + /// \internal /// /// Defines the coordinates of the upper-left and lower-right corners of a rectangle. /// @@ -2681,6 +2704,7 @@ namespace OpenTK.Platform.Windows #region WindowInfo + /// \internal /// /// Contains window information. /// @@ -3526,6 +3550,7 @@ namespace OpenTK.Platform.Windows #region QueueStatusFlags + /// \internal /// /// Queue status flags for GetQueueStatus() and MsgWaitForMultipleObjects() /// diff --git a/Source/OpenTK/Platform/Windows/WinGLContext.cs b/Source/OpenTK/Platform/Windows/WinGLContext.cs index a17e6159..dd9ea5cb 100644 --- a/Source/OpenTK/Platform/Windows/WinGLContext.cs +++ b/Source/OpenTK/Platform/Windows/WinGLContext.cs @@ -20,6 +20,7 @@ using OpenTK.Graphics.OpenGL; namespace OpenTK.Platform.Windows { + /// \internal /// /// Provides methods to create and control an opengl context on the Windows platform. /// This class supports OpenTK, and is not intended for use by OpenTK programs. diff --git a/Source/OpenTK/Platform/Windows/WinGLNative.cs b/Source/OpenTK/Platform/Windows/WinGLNative.cs index 4e1ded1a..4997a65e 100644 --- a/Source/OpenTK/Platform/Windows/WinGLNative.cs +++ b/Source/OpenTK/Platform/Windows/WinGLNative.cs @@ -37,6 +37,7 @@ using System.Drawing; namespace OpenTK.Platform.Windows { + /// \internal /// /// Drives GameWindow on Windows. /// This class supports OpenTK, and is not intended for use by OpenTK programs. @@ -45,15 +46,12 @@ namespace OpenTK.Platform.Windows { #region Fields - readonly static object SyncRoot = new object(); - const ExtendedWindowStyle ParentStyleEx = ExtendedWindowStyle.WindowEdge | ExtendedWindowStyle.ApplicationWindow; const ExtendedWindowStyle ChildStyleEx = 0; readonly IntPtr Instance = Marshal.GetHINSTANCE(typeof(WinGLNative).Module); - readonly IntPtr ClassName; + readonly IntPtr ClassName = Marshal.StringToHGlobalAuto(Guid.NewGuid().ToString()); readonly WindowProcedure WindowProcedureDelegate; - readonly UIntPtr ModalLoopTimerId; readonly uint ModalLoopTimerPeriod = 1; UIntPtr timer_handle; readonly Functions.TimerProc ModalLoopCallback; @@ -69,6 +67,8 @@ namespace OpenTK.Platform.Windows bool borderless_maximized_window_state = false; // Hack to get maximized mode with hidden border (not normally possible). bool focused; bool mouse_outside_window = true; + bool invisible_since_creation; // Set by WindowsMessage.CREATE and consumed by Visible = true (calls BringWindowToFront). + int suppress_resize; // Used in WindowBorder and WindowState in order to avoid rapid, consecutive resize events. Rectangle bounds = new Rectangle(), @@ -93,21 +93,12 @@ namespace OpenTK.Platform.Windows KeyPressEventArgs key_press = new KeyPressEventArgs((char)0); - static int window_count; - #endregion #region Contructors public WinGLNative(int x, int y, int width, int height, string title, GameWindowFlags options, DisplayDevice device) { - lock (SyncRoot) - { - ++window_count; - ClassName = Marshal.StringToHGlobalAuto(typeof(WinGLNative).Name + window_count.ToString()); - ModalLoopTimerId = new UIntPtr((uint)window_count); - } - // This is the main window procedure callback. We need the callback in order to create the window, so // don't move it below the CreateWindow calls. WindowProcedureDelegate = WindowProcedure; @@ -165,7 +156,7 @@ namespace OpenTK.Platform.Windows if (new_focused_state != Focused && FocusedChanged != null) FocusedChanged(this, EventArgs.Empty); - return IntPtr.Zero; + break; case WindowMessage.ENTERMENULOOP: case WindowMessage.ENTERSIZEMOVE: @@ -213,7 +204,7 @@ namespace OpenTK.Platform.Windows SetWindowPosFlags.NOZORDER | SetWindowPosFlags.NOOWNERZORDER | SetWindowPosFlags.NOACTIVATE | SetWindowPosFlags.NOSENDCHANGING); - if (Resize != null) + if (suppress_resize <= 0 && Resize != null) Resize(this, EventArgs.Empty); } } @@ -268,7 +259,7 @@ namespace OpenTK.Platform.Windows key_press.KeyChar = (char)wParam.ToInt32(); else key_press.KeyChar = (char)wParam.ToInt64(); - + if (KeyPress != null) KeyPress(this, key_press); break; @@ -294,7 +285,7 @@ namespace OpenTK.Platform.Windows case WindowMessage.MOUSELEAVE: mouse_outside_window = true; // Mouse tracking is disabled automatically by the OS - + if (MouseLeave != null) MouseLeave(this, EventArgs.Empty); break; @@ -441,13 +432,13 @@ namespace OpenTK.Platform.Windows Functions.GetClientRect(handle, out rect); client_rectangle = rect.ToRectangle(); - Functions.SetForegroundWindow(handle); + invisible_since_creation = true; } break; case WindowMessage.CLOSE: System.ComponentModel.CancelEventArgs e = new System.ComponentModel.CancelEventArgs(); - + if (Closing != null) Closing(this, e); @@ -471,7 +462,7 @@ namespace OpenTK.Platform.Windows if (Closed != null) Closed(this, EventArgs.Empty); - + break; #endregion @@ -496,7 +487,7 @@ namespace OpenTK.Platform.Windows { if (timer_handle == UIntPtr.Zero) { - timer_handle = Functions.SetTimer(handle, ModalLoopTimerId, ModalLoopTimerPeriod, ModalLoopCallback); + timer_handle = Functions.SetTimer(handle, new UIntPtr(1), ModalLoopTimerPeriod, ModalLoopCallback); if (timer_handle == UIntPtr.Zero) Debug.Print("[Warning] Failed to set modal loop timer callback ({0}:{1}->{2}).", GetType().Name, handle, Marshal.GetLastWin32Error()); @@ -518,7 +509,7 @@ namespace OpenTK.Platform.Windows #region IsIdle - bool IsIdle + bool IsIdle { get { @@ -609,6 +600,34 @@ namespace OpenTK.Platform.Windows #endregion + void HideBorder() + { + suppress_resize++; + WindowBorder = WindowBorder.Hidden; + ProcessEvents(); + suppress_resize--; + } + + void RestoreBorder() + { + suppress_resize++; + WindowBorder = + deferred_window_border.HasValue ? deferred_window_border.Value : + previous_window_border.HasValue ? previous_window_border.Value : + WindowBorder; + ProcessEvents(); + suppress_resize--; + deferred_window_border = previous_window_border = null; + } + + void ResetWindowState() + { + suppress_resize++; + WindowState = WindowState.Normal; + ProcessEvents(); + suppress_resize--; + } + #endregion #region INativeWindow Members @@ -699,7 +718,7 @@ namespace OpenTK.Platform.Windows public int Width { get { return ClientRectangle.Width; } - set { ClientRectangle = new Rectangle(Location, new Size(value, Height)); } + set { ClientRectangle = new Rectangle(0, 0, value, Height); } } #endregion @@ -709,7 +728,7 @@ namespace OpenTK.Platform.Windows public int Height { get { return ClientRectangle.Height; } - set { ClientRectangle = new Rectangle(Location, new Size(Width, value)); } + set { ClientRectangle = new Rectangle(0, 0, Width, value); } } #endregion @@ -718,8 +737,8 @@ namespace OpenTK.Platform.Windows public int X { - get { return ClientRectangle.X; } - set { ClientRectangle = new Rectangle(new Point(value, Y), Size); } + get { return Location.X; } + set { Location = new Point(value, Y); } } #endregion @@ -728,8 +747,8 @@ namespace OpenTK.Platform.Windows public int Y { - get { return ClientRectangle.Y; } - set { ClientRectangle = new Rectangle(new Point(X, value), Size); } + get { return Location.Y; } + set { Location = new Point(X, value); } } #endregion @@ -798,6 +817,11 @@ namespace OpenTK.Platform.Windows if (value) { Functions.ShowWindow(window.WindowHandle, ShowWindowCommand.SHOW); + if (invisible_since_creation) + { + Functions.BringWindowToTop(window.WindowHandle); + Functions.SetForegroundWindow(window.WindowHandle); + } } else if (!value) { @@ -856,7 +880,7 @@ namespace OpenTK.Platform.Windows // manually to cover the whole working area of the current monitor. // Reset state to avoid strange interactions with fullscreen/minimized windows. - WindowState = WindowState.Normal; + ResetWindowState(); if (WindowBorder == WindowBorder.Hidden) { @@ -885,11 +909,11 @@ namespace OpenTK.Platform.Windows // command for windows with hidden borders. // Reset state to avoid strange side-effects from maximized/minimized windows. - WindowState = WindowState.Normal; + ResetWindowState(); previous_bounds = Bounds; previous_window_border = WindowBorder; - WindowBorder = WindowBorder.Hidden; + HideBorder(); command = ShowWindowCommand.MAXIMIZE; Functions.SetForegroundWindow(window.WindowHandle); @@ -900,22 +924,18 @@ namespace OpenTK.Platform.Windows if (command != 0) Functions.ShowWindow(window.WindowHandle, command); + // Restore previous window border or apply pending border change when leaving fullscreen mode. + if (exiting_fullscreen) + { + RestoreBorder(); + } + // Restore previous window size/location if necessary if (command == ShowWindowCommand.RESTORE && previous_bounds != Rectangle.Empty) { Bounds = previous_bounds; previous_bounds = Rectangle.Empty; } - - // Restore previous window border or apply pending border change when leaving fullscreen mode. - if (exiting_fullscreen) - { - WindowBorder = - deferred_window_border.HasValue ? deferred_window_border.Value : - previous_window_border.HasValue ? previous_window_border.Value : - WindowBorder; - deferred_window_border = previous_window_border = null; - } } } @@ -950,7 +970,7 @@ namespace OpenTK.Platform.Windows // To ensure maximized/minimized windows work correctly, reset state to normal, // change the border, then go back to maximized/minimized. WindowState state = WindowState; - WindowState = WindowState.Normal; + ResetWindowState(); WindowStyle style = WindowStyle.ClipChildren | WindowStyle.ClipSiblings; @@ -1061,7 +1081,7 @@ namespace OpenTK.Platform.Windows public event EventHandler MouseEnter; public event EventHandler MouseLeave; - + #endregion #endregion diff --git a/Source/OpenTK/Platform/Windows/WinRawMouse.cs b/Source/OpenTK/Platform/Windows/WinRawMouse.cs index 23620452..cfaf2c78 100644 --- a/Source/OpenTK/Platform/Windows/WinRawMouse.cs +++ b/Source/OpenTK/Platform/Windows/WinRawMouse.cs @@ -15,6 +15,7 @@ using System.Drawing; namespace OpenTK.Platform.Windows { + /// \internal /// /// Contains methods to register for and process mouse WM_INPUT messages. /// diff --git a/Source/OpenTK/Platform/Windows/WinWindowInfo.cs b/Source/OpenTK/Platform/Windows/WinWindowInfo.cs index 73239126..8e5f3727 100644 --- a/Source/OpenTK/Platform/Windows/WinWindowInfo.cs +++ b/Source/OpenTK/Platform/Windows/WinWindowInfo.cs @@ -33,6 +33,7 @@ using System.Runtime.InteropServices; namespace OpenTK.Platform.Windows { + /// \internal /// Describes a win32 window. sealed class WinWindowInfo : IWindowInfo { diff --git a/Source/OpenTK/Platform/X11/API.cs b/Source/OpenTK/Platform/X11/API.cs index 8a46e1af..bd07b917 100644 --- a/Source/OpenTK/Platform/X11/API.cs +++ b/Source/OpenTK/Platform/X11/API.cs @@ -79,7 +79,10 @@ namespace OpenTK.Platform.X11 if (defaultDisplay == IntPtr.Zero) throw new PlatformException("Could not establish connection to the X-Server."); - screenCount = Functions.XScreenCount(DefaultDisplay); + using (new XLock(defaultDisplay)) + { + screenCount = Functions.XScreenCount(DefaultDisplay); + } Debug.Print("Display connection: {0}, Screen count: {1}", DefaultDisplay, ScreenCount); AppDomain.CurrentDomain.ProcessExit += new EventHandler(CurrentDomain_ProcessExit); diff --git a/Source/OpenTK/Platform/X11/Bindings/Glx.cs b/Source/OpenTK/Platform/X11/Bindings/Glx.cs index 80502709..84d02466 100644 --- a/Source/OpenTK/Platform/X11/Bindings/Glx.cs +++ b/Source/OpenTK/Platform/X11/Bindings/Glx.cs @@ -283,8 +283,10 @@ namespace OpenTK.Platform.X11 [DllImport(Library, EntryPoint = "glXDestroyContext")] public static extern void DestroyContext(IntPtr dpy, IntPtr context); - [DllImport(Library, EntryPoint = "glXDestroyContext")] - public static extern void DestroyContext(IntPtr dpy, ContextHandle context); + public static void DestroyContext(IntPtr dpy, ContextHandle context) + { + DestroyContext(dpy, context.Handle); + } [DllImport(Library, EntryPoint = "glXGetCurrentContext")] public static extern IntPtr GetCurrentContext(); @@ -292,8 +294,10 @@ namespace OpenTK.Platform.X11 [DllImport(Library, EntryPoint = "glXMakeCurrent")] public static extern bool MakeCurrent(IntPtr display, IntPtr drawable, IntPtr context); - [DllImport(Library, EntryPoint = "glXMakeCurrent")] - public static extern bool MakeCurrent(IntPtr display, IntPtr drawable, ContextHandle context); + public static bool MakeCurrent(IntPtr display, IntPtr drawable, ContextHandle context) + { + return MakeCurrent(display, drawable, context.Handle); + } [DllImport(Library, EntryPoint = "glXSwapBuffers")] public static extern void SwapBuffers(IntPtr display, IntPtr drawable); diff --git a/Source/OpenTK/Platform/X11/Functions.cs b/Source/OpenTK/Platform/X11/Functions.cs index 6611e032..1cbf5f97 100644 --- a/Source/OpenTK/Platform/X11/Functions.cs +++ b/Source/OpenTK/Platform/X11/Functions.cs @@ -42,35 +42,6 @@ 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 - #region Structs #endregion @@ -140,8 +111,7 @@ namespace OpenTK.Platform.X11 [DllImport("libX11", EntryPoint = "XMoveResizeWindow")] public extern static int XMoveResizeWindow(IntPtr display, IntPtr window, int x, int y, int width, int height); - - [DllImport("libX11", EntryPoint = "XResizeWindow")] + [DllImport("libX11", EntryPoint = "XMoveWindow")] public extern static int XMoveWindow(IntPtr display, IntPtr w, int x, int y); [DllImport("libX11", EntryPoint = "XResizeWindow")] diff --git a/Source/OpenTK/Platform/X11/X11GLContext.cs b/Source/OpenTK/Platform/X11/X11GLContext.cs index c0acef6b..69fef799 100644 --- a/Source/OpenTK/Platform/X11/X11GLContext.cs +++ b/Source/OpenTK/Platform/X11/X11GLContext.cs @@ -68,15 +68,23 @@ namespace OpenTK.Platform.X11 // Create a temporary context to obtain the necessary function pointers. XVisualInfo visual = currentWindow.VisualInfo; - IntPtr ctx = Glx.CreateContext(Display, ref visual, IntPtr.Zero, true); - if (ctx == IntPtr.Zero) - ctx = Glx.CreateContext(Display, ref visual, IntPtr.Zero, false); + IntPtr ctx = IntPtr.Zero; + + using (new XLock(Display)) + { + ctx = Glx.CreateContext(Display, ref visual, IntPtr.Zero, true); + if (ctx == IntPtr.Zero) + ctx = Glx.CreateContext(Display, ref visual, IntPtr.Zero, false); + } if (ctx != IntPtr.Zero) { new Glx().LoadEntryPoints(); - Glx.MakeCurrent(Display, IntPtr.Zero, IntPtr.Zero); - //Glx.DestroyContext(Display, ctx); + using (new XLock(Display)) + { + Glx.MakeCurrent(Display, IntPtr.Zero, IntPtr.Zero); + //Glx.DestroyContext(Display, ctx); + } glx_loaded = true; } } @@ -121,15 +129,18 @@ namespace OpenTK.Platform.X11 // Is this a single 0, or a <0, 0> pair? (Defensive coding: add two zeroes just in case). attributes.Add(0); attributes.Add(0); - - Handle = new ContextHandle(Glx.Arb.CreateContextAttribs(Display, *fbconfigs, - shareHandle.Handle, direct, attributes.ToArray())); - - if (Handle == ContextHandle.Zero) + + using (new XLock(Display)) { - Debug.Write(String.Format("failed. Trying direct: {0}... ", !direct)); Handle = new ContextHandle(Glx.Arb.CreateContextAttribs(Display, *fbconfigs, - shareHandle.Handle, !direct, attributes.ToArray())); + shareHandle.Handle, direct, attributes.ToArray())); + + if (Handle == ContextHandle.Zero) + { + Debug.Write(String.Format("failed. Trying direct: {0}... ", !direct)); + Handle = new ContextHandle(Glx.Arb.CreateContextAttribs(Display, *fbconfigs, + shareHandle.Handle, !direct, attributes.ToArray())); + } } if (Handle == ContextHandle.Zero) @@ -150,13 +161,16 @@ namespace OpenTK.Platform.X11 Debug.Write("Using legacy context creation... "); XVisualInfo info = currentWindow.VisualInfo; - // Cannot pass a Property by reference. - Handle = new ContextHandle(Glx.CreateContext(Display, ref info, shareHandle.Handle, direct)); - - if (Handle == ContextHandle.Zero) + using (new XLock(Display)) { - Debug.WriteLine(String.Format("failed. Trying direct: {0}... ", !direct)); - Handle = new ContextHandle(Glx.CreateContext(Display, ref info, IntPtr.Zero, !direct)); + // Cannot pass a Property by reference. + Handle = new ContextHandle(Glx.CreateContext(Display, ref info, shareHandle.Handle, direct)); + + if (Handle == ContextHandle.Zero) + { + Debug.WriteLine(String.Format("failed. Trying direct: {0}... ", !direct)); + Handle = new ContextHandle(Glx.CreateContext(Display, ref info, IntPtr.Zero, !direct)); + } } } @@ -164,9 +178,12 @@ namespace OpenTK.Platform.X11 Debug.Print("Context created (id: {0}).", Handle); else throw new GraphicsContextException("Failed to create OpenGL context. Glx.CreateContext call returned 0."); - - if (!Glx.IsDirect(Display, Handle.Handle)) - Debug.Print("Warning: Context is not direct."); + + using (new XLock(Display)) + { + if (!Glx.IsDirect(Display, Handle.Handle)) + Debug.Print("Warning: Context is not direct."); + } } public X11GLContext(ContextHandle handle, IWindowInfo window, IGraphicsContext shared, bool direct, @@ -232,7 +249,11 @@ namespace OpenTK.Platform.X11 if (window.Display != Display) throw new InvalidOperationException(); - string extensions = Glx.QueryExtensionsString(Display, window.Screen); + string extensions = null; + using (new XLock(Display)) + { + extensions = Glx.QueryExtensionsString(Display, window.Screen); + } return !String.IsNullOrEmpty(extensions) && extensions.Contains(e); } @@ -247,7 +268,10 @@ namespace OpenTK.Platform.X11 if (Display == IntPtr.Zero || currentWindow.WindowHandle == IntPtr.Zero) throw new InvalidOperationException( String.Format("Window is invalid. Display ({0}), Handle ({1}).", Display, currentWindow.WindowHandle)); - Glx.SwapBuffers(Display, currentWindow.WindowHandle); + using (new XLock(Display)) + { + Glx.SwapBuffers(Display, currentWindow.WindowHandle); + } } #endregion @@ -264,7 +288,19 @@ namespace OpenTK.Platform.X11 if (window == null) { - Glx.MakeCurrent(Display, IntPtr.Zero, IntPtr.Zero); + Debug.Write(String.Format("Releasing context {0} from thread {1} (Display: {2})... ", + Handle, System.Threading.Thread.CurrentThread.ManagedThreadId, Display)); + + bool result; + using (new XLock(Display)) + { + result = Glx.MakeCurrent(Display, IntPtr.Zero, IntPtr.Zero); + if (result) + { + currentWindow = null; + } + } + Debug.Print("{0}", result ? "done!" : "failed."); } else { @@ -277,7 +313,14 @@ namespace OpenTK.Platform.X11 if (Display == IntPtr.Zero || w.WindowHandle == IntPtr.Zero || Handle == ContextHandle.Zero) throw new InvalidOperationException("Invalid display, window or context."); - result = Glx.MakeCurrent(Display, w.WindowHandle, Handle); + using (new XLock(Display)) + { + result = Glx.MakeCurrent(Display, w.WindowHandle, Handle); + if (result) + { + currentWindow = w; + } + } if (!result) throw new GraphicsContextException("Failed to make context current."); @@ -294,7 +337,13 @@ namespace OpenTK.Platform.X11 public override bool IsCurrent { - get { return Glx.GetCurrentContext() == Handle.Handle; } + get + { + using (new XLock(Display)) + { + return Glx.GetCurrentContext() == Handle.Handle; + } + } } #endregion @@ -311,7 +360,11 @@ namespace OpenTK.Platform.X11 { if (vsync_supported) { - ErrorCode error_code = Glx.Sgi.SwapInterval(value ? 1 : 0); + ErrorCode error_code = 0; + using (new XLock(Display)) + { + error_code = Glx.Sgi.SwapInterval(value ? 1 : 0); + } if (error_code != X11.ErrorCode.NO_ERROR) Debug.Print("VSync = {0} failed, error code: {1}.", value, error_code); vsync_interval = value ? 1 : 0; @@ -325,7 +378,10 @@ namespace OpenTK.Platform.X11 public override IntPtr GetAddress(string function) { - return Glx.GetProcAddress(function); + using (new XLock(Display)) + { + return Glx.GetProcAddress(function); + } } #endregion @@ -370,18 +426,27 @@ namespace OpenTK.Platform.X11 if (manuallyCalled) { IntPtr display = Display; - if (IsCurrent) - Glx.MakeCurrent(display, IntPtr.Zero, IntPtr.Zero); - Glx.DestroyContext(display, Handle); + if (IsCurrent) + { + using (new XLock(display)) + { + Glx.MakeCurrent(display, IntPtr.Zero, IntPtr.Zero); + } + } + using (new XLock(display)) + { + Glx.DestroyContext(display, Handle); + } } - else - { - Debug.Print("[Warning] {0} leaked.", this.GetType().Name); - } - IsDisposed = true; } + else + { + Debug.Print("[Warning] {0} leaked.", this.GetType().Name); + } + IsDisposed = true; } + ~X11GLContext() { diff --git a/Source/OpenTK/Platform/X11/X11GLNative.cs b/Source/OpenTK/Platform/X11/X11GLNative.cs index 13f877cb..74980e8e 100644 --- a/Source/OpenTK/Platform/X11/X11GLNative.cs +++ b/Source/OpenTK/Platform/X11/X11GLNative.cs @@ -81,6 +81,8 @@ namespace OpenTK.Platform.X11 IntPtr _atom_net_wm_icon; + IntPtr _atom_net_frame_extents; + readonly IntPtr _atom_xa_cardinal = new IntPtr(6); //IntPtr _atom_motif_wm_hints; @@ -92,7 +94,7 @@ namespace OpenTK.Platform.X11 static readonly IntPtr _atom_toggle = (IntPtr)2; Rectangle bounds, client_rectangle; - int border_width; + int border_left, border_right, border_top, border_bottom; Icon icon; bool has_focus; bool visible; @@ -145,7 +147,7 @@ namespace OpenTK.Platform.X11 attributes.background_pixel = IntPtr.Zero; attributes.border_pixel = IntPtr.Zero; attributes.colormap = Functions.XCreateColormap(window.Display, window.RootWindow, window.VisualInfo.Visual, 0/*AllocNone*/); - window.EventMask = EventMask.StructureNotifyMask | EventMask.SubstructureNotifyMask | EventMask.ExposureMask | + window.EventMask = EventMask.StructureNotifyMask /*| EventMask.SubstructureNotifyMask*/ | EventMask.ExposureMask | EventMask.KeyReleaseMask | EventMask.KeyPressMask | EventMask.KeymapStateMask | EventMask.PointerMotionMask | EventMask.FocusChangeMask | EventMask.ButtonPressMask | EventMask.ButtonReleaseMask | @@ -206,7 +208,6 @@ namespace OpenTK.Platform.X11 using (new XLock(window.Display)) { - Functions.XLockDisplay(window.Display); window.Screen = Functions.XDefaultScreen(window.Display); //API.DefaultScreen; window.RootWindow = Functions.XRootWindow(window.Display, window.Screen); // API.RootWindow; } @@ -258,6 +259,9 @@ namespace OpenTK.Platform.X11 _atom_net_wm_icon = Functions.XInternAtom(window.Display, "_NEW_WM_ICON", false); + + _atom_net_frame_extents = + Functions.XInternAtom(window.Display, "_NET_FRAME_EXTENTS", false); // string[] atom_names = new string[] // { @@ -407,14 +411,14 @@ namespace OpenTK.Platform.X11 Debug.Print("Removed decorations through motif."); _decorations_hidden = true; } - + using (new XLock(window.Display)) { // Functions.XSetTransientForHint(this.window.Display, this.Handle, this.window.RootWindow); - + // Some WMs remove decorations when this hint is set. Doesn't hurt to try. Functions.XSetTransientForHint(this.window.Display, this.Handle, this.window.RootWindow); - + if (_decorations_hidden) { Functions.XUnmapWindow(this.window.Display, this.Handle); @@ -422,23 +426,27 @@ namespace OpenTK.Platform.X11 } } } + #region bool DisableMotifDecorations() bool DisableMotifDecorations() { - IntPtr atom = Functions.XInternAtom(this.window.Display, MOTIF_WM_ATOM, true); - if (atom != IntPtr.Zero) + using (new XLock(window.Display)) { - //Functions.XGetWindowProperty(window.Display, window.WindowHandle, atom, IntPtr.Zero, IntPtr.Zero, false, - - MotifWmHints hints = new MotifWmHints(); - hints.flags = (IntPtr)MotifFlags.Decorations; - Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, - ref hints, Marshal.SizeOf(hints) / IntPtr.Size); - return true; + IntPtr atom = Functions.XInternAtom(this.window.Display, MOTIF_WM_ATOM, true); + if (atom != IntPtr.Zero) + { + //Functions.XGetWindowProperty(window.Display, window.WindowHandle, atom, IntPtr.Zero, IntPtr.Zero, false, + + MotifWmHints hints = new MotifWmHints(); + hints.flags = (IntPtr)MotifFlags.Decorations; + Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, + ref hints, Marshal.SizeOf(hints) / IntPtr.Size); + return true; + } + return false; } - return false; } #endregion @@ -447,16 +455,19 @@ namespace OpenTK.Platform.X11 bool DisableGnomeDecorations() { - IntPtr atom = Functions.XInternAtom(this.window.Display, Constants.XA_WIN_HINTS, true); - if (atom != IntPtr.Zero) + using (new XLock(window.Display)) { - IntPtr hints = IntPtr.Zero; - Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, - ref hints, Marshal.SizeOf(hints) / IntPtr.Size); - return true; + IntPtr atom = Functions.XInternAtom(this.window.Display, Constants.XA_WIN_HINTS, true); + if (atom != IntPtr.Zero) + { + IntPtr hints = IntPtr.Zero; + Functions.XChangeProperty(this.window.Display, this.Handle, atom, atom, 32, PropertyMode.Replace, + ref hints, Marshal.SizeOf(hints) / IntPtr.Size); + return true; + } + + return false; } - - return false; } #endregion @@ -478,7 +489,7 @@ namespace OpenTK.Platform.X11 using (new XLock(window.Display)) { Functions.XSetTransientForHint(this.window.Display, this.Handle, IntPtr.Zero); - + if (!_decorations_hidden) { Functions.XUnmapWindow(this.window.Display, this.Handle); @@ -574,6 +585,86 @@ namespace OpenTK.Platform.X11 #endregion + bool RefreshWindowBorders() + { + IntPtr atom, nitems, bytes_after, prop = IntPtr.Zero; + int format; + bool borders_changed = false; + + using (new XLock(window.Display)) + { + Functions.XGetWindowProperty(window.Display, window.WindowHandle, + _atom_net_frame_extents, IntPtr.Zero, new IntPtr(16), false, + (IntPtr)Atom.XA_CARDINAL, out atom, out format, out nitems, out bytes_after, ref prop); + } + + if ((prop != IntPtr.Zero)) + { + if ((long)nitems == 4) + { + int new_border_left = Marshal.ReadIntPtr(prop, 0).ToInt32(); + int new_border_right = Marshal.ReadIntPtr(prop, IntPtr.Size).ToInt32(); + int new_border_top = Marshal.ReadIntPtr(prop, IntPtr.Size * 2).ToInt32(); + int new_border_bottom = Marshal.ReadIntPtr(prop, IntPtr.Size * 3).ToInt32(); + + borders_changed = + new_border_left != border_left || + new_border_right != border_right || + new_border_top != border_top || + new_border_bottom != border_bottom; + + border_left = new_border_left; + border_right = new_border_right; + border_top = new_border_top; + border_bottom = new_border_bottom; + + //Debug.WriteLine(border_left); + //Debug.WriteLine(border_right); + //Debug.WriteLine(border_top); + //Debug.WriteLine(border_bottom); + } + + using (new XLock(window.Display)) + { + Functions.XFree(prop); + } + } + + return borders_changed; + } + + void RefreshWindowBounds(ref XEvent e) + { + RefreshWindowBorders(); + + Point new_location = new Point( + e.ConfigureEvent.x - border_left, + e.ConfigureEvent.y - border_top); + if (Location != new_location) + { + bounds.Location = new_location; + if (Move != null) + Move(this, EventArgs.Empty); + } + + // Note: width and height denote the internal (client) size. + // To get the external (window) size, we need to add the border size. + Size new_size = new Size( + e.ConfigureEvent.width + border_left + border_right, + e.ConfigureEvent.height + border_top + border_bottom); + if (Bounds.Size != new_size) + { + bounds.Size = new_size; + client_rectangle.Size = new Size(e.ConfigureEvent.width, e.ConfigureEvent.height); + + if (this.Resize != null) + { + //Debug.WriteLine(new System.Diagnostics.StackTrace()); + Resize(this, EventArgs.Empty); + } + } + } + #endregion #region INativeWindow Members @@ -583,10 +674,15 @@ namespace OpenTK.Platform.X11 public void ProcessEvents() { // Process all pending events - while (Exists && window != null && - Functions.XCheckWindowEvent(window.Display, window.WindowHandle, window.EventMask, ref e) || - Functions.XCheckTypedWindowEvent(window.Display, window.WindowHandle, XEventName.ClientMessage, ref e)) + while (Exists && window != null) { + using (new XLock(window.Display)) + { + if (!Functions.XCheckWindowEvent(window.Display, window.WindowHandle, window.EventMask, ref e) && + !Functions.XCheckTypedWindowEvent(window.Display, window.WindowHandle, XEventName.ClientMessage, ref e)) + break; + } + // Respond to the event e switch (e.type) { @@ -627,7 +723,10 @@ namespace OpenTK.Platform.X11 isExiting = true; Debug.WriteLine("Destroying window."); - Functions.XDestroyWindow(window.Display, window.WindowHandle); + using (new XLock(window.Display)) + { + Functions.XDestroyWindow(window.Display, window.WindowHandle); + } break; } } @@ -644,37 +743,13 @@ namespace OpenTK.Platform.X11 return; case XEventName.ConfigureNotify: - border_width = e.ConfigureEvent.border_width; - - Point new_location = new Point(e.ConfigureEvent.x, e.ConfigureEvent.y); - if (Location != new_location) - { - bounds.Location = new_location; - if (Move != null) - Move(this, EventArgs.Empty); - } - - // Note: width and height denote the internal (client) size. - // To get the external (window) size, we need to add the border size. - Size new_size = new Size(e.ConfigureEvent.width, e.ConfigureEvent.height); - if (ClientSize != new_size) - { - bounds.Size = new_size; - bounds.Width += e.ConfigureEvent.border_width; - bounds.Height += e.ConfigureEvent.border_width; - - // Todo: Get the real client rectangle. - client_rectangle.Size = new_size; - - if (this.Resize != null) - Resize(this, EventArgs.Empty); - } + RefreshWindowBounds(ref e); break; case XEventName.KeyPress: driver.ProcessEvent(ref e); - - int status = Functions.XLookupString(ref e.KeyEvent, ascii, ascii.Length, null, IntPtr.Zero); + int status = 0; + status = Functions.XLookupString(ref e.KeyEvent, ascii, ascii.Length, null, IntPtr.Zero); Encoding.Default.GetChars(ascii, 0, status, chars, 0); EventHandler key_press = KeyPress; @@ -741,9 +816,16 @@ namespace OpenTK.Platform.X11 break; case XEventName.PropertyNotify: - if (e.PropertyEvent.atom == _atom_net_wm_state) + if (e.PropertyEvent.atom == _atom_net_wm_state) + { if (WindowStateChanged != null) WindowStateChanged(this, EventArgs.Empty); + } + + //if (e.PropertyEvent.atom == _atom_net_frame_extents) + //{ + // RefreshWindowBorders(); + //} break; default: @@ -762,8 +844,15 @@ namespace OpenTK.Platform.X11 get { return bounds; } set { - Functions.XMoveResizeWindow(window.Display, window.WindowHandle, - value.X, value.Y, value.Width - border_width, value.Height - border_width); + using (new XLock(window.Display)) + { + Functions.XMoveResizeWindow(window.Display, window.WindowHandle, + value.X, + value.Y, + value.Width - border_left - border_right, + value.Height - border_top - border_bottom); + } + ProcessEvents(); } } @@ -776,7 +865,11 @@ namespace OpenTK.Platform.X11 get { return Bounds.Location; } set { - Functions.XMoveWindow(window.Display, window.WindowHandle, value.X, value.Y); + using (new XLock(window.Display)) + { + Functions.XMoveWindow(window.Display, window.WindowHandle, value.X, value.Y); + } + ProcessEvents(); } } @@ -789,12 +882,16 @@ namespace OpenTK.Platform.X11 get { return Bounds.Size; } set { - int width = value.Width - border_width; - int height = value.Height - border_width; - width = width < 0 ? 1 : width; - height = height < 0 ? 1 : height; + int width = value.Width - border_left - border_right; + int height = value.Height - border_top - border_bottom; + width = width <= 0 ? 1 : width; + height = height <= 0 ? 1 : height; - Functions.XResizeWindow(window.Display, window.WindowHandle, width, height); + using (new XLock(window.Display)) + { + Functions.XResizeWindow(window.Display, window.WindowHandle, width, height); + } + ProcessEvents(); } } @@ -814,8 +911,12 @@ namespace OpenTK.Platform.X11 } set { - Functions.XResizeWindow(window.Display, window.WindowHandle, - value.Width, value.Height); + using (new XLock(window.Display)) + { + Functions.XResizeWindow(window.Display, window.WindowHandle, + value.Width, value.Height); + } + ProcessEvents(); } } @@ -841,8 +942,8 @@ namespace OpenTK.Platform.X11 public int Width { - get { return Bounds.Width; } - set { Size = new Size(value, Height); } + get { return ClientSize.Width; } + set { ClientSize = new Size(value, Height); } } #endregion @@ -851,8 +952,8 @@ namespace OpenTK.Platform.X11 public int Height { - get { return Bounds.Height; } - set { Size = new Size(Width, value); } + get { return ClientSize.Height; } + set { ClientSize = new Size(Width, value); } } #endregion @@ -861,7 +962,7 @@ namespace OpenTK.Platform.X11 public int X { - get { return Bounds.X; } + get { return Location.X; } set { Location = new Point(value, Y); } } @@ -871,7 +972,7 @@ namespace OpenTK.Platform.X11 public int Y { - get { return Bounds.Y; } + get { return Location.Y; } set { Location = new Point(X, value); } } @@ -1094,6 +1195,8 @@ namespace OpenTK.Platform.X11 if (temporary_resizable) WindowBorder = previous_state; + + ProcessEvents(); } } @@ -1245,7 +1348,10 @@ namespace OpenTK.Platform.X11 get { IntPtr name = IntPtr.Zero; - Functions.XFetchName(window.Display, window.WindowHandle, ref name); + using (new XLock(window.Display)) + { + Functions.XFetchName(window.Display, window.WindowHandle, ref name); + } if (name != IntPtr.Zero) return Marshal.PtrToStringAnsi(name); @@ -1254,7 +1360,12 @@ namespace OpenTK.Platform.X11 set { if (value != null && value != Title) - Functions.XStoreName(window.Display, window.WindowHandle, value); + { + using (new XLock(window.Display)) + { + Functions.XStoreName(window.Display, window.WindowHandle, value); + } + } if (TitleChanged != null) TitleChanged(this, EventArgs.Empty); @@ -1275,11 +1386,17 @@ namespace OpenTK.Platform.X11 { if (value && !visible) { - Functions.XMapWindow(window.Display, window.WindowHandle); + using (new XLock(window.Display)) + { + Functions.XMapWindow(window.Display, window.WindowHandle); + } } else if (!value && visible) { - Functions.XUnmapWindow(window.Display, window.WindowHandle); + using (new XLock(window.Display)) + { + Functions.XUnmapWindow(window.Display, window.WindowHandle); + } } } } @@ -1307,9 +1424,12 @@ namespace OpenTK.Platform.X11 ev.ClientMessageEvent.display = window.Display; ev.ClientMessageEvent.window = window.WindowHandle; ev.ClientMessageEvent.ptr1 = _atom_wm_destroy; - Functions.XSendEvent(window.Display, window.WindowHandle, false, - EventMask.NoEventMask, ref ev); - Functions.XFlush(window.Display); + using (new XLock(window.Display)) + { + Functions.XSendEvent(window.Display, window.WindowHandle, false, + EventMask.NoEventMask, ref ev); + Functions.XFlush(window.Display); + } } #endregion @@ -1319,7 +1439,10 @@ namespace OpenTK.Platform.X11 public void DestroyWindow() { Debug.WriteLine("X11GLNative shutdown sequence initiated."); - Functions.XDestroyWindow(window.Display, window.WindowHandle); + using (new XLock(window.Display)) + { + Functions.XDestroyWindow(window.Display, window.WindowHandle); + } } #endregion @@ -1331,7 +1454,10 @@ namespace OpenTK.Platform.X11 int ox, oy; IntPtr child; - Functions.XTranslateCoordinates(window.Display, window.RootWindow, window.WindowHandle, point.X, point.Y, out ox, out oy, out child); + using (new XLock(window.Display)) + { + Functions.XTranslateCoordinates(window.Display, window.RootWindow, window.WindowHandle, point.X, point.Y, out ox, out oy, out child); + } point.X = ox; point.Y = oy; @@ -1348,7 +1474,10 @@ namespace OpenTK.Platform.X11 int ox, oy; IntPtr child; - Functions.XTranslateCoordinates(window.Display, window.WindowHandle, window.RootWindow, point.X, point.Y, out ox, out oy, out child); + using (new XLock(window.Display)) + { + Functions.XTranslateCoordinates(window.Display, window.WindowHandle, window.RootWindow, point.X, point.Y, out ox, out oy, out child); + } point.X = ox; point.Y = oy; @@ -1378,15 +1507,10 @@ namespace OpenTK.Platform.X11 { if (Exists) { - try + using (new XLock(window.Display)) { - Functions.XLockDisplay(window.Display); Functions.XDestroyWindow(window.Display, window.WindowHandle); } - finally - { - Functions.XUnlockDisplay(window.Display); - } while (Exists) ProcessEvents(); diff --git a/Source/OpenTK/Platform/X11/X11GraphicsMode.cs b/Source/OpenTK/Platform/X11/X11GraphicsMode.cs index e5c75532..330703a1 100644 --- a/Source/OpenTK/Platform/X11/X11GraphicsMode.cs +++ b/Source/OpenTK/Platform/X11/X11GraphicsMode.cs @@ -165,36 +165,33 @@ namespace OpenTK.Platform.X11 // Select a visual that matches the parameters set by the user. IntPtr display = API.DefaultDisplay; - try + using (new XLock(display)) { - 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); - - unsafe + try { - Debug.Print("Getting FB config."); - int fbcount; - // Note that ChooseFBConfig returns an array of GLXFBConfig opaque structures (i.e. mapped to IntPtrs). - IntPtr* fbconfigs = Glx.ChooseFBConfig(display, screen, visualAttributes.ToArray(), out fbcount); - if (fbcount > 0 && fbconfigs != null) + int screen = Functions.XDefaultScreen(display); + IntPtr root = Functions.XRootWindow(display, screen); + Debug.Print("Display: {0}, Screen: {1}, RootWindow: {2}", display, screen, root); + + unsafe { - // We want to use the first GLXFBConfig from the fbconfigs array (the first one is the best match). - visual = Glx.GetVisualFromFBConfig(display, *fbconfigs); - Functions.XFree((IntPtr)fbconfigs); + Debug.Print("Getting FB config."); + int fbcount; + // Note that ChooseFBConfig returns an array of GLXFBConfig opaque structures (i.e. mapped to IntPtrs). + IntPtr* fbconfigs = Glx.ChooseFBConfig(display, screen, visualAttributes.ToArray(), out fbcount); + if (fbcount > 0 && fbconfigs != null) + { + // We want to use the first GLXFBConfig from the fbconfigs array (the first one is the best match). + visual = Glx.GetVisualFromFBConfig(display, *fbconfigs); + Functions.XFree((IntPtr)fbconfigs); + } } } - } - catch (EntryPointNotFoundException) - { - Debug.Print("Function glXChooseFBConfig not supported."); - return IntPtr.Zero; - } - finally - { - Functions.XUnlockDisplay(display); + catch (EntryPointNotFoundException) + { + Debug.Print("Function glXChooseFBConfig not supported."); + return IntPtr.Zero; + } } return visual; @@ -266,15 +263,10 @@ namespace OpenTK.Platform.X11 Debug.Print("Falling back to glXChooseVisual."); IntPtr display = API.DefaultDisplay; - try + using (new XLock(display)) { - Functions.XLockDisplay(display); return Glx.ChooseVisual(display, Functions.XDefaultScreen(display), visualAttributes.ToArray()); } - finally - { - Functions.XUnlockDisplay(display); - } } #endregion diff --git a/Source/OpenTK/Properties/AssemblyInfo.cs b/Source/OpenTK/Properties/AssemblyInfo.cs index abdad4f0..13f6efd9 100644 --- a/Source/OpenTK/Properties/AssemblyInfo.cs +++ b/Source/OpenTK/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("The Open Toolkit Library")] [assembly: AssemblyProduct("The Open Toolkit Library")] -[assembly: AssemblyCopyright("Copyright © 2006-2009 the Open Toolkit Library")] +[assembly: AssemblyCopyright("Copyright © 2006-2010 the Open Toolkit Library")] [assembly: AssemblyTrademark("OpenTK")] [assembly: AssemblyCulture("")] @@ -40,4 +40,4 @@ using System.Runtime.InteropServices; #if SIGN_ASSEMBLY [assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif \ No newline at end of file +#endif