Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-29 14:49:44 +00:00
Code Issues Projects Releases Wiki Activity

- minor cleanups

Browse Source
This commit is contained in:
cebix 2000-07-25 11:13:24 +00:00
parent cc8de15355
commit fa1060d325
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BasiliskII/src/adb.cpp
View File

@ -29,6 +29,7 @@
#include "sysdeps.h" #include "sysdeps.h"
#include "cpu_emulation.h" #include "cpu_emulation.h"
#include "main.h" #include "main.h"
#include "emul_op.h"
#include "video.h" #include "video.h"
#include "adb.h" #include "adb.h"
@ -192,7 +193,7 @@ void ADBOp(uint8 op, uint8 *data)
/* /*
* Mouse was moved (x/y are absolute or relative, depending on ADBSetMouseMode()) * Mouse was moved (x/y are absolute or relative, depending on ADBSetRelMouseMode())
*/ */
void ADBMouseMoved(int x, int y) void ADBMouseMoved(int x, int y)
@ -283,11 +284,13 @@ void ADBInterrupt(void)
int mx = mouse_x; int mx = mouse_x;
int my = mouse_y; int my = mouse_y;
uint32 key_base = adb_base + 4;
uint32 mouse_base = adb_base + 16;
if (relative_mouse) { if (relative_mouse) {
// Mouse movement (relative) and buttons // Mouse movement (relative) and buttons
if (mx != 0 || my != 0 || mouse_button[0] != old_mouse_button[0] || mouse_button[1] != old_mouse_button[1] || mouse_button[2] != old_mouse_button[2]) { if (mx != 0 || my != 0 || mouse_button[0] != old_mouse_button[0] || mouse_button[1] != old_mouse_button[1] || mouse_button[2] != old_mouse_button[2]) {
uint32 mouse_base = adb_base + 16;
// Call mouse ADB handler // Call mouse ADB handler
if (mouse_reg_3[1] == 4) { if (mouse_reg_3[1] == 4) {
@ -319,11 +322,26 @@ void ADBInterrupt(void)
// Update mouse position (absolute) // Update mouse position (absolute)
if (mx != old_mouse_x || my != old_mouse_y) { if (mx != old_mouse_x || my != old_mouse_y) {
#ifdef POWERPC_ROM
static const uint16 proc[] = {
0x2f08, // move.l a0,-(sp)
0x2f00, // move.l d0,-(sp)
0x2f01, // move.l d1,-(sp)
0x7001, // moveq #1,d0 (MoveTo)
0xaadb, // CursorDeviceDispatch
M68K_RTS
};
r.a[0] = ReadMacInt32(mouse_base + 4);
r.d[0] = mx;
r.d[1] = my;
Execute68k((uint32)proc, &r);
#else
WriteMacInt16(0x82a, mx); WriteMacInt16(0x82a, mx);
WriteMacInt16(0x828, my); WriteMacInt16(0x828, my);
WriteMacInt16(0x82e, mx); WriteMacInt16(0x82e, mx);
WriteMacInt16(0x82c, my); WriteMacInt16(0x82c, my);
WriteMacInt8(0x8ce, ReadMacInt8(0x8cf)); // CrsrCouple -> CrsrNew WriteMacInt8(0x8ce, ReadMacInt8(0x8cf)); // CrsrCouple -> CrsrNew
#endif
old_mouse_x = mx; old_mouse_x = mx;
old_mouse_y = my; old_mouse_y = my;
} }
@ -359,7 +377,6 @@ void ADBInterrupt(void)
} }
// Process accumulated keyboard events // Process accumulated keyboard events
uint32 key_base = adb_base + 4;
while (key_read_ptr != key_write_ptr) { while (key_read_ptr != key_write_ptr) {
// Read keyboard event // Read keyboard event

1
BasiliskII/src/extfs.cpp
View File

@ -49,7 +49,6 @@
#endif #endif
#include "cpu_emulation.h" #include "cpu_emulation.h"
#include "macos_util.h"
#include "emul_op.h" #include "emul_op.h"
#include "main.h" #include "main.h"
#include "disk.h" #include "disk.h"