From 9e80491acbb88cd3fb30286d6b794728a6e562b8 Mon Sep 17 00:00:00 2001 From: cuz Date: Wed, 12 Sep 2001 13:49:08 +0000 Subject: [PATCH] Remove sprite param to mouse_init git-svn-id: svn://svn.cc65.org/cc65/trunk@893 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- include/mouse.h | 18 +++++++++++++----- libsrc/atari/mouse.s | 3 +-- libsrc/geos/mousesprite/mouse.s | 7 +++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/include/mouse.h b/include/mouse.h index 9eaccb990..bbc3e4fee 100644 --- a/include/mouse.h +++ b/include/mouse.h @@ -82,12 +82,17 @@ struct mouse_info { unsigned char __fastcall__ mouse_init (unsigned char port, - unsigned char sprite, unsigned char type); -/* Setup the mouse interrupt handler. If the sprite value is != zero, the - * mouse routines will manage the sprite with this number. That means, it - * is moved if the mouse is moved (provided that the mouse cursor is visible), - * and switched on and off in the show and hide functions. +/* Setup the mouse interrupt handler. The mouse routines will use a predefined + * system resource for the mouse cursor: + * C64: Sprite #0 + * C128: Sprite #0 + * GEOS: Sprite #0 + * Atari: PM #0 + * However, the mouse routines will not initialize this cursor or set a + * specific shape - this is platform dependent and up to the user program. + * The mouse cursor is moved if the mouse is moved (provided that the mouse + * cursor is visible), and switched on and off in the show and hide functions. * The port parameter gives the joystick port used for the mouse and is only * needed to read the mouse button state. * The type parameter is needed on some systems to determine the type of @@ -154,6 +159,9 @@ void __fastcall__ mouse_info (struct mouse_info* info); /* Return the state of the mouse buttons and the position of the mouse */ + /* End of mouse.h */ #endif + + diff --git a/libsrc/atari/mouse.s b/libsrc/atari/mouse.s index db80651e2..a6eb380fa 100644 --- a/libsrc/atari/mouse.s +++ b/libsrc/atari/mouse.s @@ -56,11 +56,10 @@ initmouse: ;-------------------------------------------------------------------- ; Initialize mouse routines -; void __fastcall__ mouse_init (unsigned char port, unsigned char sprite, unsigned char type); +; void __fastcall__ mouse_init (unsigned char port, unsigned char type); _mouse_init: pha ; remember mouse type - jsr popa ; ignore sprite / pm for now jsr popa sta port_nr pla ; get mouse type again diff --git a/libsrc/geos/mousesprite/mouse.s b/libsrc/geos/mousesprite/mouse.s index a5f59fa2e..5bf1f1e75 100644 --- a/libsrc/geos/mousesprite/mouse.s +++ b/libsrc/geos/mousesprite/mouse.s @@ -12,7 +12,7 @@ .export _mouse_pos, _mouse_info .export _mouse_move, _mouse_buttons - .import popax, popsreg, addysp1 + .import popa, popsreg, addysp1 .importzp sp, sreg, ptr1 .include "../inc/const.inc" @@ -25,12 +25,11 @@ ; -------------------------------------------------------------------------- ; ; unsigned char __fastcall__ mouse_init (unsigned char port, -; unsigned char sprite, -; unsigned char type); +; unsigned char type); ; _mouse_init: - jsr popax ; ignore all parameters + jsr popa ; ignore all parameters jsr StartMouseMode jsr MouseOff