mirror of
https://github.com/spice2x/spice2x.github.io.git
synced 2026-10-02 03:37:57 +03:00
Add GITADORA Arena windowed monitor layout support, allows the SMALL touch window to be resized (#716)
## Link to GitHub Issue or related Pull Request, if one exists N/A ## Description of change Adds GITADORA Arena windowed monitor layout options for the GITADORA, LEFT, RIGHT, and SMALL windows. This also applies the selected window border style to all four GITADORA Arena windows, and allows the SMALL touch window to be resized in windowed mode while keeping touch coordinates updated. ## Testing - Manually tested GITADORA Arena windowed mode: - default, resizable, and borderless window styles - per-window monitor placement - SMALL resize - SMALL touch coordinate mapping after resize
This commit is contained in:
Selundine
@@ -125,6 +125,128 @@ static void reset_window_hook(HWND hWnd) {
|
||||
}
|
||||
}
|
||||
|
||||
static std::string gitadora_canonical_window_name(const std::string &window_name) {
|
||||
if (window_name == "GITADORA") {
|
||||
return "GITADORA";
|
||||
}
|
||||
if (window_name.ends_with("LEFT")) {
|
||||
return "LEFT";
|
||||
}
|
||||
if (window_name.ends_with("RIGHT")) {
|
||||
return "RIGHT";
|
||||
}
|
||||
if (window_name.ends_with("SMALL")) {
|
||||
return "SMALL";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
static const char *gitadora_window_name_for_hwnd(HWND hWnd) {
|
||||
if (hWnd == nullptr) {
|
||||
return nullptr;
|
||||
}
|
||||
if (GRAPHICS_HOOKED_WINDOW.has_value() && hWnd == GRAPHICS_HOOKED_WINDOW.value()) {
|
||||
return "GITADORA";
|
||||
}
|
||||
if (hWnd == GFDM_LEFT_WINDOW) {
|
||||
return "LEFT";
|
||||
}
|
||||
if (hWnd == GFDM_RIGHT_WINDOW) {
|
||||
return "RIGHT";
|
||||
}
|
||||
if (hWnd == GFDM_SUBSCREEN_WINDOW) {
|
||||
return "SMALL";
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
static bool is_gfdm_known_window(HWND hWnd) {
|
||||
return gitadora_window_name_for_hwnd(hWnd) != nullptr;
|
||||
}
|
||||
|
||||
static bool gitadora_should_block_game_window_placement(HWND hWnd) {
|
||||
if (!GRAPHICS_WINDOWED || !games::gitadora::is_arena_model()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const auto window_name = gitadora_window_name_for_hwnd(hWnd);
|
||||
return window_name != nullptr && graphics_gitadora_has_window_monitor(window_name);
|
||||
}
|
||||
|
||||
static void gitadora_remember_window(HWND hWnd, const std::string &window_name) {
|
||||
if (window_name == "LEFT") {
|
||||
GFDM_LEFT_WINDOW = hWnd;
|
||||
} else if (window_name == "RIGHT") {
|
||||
GFDM_RIGHT_WINDOW = hWnd;
|
||||
} else if (window_name == "SMALL") {
|
||||
GFDM_SUBSCREEN_WINDOW = hWnd;
|
||||
}
|
||||
}
|
||||
|
||||
static bool gitadora_should_allow_small_resize() {
|
||||
return GRAPHICS_WINDOWED &&
|
||||
games::gitadora::is_arena_model() &&
|
||||
!graphics_gitadora_is_borderless_windowed();
|
||||
}
|
||||
|
||||
static void gitadora_apply_small_resize_style(DWORD &style) {
|
||||
if (!gitadora_should_allow_small_resize()) {
|
||||
return;
|
||||
}
|
||||
|
||||
style |= WS_SIZEBOX;
|
||||
style |= WS_MAXIMIZEBOX;
|
||||
style |= WS_SYSMENU;
|
||||
}
|
||||
|
||||
static void gitadora_force_window_style(HWND hWnd) {
|
||||
if (!GRAPHICS_WINDOWED || !games::gitadora::is_arena_model() || hWnd == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
DWORD style = GetWindowLongA(hWnd, GWL_STYLE);
|
||||
DWORD style_ex = GetWindowLongA(hWnd, GWL_EXSTYLE);
|
||||
const DWORD style_orig = style;
|
||||
const DWORD style_ex_orig = style_ex;
|
||||
graphics_gitadora_apply_window_style(style, style_ex);
|
||||
if (hWnd == GFDM_SUBSCREEN_WINDOW) {
|
||||
gitadora_apply_small_resize_style(style);
|
||||
}
|
||||
|
||||
if (style == style_orig && style_ex == style_ex_orig) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (SetWindowLongA_orig != nullptr) {
|
||||
SetWindowLongA_orig(hWnd, GWL_STYLE, static_cast<LONG>(style));
|
||||
SetWindowLongA_orig(hWnd, GWL_EXSTYLE, static_cast<LONG>(style_ex));
|
||||
} else {
|
||||
SetWindowLongA(hWnd, GWL_STYLE, static_cast<LONG>(style));
|
||||
SetWindowLongA(hWnd, GWL_EXSTYLE, static_cast<LONG>(style_ex));
|
||||
}
|
||||
|
||||
const UINT flags =
|
||||
SWP_NOMOVE |
|
||||
SWP_NOSIZE |
|
||||
SWP_NOZORDER |
|
||||
SWP_NOACTIVATE |
|
||||
SWP_FRAMECHANGED;
|
||||
if (SetWindowPos_orig != nullptr) {
|
||||
SetWindowPos_orig(hWnd, nullptr, 0, 0, 0, 0, flags);
|
||||
} else {
|
||||
SetWindowPos(hWnd, nullptr, 0, 0, 0, 0, flags);
|
||||
}
|
||||
|
||||
log_misc(
|
||||
"graphics",
|
||||
"GITADORA window style override: hwnd={}, style 0x{:x}->0x{:x}, ex 0x{:x}->0x{:x}",
|
||||
fmt::ptr(hWnd),
|
||||
style_orig,
|
||||
style,
|
||||
style_ex_orig,
|
||||
style_ex);
|
||||
}
|
||||
|
||||
// window procedure
|
||||
static LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
|
||||
|
||||
@@ -286,6 +408,18 @@ static LRESULT CALLBACK WsubWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
|
||||
log_misc("graphics", "ignore WM_CLOSE for subscreen window");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (hWnd == GFDM_SUBSCREEN_WINDOW && (uMsg == WM_MOVE || uMsg == WM_SIZE)) {
|
||||
update_spicetouch_window_dimensions(hWnd);
|
||||
if (SPICETOUCH_TOUCH_HWND) {
|
||||
SetWindowPos(
|
||||
SPICETOUCH_TOUCH_HWND, HWND_TOP,
|
||||
SPICETOUCH_TOUCH_X, SPICETOUCH_TOUCH_Y,
|
||||
SPICETOUCH_TOUCH_WIDTH, SPICETOUCH_TOUCH_HEIGHT,
|
||||
SWP_NOZORDER | SWP_NOREDRAW | SWP_NOREPOSITION | SWP_NOACTIVATE);
|
||||
}
|
||||
}
|
||||
|
||||
return CallWindowProcA(WSUB_WNDPROC_ORIG, hWnd, uMsg, wParam, lParam);
|
||||
}
|
||||
|
||||
@@ -349,27 +483,37 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
|
||||
fmt::ptr(lpParam));
|
||||
|
||||
// gfdm
|
||||
std::string effective_window_name = window_name;
|
||||
if (avs::game::is_model({"J32", "J33", "K32", "K33", "L32", "L33", "M32"})) {
|
||||
// set window name
|
||||
if (!lpWindowName) {
|
||||
lpWindowName = "GITADORA";
|
||||
effective_window_name = "GITADORA";
|
||||
}
|
||||
}
|
||||
|
||||
bool is_tdj_sub_window = avs::game::is_model("LDJ") && window_name.ends_with(" sub");
|
||||
bool is_sdvx_sub_window = avs::game::is_model("KFC") && window_name.ends_with(" Sub Screen");
|
||||
bool is_popn_sub_window = avs::game::is_model("M39") && window_name.ends_with("Sub Screen");
|
||||
bool is_gfdm_sub_window = games::gitadora::is_arena_model() && window_name.ends_with("SMALL");
|
||||
bool is_gfdm_left_window = games::gitadora::is_arena_model() && window_name.ends_with("LEFT");
|
||||
bool is_gfdm_right_window = games::gitadora::is_arena_model() && window_name.ends_with("RIGHT");
|
||||
const std::string gfdm_window_name = games::gitadora::is_arena_model()
|
||||
? gitadora_canonical_window_name(effective_window_name)
|
||||
: "";
|
||||
const bool is_gfdm_window = !gfdm_window_name.empty();
|
||||
const bool is_gfdm_sub_window = gfdm_window_name == "SMALL";
|
||||
const bool allow_gfdm_small_resize =
|
||||
is_gfdm_sub_window && gitadora_should_allow_small_resize();
|
||||
|
||||
// update style / ex-style
|
||||
if (is_tdj_sub_window || is_sdvx_sub_window || is_gfdm_sub_window || is_popn_sub_window) {
|
||||
// hide maximize button (prevent misaligned touches)
|
||||
dwStyle &= ~(WS_MAXIMIZEBOX);
|
||||
if (!allow_gfdm_small_resize) {
|
||||
dwStyle &= ~(WS_MAXIMIZEBOX);
|
||||
}
|
||||
|
||||
// mouse clicks become misaligned when resized
|
||||
dwStyle &= ~(WS_SIZEBOX);
|
||||
if (!allow_gfdm_small_resize) {
|
||||
dwStyle &= ~(WS_SIZEBOX);
|
||||
}
|
||||
|
||||
// borderless
|
||||
if (GRAPHICS_WINDOWED && GRAPHICS_WSUB_BORDERLESS) {
|
||||
@@ -383,6 +527,13 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
|
||||
}
|
||||
}
|
||||
|
||||
if (allow_gfdm_small_resize) {
|
||||
gitadora_apply_small_resize_style(dwStyle);
|
||||
}
|
||||
if (is_gfdm_window) {
|
||||
graphics_gitadora_apply_window_style(dwStyle, dwExStyle);
|
||||
}
|
||||
|
||||
if (is_sdvx_sub_window) {
|
||||
graphics_load_windowed_subscreen_parameters();
|
||||
if (GRAPHICS_WSUB_SIZE.has_value()) {
|
||||
@@ -401,6 +552,16 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gfdm_window) {
|
||||
graphics_gitadora_apply_window_monitor(
|
||||
gfdm_window_name,
|
||||
x,
|
||||
y,
|
||||
nWidth,
|
||||
nHeight,
|
||||
true);
|
||||
}
|
||||
|
||||
if (GRAPHICS_WINDOWED) {
|
||||
graphics_window_check_bounds_before_creation(x, y, nWidth, nHeight);
|
||||
}
|
||||
@@ -427,15 +588,15 @@ static HWND WINAPI CreateWindowExA_hook(DWORD dwExStyle, LPCSTR lpClassName, LPC
|
||||
}
|
||||
|
||||
// only hook touch window if multiple windows are allowed
|
||||
if (gfdm_window_name == "LEFT" || gfdm_window_name == "RIGHT") {
|
||||
gitadora_remember_window(result, gfdm_window_name);
|
||||
}
|
||||
if (is_gfdm_sub_window && GRAPHICS_WINDOWED && !GRAPHICS_PREVENT_SECONDARY_WINDOWS) {
|
||||
GFDM_SUBSCREEN_WINDOW = result;
|
||||
gitadora_remember_window(result, gfdm_window_name);
|
||||
graphics_hook_subscreen_window(GFDM_SUBSCREEN_WINDOW);
|
||||
}
|
||||
if (is_gfdm_left_window) {
|
||||
GFDM_LEFT_WINDOW = result;
|
||||
}
|
||||
if (is_gfdm_right_window) {
|
||||
GFDM_RIGHT_WINDOW = result;
|
||||
if (is_gfdm_window && GRAPHICS_WINDOWED && !GRAPHICS_PREVENT_SECONDARY_WINDOWS) {
|
||||
gitadora_force_window_style(result);
|
||||
}
|
||||
|
||||
if (is_popn_sub_window) {
|
||||
@@ -625,6 +786,12 @@ static BOOL WINAPI MoveWindow_hook(HWND hWnd, int X, int Y, int nWidth, int nHei
|
||||
}
|
||||
}
|
||||
|
||||
// Monitor overrides are applied at creation time. Suppress later game
|
||||
// placement calls instead of resizing again during scene transitions.
|
||||
if (gitadora_should_block_game_window_placement(hWnd)) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// call original
|
||||
return MoveWindow_orig(hWnd, X, Y, nWidth, nHeight, bRepaint);
|
||||
}
|
||||
@@ -678,8 +845,17 @@ static LONG WINAPI SetWindowLongA_hook(HWND hWnd, int nIndex, LONG dwNewLong) {
|
||||
dwNewLong |= WS_OVERLAPPEDWINDOW;
|
||||
}
|
||||
|
||||
// call original
|
||||
return SetWindowLongA_orig(hWnd, nIndex, dwNewLong);
|
||||
const bool force_gfdm_style =
|
||||
GRAPHICS_WINDOWED &&
|
||||
games::gitadora::is_arena_model() &&
|
||||
is_gfdm_known_window(hWnd) &&
|
||||
(nIndex == GWL_STYLE || nIndex == GWL_EXSTYLE);
|
||||
|
||||
const auto result = SetWindowLongA_orig(hWnd, nIndex, dwNewLong);
|
||||
if (force_gfdm_style) {
|
||||
gitadora_force_window_style(hWnd);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static LONG WINAPI SetWindowLongW_hook(HWND hWnd, int nIndex, LONG dwNewLong) {
|
||||
@@ -689,8 +865,17 @@ static LONG WINAPI SetWindowLongW_hook(HWND hWnd, int nIndex, LONG dwNewLong) {
|
||||
dwNewLong |= WS_OVERLAPPEDWINDOW;
|
||||
}
|
||||
|
||||
// call original
|
||||
return SetWindowLongW_orig(hWnd, nIndex, dwNewLong);
|
||||
const bool force_gfdm_style =
|
||||
GRAPHICS_WINDOWED &&
|
||||
games::gitadora::is_arena_model() &&
|
||||
is_gfdm_known_window(hWnd) &&
|
||||
(nIndex == GWL_STYLE || nIndex == GWL_EXSTYLE);
|
||||
|
||||
const auto result = SetWindowLongW_orig(hWnd, nIndex, dwNewLong);
|
||||
if (force_gfdm_style) {
|
||||
gitadora_force_window_style(hWnd);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
static BOOL WINAPI SetWindowPos_hook(HWND hWnd, HWND hWndInsertAfter,
|
||||
@@ -701,6 +886,13 @@ static BOOL WINAPI SetWindowPos_hook(HWND hWnd, HWND hWndInsertAfter,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// Monitor overrides are applied at creation time. Suppress later game
|
||||
// placement calls instead of resizing again during scene transitions.
|
||||
if (gitadora_should_block_game_window_placement(hWnd) &&
|
||||
(uFlags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE)) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// prevent gitadora arena model from shifting windows around if the user has preferences
|
||||
if (GRAPHICS_WINDOWED && games::gitadora::is_arena_model() &&
|
||||
GRAPHICS_HOOKED_WINDOW.has_value() && hWnd == GRAPHICS_HOOKED_WINDOW.value() &&
|
||||
|
||||
Reference in New Issue
Block a user