Skip to content

Commit bcef833

Browse files
dirkwhoffmanndirkwhoffmann
committed
This is vAmiga 4.3.2
1 parent 092b519 commit bcef833

File tree

5 files changed

+44
-47
lines changed

5 files changed

+44
-47
lines changed

‎Core/config.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// Version number
1717
static constexpr int VER_MAJOR = 4;
1818
static constexpr int VER_MINOR = 3;
19-
static constexpr int VER_SUBMINOR = 1;
19+
static constexpr int VER_SUBMINOR = 2;
2020
static constexpr int VER_BETA = 0;
2121

2222
// Snapshot version number

‎GUI/Input/DeviceDatabase.swift‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
// Mapping scheme: HIDEvent -> Item -> Value -> [Actions]
3939
typealias HIDMapping = [ HIDEvent: [ Int: [ Int: [GamePadAction] ] ] ]
4040

41+
func printHIDMapping(_ mapping: HIDMapping) {
42+
43+
for (event, keys) in mapping {
44+
print("\(event):")
45+
for (key, value) in keys {
46+
print(" \(key): \(value)")
47+
}
48+
}
49+
}
50+
4151
class DeviceDatabase {
4252

4353
// Known devices
@@ -244,29 +254,30 @@ class DeviceDatabase {
244254
case "a3~": result[.AXIS]![3] = mapAxis(key: pair[0], rev: true)
245255
case "a4~": result[.AXIS]![4] = mapAxis(key: pair[0], rev: true)
246256
case "a5~": result[.AXIS]![5] = mapAxis(key: pair[0], rev: true)
247-
case "b0": result[.BUTTON]![1] = mapButton(key: pair[0])
248-
case "b1": result[.BUTTON]![2] = mapButton(key: pair[0])
249-
case "b2": result[.BUTTON]![3] = mapButton(key: pair[0])
250-
case "b3": result[.BUTTON]![4] = mapButton(key: pair[0])
251-
case "b4": result[.BUTTON]![5] = mapButton(key: pair[0])
252-
case "b5": result[.BUTTON]![6] = mapButton(key: pair[0])
253-
case "b6": result[.BUTTON]![7] = mapButton(key: pair[0])
254-
case "b7": result[.BUTTON]![8] = mapButton(key: pair[0])
255-
case "b8": result[.BUTTON]![9] = mapButton(key: pair[0])
256-
case "b9": result[.BUTTON]![10] = mapButton(key: pair[0])
257-
case "b10": result[.BUTTON]![11] = mapButton(key: pair[0])
258-
case "b11": result[.BUTTON]![12] = mapButton(key: pair[0])
259-
case "b12": result[.BUTTON]![13] = mapButton(key: pair[0])
260-
case "b13": result[.BUTTON]![14] = mapButton(key: pair[0])
261-
case "b14": result[.BUTTON]![15] = mapButton(key: pair[0])
262-
case "b15": result[.BUTTON]![16] = mapButton(key: pair[0])
263-
case "b16": result[.BUTTON]![17] = mapButton(key: pair[0])
257+
case "b0": result[.BUTTON]![0] = mapButton(key: pair[0])
258+
case "b1": result[.BUTTON]![1] = mapButton(key: pair[0])
259+
case "b2": result[.BUTTON]![2] = mapButton(key: pair[0])
260+
case "b3": result[.BUTTON]![3] = mapButton(key: pair[0])
261+
case "b4": result[.BUTTON]![4] = mapButton(key: pair[0])
262+
case "b5": result[.BUTTON]![5] = mapButton(key: pair[0])
263+
case "b6": result[.BUTTON]![6] = mapButton(key: pair[0])
264+
case "b7": result[.BUTTON]![7] = mapButton(key: pair[0])
265+
case "b8": result[.BUTTON]![8] = mapButton(key: pair[0])
266+
case "b9": result[.BUTTON]![9] = mapButton(key: pair[0])
267+
case "b10": result[.BUTTON]![10] = mapButton(key: pair[0])
268+
case "b11": result[.BUTTON]![11] = mapButton(key: pair[0])
269+
case "b12": result[.BUTTON]![12] = mapButton(key: pair[0])
270+
case "b13": result[.BUTTON]![13] = mapButton(key: pair[0])
271+
case "b14": result[.BUTTON]![14] = mapButton(key: pair[0])
272+
case "b15": result[.BUTTON]![15] = mapButton(key: pair[0])
273+
case "b16": result[.BUTTON]![16] = mapButton(key: pair[0])
264274

265275
default:
266276
break
267277
}
268278
}
269279

280+
// printHIDMapping(result)
270281
return result
271282
}
272283

@@ -305,7 +316,7 @@ class DeviceDatabase {
305316

306317
switch (key) {
307318

308-
case "a", "b", "leftshoulder", "rightshoulder":
319+
case "a", "b", "x", "y", "leftshoulder", "rightshoulder":
309320
return [0: [.RELEASE_FIRE], 1: [.PRESS_FIRE]]
310321
case "dpdown":
311322
return [0: [.RELEASE_Y], 1: [.PULL_DOWN]]

‎GUI/Input/GamePad.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,8 @@ class GamePad {
301301

302302
if usagePage == kHIDPage_Button {
303303

304-
hidEvent = (.BUTTON, usage, intValue)
304+
// usage - 1 yields the button number with 0 = first button
305+
hidEvent = (.BUTTON, usage - 1, intValue)
305306
}
306307

307308
if usagePage == kHIDPage_GenericDesktop {

‎GUI/XIB files/Settings.storyboard‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<scene sceneID="5Qc-K9-l5S">
1212
<objects>
1313
<windowController storyboardIdentifier="SettingsWindowController" id="3md-5x-CLM" customClass="SettingsWindowController" customModule="vAmiga" customModuleProvider="target" sceneMemberID="viewController">
14-
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="Rfa-Pi-9iE">
14+
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="Rfa-Pi-9iE">
1515
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
1616
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
1717
<rect key="contentRect" x="207" y="263" width="480" height="270"/>
@@ -20,21 +20,6 @@
2020
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
2121
<autoresizingMask key="autoresizingMask"/>
2222
</view>
23-
<toolbar key="toolbar" implicitIdentifier="09D11707-F4A3-4FD5-970E-AC5832E91C2B" autosavesConfiguration="NO" showsBaselineSeparator="NO" displayMode="iconAndLabel" sizeMode="regular" id="EjN-Y7-1B6">
24-
<allowedToolbarItems>
25-
<toolbarItem implicitItemIdentifier="NSToolbarShowColorsItem" id="kJi-pV-2bc"/>
26-
<toolbarItem implicitItemIdentifier="NSToolbarShowFontsItem" id="Vxm-Z2-mt0"/>
27-
<toolbarItem implicitItemIdentifier="NSToolbarPrintItem" id="Fxc-cT-B8i"/>
28-
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="Jg3-Hb-NBl"/>
29-
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="uS9-RJ-M6c"/>
30-
</allowedToolbarItems>
31-
<defaultToolbarItems>
32-
<toolbarItem reference="kJi-pV-2bc"/>
33-
<toolbarItem reference="Vxm-Z2-mt0"/>
34-
<toolbarItem reference="uS9-RJ-M6c"/>
35-
<toolbarItem reference="Fxc-cT-B8i"/>
36-
</defaultToolbarItems>
37-
</toolbar>
3823
<connections>
3924
<outlet property="delegate" destination="3md-5x-CLM" id="rLa-T5-Mty"/>
4025
</connections>
@@ -106,7 +91,7 @@
10691
<rect key="frame" x="8" y="0.0" width="130" height="42"/>
10792
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10893
<subviews>
109-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GQl-eS-sZn">
94+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GQl-eS-sZn">
11095
<rect key="frame" x="46" y="13" width="84" height="16"/>
11196
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
11297
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="jUa-V7-nwV">
@@ -132,7 +117,7 @@
132117
</subviews>
133118
</clipView>
134119
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="f7n-Ug-slC">
135-
<rect key="frame" x="1" y="198" width="147" height="15"/>
120+
<rect key="frame" x="1" y="284" width="147" height="15"/>
136121
<autoresizingMask key="autoresizingMask"/>
137122
</scroller>
138123
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="qob-Qv-03X">
@@ -169,7 +154,7 @@
169154
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
170155
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="NSColorPanel" id="hIC-J7-i59"/>
171156
</imageView>
172-
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9mJ-ka-po8">
157+
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9mJ-ka-po8">
173158
<rect key="frame" x="94" y="284" width="114" height="16"/>
174159
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
175160
<textFieldCell key="cell" lineBreakMode="clipping" title="Holla, die Waldfee" id="Jjw-uQ-Twg">

‎vAmiga.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3206,7 +3206,7 @@
32063206
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
32073207
CODE_SIGN_STYLE = Manual;
32083208
COMBINE_HIDPI_IMAGES = YES;
3209-
CURRENT_PROJECT_VERSION = 250917;
3209+
CURRENT_PROJECT_VERSION = 250918;
32103210
DEAD_CODE_STRIPPING = YES;
32113211
DEVELOPMENT_TEAM = "";
32123212
"DEVELOPMENT_TEAM[sdk=macosx*]" = 3NG65ZLYW7;
@@ -3229,7 +3229,7 @@
32293229
"@executable_path/../Frameworks",
32303230
);
32313231
MACOSX_DEPLOYMENT_TARGET = 13.5;
3232-
MARKETING_VERSION = 4.3.1;
3232+
MARKETING_VERSION = 4.3.2;
32333233
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
32343234
ONLY_ACTIVE_ARCH = NO;
32353235
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
@@ -3260,7 +3260,7 @@
32603260
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
32613261
CODE_SIGN_STYLE = Manual;
32623262
COMBINE_HIDPI_IMAGES = YES;
3263-
CURRENT_PROJECT_VERSION = 250917;
3263+
CURRENT_PROJECT_VERSION = 250918;
32643264
DEAD_CODE_STRIPPING = YES;
32653265
DEBUG_INFORMATION_FORMAT = dwarf;
32663266
DEVELOPMENT_TEAM = "";
@@ -3283,7 +3283,7 @@
32833283
);
32843284
LLVM_LTO = YES_THIN;
32853285
MACOSX_DEPLOYMENT_TARGET = 13.5;
3286-
MARKETING_VERSION = 4.3.1;
3286+
MARKETING_VERSION = 4.3.2;
32873287
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 c++20";
32883288
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga;
32893289
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3307,7 +3307,7 @@
33073307
CODE_SIGN_IDENTITY = "Apple Development";
33083308
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
33093309
CODE_SIGN_STYLE = Automatic;
3310-
CURRENT_PROJECT_VERSION = 250917;
3310+
CURRENT_PROJECT_VERSION = 250918;
33113311
DEVELOPMENT_TEAM = 3NG65ZLYW7;
33123312
ENABLE_HARDENED_RUNTIME = YES;
33133313
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3323,7 +3323,7 @@
33233323
);
33243324
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
33253325
MACOSX_DEPLOYMENT_TARGET = 15.1;
3326-
MARKETING_VERSION = 4.3.1;
3326+
MARKETING_VERSION = 4.3.2;
33273327
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
33283328
PRODUCT_NAME = "$(TARGET_NAME)";
33293329
SKIP_INSTALL = YES;
@@ -3341,7 +3341,7 @@
33413341
CODE_SIGN_IDENTITY = "Apple Development";
33423342
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
33433343
CODE_SIGN_STYLE = Automatic;
3344-
CURRENT_PROJECT_VERSION = 250917;
3344+
CURRENT_PROJECT_VERSION = 250918;
33453345
DEVELOPMENT_TEAM = 3NG65ZLYW7;
33463346
ENABLE_HARDENED_RUNTIME = YES;
33473347
GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -3357,7 +3357,7 @@
33573357
);
33583358
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
33593359
MACOSX_DEPLOYMENT_TARGET = 15.1;
3360-
MARKETING_VERSION = 4.3.1;
3360+
MARKETING_VERSION = 4.3.2;
33613361
PRODUCT_BUNDLE_IDENTIFIER = dirkwhoffmann.vAmiga.QuickLookPlugIn;
33623362
PRODUCT_NAME = "$(TARGET_NAME)";
33633363
SKIP_INSTALL = YES;

0 commit comments

Comments
 (0)