From 9309889a1aa045e60e29c7182b938f26bbae14d5 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 25 Jun 2017 13:49:04 +0200 Subject: [PATCH] Corrected usages of tabs instead of spaces. --- .../OSX/OSXWindowInfoInitializer.cs | 36 +-- .../Win/WinWindowsInfoInitializer.cs | 30 +-- .../X11/XWindowInfoInitializer.cs | 238 +++++++++--------- 3 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/OpenTK.GLWidget/OSX/OSXWindowInfoInitializer.cs b/src/OpenTK.GLWidget/OSX/OSXWindowInfoInitializer.cs index 6df6802b..fd1c27ba 100644 --- a/src/OpenTK.GLWidget/OSX/OSXWindowInfoInitializer.cs +++ b/src/OpenTK.GLWidget/OSX/OSXWindowInfoInitializer.cs @@ -9,30 +9,30 @@ namespace OpenTK.OSX /// Handler class for initializing objects under the OSX platform for both GTK2 and /// GTK3. /// - 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 - /// - /// Initializes an under the OSX platform. - /// - /// - public static IWindowInfo Initialize(IntPtr gdkWindowHandle) - { - IntPtr windowHandle = gdk_quartz_window_get_nswindow(gdkWindowHandle); - IntPtr viewHandle = gdk_quartz_window_get_nsview(gdkWindowHandle); + /// + /// Initializes an under the OSX platform. + /// + /// + 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 diff --git a/src/OpenTK.GLWidget/Win/WinWindowsInfoInitializer.cs b/src/OpenTK.GLWidget/Win/WinWindowsInfoInitializer.cs index 9ce66699..814267fa 100644 --- a/src/OpenTK.GLWidget/Win/WinWindowsInfoInitializer.cs +++ b/src/OpenTK.GLWidget/Win/WinWindowsInfoInitializer.cs @@ -9,35 +9,35 @@ namespace OpenTK.Win /// Handler class for initializing objects under the Windows platform for both GTK2 and /// GTK3. /// - 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 - /// - /// Initializes an under the Windows platform. - /// - /// - public static IWindowInfo Initialize(IntPtr gdkWindowHandle) - { + /// + /// Initializes an under the Windows platform. + /// + /// + 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 diff --git a/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs b/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs index b2312b0d..f81c8ccc 100644 --- a/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs +++ b/src/OpenTK.GLWidget/X11/XWindowInfoInitializer.cs @@ -11,165 +11,165 @@ namespace OpenTK.X11 /// /// Handler class for initializing objects under the X11 platform for both GTK2 and GTK3. /// - 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"; + private const string UnixLibX11Name = "libX11.so.6"; + private const string UnixLibGLName = "libGL.so.1"; - /// - /// Initializes an under the X11 platform. - /// - /// - /// - /// - /// - /// - /// - public static IWindowInfo Initialize(GraphicsMode mode, IntPtr displayHandle, int screenNumber, IntPtr gdkWindowHandle, IntPtr gdkRootWindowHandle) - { - IntPtr display = gdk_x11_display_get_xdisplay(displayHandle); + /// + /// Initializes an under the X11 platform. + /// + /// + /// + /// + /// + /// + /// + 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 CreateAttributeList(GraphicsMode mode) - { - List attributeList = new List(24); + private static List CreateAttributeList(GraphicsMode mode) + { + List attributeList = new List(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); + [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); + [SuppressUnmanagedCodeSecurity, DllImport(UnixLibX11Name)] + private static extern void XFree(IntPtr handle); #if GTK3 - /// Returns the X resource (window or pixmap) belonging to a GdkWindow. - /// XID gdk_x11_window_get_xid(GdkWindow *drawable); - /// The GdkDrawable. - /// The ID of window's X resource. - [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)] - private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkDisplay); + /// Returns the X resource (window or pixmap) belonging to a GdkWindow. + /// XID gdk_x11_window_get_xid(GdkWindow *drawable); + /// The GdkDrawable. + /// The ID of window's X resource. + [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)] + private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkDisplay); #else - /// Returns the X resource (window or pixmap) belonging to a GdkDrawable. - /// XID gdk_x11_drawable_get_xid(GdkDrawable *drawable); - /// The GdkDrawable. - /// The ID of drawable's X resource. - [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)] - static extern IntPtr gdk_x11_drawable_get_xid(IntPtr gdkDisplay); + /// Returns the X resource (window or pixmap) belonging to a GdkDrawable. + /// XID gdk_x11_drawable_get_xid(GdkDrawable *drawable); + /// The GdkDrawable. + /// The ID of drawable's X resource. + [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)] + static extern IntPtr gdk_x11_drawable_get_xid(IntPtr gdkDisplay); #endif - /// Returns the X display of a GdkDisplay. - /// Display* gdk_x11_display_get_xdisplay(GdkDisplay *display); - /// The GdkDrawable. - /// The X Display of the GdkDisplay. - [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGdkName)] - private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay); + /// Returns the X display of a GdkDisplay. + /// Display* gdk_x11_display_get_xdisplay(GdkDisplay *display); + /// The GdkDrawable. + /// The X Display of the GdkDisplay. + [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); - } + [SuppressUnmanagedCodeSecurity, DllImport(UnixLibGLName)] + private static extern IntPtr glXChooseVisual(IntPtr display, int screen, int[] attr); + } } \ No newline at end of file