forked from Ports/goldeneye-pc-port
James Dansereau
545b2c7792
Input (input.c/h): - D380/D386: single effective PC layout; ini values ARE the bindings (no hidden defaults); versioned migration materialises effective GEPD defaults once (inputMigrateBinds, bindsVersion). - D385: keyboard keys and pad buttons 1..5 share the two bind slots; legacy extra ini tokens are migration-only. D386: SDL button-number correction in the D385 defaults. - D383/D384: opt-in inputBindingProbe (restores ini state); the PC settings editor must not navigate with live game keys. - D393/D394: Xbox 1.1 Jinx face map — A use, X reload, Y weapon cycle, B owned-gadget cycle (no N64 equivalent, port-side), L3/R3 crouch, LB aim; retires LB/RB weapon cycling. - D395: both options UIs refuse pad-initiated keyboard/mouse capture; pad B cancels a capture started by keyboard/mouse. Options UI (optionsoverlay.c/h): - D388: nested Input -> Bindings / Gameplay -> HUD roots in both F10 and front-options; redundant Low-end toggle retired (FPS cap / MSAA remain independent, stored values preserved on migration). - D391: hit bands follow rendered glyph baselines; dead zone + out-of-card click rejection. - D396: F10 pad B backs/closes a page (closes at root), A/X accepts/toggles without shifting sliders; left/right still adjust. All behind #ifdef PORT; N64 input/menu paths untouched. M7 (D387 AllUnlocked save-safety) intentionally NOT in this wave.
120 lines
5.3 KiB
C
120 lines
5.3 KiB
C
#ifndef PORT_OPTIONSOVERLAY_H
|
|
#define PORT_OPTIONSOVERLAY_H
|
|
|
|
/*
|
|
* F10 in-game options overlay (approach C from docs/dev/OPTIONS-MENU-PLAN.md).
|
|
*
|
|
* A self-contained port-layer immediate-mode overlay: it draws its own 2D
|
|
* display list on top of the game's frame (appended in fast3d's gfx_run,
|
|
* after the game DL) and handles its own keyboard/mouse nav. It edits the
|
|
* port-owned config.c options directly, so changes apply live for the live
|
|
* ones. When closed it renders NOTHING (zero bytes appended) -- golden dumps
|
|
* stay byte-identical.
|
|
*
|
|
* Hooks:
|
|
* video.c videoPumpEvents : F10 -> optionsOverlayToggle(); ESC closes;
|
|
* wheel -> optionsOverlayScroll()
|
|
* input.c inputComputePad : controller 0 swallowed while open;
|
|
* nav routed to optionsOverlayHandleInput()
|
|
* gfx_pc.cpp gfx_run : optionsOverlayEmit() appended after the game DL
|
|
*
|
|
* D346 (M2): the row API below is the shared row table the front MENU_PC_
|
|
* OPTIONS screen (frontoptions.c) renders from, so one option set in one
|
|
* place.
|
|
*/
|
|
|
|
#include <PR/ultratypes.h>
|
|
#include <PR/gbi.h>
|
|
#include <config.h>
|
|
#include <video.h>
|
|
#include <watchsettings.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Toggle open/closed. On the closing edge the config is saved. */
|
|
void optionsOverlayToggle(void);
|
|
/* ESC: back to categories, or close from the category list (host-thread request). */
|
|
void optionsOverlayBack(void);
|
|
|
|
/* 1 while the overlay is on screen. */
|
|
int optionsOverlayIsOpen(void);
|
|
|
|
/* Called from inputComputePad(0) while open: reads SDL keyboard edges and
|
|
* drives the cursor / value adjustments. */
|
|
void optionsOverlayHandleInput(void);
|
|
|
|
/* Mouse-wheel notch -> move the selection (host event pump). */
|
|
void optionsOverlayScroll(int dir);
|
|
|
|
/* D383/D385 keyboard + mouse rebinding modal, shared by both options UIs.
|
|
* Host event pump hands off one key/button; menu thread commits it. */
|
|
int optionsBindingCaptureActive(void);
|
|
int optionsBindingInputBlocked(void); /* active or captured key still held */
|
|
int optionsBindingKeyDown(const SDL_KeyboardEvent *ev); /* 1 = consumed */
|
|
int optionsBindingMouseDown(const SDL_MouseButtonEvent *ev); /* 1 = consumed */
|
|
int optionsBindingCaptureTick(void); /* 1 = swallow menu nav this tick */
|
|
|
|
/* Build the overlay's 2D display list for this frame, or return NULL when the
|
|
* overlay is closed. Called by fast3d after running the game DL. */
|
|
Gfx *optionsOverlayEmit(void);
|
|
|
|
/* D343 (M2): row API for the file-select options screen (frontoptions.c).
|
|
* Index i runs over the same row table as the F10 overlay; headers split it
|
|
* into the screen's sections. */
|
|
int optionsRowCount(void);
|
|
int optionsRowIsHeader(int i);
|
|
int optionsRowHeaderParent(int i); /* -1 for root sections */
|
|
int optionsRowChildHeader(int i); /* -1 unless this row opens a nested section */
|
|
int optionsRowIsShown(int i);
|
|
const char *optionsRowLabel(int i);
|
|
int optionsRowIsSlider(int i);
|
|
int optionsRowIsBind(int i);
|
|
void optionsRowBeginBind(int i);
|
|
int optionsRowIsBondChooser(int i); /* D353: the Bond-file chooser row
|
|
(front options screen only) */
|
|
/* D356: 1 when this row's value lives in the selected save file (content
|
|
* rows); on a header, when its section contains such rows -- the front page
|
|
* uses the header form for its "(File N)" title annotation. */
|
|
int optionsRowIsSaveScoped(int i);
|
|
int optionsRowNeedsRestart(int i);
|
|
double optionsRowFraction(int i);
|
|
double optionsRowGetValue(int i); /* D356: raw value (fraction is bar geometry) */
|
|
void optionsRowSetFraction(int i, double f);
|
|
void optionsRowCommit(int i); /* slider release; watch rows persist once */
|
|
void optionsRowValueText(int i, char *out, int n);
|
|
void optionsRowAdjust(int i, int dir);
|
|
|
|
/* D356: per-section "Reset to defaults" rows (ROW_ACTION, keys
|
|
* "__Reset*"). Activation is edge-triggered and two-step (arm -> confirm
|
|
* within 3 s, one commit per confirmed activation; timeout or navigating
|
|
* away disarms) -- optionsRowIsReset lets the front screen suppress its
|
|
* held-key repeat for them. optionsResetMaintain runs each frame from the
|
|
* open UI (selRow = its selected rows[] index, -1 = none); optionsResetClear
|
|
* when a UI closes. Identical contract in F10 and on the front options
|
|
* screen (they are never open at the same time). Front: the confirmed reset
|
|
* writes the section's file rows through watchSettingsSet (direct commit)
|
|
* and the ini rows live (persisted on screen close, like any ini edit).
|
|
* In stage: the file rows enter the D352 queue (the game thread applies +
|
|
* persists them) and the ini rows are applied live immediately. */
|
|
int optionsRowIsReset(int i);
|
|
void optionsRowActivateReset(int i);
|
|
void optionsResetMaintain(int selRow);
|
|
void optionsResetClear(void);
|
|
|
|
/* D356 GE_WSPROBE_RESET dev hook (env-gated, driven from
|
|
* watchSettingsGameTick): runs the real arm -> confirm -> dispatch for
|
|
* EVERY section's reset row and verifies each section's values after its
|
|
* own dispatch (plan §5.8). Front is one-shot; the stage pair runs on the
|
|
* tick after the stage drain. */
|
|
void optionsResetProbePrepare(void);
|
|
void optionsResetProbeDispatchStage(void);
|
|
void optionsResetProbeVerifyStage(void);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* PORT_OPTIONSOVERLAY_H */
|