Intermediate state - doesn't run as is.

[cc65] / include / mouse.h

diff --git a/include/mouse.h b/include/mouse.h
index edb4e0d4e23237245d28332cfe6143ea9610a2a1..27577d193542c8e72a5dfb9333515721b2e76f24 100644 (file)
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003-2004 Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
@@ -60,8 +60,8 @@
 
 /* Structure containing the mouse coordinates */
 struct mouse_pos {
-    int x;
-    int y;
+    int                x;
+    int                y;
 };
 
 /* Structure containing information about the mouse */
@@ -70,6 +70,14 @@ struct mouse_info {
     unsigned char       buttons;       /* Mouse button mask */
 };
 
+/* Structure used for getbox/setbox */
+struct mouse_box {
+    int                minx;
+    int                miny;
+    int                maxx;
+    int                maxy;
+};
+
 /* Structure containing mouse callback functions. These functions are declared
  * in C notation here, but they cannot be C functions (at least not easily),
  * since they may be called from within an interrupt.
@@ -82,12 +90,12 @@ struct mouse_callbacks {
     void (*show) (void);
     /* Show the mouse cursor */
 
-    void (*movex) (void);
+    void __fastcall__ (*movex) (int x);
     /* Move the mouse cursor to the new X coordinate. This function is called,
      * even when the cursor is currently invisible.
      */
 
-    void (*movey) (void);
+    void __fastcall__ (*movey) (int y);
     /* Move the mouse cursor to the new Y coordinate. This function is called,
      * even when the cursor is currently invisible.
      */
@@ -96,6 +104,9 @@ struct mouse_callbacks {
 /* The default mouse callbacks */
 extern const struct mouse_callbacks mouse_def_callbacks;
 
+/* The name of the standard mouse driver for a platform */
+extern const char mouse_stddrv[];
+
 
 
 /*****************************************************************************/
@@ -108,26 +119,29 @@ unsigned char __fastcall__ mouse_load_driver (const struct mouse_callbacks* c,
                                               const char* driver);
 /* Load and install a mouse driver, return an error code. */
 
-unsigned char __fastcall__ mouse_unload (void);
+unsigned char mouse_unload (void);
 /* Uninstall, then unload the currently loaded driver. */
 
 unsigned char __fastcall__ mouse_install (const struct mouse_callbacks* c,
                                           void* driver);
 /* Install an already loaded driver. Returns an error code. */
 
-unsigned char __fastcall__ mouse_uninstall (void);
+unsigned char mouse_uninstall (void);
 /* Uninstall the currently loaded driver. Returns an error code. */
 
-void __fastcall__ mouse_hide (void);
+const char* __fastcall__ mouse_geterrormsg (unsigned char code);
+/* Get an error message describing the error in code. */
+
+void mouse_hide (void);
 /* Hide the mouse. The function manages a counter and may be called more than
  * once. For each call to mouse_hide there must be a call to mouse_show to make
  * the mouse visible again.
  */
 
-void __fastcall__ mouse_show (void);
+void mouse_show (void);
 /* Show the mouse. See mouse_hide for more information. */
 
-void __fastcall__ mouse_box (int minx, int miny, int maxx, int maxy);
+void __fastcall__ mouse_setbox (const struct mouse_box* box);
 /* Set the bounding box for the mouse pointer movement. The mouse X and Y
  * coordinates will never go outside the given box.
  * NOTE: The function does *not* check if the mouse is currently inside the
@@ -139,10 +153,13 @@ void __fastcall__ mouse_box (int minx, int miny, int maxx, int maxy);
  *     - Show the mouse again.
  *
  * NOTE2: When setting the box to something that is larger than the actual
- * screen, the positioning of the mouse cursor will fail. If such margins
+ * screen, the positioning of the mouse cursor can fail. If such margins
  * are really what you want, you have to use your own cursor routines.
  */
 
+void __fastcall__ mouse_getbox (struct mouse_box* box);
+/* Get the current bounding box for the mouse pointer movement. */
+
 void __fastcall__ mouse_move (int x, int y);
 /* Set the mouse cursor to the given position. If a mouse cursor is defined
  * and currently visible, the mouse cursor is also moved.
@@ -150,7 +167,7 @@ void __fastcall__ mouse_move (int x, int y);
  * inside the bounding box.
  */
 
-unsigned char __fastcall__ mouse_buttons (void);
+unsigned char mouse_buttons (void);
 /* Return a bit mask encoding the states of the mouse buttons. Use the
  * MOUSE_BTN_XXX flags to decode a specific button.
  */