Corrected usages of tabs instead of spaces.
authorJarl Gullberg <jarl.gullberg@gmail.com>
Sun, 25 Jun 2017 11:49:04 +0000 (13:49 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Sun, 25 Jun 2017 11:49:04 +0000 (13:49 +0200)
src/OpenTK.GLWidget/OSX/OSXWindowInfoInitializer.cs
src/OpenTK.GLWidget/Win/WinWindowsInfoInitializer.cs
src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs

index 6df6802..fd1c27b 100644 (file)
@@ -9,30 +9,30 @@ namespace OpenTK.OSX
     /// Handler class for initializing <see cref="IWindowInfo"/> objects under the OSX platform for both GTK2 and
     /// GTK3.
     /// </summary>
-       public static class OSXWindowInfoInitializer
-       {
+    public static class OSXWindowInfoInitializer
+    {
 #if GTK3
-           const string OSXLibGdkName = "libgdk-3.dylib";
+        const string OSXLibGdkName = "libgdk-3.dylib";
 #else
         const string OSXLibGdkName = "libgdk-quartz-2.0.0.dylib";
 #endif
 
-           /// <summary>
-           /// Initializes an <see cref="IWindowInfo"/> under the OSX platform.
-           /// </summary>
-           /// <param name="gdkWindowHandle"></param>
-               public static IWindowInfo Initialize(IntPtr gdkWindowHandle)
-               {
-                       IntPtr windowHandle = gdk_quartz_window_get_nswindow(gdkWindowHandle);
-                       IntPtr viewHandle = gdk_quartz_window_get_nsview(gdkWindowHandle);
+        /// <summary>
+        /// Initializes an <see cref="IWindowInfo"/> under the OSX platform.
+        /// </summary>
+        /// <param name="gdkWindowHandle"></param>
+        public static IWindowInfo Initialize(IntPtr gdkWindowHandle)
+        {
+            IntPtr windowHandle = gdk_quartz_window_get_nswindow(gdkWindowHandle);
+            IntPtr viewHandle = gdk_quartz_window_get_nsview(gdkWindowHandle);
 
-                       return Utilities.CreateMacOSWindowInfo(windowHandle, viewHandle);
-               }
+            return Utilities.CreateMacOSWindowInfo(windowHandle, viewHandle);
+        }
 
-               [SuppressUnmanagedCodeSecurity, DllImport(OSXLibGdkName)]
-               private static extern IntPtr gdk_quartz_window_get_nswindow(IntPtr handle);
+        [SuppressUnmanagedCodeSecurity, DllImport(OSXLibGdkName)]
+        private static extern IntPtr gdk_quartz_window_get_nswindow(IntPtr handle);
 
-               [SuppressUnmanagedCodeSecurity, DllImport(OSXLibGdkName)]
-               private static extern IntPtr gdk_quartz_window_get_nsview(IntPtr handle);
-       }
+        [SuppressUnmanagedCodeSecurity, DllImport(OSXLibGdkName)]
+        private static extern IntPtr gdk_quartz_window_get_nsview(IntPtr handle);
+    }
 }
\ No newline at end of file
index 9ce6669..814267f 100644 (file)
@@ -9,35 +9,35 @@ namespace OpenTK.Win
     /// Handler class for initializing <see cref="IWindowInfo"/> objects under the Windows platform for both GTK2 and
     /// GTK3.
     /// </summary>
-       public static class WinWindowsInfoInitializer
-       {
+    public static class WinWindowsInfoInitializer
+    {
 #if GTK3
-               private const string WinLibGDKName = "libgdk-3-0.dll";
+        private const string WinLibGDKName = "libgdk-3-0.dll";
 #else
         private const string WinLibGDKName = "libgdk-win32-2.0-0.dll";
 #endif
 
-           /// <summary>
-           /// Initializes an <see cref="IWindowInfo"/> under the Windows platform.
-           /// </summary>
-           /// <param name="gdkWindowHandle"></param>
-               public static IWindowInfo Initialize(IntPtr gdkWindowHandle)
-               {
+        /// <summary>
+        /// Initializes an <see cref="IWindowInfo"/> under the Windows platform.
+        /// </summary>
+        /// <param name="gdkWindowHandle"></param>
+        public static IWindowInfo Initialize(IntPtr gdkWindowHandle)
+        {
 #if GTK3
-                   IntPtr windowHandle = gdk_win32_window_get_handle(gdkWindowHandle);
+            IntPtr windowHandle = gdk_win32_window_get_handle(gdkWindowHandle);
 #else
             IntPtr windowHandle = gdk_win32_drawable_get_handle(gdkWindowHandle);
 #endif
-                       return Utilities.CreateWindowsWindowInfo(windowHandle);
-               }
+            return Utilities.CreateWindowsWindowInfo(windowHandle);
+        }
 
 #if GTK3
-           [SuppressUnmanagedCodeSecurity, DllImport(WinLibGDKName, CallingConvention = CallingConvention.Cdecl)]
-           static extern IntPtr gdk_win32_window_get_handle(IntPtr w);
+        [SuppressUnmanagedCodeSecurity, DllImport(WinLibGDKName, CallingConvention = CallingConvention.Cdecl)]
+        static extern IntPtr gdk_win32_window_get_handle(IntPtr w);
 #else
         [SuppressUnmanagedCodeSecurity, DllImport(WinLibGDKName, CallingConvention = CallingConvention.Cdecl)]
         static extern IntPtr gdk_win32_drawable_get_handle(IntPtr d);
 #endif
 
-       }
+    }
 }
\ No newline at end of file
index b2312b0..f81c8cc 100644 (file)
@@ -11,165 +11,165 @@ namespace OpenTK.X11
     /// <summary>
     /// Handler class for initializing <see cref="IWindowInfo"/> objects under the X11 platform for both GTK2 and GTK3.
     /// </summary>
-       public static class XWindowInfoInitializer
-       {
+    public static class XWindowInfoInitializer
+    {
 
 #if GTK3
-           const string UnixLibGdkName = "libgdk-3.so.0";
+        const string UnixLibGdkName = "libgdk-3.so.0";
 #else
         const string UnixLibGdkName = "libgdk-x11-2.0.so.0";
 #endif
-               private const string UnixLibX11Name = "libX11.so.6";
-               private const string UnixLibGLName = "libGL.so.1";
-
-           /// <summary>
-           /// Initializes an <see cref="IWindowInfo"/> under the X11 platform.
-           /// </summary>
-           /// <param name="mode"></param>
-           /// <param name="displayHandle"></param>
-           /// <param name="screenNumber"></param>
-           /// <param name="gdkWindowHandle"></param>
-           /// <param name="gdkRootWindowHandle"></param>
-           /// <returns></returns>
-               public static IWindowInfo Initialize(GraphicsMode mode, IntPtr displayHandle, int screenNumber, IntPtr gdkWindowHandle, IntPtr gdkRootWindowHandle)
-               {
-                       IntPtr display = gdk_x11_display_get_xdisplay(displayHandle);
+        private const string UnixLibX11Name = "libX11.so.6";
+        private const string UnixLibGLName = "libGL.so.1";
+
+        /// <summary>
+        /// Initializes an <see cref="IWindowInfo"/> under the X11 platform.
+        /// </summary>
+        /// <param name="mode"></param>
+        /// <param name="displayHandle"></param>
+        /// <param name="screenNumber"></param>
+        /// <param name="gdkWindowHandle"></param>
+        /// <param name="gdkRootWindowHandle"></param>
+        /// <returns></returns>
+        public static IWindowInfo Initialize(GraphicsMode mode, IntPtr displayHandle, int screenNumber, IntPtr gdkWindowHandle, IntPtr gdkRootWindowHandle)
+        {
+            IntPtr display = gdk_x11_display_get_xdisplay(displayHandle);
 
 #if GTK3
-                   IntPtr windowXid = gdk_x11_window_get_xid(gdkWindowHandle);
-                   IntPtr rootWindowXid = gdk_x11_window_get_xid(gdkRootWindowHandle);
+            IntPtr windowXid = gdk_x11_window_get_xid(gdkWindowHandle);
+            IntPtr rootWindowXid = gdk_x11_window_get_xid(gdkRootWindowHandle);
 #else
             IntPtr windowXid = gdk_x11_drawable_get_xid(gdkWindowHandle);
             IntPtr rootWindowXid = gdk_x11_drawable_get_xid(gdkRootWindowHandle);
 #endif
 
-                       IntPtr visualInfo;
-                       if (mode.Index.HasValue)
-                       {
-                               XVisualInfo info = new XVisualInfo
-                               {
-                                       VisualID = mode.Index.Value
-                               };
+            IntPtr visualInfo;
+            if (mode.Index.HasValue)
+            {
+                XVisualInfo info = new XVisualInfo
+                {
+                    VisualID = mode.Index.Value
+                };
 
-                               int dummy;
-                               visualInfo = XGetVisualInfo(display, XVisualInfoMask.ID, ref info, out dummy);
-                       }
-                       else
-                       {
-                               visualInfo = GetVisualInfo(mode, display, screenNumber);
-                       }
+                int dummy;
+                visualInfo = XGetVisualInfo(display, XVisualInfoMask.ID, ref info, out dummy);
+            }
+            else
+            {
+                visualInfo = GetVisualInfo(mode, display, screenNumber);
+            }
 
-                       IWindowInfo retval = Utilities.CreateX11WindowInfo(display, screenNumber, windowXid, rootWindowXid, visualInfo);
-                       XFree(visualInfo);
+            IWindowInfo retval = Utilities.CreateX11WindowInfo(display, screenNumber, windowXid, rootWindowXid, visualInfo);
+            XFree(visualInfo);
 
-                       return retval;
-               }
+            return retval;
+        }
 
-               private static IntPtr XGetVisualInfo(IntPtr display, XVisualInfoMask infoMask, ref XVisualInfo template, out int nitems)
-               {
-                       return XGetVisualInfoInternal(display, (IntPtr)(int)infoMask, ref template, out nitems);
-               }
+        private static IntPtr XGetVisualInfo(IntPtr display, XVisualInfoMask infoMask, ref XVisualInfo template, out int nitems)
+        {
+            return XGetVisualInfoInternal(display, (IntPtr)(int)infoMask, ref template, out nitems);
+        }
 
-               private static IntPtr GetVisualInfo(GraphicsMode mode, IntPtr display, int screenNumber)
-               {
-                       try
-                       {
-                               int[] attributes = CreateAttributeList(mode).ToArray();
-                               return glXChooseVisual(display, screenNumber, attributes);
-                       }
-                       catch (DllNotFoundException e)
-                       {
-                               throw new DllNotFoundException("OpenGL dll not found!", e);
-                       }
-                       catch (EntryPointNotFoundException enf)
-                       {
-                               throw new EntryPointNotFoundException("Glx entry point not found!", enf);
-                       }
-               }
+        private static IntPtr GetVisualInfo(GraphicsMode mode, IntPtr display, int screenNumber)
+        {
+            try
+            {
+                int[] attributes = CreateAttributeList(mode).ToArray();
+                return glXChooseVisual(display, screenNumber, attributes);
+            }
+            catch (DllNotFoundException e)
+            {
+                throw new DllNotFoundException("OpenGL dll not found!", e);
+            }
+            catch (EntryPointNotFoundException enf)
+            {
+                throw new EntryPointNotFoundException("Glx entry point not found!", enf);
+            }
+        }
 
-               private static List<int> CreateAttributeList(GraphicsMode mode)
-               {
-                       List<int> attributeList = new List<int>(24);
+        private static List<int> CreateAttributeList(GraphicsMode mode)
+        {
+            List<int> attributeList = new List<int>(24);
 
-                       attributeList.Add((int)GLXAttribute.RGBA);
+            attributeList.Add((int)GLXAttribute.RGBA);
 
-                       if (mode.Buffers > 1)
-                       {
-                               attributeList.Add((int)GLXAttribute.DOUBLEBUFFER);
-                       }
+            if (mode.Buffers > 1)
+            {
+                attributeList.Add((int)GLXAttribute.DOUBLEBUFFER);
+            }
 
-                       if (mode.Stereo)
-                       {
-                               attributeList.Add((int)GLXAttribute.STEREO);
-                       }
+            if (mode.Stereo)
+            {
+                attributeList.Add((int)GLXAttribute.STEREO);
+            }
 
-                       attributeList.Add((int)GLXAttribute.RED_SIZE);
-                       attributeList.Add(mode.ColorFormat.Red / 4); // TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.RED_SIZE);
+            attributeList.Add(mode.ColorFormat.Red / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.GREEN_SIZE);
-                       attributeList.Add(mode.ColorFormat.Green / 4); // TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.GREEN_SIZE);
+            attributeList.Add(mode.ColorFormat.Green / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.BLUE_SIZE);
-                       attributeList.Add(mode.ColorFormat.Blue / 4); // TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.BLUE_SIZE);
+            attributeList.Add(mode.ColorFormat.Blue / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.ALPHA_SIZE);
-                       attributeList.Add(mode.ColorFormat.Alpha / 4); // TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.ALPHA_SIZE);
+            attributeList.Add(mode.ColorFormat.Alpha / 4); // TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.DEPTH_SIZE);
-                       attributeList.Add(mode.Depth);
+            attributeList.Add((int)GLXAttribute.DEPTH_SIZE);
+            attributeList.Add(mode.Depth);
 
-                       attributeList.Add((int)GLXAttribute.STENCIL_SIZE);
-                       attributeList.Add(mode.Stencil);
+            attributeList.Add((int)GLXAttribute.STENCIL_SIZE);
+            attributeList.Add(mode.Stencil);
 
-                       //attributeList.Add(GLX_AUX_BUFFERS);
-                       //attributeList.Add(Buffers);
+            //attributeList.Add(GLX_AUX_BUFFERS);
+            //attributeList.Add(Buffers);
 
-                       attributeList.Add((int)GLXAttribute.ACCUM_RED_SIZE);
-                       attributeList.Add(mode.AccumulatorFormat.Red / 4);// TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.ACCUM_RED_SIZE);
+            attributeList.Add(mode.AccumulatorFormat.Red / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.ACCUM_GREEN_SIZE);
-                       attributeList.Add(mode.AccumulatorFormat.Green / 4);// TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.ACCUM_GREEN_SIZE);
+            attributeList.Add(mode.AccumulatorFormat.Green / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.ACCUM_BLUE_SIZE);
-                       attributeList.Add(mode.AccumulatorFormat.Blue / 4);// TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.ACCUM_BLUE_SIZE);
+            attributeList.Add(mode.AccumulatorFormat.Blue / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.ACCUM_ALPHA_SIZE);
-                       attributeList.Add(mode.AccumulatorFormat.Alpha / 4);// TODO support 16-bit
+            attributeList.Add((int)GLXAttribute.ACCUM_ALPHA_SIZE);
+            attributeList.Add(mode.AccumulatorFormat.Alpha / 4);// TODO support 16-bit
 
-                       attributeList.Add((int)GLXAttribute.NONE);
+            attributeList.Add((int)GLXAttribute.NONE);
 
-                       return attributeList;
-               }
+            return attributeList;
+        }
 
-               [DllImport(UnixLibX11Name, EntryPoint = "XGetVisualInfo")]
-               private static extern IntPtr XGetVisualInfoInternal(IntPtr display, IntPtr infoMask, ref XVisualInfo template, out int nitems);
-
-               [SuppressUnmanagedCodeSecurity, DllImport(UnixLibX11Name)]
-               private static extern void XFree(IntPtr handle);
+        [DllImport(UnixLibX11Name, EntryPoint = "XGetVisualInfo")]
+        private static extern IntPtr XGetVisualInfoInternal(IntPtr display, IntPtr infoMask, ref XVisualInfo template, out int nitems);
+
+        [SuppressUnmanagedCodeSecurity, DllImport(UnixLibX11Name)]
+        private static extern void XFree(IntPtr handle);
 
 #if GTK3
-               /// <summary> Returns the X resource (window or pixmap) belonging to a GdkWindow. </summary>
-               /// <remarks> XID gdk_x11_window_get_xid(GdkWindow *drawable); </remarks>
-               /// <param name="gdkDisplay"> The GdkDrawable. </param>
-               /// <returns> The ID of window's X resource. </returns>
-               [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
-               private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkDisplay);
+        /// <summary> Returns the X resource (window or pixmap) belonging to a GdkWindow. </summary>
+        /// <remarks> XID gdk_x11_window_get_xid(GdkWindow *drawable); </remarks>
+        /// <param name="gdkDisplay"> The GdkDrawable. </param>
+        /// <returns> The ID of window's X resource. </returns>
+        [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
+        private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkDisplay);
 #else
-           /// <summary> Returns the X resource (window or pixmap) belonging to a GdkDrawable. </summary>
-           /// <remarks> XID gdk_x11_drawable_get_xid(GdkDrawable *drawable); </remarks>
-           /// <param name="gdkDisplay"> The GdkDrawable. </param>
-           /// <returns> The ID of drawable's X resource. </returns>
-           [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
-           static extern IntPtr gdk_x11_drawable_get_xid(IntPtr gdkDisplay);
+        /// <summary> Returns the X resource (window or pixmap) belonging to a GdkDrawable. </summary>
+        /// <remarks> XID gdk_x11_drawable_get_xid(GdkDrawable *drawable); </remarks>
+        /// <param name="gdkDisplay"> The GdkDrawable. </param>
+        /// <returns> The ID of drawable's X resource. </returns>
+        [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
+        static extern IntPtr gdk_x11_drawable_get_xid(IntPtr gdkDisplay);
 #endif
-               /// <summary> Returns the X display of a GdkDisplay. </summary>
-               /// <remarks> Display* gdk_x11_display_get_xdisplay(GdkDisplay *display); </remarks>
-               /// <param name="gdkDisplay"> The GdkDrawable. </param>
-               /// <returns> The X Display of the GdkDisplay. </returns>
-               [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
-               private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
-
-               [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGLName)]
-               private static extern IntPtr glXChooseVisual(IntPtr display, int screen, int[] attr);
-       }
+        /// <summary> Returns the X display of a GdkDisplay. </summary>
+        /// <remarks> Display* gdk_x11_display_get_xdisplay(GdkDisplay *display); </remarks>
+        /// <param name="gdkDisplay"> The GdkDrawable. </param>
+        /// <returns> The X Display of the GdkDisplay. </returns>
+        [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)]
+        private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
+
+        [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGLName)]
+        private static extern IntPtr glXChooseVisual(IntPtr display, int screen, int[] attr);
+    }
 }
\ No newline at end of file