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

[Linux] Implemented CursorVisible

Browse source
This commit is contained in:
thefiddler 2014-07-17 09:45:13 +02:00
parent 153522c0a4
commit fd6ff962a1
2 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Source/OpenTK/Platform/Linux/LinuxNativeWindow.cs
View file

@ -56,6 +56,7 @@ namespace OpenTK.Platform.Linux
MouseCursor cursor_current; MouseCursor cursor_current;
BufferObject cursor_custom; BufferObject cursor_custom;
BufferObject cursor_default; BufferObject cursor_default;
BufferObject cursor_empty;
IntPtr gbm_surface; IntPtr gbm_surface;
@ -114,6 +115,7 @@ namespace OpenTK.Platform.Linux
Debug.Print("[KMS] Created EGL surface {0:x}", window.Surface); Debug.Print("[KMS] Created EGL surface {0:x}", window.Surface);
cursor_default = CreateCursor(gbm, Cursors.Default); cursor_default = CreateCursor(gbm, Cursors.Default);
cursor_empty = CreateCursor(gbm, Cursors.Empty);
Cursor = MouseCursor.Default; Cursor = MouseCursor.Default;
exists = true; exists = true;
} }
@ -133,13 +135,16 @@ namespace OpenTK.Platform.Linux
int height = 64; int height = 64;
SurfaceFormat format = SurfaceFormat.ARGB8888; SurfaceFormat format = SurfaceFormat.ARGB8888;
SurfaceFlags usage = SurfaceFlags.Cursor64x64 | SurfaceFlags.Write; SurfaceFlags usage = SurfaceFlags.Cursor64x64 | SurfaceFlags.Write;
Debug.Print("[KMS] Gbm.CreateBuffer({0:X}, {1}, {2}, {3}, {4}).",
gbm, width, height, format, usage);
BufferObject bo = Gbm.CreateBuffer( BufferObject bo = Gbm.CreateBuffer(
gbm, width, height, format, usage); gbm, width, height, format, usage);
if (bo == BufferObject.Zero) if (bo == BufferObject.Zero)
{ {
Debug.Print("[KMS] Gbm.CreateBuffer({0:X}, {1}, {2}, {3}, {4}) failed.", Debug.Print("[KMS] Failed to create buffer.");
gbm, width, height, format, usage);
return bo; return bo;
} }
@ -169,15 +174,28 @@ namespace OpenTK.Platform.Linux
} }
else if (cursor == MouseCursor.Empty) else if (cursor == MouseCursor.Empty)
{ {
// nothing to do bo = cursor_empty;
} }
else else
{ {
if (cursor_custom != BufferObject.Zero)
cursor_custom.Dispose();
cursor_custom = CreateCursor(window.BufferManager, cursor); cursor_custom = CreateCursor(window.BufferManager, cursor);
bo = cursor_custom;
} }
Drm.SetCursor(window.FD, window.DisplayDevice.Id, // If we failed to create a proper cursor, try falling back
bo.Handle, bo.Width, bo.Height, cursor.X, cursor.Y); // to the empty cursor. We do not want to crash here!
if (bo == BufferObject.Zero)
{
bo = cursor_empty;
}
if (bo != BufferObject.Zero)
{
Drm.SetCursor(window.FD, window.DisplayDevice.Id,
bo.Handle, bo.Width, bo.Height, cursor.X, cursor.Y);
}
} }
static SurfaceFormat GetSurfaceFormat(IntPtr display, GraphicsMode mode) static SurfaceFormat GetSurfaceFormat(IntPtr display, GraphicsMode mode)
@ -464,9 +482,15 @@ namespace OpenTK.Platform.Linux
} }
set set
{ {
if (value) if (value && !is_cursor_visible)
{ {
SetCursor(cursor_current);
} }
else if (!value && is_cursor_visible)
{
SetCursor(MouseCursor.Empty);
}
is_cursor_visible = value;
} }
} }
@ -485,8 +509,10 @@ namespace OpenTK.Platform.Linux
cursor_custom.Dispose(); cursor_custom.Dispose();
} }
SetCursor(value); if (CursorVisible)
{
SetCursor(value);
}
cursor_current = value; cursor_current = value;
} }
} }

1
Source/OpenTK/Platform/Linux/LinuxWindowInfo.cs
View file

@ -46,6 +46,7 @@ namespace OpenTK.Platform.Linux
throw new ArgumentNullException(); throw new ArgumentNullException();
FD = fd; FD = fd;
BufferManager = gbm;
DisplayDevice = display_device; DisplayDevice = display_device;
// The window handle and surface handle must // The window handle and surface handle must
// be filled in manually once they are known. // be filled in manually once they are known.