move Touchpad toggle to controller section + enable per-game profiles (…

…#11)

* update backend to support setting touchpad

* move FE toggle to controller section

main.py

@@ -47,6 +47,8 @@ async def save_controller_settings(self, controller, currentGameId):
         result = settings.set_all_controller_profiles(controllerProfiles)
         if currentGameId:
             settings.sync_controller_profile_settings(currentGameId)
+            # also sync touchpad
+            settings.sync_touchpad(currentGameId)
         return result
 
     async def save_rgb_settings(self, rgbProfiles, currentGameId):

py_modules/controller_settings.py

@@ -104,12 +104,23 @@ def sync_controller_profile_settings(current_game_id):
             elif remappable_button_name in ['Y1', 'Y2']:
                 controller_code = Controller['LEFT'].value
             if not controller_code:
-                return
+                continue
 
             btn_code = RemappableButtons[remappable_button_name].value
             action_code = RemapActions[remap_action].value
             remap_command = legion_configurator.create_button_remap_command(controller_code, btn_code, action_code)
 
             legion_configurator.send_command(remap_command)
     except Exception as e:
-        decky_plugin.logger.error(f"sync_controller_profile_settings: {e}")
+        decky_plugin.logger.error(f"sync_controller_profile_settings: {e}")
+
+def sync_touchpad(current_game_id):
+    settings = get_settings()
+    controller_profile = settings.get('controller').get(current_game_id, {})
+
+    try:
+        new_touchpad_state = bool(controller_profile.get('TOUCHPAD'))
+        t_toggle = legion_configurator.create_touchpad_command(new_touchpad_state)
+        legion_configurator.send_command(t_toggle)
+    except Exception as e:
+        decky_plugin.logger.error(f"sync_touchpad: {e}")

src/components/controller/RemapButtons.tsx

@@ -4,7 +4,8 @@ import RemapActionDropdown from './RemapActionDropdown';
 import { PanelSection, PanelSectionRow, ToggleField } from 'decky-frontend-lib';
 import {
   useControllerPerGameEnabled,
-  useControllerProfileDisplayName
+  useControllerProfileDisplayName,
+  useTouchpadEnabled
 } from '../../hooks/controller';
 import { IconRow } from '../IconRow';
 
@@ -14,6 +15,8 @@ const RemapButtons: FC = () => {
   const { controllerPerGameEnabled, setControllerPerGameEnabled } =
     useControllerPerGameEnabled();
 
+  const { touchpadEnabled, setTouchpad } = useTouchpadEnabled();
+
   const title = controllerPerGameEnabled
     ? `Remap Buttons -\n${displayName.substring(0, 20)}${
         displayName.length > 20 ? '...' : ''
@@ -37,6 +40,12 @@ const RemapButtons: FC = () => {
           </IconRow>
         );
       })}
+
+      <ToggleField
+        label="Touchpad"
+        checked={touchpadEnabled}
+        onChange={(value) => setTouchpad(value)}
+      ></ToggleField>
     </PanelSection>
   );
 };

src/components/rgb/ControllerLightingPanel.tsx

@@ -1,25 +1,12 @@
-import { ToggleField, PanelSection, ServerAPI } from 'decky-frontend-lib';
+import { PanelSection } from 'decky-frontend-lib';
 import { VFC } from 'react';
-import { useState } from 'react';
+// import { useState } from 'react';
 import { useRgbProfileDisplayName } from '../../hooks/rgb';
 import { RgbPerGameProfilesToggle } from './RgbPerGameProfilesToggle';
 import { RgbSettings } from './RgbSettings';
 
-const DEFAULT_STATE = {
-  isTouchpad: true
-};
-
-const ControllerLightingPanel: VFC<{ serverAPI: ServerAPI }> = ({
-  serverAPI
-}) => {
+const ControllerLightingPanel: VFC = () => {
   const displayName = useRgbProfileDisplayName();
-  const [isTouchpad, setIsTouchpad] = useState(DEFAULT_STATE.isTouchpad);
-
-  const TPadToggleChange = (value: boolean) => {
-    setIsTouchpad(value);
-    console.log(`Toggle value: ${value}`);
-    serverAPI!.callPluginMethod('set_touchpad', { enable: value });
-  };
 
   let title =
     displayName === 'Default'
@@ -32,12 +19,6 @@ const ControllerLightingPanel: VFC<{ serverAPI: ServerAPI }> = ({
         <RgbPerGameProfilesToggle />
         <RgbSettings controller="RIGHT" />
         <RgbSettings controller="LEFT" />
-
-        <ToggleField
-          label="Touchpad"
-          checked={isTouchpad}
-          onChange={(value) => TPadToggleChange(value)}
-        ></ToggleField>
       </div>
     </PanelSection>
   );

src/hooks/controller.tsx

@@ -3,10 +3,21 @@ import {
   controllerSlice,
   selectButtonRemapAction,
   selectControllerPerGameProfilesEnabled,
-  selectControllerProfileDisplayName
+  selectControllerProfileDisplayName,
+  selectTouchpadEnabled
 } from '../redux-modules/controllerSlice';
 import { RemapActions, RemappableButtons } from '../backend/constants';
 
+export const useTouchpadEnabled = () => {
+  const touchpadEnabled = useSelector(selectTouchpadEnabled);
+  const dispatch = useDispatch();
+
+  const setTouchpad = (enabled: boolean) => {
+    return dispatch(controllerSlice.actions.setTouchpad(enabled));
+  };
+  return { touchpadEnabled, setTouchpad };
+};
+
 export const useControllerPerGameEnabled = () => {
   const controllerPerGameEnabled = useSelector(
     selectControllerPerGameProfilesEnabled

src/index.tsx

@@ -20,7 +20,7 @@ const Content: VFC<{ serverAPI: ServerAPI }> = memo(({ serverAPI }) => {
   }
   return (
     <>
-      <ControllerLightingPanel serverAPI={serverAPI} />
+      <ControllerLightingPanel />
       <RemapButtons />
     </>
   );

src/redux-modules/controllerSlice.tsx

@@ -12,7 +12,8 @@ const DEFAULT_CONTROLLER_VALUES = {
   Y2: RemapActions.DISABLED,
   Y3: RemapActions.DISABLED,
   M2: RemapActions.DISABLED,
-  M3: RemapActions.DISABLED
+  M3: RemapActions.DISABLED,
+  TOUCHPAD: true
 };
 
 type ControllerProfile = {
@@ -21,6 +22,7 @@ type ControllerProfile = {
   Y3: RemapActions;
   M2: RemapActions;
   M3: RemapActions;
+  TOUCHPAD: boolean;
 };
 
 type ControllerProfiles = {
@@ -67,6 +69,14 @@ export const controllerSlice = createSlice({
       action: PayloadAction<ControllerProfiles>
     ) => {
       merge(state.controllerProfiles, action.payload);
+    },
+    setTouchpad: (state, action: PayloadAction<boolean>) => {
+      const touchpadEnabled = action.payload;
+      setStateValue({
+        sliceState: state,
+        key: 'TOUCHPAD',
+        value: touchpadEnabled
+      });
     }
   },
   extraReducers: (builder) => {
@@ -100,6 +110,17 @@ export const selectControllerPerGameProfilesEnabled = (state: RootState) => {
   return state.controller.perGameProfilesEnabled;
 };
 
+export const selectTouchpadEnabled = (state: RootState) => {
+  if (state.controller.perGameProfilesEnabled) {
+    return get(
+      state,
+      `controller.controllerProfiles.${extractCurrentGameId()}.TOUCHPAD`
+    );
+  } else {
+    return get(state, `controller.controllerProfiles.default.TOUCHPAD`);
+  }
+};
+
 export const selectButtonRemapAction =
   (button: RemappableButtons) => (state: RootState) => {
     if (state.controller.perGameProfilesEnabled) {
@@ -128,6 +149,7 @@ const mutatingActionTypes = [
   controllerSlice.actions.setPerGameProfilesEnabled.type,
   controllerSlice.actions.remapButton.type,
   controllerSlice.actions.updateControllerProfiles.type,
+  controllerSlice.actions.setTouchpad.type,
   setCurrentGameId.type
 ];