Skip to content

SDL3 + Multi mouse keyboard #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 27 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7b99e34
sdl3 changes
HeliumAnt Mar 17, 2025
48cd5d9
add sdl3
HeliumAnt Mar 17, 2025
809a4b2
meson enable sdl3
HeliumAnt Mar 17, 2025
449244b
initial multi mouse support
HeliumAnt Mar 23, 2025
88c5e55
allow multiple gui cursor positions; fix dual action on mouse button …
HeliumAnt Mar 23, 2025
6fc5f05
add device config buttons to settings
HeliumAnt Mar 24, 2025
85ab6ec
ForceEnable->ForceDisable
HeliumAnt Mar 29, 2025
7995070
check multimouse on activity start
HeliumAnt Mar 29, 2025
080909a
fix text in device capture window
HeliumAnt Mar 29, 2025
a00451d
maybe fix input not working for one click after assigning devices
HeliumAnt Mar 29, 2025
3fcf3e8
build sdl3 from source
HeliumAnt Mar 29, 2025
42d2342
add ui changes
HeliumAnt Mar 29, 2025
dff736b
fix missing SDL3 files
HeliumAnt Apr 1, 2025
363fad9
fix windows meson build
HeliumAnt Apr 1, 2025
84972da
disable some unused img formats
HeliumAnt Apr 18, 2025
a712874
add dear imgui
HeliumAnt Apr 18, 2025
efd6a3e
SDL3-3.2.10
HeliumAnt May 2, 2025
1033918
add SDL3 windows static libs
HeliumAnt May 2, 2025
f14836c
add SDL3_image windows binaries
HeliumAnt May 2, 2025
fa14082
add SDL3_image meson files
HeliumAnt May 2, 2025
559512c
fix builds
HeliumAnt May 2, 2025
4eeb6b9
Merge branch 'development' into multi-mouse-keyboard
HeliumAnt May 2, 2025
c389dc2
unignore sdl3 build-scripts
HeliumAnt May 2, 2025
acbd32e
add sdl3 winsdk dependencies
HeliumAnt May 2, 2025
bbf7bd5
unignore all sdl build* files
HeliumAnt May 2, 2025
e407d1e
more missing winsdk libs
HeliumAnt May 2, 2025
cd708c1
patch osx build
HeliumAnt May 2, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
228 changes: 228 additions & 0 deletions Data/Base.rte/GUIs/SettingsGUI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading