ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge kb to master (#8)

Browse source 
* bump version 1.0.4

* nuget

* fix windows keyboard(for real this time)

* fix keyboard

* update gitignore

* fix source files corruption

* test

* Fix x11 window creation. (#3)

Co-authored-by: Emmanuel <nhv3@localhost.localdomain>
Co-authored-by: riperiperi <rhy3756547@hotmail.com>
This commit is contained in:
emmauss 2020-10-26 22:22:01 +00:00 committed by GitHub
parent ef33f1e08e
commit bf2d7049a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/OpenTK/Platform/X11/API.cs
View file

@ -1323,12 +1323,12 @@ XF86VidModeGetGammaRampSize(
{ {
XSetWindowAttributes attr = attributes.Value; XSetWindowAttributes attr = attributes.Value;
return XCreateWindow(display, parent, x, y, width, height, border_width, depth, return XCreateWindow(display, parent, x, y, width, height, border_width, depth,
(int)@class, visual, (IntPtr)valuemask, &attr); (int)@class, visual, (IntPtr)valuemask, (IntPtr)(&attr));
} }
else else
{ {
return XCreateWindow(display, parent, x, y, width, height, border_width, depth, return XCreateWindow(display, parent, x, y, width, height, border_width, depth,
(int)@class, visual, (IntPtr)valuemask, null); (int)@class, visual, (IntPtr)valuemask, (IntPtr)null);
} }
} }
} }

2
src/OpenTK/Platform/X11/Functions.cs
View file

@ -65,7 +65,7 @@ namespace OpenTK.Platform.X11
public extern static IntPtr XSynchronize(IntPtr display, bool onoff); public extern static IntPtr XSynchronize(IntPtr display, bool onoff);
[DllImport("libX11", EntryPoint = "XCreateWindow")] [DllImport("libX11", EntryPoint = "XCreateWindow")]
public unsafe extern static IntPtr XCreateWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, int depth, int xclass, IntPtr visual, IntPtr valuemask, XSetWindowAttributes* attributes); public extern static IntPtr XCreateWindow(Display display, Window parent, int x, int y, int width, int height, int borderWidth, int depth, int xclass, IntPtr visual, IntPtr valueMask, IntPtr attributes);
[DllImport("libX11", EntryPoint = "XCreateSimpleWindow")]//, CLSCompliant(false)] [DllImport("libX11", EntryPoint = "XCreateSimpleWindow")]//, CLSCompliant(false)]
public extern static IntPtr XCreateSimpleWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, UIntPtr border, UIntPtr background); public extern static IntPtr XCreateSimpleWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, UIntPtr border, UIntPtr background);