duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace WinAPI with SDL2 as the windowing system

Browse source
This commit is contained in:
Clownacy 2019-09-02 20:05:47 +01:00
parent 4dadefc7d4
commit 1301ea8797
2 changed files with 236 additions and 385 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -41,11 +41,14 @@ ifeq ($(DEBUG_SAVE), 1)
CXXFLAGS += -DDEBUG_SAVE CXXFLAGS += -DDEBUG_SAVE
endif endif
CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d -DWINDOWS -DNONPORTABLE CXXFLAGS += -std=c++98 -MMD -MP -MF $@.d -DWINDOWS -DNONPORTABLE `pkg-config sdl2 --cflags`
LIBS += -lkernel32 -lgdi32 -lddraw -ldinput -ldsound -lversion -lshlwapi -limm32 -lwinmm -ldxguid LIBS += -lkernel32 -lgdi32 -lddraw -ldinput -ldsound -lversion -lshlwapi -limm32 -lwinmm -ldxguid
ifeq ($(STATIC), 1) ifeq ($(STATIC), 1)
LDFLAGS += -static LDFLAGS += -static
LIBS += `pkg-config sdl2 --libs --static`
else
LIBS += `pkg-config sdl2 --libs`
endif endif
SOURCES = \ SOURCES = \

358
src/Main.cpp
View file

@ -6,6 +6,9 @@
#include <shlwapi.h> #include <shlwapi.h>
#include "SDL.h"
#include "SDL_syswm.h"
#include "WindowsWrapper.h" #include "WindowsWrapper.h"
#include "CommonDefines.h" #include "CommonDefines.h"
@ -22,8 +25,6 @@
#include "Sound.h" #include "Sound.h"
#include "Triangle.h" #include "Triangle.h"
LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
char gModulePath[MAX_PATH]; char gModulePath[MAX_PATH];
char gDataPath[MAX_PATH]; char gDataPath[MAX_PATH];
@ -38,7 +39,6 @@ static BOOL bActive = TRUE;
static HANDLE hObject; static HANDLE hObject;
static HANDLE hMutex; static HANDLE hMutex;
static HINSTANCE ghInstance;
static int windowWidth; static int windowWidth;
static int windowHeight; static int windowHeight;
@ -46,19 +46,11 @@ static int windowHeight;
static const char *mutex_name = "Doukutsu"; static const char *mutex_name = "Doukutsu";
#ifdef JAPANESE #ifdef JAPANESE
static const char *lpWindowName = "\x93\xB4\x8C\x41\x95\xA8\x8C\xEA"; static const char *lpWindowName = "洞窟物語";
#else #else
static const char *lpWindowName = "Cave Story ~ Doukutsu Monogatari"; static const char *lpWindowName = "Cave Story ~ Doukutsu Monogatari";
#endif #endif
void SetWindowName(HWND hWnd)
{
char window_name[0x100];
sprintf(window_name, "%s", lpWindowName);
SetWindowTextA(hWnd, window_name);
}
// Framerate stuff // Framerate stuff
void PutFramePerSecound(void) void PutFramePerSecound(void)
{ {
@ -96,8 +88,11 @@ unsigned long GetFramePerSecound(void)
return frames_this_second; return frames_this_second;
} }
int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) int main(int argc, char *argv[])
{ {
(void)argc;
(void)argv;
int i; int i;
hObject = OpenMutexA(MUTEX_ALL_ACCESS, 0, mutex_name); hObject = OpenMutexA(MUTEX_ALL_ACCESS, 0, mutex_name);
@ -109,8 +104,6 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
hMutex = CreateMutexA(NULL, FALSE, mutex_name); hMutex = CreateMutexA(NULL, FALSE, mutex_name);
ghInstance = hInstance;
// Get executable's path // Get executable's path
GetModuleFileNameA(NULL, gModulePath, MAX_PATH); GetModuleFileNameA(NULL, gModulePath, MAX_PATH);
PathRemoveFileSpecA(gModulePath); PathRemoveFileSpecA(gModulePath);
@ -210,35 +203,16 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
RECT unused_rect = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT}; RECT unused_rect = {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT};
WNDCLASSEXA wndclassex; SDL_Init(SDL_INIT_EVENTS);
memset(&wndclassex, 0, sizeof(WNDCLASSEXA));
wndclassex.cbSize = sizeof(WNDCLASSEXA);
wndclassex.lpfnWndProc = WindowProcedure;
wndclassex.hInstance = hInstance;
wndclassex.hbrBackground = (HBRUSH)GetStockObject(DKGRAY_BRUSH); // This is what gives the window's undrawn regions its grey colour
wndclassex.lpszClassName = lpWindowName;
wndclassex.hCursor = LoadCursorA(hInstance, "CURSOR_NORMAL");
wndclassex.hIcon = LoadIconA(hInstance, "0");
wndclassex.hIconSm = LoadIconA(hInstance, "ICON_MINI");
HWND hWnd; HWND hWnd;
HMENU hMenu; SDL_Window *window;
int nWidth; SDL_SysWMinfo info;
int nHeight;
int x;
int y;
switch (conf.display_mode) switch (conf.display_mode)
{ {
case 1: case 1:
case 2: case 2:
wndclassex.lpszMenuName = "MENU_MAIN";
if (RegisterClassExA(&wndclassex) == 0)
{
ReleaseMutex(hMutex);
return 0;
}
// Set window dimensions // Set window dimensions
if (conf.display_mode == 1) if (conf.display_mode == 1)
{ {
@ -251,23 +225,21 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
windowHeight = WINDOW_HEIGHT * 2; windowHeight = WINDOW_HEIGHT * 2;
} }
nWidth = windowWidth + 2 * GetSystemMetrics(SM_CXFIXEDFRAME) + 2; SetWindowPadding(GetSystemMetrics(SM_CXFIXEDFRAME) + 1, GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION) + 1);
nHeight = (2 * GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION)) + GetSystemMetrics(SM_CYMENU) + windowHeight + 2;
x = (GetSystemMetrics(SM_CXSCREEN) - nWidth) / 2;
y = (GetSystemMetrics(SM_CYSCREEN) - nHeight) / 2;
SetWindowPadding(GetSystemMetrics(SM_CXFIXEDFRAME) + 1, GetSystemMetrics(SM_CYFIXEDFRAME) + GetSystemMetrics(SM_CYCAPTION) + GetSystemMetrics(SM_CYMENU) + 1); window = SDL_CreateWindow(lpWindowName, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, 0);
hWnd = CreateWindowExA(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR, lpWindowName, lpWindowName, WS_MINIMIZEBOX | WS_SYSMENU | WS_BORDER | WS_DLGFRAME | WS_VISIBLE, x, y, nWidth, nHeight, NULL, NULL, hInstance, NULL); if (window == NULL)
ghWnd = hWnd;
if (hWnd == NULL)
{ {
ReleaseMutex(hMutex); ReleaseMutex(hMutex);
return 0; return 0;
} }
hMenu = GetMenu(hWnd); SDL_VERSION(&info.version);
SDL_GetWindowWMInfo(window, &info);
hWnd = info.info.win.window;
ghWnd = hWnd;
if (conf.display_mode == 1) if (conf.display_mode == 1)
StartDirectDraw(hWnd, 0, 0); StartDirectDraw(hWnd, 0, 0);
@ -279,19 +251,24 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
case 0: case 0:
case 3: case 3:
case 4: case 4:
if (RegisterClassExA(&wndclassex) == 0)
{
ReleaseMutex(hMutex);
return 0;
}
// Set window dimensions // Set window dimensions
windowWidth = WINDOW_WIDTH * 2; windowWidth = WINDOW_WIDTH * 2;
windowHeight = WINDOW_HEIGHT * 2; windowHeight = WINDOW_HEIGHT * 2;
SetWindowPadding(0, 0); SetWindowPadding(0, 0);
hWnd = CreateWindowExA(WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR, lpWindowName, lpWindowName, WS_SYSMENU | WS_VISIBLE | WS_POPUP, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), NULL, NULL, hInstance, NULL); window = SDL_CreateWindow(lpWindowName, 0, 0, windowWidth, windowHeight, SDL_WINDOW_FULLSCREEN);
if (window == NULL)
{
ReleaseMutex(hMutex);
return 0;
}
SDL_VERSION(&info.version);
SDL_GetWindowWMInfo(window, &info);
hWnd = info.info.win.window;
ghWnd = hWnd; ghWnd = hWnd;
if (hWnd == NULL) if (hWnd == NULL)
@ -319,10 +296,13 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
StartDirectDraw(ghWnd, 2, depth); StartDirectDraw(ghWnd, 2, depth);
bFullscreen = TRUE; bFullscreen = TRUE;
ShowCursor(FALSE);
break; break;
} }
#ifdef DEBUG_SAVE
SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
#endif
// Set rects // Set rects
RECT rcLoading = {0, 0, 64, 8}; RECT rcLoading = {0, 0, 64, 8};
RECT rcFull = {0, 0, 0, 0}; RECT rcFull = {0, 0, 0, 0};
@ -348,7 +328,7 @@ int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
InitDirectSound(hWnd); InitDirectSound(hWnd);
// Initialize joystick // Initialize joystick
if (conf.bJoystick && InitDirectInput(hInstance, hWnd)) if (conf.bJoystick && InitDirectInput(info.info.win.hinstance, hWnd))
{ {
ResetJoystickStatus(); ResetJoystickStatus();
gbUseJoystick = TRUE; gbUseJoystick = TRUE;
@ -397,340 +377,208 @@ void ActiveWindow(void)
PlaySoundObject(7, -1); PlaySoundObject(7, -1);
} }
// Turns out you could drag-and-drop a save file onto the void JoystickProc(void);
// window to load it, but this behavior is dummied-out.
BOOL DragAndDropHandler(HWND hWnd, WPARAM wParam) BOOL SystemTask(void)
{ {
char path[MAX_PATH]; SDL_Event event;
HDROP hDrop = (HDROP)wParam; while (SDL_PollEvent(&event) || !bActive)
if (DragQueryFileA(hDrop, 0xFFFFFFFF, NULL, 0) != 0)
{ {
DragQueryFileA(hDrop, 0, path, sizeof(path)); switch (event.type)
LoadProfile(path);
}
DragFinish(hDrop);
return TRUE;
}
LRESULT __stdcall WindowProcedure(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
{ {
BOOL window_focus; case SDL_KEYDOWN:
HMENU hMenu; switch (event.key.keysym.sym)
switch (Msg)
{ {
case WM_CREATE: case SDLK_ESCAPE:
hMenu = GetMenu(hWnd);
#ifdef DEBUG_SAVE
if (!CheckFileExists("save")) // Chances are a line like this used to exist
#endif
DeleteMenu(hMenu, 40005, MF_BYCOMMAND);
DrawMenuBar(hWnd);
hMenu = GetMenu(hWnd);
if (!CheckFileExists("mute"))
DeleteMenu(hMenu, 40007, MF_BYCOMMAND);
DrawMenuBar(hWnd);
if (CheckFileExists("fps"))
bFps = TRUE;
if (!bFullscreen)
LoadWindowRect(hWnd, "window.rect", FALSE);
SetWindowName(hWnd);
#ifdef DEBUG_SAVE
DragAcceptFiles(hWnd, TRUE);
#endif
break;
case WM_SYSCOMMAND:
switch (wParam)
{
case SC_MONITORPOWER:
break;
case SC_KEYMENU:
break;
case SC_SCREENSAVE:
break;
default:
DefWindowProcA(hWnd, Msg, wParam, lParam);
break;
}
break;
case WM_IME_NOTIFY:
if (wParam == IMN_SETOPENSTATUS)
{
HIMC hImc = ImmGetContext(hWnd);
ImmSetOpenStatus(hImc, 0);
ImmReleaseContext(hWnd, hImc);
}
break;
case WM_KEYDOWN:
switch (wParam)
{
case VK_ESCAPE:
gKey |= KEY_ESCAPE; gKey |= KEY_ESCAPE;
break; break;
case 'W': case SDLK_w:
gKey |= KEY_MAP; gKey |= KEY_MAP;
break; break;
case VK_LEFT: case SDLK_LEFT:
gKey |= KEY_LEFT; gKey |= KEY_LEFT;
break; break;
case VK_RIGHT: case SDLK_RIGHT:
gKey |= KEY_RIGHT; gKey |= KEY_RIGHT;
break; break;
case VK_UP: case SDLK_UP:
gKey |= KEY_UP; gKey |= KEY_UP;
break; break;
case VK_DOWN: case SDLK_DOWN:
gKey |= KEY_DOWN; gKey |= KEY_DOWN;
break; break;
case 'X': case SDLK_x:
gKey |= KEY_X; gKey |= KEY_X;
break; break;
case 'Z': case SDLK_z:
gKey |= KEY_Z; gKey |= KEY_Z;
break; break;
case 'S': case SDLK_s:
gKey |= KEY_ARMS; gKey |= KEY_ARMS;
break; break;
case 'A': case SDLK_a:
gKey |= KEY_ARMSREV; gKey |= KEY_ARMSREV;
break; break;
case VK_SHIFT: case SDLK_LSHIFT:
case SDLK_RSHIFT:
gKey |= KEY_SHIFT; gKey |= KEY_SHIFT;
break; break;
case VK_F1: case SDLK_F1:
gKey |= KEY_F1; gKey |= KEY_F1;
break; break;
case VK_F2: case SDLK_F2:
gKey |= KEY_F2; gKey |= KEY_F2;
break; break;
case 'Q': case SDLK_q:
gKey |= KEY_ITEM; gKey |= KEY_ITEM;
break; break;
case VK_OEM_COMMA: case SDLK_COMMA:
gKey |= KEY_ALT_LEFT; gKey |= KEY_ALT_LEFT;
break; break;
case VK_OEM_PERIOD: case SDLK_PERIOD:
gKey |= KEY_ALT_DOWN; gKey |= KEY_ALT_DOWN;
break; break;
case VK_OEM_2: case SDLK_SLASH:
gKey |= KEY_ALT_RIGHT; gKey |= KEY_ALT_RIGHT;
break; break;
case 'L': case SDLK_l:
gKey |= KEY_L; gKey |= KEY_L;
break; break;
case VK_OEM_PLUS: case SDLK_PLUS:
gKey |= KEY_PLUS; gKey |= KEY_PLUS;
break; break;
case VK_F5: case SDLK_F5:
gbUseJoystick = FALSE; gbUseJoystick = FALSE;
break; break;
} }
break; break;
case WM_KEYUP: case SDL_KEYUP:
switch (wParam) switch (event.key.keysym.sym)
{ {
case VK_ESCAPE: case SDLK_ESCAPE:
gKey &= ~KEY_ESCAPE; gKey &= ~KEY_ESCAPE;
break; break;
case 'W': case SDLK_w:
gKey &= ~KEY_MAP; gKey &= ~KEY_MAP;
break; break;
case VK_LEFT: case SDLK_LEFT:
gKey &= ~KEY_LEFT; gKey &= ~KEY_LEFT;
break; break;
case VK_RIGHT: case SDLK_RIGHT:
gKey &= ~KEY_RIGHT; gKey &= ~KEY_RIGHT;
break; break;
case VK_UP: case SDLK_UP:
gKey &= ~KEY_UP; gKey &= ~KEY_UP;
break; break;
case VK_DOWN: case SDLK_DOWN:
gKey &= ~KEY_DOWN; gKey &= ~KEY_DOWN;
break; break;
case 'X': case SDLK_x:
gKey &= ~KEY_X; gKey &= ~KEY_X;
break; break;
case 'Z': case SDLK_z:
gKey &= ~KEY_Z; gKey &= ~KEY_Z;
break; break;
case 'S': case SDLK_s:
gKey &= ~KEY_ARMS; gKey &= ~KEY_ARMS;
break; break;
case 'A': case SDLK_a:
gKey &= ~KEY_ARMSREV; gKey &= ~KEY_ARMSREV;
break; break;
case VK_SHIFT: case SDLK_LSHIFT:
case SDLK_RSHIFT:
gKey &= ~KEY_SHIFT; gKey &= ~KEY_SHIFT;
break; break;
case VK_F1: case SDLK_F1:
gKey &= ~KEY_F1; gKey &= ~KEY_F1;
break; break;
case VK_F2: case SDLK_F2:
gKey &= ~KEY_F2; gKey &= ~KEY_F2;
break; break;
case 'Q': case SDLK_q:
gKey &= ~KEY_ITEM; gKey &= ~KEY_ITEM;
break; break;
case VK_OEM_COMMA: case SDLK_COMMA:
gKey &= ~KEY_ALT_LEFT; gKey &= ~KEY_ALT_LEFT;
break; break;
case VK_OEM_PERIOD: case SDLK_PERIOD:
gKey &= ~KEY_ALT_DOWN; gKey &= ~KEY_ALT_DOWN;
break; break;
case VK_OEM_2: case SDLK_SLASH:
gKey &= ~KEY_ALT_RIGHT; gKey &= ~KEY_ALT_RIGHT;
break; break;
case 'L': case SDLK_l:
gKey &= ~KEY_L; gKey &= ~KEY_L;
break; break;
case VK_OEM_PLUS: case SDLK_PLUS:
gKey &= ~KEY_PLUS; gKey &= ~KEY_PLUS;
break; break;
} }
break; break;
case WM_COMMAND: case SDL_DROPFILE:
switch (LOWORD(wParam)) LoadProfile(event.drop.file);
SDL_free(event.drop.file);
break;
case SDL_WINDOWEVENT:
switch (event.window.type)
{ {
case 40001: case SDL_WINDOWEVENT_FOCUS_LOST:
if (DialogBoxParamA(ghInstance, "DLG_YESNO", hWnd, QuitDialog, (LPARAM)"Quit?") == 1)
PostMessageA(hWnd, WM_CLOSE, 0, 0);
break;
case 40002:
DialogBoxParamA(ghInstance, "DLG_ABOUT", hWnd, VersionDialog, 0);
break;
case 40004:
if (!OpenVolumeConfiguration(hWnd))
#ifdef JAPANESE
MessageBoxA(hWnd, "â{âèâàü[âÇɦÆÞé­ïNô«é+é½é_é¦é±é+éÁé¢", lpWindowName, 0);
#else
MessageBoxA(hWnd, "Could not launch volume configuration", lpWindowName, 0);
#endif
break;
case 40005:
DialogBoxParamA(ghInstance, "DLG_SAVE", hWnd, DebugSaveDialog, 0);
break;
case 40007:
DialogBoxParamA(ghInstance, "DLG_MUTE", hWnd, DebugMuteDialog, 0);
break;
}
break;
case WM_DROPFILES:
DragAndDropHandler(hWnd, wParam);
break;
case WM_ACTIVATE:
switch (LOWORD(wParam))
{
case WA_INACTIVE:
window_focus = FALSE;
break;
case WA_ACTIVE:
case WA_CLICKACTIVE:
if (HIWORD(wParam) != 0)
window_focus = FALSE;
else
window_focus = TRUE;
break;
}
if (window_focus)
ActiveWindow();
else
InactiveWindow(); InactiveWindow();
break;
case SDL_WINDOWEVENT_FOCUS_GAINED:
ActiveWindow();
break;
}
break; break;
case WM_CLOSE: case SDL_QUIT:
StopOrganyaMusic(); StopOrganyaMusic();
PostQuitMessage(0);
break;
default:
return DefWindowProcA(hWnd, Msg, wParam, lParam);
}
return 1;
}
void JoystickProc(void);
BOOL SystemTask(void)
{
MSG Msg;
while (PeekMessageA(&Msg, NULL, 0, 0, PM_NOREMOVE) || !bActive)
{
if (!GetMessageA(&Msg, NULL, 0, 0))
return FALSE; return FALSE;
}
TranslateMessage(&Msg);
DispatchMessageA(&Msg);
} }
// Run joystick code // Run joystick code