Skip to content

Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit

fix(panel): call reading controllers directly recommended, as it is the default

raymondchinsc807dde78bcf
diff --git a/dylib/feats/webpatch.c b/dylib/feats/webpatch.c
index de957e1..3cd6cb6 100644
--- a/dylib/feats/webpatch.c
+++ b/dylib/feats/webpatch.c
@@ -418,9 +418,9 @@ static int out_expand(np_out_t *o, const char *replace, const np_cap_t *caps) {
"onChange:v=>s([[\"DXMT_METALFX_SPATIAL_SWAPCHAIN\",v.data?\"1\":\"\"],[\"DXMT_CONFIG\",fx(v.data)]])})},\"usf\")," \
"FG()," \
"(0," RT ".jsxs)(" BARREL ".XY,{label:npL(\"Controllers\",\"控制器\",\"Controller\"),children:[" \
- "T([\"BRIDGEPLAY_RAW_CONTROLLERS\"],npL(\"Let games read controllers directly (May break Steam Input. Not recommended)\"," \
- "\"允许游戏直接读取控制器(可能导致 Steam Input 失效,不推荐)\"," \
- "\"Lascia che i giochi leggano direttamente i controller (pu\\u00f2 interferire con Steam Input, sconsigliato)\"),\"1\",\"\")," \
+ "T([\"BRIDGEPLAY_RAW_CONTROLLERS\"],npL(\"Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)\"," \
+ "\"允许游戏直接读取控制器(Mac 上推荐,仅在需要 Steam Input 按键映射时关闭)\"," \
+ "\"Lascia che i giochi leggano direttamente i controller (consigliato su Mac, disattiva solo per la rimappatura di Steam Input)\"),\"1\",\"\")," \
"T([\"BRIDGEPLAY_DISABLE_HIDRAW\"],npL(\"Disable hidraw\",\"停用 hidraw\",\"Disable hidraw\"),\"1\",\"\")" \
"]},\"ctl\")," \
"fex&&(0," RT ".jsx)(" BARREL ".XY,{label:\"FEX\"," \
diff --git a/dylib/tests/panel-behavior/behavior.js b/dylib/tests/panel-behavior/behavior.js
index bd49995..54396f2 100644
--- a/dylib/tests/panel-behavior/behavior.js
+++ b/dylib/tests/panel-behavior/behavior.js
@@ -78,7 +78,7 @@ for (const form of Object.keys(FORMS)) {
t.ok(root.props.className === 'MSCXPanel', 'the panel root carries its own class');
const classes = nodes('').filter(x => x.type === 'Toggle').map(x => x.props.className);
t.ok(classes.length === 7 && classes.every(c => c === 'MSCXRow'), 'every checkbox carries the row class');
- const raw = o => nodes(o).find(x => x.props.label === 'Let games read controllers directly (May break Steam Input. Not recommended)');
+ const raw = o => nodes(o).find(x => x.props.label === 'Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)');
t.ok(sections(nodes('')).includes('Controllers') && raw('').props.checked === false,
'controller hiding is on unless the game says otherwise');
written.length = 0;
diff --git a/dylib/tests/panel-behavior/effective.js b/dylib/tests/panel-behavior/effective.js
index 2c45dbb..1ce306d 100644
--- a/dylib/tests/panel-behavior/effective.js
+++ b/dylib/tests/panel-behavior/effective.js
@@ -92,7 +92,7 @@ t0.ok(!!legacyFx && legacyFx.g.BRIDGEPLAY_RETINA === '1',
failed += t0.failed;
const LABELS = ['Metal HUD', 'DLSS', 'Advertise AVX2 to Rosetta', 'MSync', 'High Resolution',
- 'Let games read controllers directly (May break Steam Input. Not recommended)'];
+ 'Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)'];
globalThis.MSCXFx = fx;
for (const form of Object.keys(FORMS)) {
const { render: P, written } = panel(emit, form);
diff --git a/dylib/tests/panel-behavior/localization.js b/dylib/tests/panel-behavior/localization.js
index 233c7ee..6d7adad 100644
--- a/dylib/tests/panel-behavior/localization.js
+++ b/dylib/tests/panel-behavior/localization.js
@@ -29,9 +29,9 @@ for (const form of Object.keys(FORMS)) {
assert(nodes.some(n => n.props.label === t('Graphics', '图形', 'Grafica')));
assert(nodes.some(n => n.props.label === t('Controllers', '控制器', 'Controller')));
const raw = nodes.find(n => n.props.label === t(
- 'Let games read controllers directly (May break Steam Input. Not recommended)',
- '允许游戏直接读取控制器(可能导致 Steam Input 失效,不推荐)',
- 'Lascia che i giochi leggano direttamente i controller (può interferire con Steam Input, sconsigliato)'));
+ 'Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)',
+ '允许游戏直接读取控制器(Mac 上推荐,仅在需要 Steam Input 按键映射时关闭)',
+ 'Lascia che i giochi leggano direttamente i controller (consigliato su Mac, disattiva solo per la rimappatura di Steam Input)'));
assert(nodes.some(n => n.props.label === t('Disable hidraw', '停用 hidraw', 'Disable hidraw')));
raw.props.onChange(true);
assert.equal(written.at(-1).opts, 'BRIDGEPLAY_RAW_CONTROLLERS=1 CX_GRAPHICS_BACKEND=dxmt %command%');
diff --git a/dylib/tests/panel-behavior/shell.js b/dylib/tests/panel-behavior/shell.js
index 7d11b2e..f604d5d 100644
--- a/dylib/tests/panel-behavior/shell.js
+++ b/dylib/tests/panel-behavior/shell.js
@@ -13,7 +13,7 @@ const TOGGLES = {
'MSync': 'WINEMSYNC',
'High Resolution': 'BRIDGEPLAY_RETINA',
'Advertise AVX2 to Rosetta': 'ROSETTA_ADVERTISE_AVX',
- 'Let games read controllers directly (May break Steam Input. Not recommended)': 'BRIDGEPLAY_RAW_CONTROLLERS',
+ 'Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)': 'BRIDGEPLAY_RAW_CONTROLLERS',
'Disable hidraw': 'BRIDGEPLAY_DISABLE_HIDRAW',
};
const ON_UNLESS_0 = { ROSETTA_ADVERTISE_AVX: true };