Merge pull request #194 from cortex-command-community/multi-mouse-keyboard

SDL3 + Multi mouse keyboard

Author: Causeless

.github/workflows/meson.yml

@@ -36,7 +36,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
   # Triggers the workflow when called by a top-level workflow
   workflow_call:
@@ -63,7 +63,7 @@ on:
       macosx-deployment-target:
         type: string
         required: false
-        default: "10.15"
+        default: "11.1"
 
 jobs:
   build-linux:
@@ -178,7 +178,7 @@ jobs:
           echo "::group::Installing pkg-config"
           sudo apt install pkg-config
           echo "::group::Installing mac deps"
-          omp install libsdl2 libsdl2_image onetbb lz4 libpng minizip luajit flac
+          omp install SDL3 onetbb lz4 libpng minizip luajit flac
           echo "OSXCROSS_PKG_CONFIG_PATH=${{env.OSXCROSS_TARGET}}/macports/pkgs/opt/local/libexec/onetbb/lib/pkgconfig" >> $GITHUB_ENV
           echo "::endgroup::"
           echo "::group::Installing meson"

.gitignore

@@ -12,6 +12,7 @@
 
 compile_commands.json
 **/.ccls-cache
+**/.cache
 
 **/build*
 

CHANGELOG.md

@@ -122,6 +122,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 	```
 	Original bindings with no scale argument are untouched and can be called as they were.
 
+- Added multiseat support for multiple mice and keyboards on one computer.
+
+- Added optional player argument to all `UInputMan:Key*` Lua Methods. (e.g. `KeyHeld(keycode, player)`) This allows checking individual player's keyboards, when multiple keyboards are available.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -176,6 +180,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Various performance improvements.
 
+- Drop support for macOS < 11.1 (Big Sur) :(
+
+- Updated SDL2 to SDL3
+
 </details>
 
 <details><summary><b>Fixed</b></summary>

Data/Base.rte/GUIs/SettingsGUI.ini

@@ -933,6 +933,47 @@ Anchor = Left, Top
 Text = Square
 Checked = False
 
+[CollectionBoxP1KeyboardMouseSelect]
+ControlType = COLLECTIONBOX
+Parent = BoxP1Controls
+X = 263
+Y = 25
+Width = 195
+Height = 20
+Visible = True
+Enabled = True
+Name = CollectionBoxP1KeyboardMouseSelect
+Anchor = Left, Top
+DrawBackground = False
+DrawType = Color
+DrawColor = 0
+
+[ButtonP1KeyboardSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP1KeyboardMouseSelect
+X = 7
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP1KeyboardSelect
+Anchor = Left, Top
+Text = Set Keyboard
+
+[ButtonP1MouseSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP1KeyboardMouseSelect
+X = 102
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP1MouseSelect
+Anchor = Left, Top
+Text = Set Mouse
+
 [BoxP2Controls]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxInputSettings
@@ -1120,6 +1161,47 @@ Anchor = Left, Top
 Text = Square
 Checked = False
 
+[CollectionBoxP2KeyboardMouseSelect]
+ControlType = COLLECTIONBOX
+Parent = BoxP2Controls
+X = 263
+Y = 25
+Width = 195
+Height = 20
+Visible = True
+Enabled = True
+Name = CollectionBoxP2KeyboardMouseSelect
+Anchor = Left, Top
+DrawBackground = False
+DrawType = Color
+DrawColor = 0
+
+[ButtonP2KeyboardSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP2KeyboardMouseSelect
+X = 7
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP2KeyboardSelect
+Anchor = Left, Top
+Text = Set Keyboard
+
+[ButtonP2MouseSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP2KeyboardMouseSelect
+X = 102
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP2MouseSelect
+Anchor = Left, Top
+Text = Set Mouse
+
 [BoxP3Controls]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxInputSettings
@@ -1307,6 +1389,47 @@ Anchor = Left, Top
 Text = Square
 Checked = False
 
+[CollectionBoxP3KeyboardMouseSelect]
+ControlType = COLLECTIONBOX
+Parent = BoxP3Controls
+X = 263
+Y = 25
+Width = 195
+Height = 20
+Visible = True
+Enabled = True
+Name = CollectionBoxP3KeyboardMouseSelect
+Anchor = Left, Top
+DrawBackground = False
+DrawType = Color
+DrawColor = 0
+
+[ButtonP3KeyboardSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP3KeyboardMouseSelect
+X = 7
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP3KeyboardSelect
+Anchor = Left, Top
+Text = Set Keyboard
+
+[ButtonP3MouseSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP3KeyboardMouseSelect
+X = 102
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP3MouseSelect
+Anchor = Left, Top
+Text = Set Mouse
+
 [BoxP4Controls]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxInputSettings
@@ -1494,6 +1617,47 @@ Anchor = Left, Top
 Text = Square
 Checked = False
 
+[CollectionBoxP4KeyboardMouseSelect]
+ControlType = COLLECTIONBOX
+Parent = BoxP4Controls
+X = 263
+Y = 25
+Width = 195
+Height = 20
+Visible = True
+Enabled = True
+Name = CollectionBoxP4KeyboardMouseSelect
+Anchor = Left, Top
+DrawBackground = False
+DrawType = Color
+DrawColor = 0
+
+[ButtonP4KeyboardSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP4KeyboardMouseSelect
+X = 7
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP4KeyboardSelect
+Anchor = Left, Top
+Text = Set Keyboard
+
+[ButtonP4MouseSelect]
+ControlType = BUTTON
+Parent = CollectionBoxP4KeyboardMouseSelect
+X = 102
+Y = 0
+Width = 85
+Height = 18
+Visible = True
+Enabled = True
+Name = ButtonP4MouseSelect
+Anchor = Left, Top
+Text = Set Mouse
+
 [CollectionBoxPlayerInputMapping]
 ControlType = COLLECTIONBOX
 Parent = CollectionBoxInputSettings
@@ -2642,6 +2806,70 @@ Anchor = Left, Top
 ToolTip = None
 Text = [InputKey]
 
+[CollectionBoxDeviceCapture]
+ControlType = COLLECTIONBOX
+Parent = root
+X = 110
+Y = 70
+Width = 260
+Height = 100
+Visible = False
+Enabled = False
+Name = CollectionBoxDeviceCapture
+Anchor = Left, Top
+ToolTip = None
+DrawBackground = True
+DrawType = Image
+DrawColor = 0
+
+[LabelDeviceCaptureInstruction1]
+ControlType = LABEL
+Parent = CollectionBoxDeviceCapture
+X = 10
+Y = 30
+Width = 240
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelDeviceCaptureInstruction1
+Anchor = Left, Top
+ToolTip = None
+Text = Press any key on the device you want to use.
+HAlignment = centre
+VAlignment = middle
+
+[LabelDeviceCaptureInstruction2]
+ControlType = LABEL
+Parent = CollectionBoxDeviceCapture
+X = 10
+Y = 50
+Width = 240
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelDeviceCaptureInstruction2
+Anchor = Left, Top
+ToolTip = None
+Text = Press ESC to cancel device mapping.
+HAlignment = centre
+VAlignment = middle
+
+[LabelDeviceCaptureInstruction3]
+ControlType = LABEL
+Parent = CollectionBoxDeviceCapture
+X = 10
+Y = 70
+Width = 240
+Height = 20
+Visible = True
+Enabled = True
+Name = LabelDeviceCaptureInstruction3
+Anchor = Left, Top
+ToolTip = None
+Text = Press DELETE to remove existing mapping.
+HAlignment = centre
+VAlignment = middle
+
 [CollectionBoxInputCapture]
 ControlType = COLLECTIONBOX
 Parent = root