ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-03 16:25:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct arithmetic operator position.

Browse source
This commit is contained in:
Jarl Gullberg 2017-07-30 17:59:19 +02:00
parent c06ce5658d
commit 3bfaeda99d
No known key found for this signature in database
GPG key ID: 750FF6F6BDA72D23
6 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/OpenTK/Platform/Linux/Bindings/Evdev.cs
View file

@ -472,7 +472,7 @@ namespace OpenTK.Platform.Linux
MT_TOOL_Y = 0x3d, /* Center Y tool position */ MT_TOOL_Y = 0x3d, /* Center Y tool position */
MAX = 0x3f, MAX = 0x3f,
CNT = (MAX+1), CNT = (MAX + 1),
} }
internal enum EvdevButton internal enum EvdevButton
@ -579,7 +579,7 @@ namespace OpenTK.Platform.Linux
PWR = 0x16, PWR = 0x16,
FF_STATUS = 0x17, FF_STATUS = 0x17,
MAX = 0x1f, MAX = 0x1f,
CNT = (MAX+1), CNT = (MAX + 1),
} }
internal enum EvdevIoctl : uint internal enum EvdevIoctl : uint

2
src/OpenTK/Platform/Windows/API.cs
View file

@ -3326,7 +3326,7 @@ namespace OpenTK.Platform.Windows
/* /*
* NEC PC-9800 kbd definitions * NEC PC-9800 kbd definitions
*/ */
OEM_NEC_EQUAL= 0x92, // '=' key on numpad OEM_NEC_EQUAL = 0x92, // '=' key on numpad
/* /*
* Fujitsu/OASYS kbd definitions * Fujitsu/OASYS kbd definitions

2
src/OpenTK/Platform/Windows/XInputJoystick.cs
View file

@ -81,7 +81,7 @@ namespace OpenTK.Platform.Windows
{ {
XInputButtons dir = 0; XInputButtons dir = 0;
dir =XInputButtons.DPadUp | XInputButtons.DPadLeft; dir = XInputButtons.DPadUp | XInputButtons.DPadLeft;
if ((buttons & dir) == dir) if ((buttons & dir) == dir)
{ {
return HatPosition.UpLeft; return HatPosition.UpLeft;

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

@ -677,7 +677,7 @@ XF86VidModeGetGammaRampSize(
public override string ToString () public override string ToString ()
{ {
return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags) flags.ToInt32 (), (MotifFunctions) functions.ToInt32 (), (MotifDecorations) decorations.ToInt32 (), (MotifInputMode) input_mode.ToInt32 (), status.ToInt32 ()); return string.Format("MotifWmHints <flags={0}, functions={1}, decorations={2}, input_mode={3}, status={4}", (MotifFlags)flags.ToInt32 (), (MotifFunctions)functions.ToInt32 (), (MotifDecorations)decorations.ToInt32 (), (MotifInputMode)input_mode.ToInt32 (), status.ToInt32 ());
} }
} }
@ -764,26 +764,26 @@ XF86VidModeGetGammaRampSize(
internal enum WindowState internal enum WindowState
{ {
Sticky = (1<<0), /* everyone knows sticky */ Sticky = (1 << 0), /* everyone knows sticky */
Minimized = (1<<1), /* ??? */ Minimized = (1 << 1), /* ??? */
MaximizedVertically = (1<<2), /* window in maximized V state */ MaximizedVertically = (1 << 2), /* window in maximized V state */
MaximizedHorizontally = (1<<3), /* window in maximized H state */ MaximizedHorizontally = (1 << 3), /* window in maximized H state */
Hidden = (1<<4), /* not on taskbar but window visible */ Hidden = (1 << 4), /* not on taskbar but window visible */
Shaded = (1<<5), /* shaded (NeXT style), */ Shaded = (1 << 5), /* shaded (NeXT style), */
HID_WORKSPACE = (1<<6), /* not on current desktop */ HID_WORKSPACE = (1 << 6), /* not on current desktop */
HID_TRANSIENT = (1<<7), /* owner of transient is hidden */ HID_TRANSIENT = (1 << 7), /* owner of transient is hidden */
FixedPosition = (1<<8), /* window is fixed in position even */ FixedPosition = (1 << 8), /* window is fixed in position even */
ArrangeIgnore = (1<<9), /* ignore for auto arranging */ ArrangeIgnore = (1 << 9), /* ignore for auto arranging */
} }
internal enum WindowHints internal enum WindowHints
{ {
SkipFocus = (1<<0), /* "alt-tab" skips this win */ SkipFocus = (1 << 0), /* "alt-tab" skips this win */
SkipWinlist = (1<<1), /* not in win list */ SkipWinlist = (1 << 1), /* not in win list */
SkipTaskbar = (1<<2), /* not on taskbar */ SkipTaskbar = (1 << 2), /* not on taskbar */
GroupTransient = (1<<3), /* ??????? */ GroupTransient = (1 << 3), /* ??????? */
FocusOnClick = (1<<4), /* app only accepts focus when clicked */ FocusOnClick = (1 << 4), /* app only accepts focus when clicked */
DoNotCover = (1<<5), /* attempt to not cover this window */ DoNotCover = (1 << 5), /* attempt to not cover this window */
} }
internal enum ErrorCodes : int internal enum ErrorCodes : int
@ -811,28 +811,28 @@ XF86VidModeGetGammaRampSize(
[Flags] [Flags]
internal enum CreateWindowMask : long//: ulong internal enum CreateWindowMask : long//: ulong
{ {
CWBackPixmap = (1L<<0), CWBackPixmap = (1L << 0),
CWBackPixel = (1L<<1), CWBackPixel = (1L << 1),
CWSaveUnder = (1L<<10), CWSaveUnder = (1L << 10),
CWEventMask = (1L<<11), CWEventMask = (1L << 11),
CWDontPropagate = (1L<<12), CWDontPropagate = (1L << 12),
CWColormap = (1L<<13), CWColormap = (1L << 13),
CWCursor = (1L<<14), CWCursor = (1L << 14),
CWBorderPixmap = (1L<<2), CWBorderPixmap = (1L << 2),
CWBorderPixel = (1L<<3), CWBorderPixel = (1L << 3),
CWBitGravity = (1L<<4), CWBitGravity = (1L << 4),
CWWinGravity = (1L<<5), CWWinGravity = (1L << 5),
CWBackingStore = (1L<<6), CWBackingStore = (1L << 6),
CWBackingPlanes = (1L<<7), CWBackingPlanes = (1L << 7),
CWBackingPixel = (1L<<8), CWBackingPixel = (1L << 8),
CWOverrideRedirect = (1L<<9), CWOverrideRedirect = (1L << 9),
//CWY = (1<<1), //CWY = (1 << 1),
//CWWidth = (1<<2), //CWWidth = (1 << 2),
//CWHeight = (1<<3), //CWHeight = (1 << 3),
//CWBorderWidth = (1<<4), //CWBorderWidth = (1 << 4),
//CWSibling = (1<<5), //CWSibling = (1 << 5),
//CWStackMode = (1<<6), //CWStackMode = (1 << 6),
} }
/// <summary> /// <summary>
@ -1197,7 +1197,7 @@ XF86VidModeGetGammaRampSize(
XF86AudioPrev = 0x1008ff16, XF86AudioPrev = 0x1008ff16,
XF86AudioNext = 0x1008ff17, XF86AudioNext = 0x1008ff17,
XF86AudioRecord = 0x1008ff1c, XF86AudioRecord = 0x1008ff1c,
XF86AudioPause =0x1008ff31, XF86AudioPause = 0x1008ff31,
XF86AudioRewind = 0x1008ff3e, XF86AudioRewind = 0x1008ff3e,
XF86AudioForward = 0x1008ff97, XF86AudioForward = 0x1008ff97,
XF86Phone = 0x1008ff6e, XF86Phone = 0x1008ff6e,

36
src/OpenTK/Platform/X11/Structs.cs
View file

@ -5,10 +5,10 @@
// distribute, sublicense, and/or sell copies of the Software, and to // distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to // permit persons to whom the Software is furnished to do so, subject to
// the following conditions: // the following conditions:
// //
// The above copyright notice and this permission notice shall be // The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software. // included in all copies or substantial portions of the Software.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@ -1050,21 +1050,21 @@ namespace OpenTK.Platform.X11
Sibling = 1 << 5, Sibling = 1 << 5,
StackMode = 1 << 6, StackMode = 1 << 6,
//BackPixmap (1L<<0) //BackPixmap (1L << 0)
//BackPixel (1L<<1) //BackPixel (1L << 1)
//SaveUnder (1L<<10) //SaveUnder (1L << 10)
//EventMask (1L<<11) //EventMask (1L << 11)
//DontPropagate (1L<<12) //DontPropagate (1L << 12)
//Colormap (1L<<13) //Colormap (1L << 13)
//Cursor (1L<<14) //Cursor (1L << 14)
//BorderPixmap (1L<<2) //BorderPixmap (1L << 2)
//BorderPixel (1L<<3) //BorderPixel (1L << 3)
//BitGravity (1L<<4) //BitGravity (1L << 4)
//WinGravity (1L<<5) //WinGravity (1L << 5)
//BackingStore (1L<<6) //BackingStore (1L << 6)
//BackingPlanes (1L<<7) //BackingPlanes (1L << 7)
//BackingPixel (1L<<8) //BackingPixel (1L << 8)
OverrideRedirect = 1<<9, OverrideRedirect = 1 << 9,
} }
internal enum StackMode internal enum StackMode
@ -1816,7 +1816,7 @@ namespace OpenTK.Platform.X11
mask = (byte*)Marshal.AllocHGlobal(mask_len); mask = (byte*)Marshal.AllocHGlobal(mask_len);
for (int i = 0; i < mask_len; i++) for (int i = 0; i < mask_len; i++)
{ {
mask[i] = (byte)((uint)m >> i*8); mask[i] = (byte)((uint)m >> i * 8);
} }
} }
} }

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

@ -149,7 +149,7 @@ namespace OpenTK.Platform.X11
deviceToScreen.Add(dev, 0 /*screen.ScreenNumber*/); deviceToScreen.Add(dev, 0 /*screen.ScreenNumber*/);
} }
} }
return (devices.Count>0); return (devices.Count > 0);
} }
private bool QueryXRandR(List<DisplayDevice> devices) private bool QueryXRandR(List<DisplayDevice> devices)
@ -356,7 +356,7 @@ namespace OpenTK.Platform.X11
screen, current_resolution_index, new_resolution_index); screen, current_resolution_index, new_resolution_index);
int ret = 0; int ret = 0;
short refresh_rate =(short)(resolution != null ? resolution.RefreshRate : 0); short refresh_rate = (short)(resolution != null ? resolution.RefreshRate : 0);
if (refresh_rate > 0) if (refresh_rate > 0)
{ {
ret = Functions.XRRSetScreenConfigAndRate(API.DefaultDisplay, ret = Functions.XRRSetScreenConfigAndRate(API.DefaultDisplay,