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

- Amiga mouse pointer is hidden inside windowed displays

Browse Source
This commit is contained in:
cebix 2000-07-22 18:25:48 +00:00
parent ce02e4fc56
commit 0e6bdfdce5
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BasiliskII/ChangeLog
View File

@ -1,5 +1,6 @@
V0.8 (snapshot) -
- AmigaOS: enabled floppy support, fixed floppy bugs [Jürgen Lachmann]
- AmigaOS: Amiga mouse pointer is hidden inside windowed Mac displays
- AmigaOS/sys_amiga.cpp: workaround for 2060scsi.device bug when
when reading from CD-ROM [Jürgen Lachmann]
- AmigaOS/prefs_editor_amiga.cpp: fixed bug when adding volumes

33
BasiliskII/src/AmigaOS/video_amiga.cpp
View File

@ -57,6 +57,8 @@ static int display_type = DISPLAY_WINDOW; // See enum above
static struct Screen *the_screen = NULL;
static struct Window *the_win = NULL;
static struct BitMap *the_bitmap = NULL;
static UWORD *null_pointer = NULL; // Blank mouse pointer data
static UWORD *current_pointer = (UWORD *)-1; // Currently visible mouse pointer data
static LONG black_pen = -1, white_pen = -1;
static struct Process *periodic_proc = NULL; // Periodic process
@ -352,6 +354,13 @@ static bool init_screen_cgfx(ULONG mode_id)
bool VideoInit(bool classic)
{
// Allocate blank mouse pointer data
null_pointer = (UWORD *)AllocMem(12, MEMF_PUBLIC | MEMF_CHIP | MEMF_CLEAR);
if (null_pointer == NULL) {
ErrorAlert(GetString(STR_NO_MEM_ERR));
return false;
}
// Read frame skip prefs
frame_skip = PrefsFindInt32("frameskip");
if (frame_skip == 0)
@ -488,6 +497,12 @@ void VideoExit(void)
}
break;
}
// Free mouse pointer
if (null_pointer) {
FreeMem(null_pointer, 12);
null_pointer = NULL;
}
}
@ -600,8 +615,24 @@ static __saveds void periodic_func(void)
case IDCMP_MOUSEMOVE:
if (display_type == DISPLAY_SCREEN_P96 || display_type == DISPLAY_SCREEN_CGFX)
ADBMouseMoved(mx, my);
else
else {
ADBMouseMoved(mx - the_win->BorderLeft, my - the_win->BorderTop);
if (mx < the_win->BorderLeft
|| my < the_win->BorderTop
|| mx >= the_win->BorderLeft + VideoMonitor.x
|| my >= the_win->BorderTop + VideoMonitor.y) {
if (current_pointer) {
ClearPointer(the_win);
current_pointer = NULL;
}
} else {
if (current_pointer != null_pointer) {
// Hide mouse pointer inside window
SetPointer(the_win, null_pointer, 1, 16, 0, 0);
current_pointer = null_pointer;
}
}
}
break;
case IDCMP_MOUSEBUTTONS: