Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Window] Apply waiting cursor while loading fastfiles

Browse Source
This commit is contained in:
momo5502 2017-06-06 22:13:08 +02:00
parent 5e3a8b313c
commit eb8c141ad9
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Components/Modules/Window.cpp
View File

@ -124,6 +124,23 @@ namespace Components
return Window::MainWindow; return Window::MainWindow;
} }
void Window::ApplyCursor()
{
bool isLoading = !FastFiles::Ready();
SetCursor(LoadCursor(nullptr, isLoading ? IDC_WAIT : IDC_ARROW));
}
BOOL WINAPI Window::MessageHandler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{
if(Msg == WM_SETCURSOR)
{
Window::ApplyCursor();
return TRUE;
}
return Utils::Hook::Call<BOOL(__stdcall)(HWND, UINT, WPARAM, LPARAM)>(0x4731F0)(hWnd, Msg, wParam, lParam);
}
Window::Window() Window::Window()
{ {
// Borderless window // Borderless window
@ -145,11 +162,10 @@ namespace Components
if (Window::NativeCursor.get<bool>() && IsWindow(Window::MainWindow) && GetForegroundWindow() == Window::MainWindow && Window::IsCursorWithin(Window::MainWindow)) if (Window::NativeCursor.get<bool>() && IsWindow(Window::MainWindow) && GetForegroundWindow() == Window::MainWindow && Window::IsCursorWithin(Window::MainWindow))
{ {
int value = 0; int value = 0;
Window::ApplyCursor();
if (Window::CursorVisible) if (Window::CursorVisible)
{ {
SetCursor(LoadCursor(nullptr, IDC_ARROW));
while ((value = ShowCursor(TRUE)) < 0) {}; while ((value = ShowCursor(TRUE)) < 0) {};
while (value > 0) { value = ShowCursor(FALSE); } // Set display counter to 0 while (value > 0) { value = ShowCursor(FALSE); } // Set display counter to 0
} }
@ -165,5 +181,8 @@ namespace Components
// Don't let the game interact with the native cursor // Don't let the game interact with the native cursor
Utils::Hook::Set(0x6D7348, Window::ShowCursorHook); Utils::Hook::Set(0x6D7348, Window::ShowCursorHook);
// Use custom message handler
Utils::Hook::Set(0x64D298, Window::MessageHandler);
} }
} }

4
src/Components/Modules/Window.hpp
View File

@ -25,8 +25,12 @@ namespace Components
static HWND MainWindow; static HWND MainWindow;
static void ApplyCursor();
static int IsNoBorder(); static int IsNoBorder();
static BOOL WINAPI MessageHandler(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
static int WINAPI ShowCursorHook(BOOL show); static int WINAPI ShowCursorHook(BOOL show);
static void DrawCursorStub(void *scrPlace, float x, float y, float w, float h, int horzAlign, int vertAlign, const float *color, Game::Material *material); static void DrawCursorStub(void *scrPlace, float x, float y, float w, float h, int horzAlign, int vertAlign, const float *color, Game::Material *material);