Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2024-12-21 14:30:09 +00:00
Code Issues Projects Releases Wiki Activity

- Mouse Button / Paddle 3 is inverted

Browse Source 
- Reset Paddle / Joystick / Mouse buttons
This commit is contained in:
tudnai 2020-05-28 09:35:17 -07:00
parent 04d9ca20eb
commit f79be51bb1
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
A2Mac/ViewController.swift
View File

@ -400,31 +400,31 @@ class ViewController: NSViewController {
case [.shift]:
setIO(0xC061, 0);
setIO(0xC062, 0);
setIO(0xC063, 1 << 7);
setIO(0xC063, 0); // inverted (bit 7: not pressed)
print("shift key is pressed")
case [.control]:
print("control key is pressed")
case [.option] :
setIO(0xC061, 1 << 7);
setIO(0xC062, 0);
setIO(0xC063, 0);
setIO(0xC063, 1 << 7); // inverted (bit 7: not pressed)
print("option key is pressed")
case [.command]:
print("Command key is pressed")
setIO(0xC061, 0);
setIO(0xC062, 1 << 7);
setIO(0xC063, 0);
setIO(0xC063, 1 << 7); // inverted (bit 7: not pressed)
case [.control, .shift]:
print("control-shift keys are pressed")
case [.option, .shift]:
setIO(0xC061, 1 << 7);
setIO(0xC062, 0);
setIO(0xC063, 1 << 7);
setIO(0xC063, 0); // inverted (bit 7: not pressed)
print("option-shift keys are pressed")
case [.command, .shift]:
setIO(0xC061, 0);
setIO(0xC062, 1 << 7);
setIO(0xC063, 1 << 7);
setIO(0xC063, 0); // inverted (bit 7: not pressed)
print("command-shift keys are pressed")
case [.control, .option]:
print("control-option keys are pressed")
@ -433,7 +433,7 @@ class ViewController: NSViewController {
case [.option, .command]:
setIO(0xC061, 1 << 7);
setIO(0xC062, 1 << 7);
setIO(0xC063, 0);
setIO(0xC063, 1 << 7); // inverted (bit 7: not pressed)
print("option-command keys are pressed")
case [.shift, .control, .option]:
print("shift-control-option keys are pressed")
@ -444,7 +444,7 @@ class ViewController: NSViewController {
case [.shift, .command, .option]:
setIO(0xC061, 1 << 7);
setIO(0xC062, 1 << 7);
setIO(0xC063, 1 << 7);
setIO(0xC063, 0); // inverted (bit 7: not pressed)
print("shift-command-option keys are pressed")
case [.shift, .control, .option, .command]:
print("shift-control-option-command keys are pressed")
@ -455,7 +455,7 @@ class ViewController: NSViewController {
default:
setIO(0xC061, 0);
setIO(0xC062, 0);
setIO(0xC063, 0);
setIO(0xC063, 1 << 7); // inverted (bit 7: not pressed)
print("no modifier keys are pressed")
}
}
@ -654,16 +654,16 @@ class ViewController: NSViewController {
#if SPEEDTEST
#else
if ( !halted ) {
// // Mouse 2 JoyStick (Game Controller / Paddle)
// mouseLocation = view.window!.mouseLocationOutsideOfEventStream
//
// pdl_prevarr[0] = pdl_valarr[0]
// pdl_valarr[0] = Double(mouseLocation.x / (displayField.frame.width) )
// pdl_diffarr[0] = pdl_valarr[0] - pdl_prevarr[0]
//
// pdl_prevarr[1] = pdl_valarr[1]
// pdl_valarr[1] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
// pdl_diffarr[1] = pdl_valarr[1] - pdl_prevarr[1]
// Mouse 2 JoyStick (Game Controller / Paddle)
mouseLocation = view.window!.mouseLocationOutsideOfEventStream
pdl_prevarr[2] = pdl_valarr[2]
pdl_valarr[2] = Double(mouseLocation.x / (displayField.frame.width) )
pdl_diffarr[2] = pdl_valarr[2] - pdl_prevarr[2]
pdl_prevarr[3] = pdl_valarr[3]
pdl_valarr[3] = 1 - Double(mouseLocation.y / (displayField.frame.height) )
pdl_diffarr[3] = pdl_valarr[3] - pdl_prevarr[3]
m6502_Run()
}

6
src/cpu/6502.c
View File

@ -1019,6 +1019,12 @@ void m6502_ColdReset( const char * bundlePath, const char * romFileName ) {
// set the default speed
clk_6502_per_frm_set = clk_6502_per_frm = default_MHz_6502 / fps;
// Initialize Paddle / Game Controller / Joystick / Mouse Buttons
setIO(0xC061, 0);
setIO(0xC062, 0);
setIO(0xC063, 1 << 7); // inverted (bit 7: not pressed)
}