WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 03:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Add mouse cursor handling

Browse Source
This commit is contained in:
elasota
2019-12-22 00:35:30 -05:00
parent 8354d13a84
commit eed82e2960
32 changed files with 835 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PortabilityLayer/HostDisplayDriver.h
View File

@@ -3,6 +3,9 @@
#define __PL_HOST_DISPLAY_DRIVER_H__
#include "PixelFormat.h"
#include "EGpStandardCursor.h"
struct IGpColorCursor;
namespace PortabilityLayer
{
@@ -10,7 +13,9 @@ namespace PortabilityLayer
{
public:
virtual void GetDisplayResolution(unsigned int *width, unsigned int *height, PixelFormat *pixelFormat) = 0;
virtual void HideCursor() = 0;
virtual IGpColorCursor *LoadColorCursor(int id) = 0;
virtual void SetColorCursor(IGpColorCursor *colorCursor) = 0;
virtual void SetStandardCursor(EGpStandardCursor_t standardCursor) = 0;
static void SetInstance(HostDisplayDriver *instance);
static HostDisplayDriver *GetInstance();

30
PortabilityLayer/PLCore.cpp
View File

@@ -14,6 +14,7 @@
#include "HostDisplayDriver.h"
#include "HostSystemServices.h"
#include "HostVOSEventQueue.h"
#include "IGpColorCursor.h"
#include "InputManager.h"
#include "ResourceManager.h"
#include "MacFileInfo.h"
@@ -64,6 +65,7 @@ static void ImportVOSEvents()
void InitCursor()
{
PortabilityLayer::HostDisplayDriver::GetInstance()->SetStandardCursor(EGpStandardCursors::kArrow);
}
Rect BERect::ToRect() const
@@ -90,26 +92,34 @@ CursHandle GetCursor(int cursorID)
CCrsrHandle GetCCursor(int cursorID)
{
PortabilityLayer::ResourceManager *resManager = PortabilityLayer::ResourceManager::GetInstance();
PortabilityLayer::MMHandleBlock *ccRes = resManager->GetResource('crsr', cursorID);
PortabilityLayer::HostDisplayDriver *driver = PortabilityLayer::HostDisplayDriver::GetInstance();
IGpColorCursor *hwCursor = driver->LoadColorCursor(cursorID);
if (!ccRes)
if (!hwCursor)
return nullptr;
PortabilityLayer::MMHandleBlock *copy = PortabilityLayer::MemoryManager::GetInstance()->AllocHandle(ccRes->m_size);
memcpy(copy->m_contents, ccRes->m_contents, ccRes->m_size);
CCrsrHandle hdl = PortabilityLayer::MemoryManager::GetInstance()->NewHandle<CCursor>();
if (!hdl)
{
hwCursor->Destroy();
return nullptr;
}
return reinterpret_cast<CCrsrHandle>(copy);
CCursor *ccursor = *hdl;
ccursor->hwCursor = hwCursor;
return hdl;
}
void SetCCursor(CCrsrHandle handle)
{
PL_NotYetImplemented_Minor();
assert(handle);
PortabilityLayer::HostDisplayDriver::GetInstance()->SetColorCursor((*handle)->hwCursor);
}
void HideCursor()
{
PortabilityLayer::HostDisplayDriver::GetInstance()->HideCursor();
PortabilityLayer::HostDisplayDriver::GetInstance()->SetStandardCursor(EGpStandardCursors::kHidden);
}
void SetCursor(CursPtr cursor)
@@ -124,7 +134,9 @@ void SetBuiltinCursor(int builtinCursor)
void DisposeCCursor(CCrsrHandle handle)
{
PL_NotYetImplemented();
(*handle)->hwCursor->Destroy();
PortabilityLayer::MemoryManager::GetInstance()->ReleaseHandle(reinterpret_cast<PortabilityLayer::MMHandleBlock*>(handle));
}
void Delay(int ticks, UInt32 *endTickCount)

3
PortabilityLayer/PLCore.h
View File

@@ -12,6 +12,8 @@
#pragma warning(error:4311) // Pointer truncation to int
#endif
struct IGpColorCursor;
namespace PortabilityLayer
{
struct MMHandleBlock;
@@ -92,6 +94,7 @@ struct Cursor
struct CCursor
{
IGpColorCursor *hwCursor;
};
struct Window

1
PortabilityLayer/VirtualDirectory.h
View File

@@ -11,5 +11,6 @@ namespace PortabilityLayer
EVirtualDirectory_UserData,
EVirtualDirectory_Prefs,
EVirtualDirectory_Fonts,
EVirtualDirectory_Cursors,
};
}