Moved the lightpen names from <mouse.h> to a new <pen.h>.

Renamed the adjuster pointer.

diff --git a/include/mouse.h b/include/mouse.h
index bc93f8b8ce99ba59d46a928c3ce287d96a9da46f..5e69c7ff6960844d291fcc72a1c3aa3eb1d7cca9 100644 (file)
--- a/include/mouse.h
+++ b/include/mouse.h
@@ -118,13 +118,6 @@ extern const char mouse_stddrv[];
 /* The address of the static standard mouse driver for a platform */
 extern const void mouse_static_stddrv[];
 
-/* A program optionally can set this pointer to a function that gives
-** a calibration value to a driver.  If this pointer isn't NULL,
-** then a driver that wants a value can call that function.
-** mouse_adjuster must be set before the driver is installed.
-*/
-extern void __fastcall__ (*mouse_adjuster) (unsigned char *pValue);
-
 
 
 /*****************************************************************************/
@@ -201,23 +194,6 @@ unsigned char __fastcall__ mouse_ioctl (unsigned char code, void* data);
  * NON-PORTABLE!
  */
 
-void __fastcall__ pen_calibrate (unsigned char *XOffset);
-/* Ask the user to help to calibrate a lightpen.  Changes the screen!
- * A pointer to this function can be put into mouse_adjuster.
- */
-
-void __fastcall__ pen_adjust (const char *filename);
-/* Get a lightpen calibration value from a file if it exists.  Otherwise, call
- * pen_calibrate() to create a value; then, write it into a file, so that it
- * will be available at the next time that the lightpen is used.
- * Might change the screen.
- * pen_adjust() is optional; if you want to use its feature,
- * then it must be called before a driver is installed.
- * Note:  This function merely saves the file-name pointer, and sets
- * the mouse_adjuster pointer.  The file will be read only when a driver
- * is installed, and only if that driver wants to be calibrated.
- */
-
 
 
 /* End of mouse.h */

diff --git a/include/pen.h b/include/pen.h
new file mode 100644 (file)
index 0000000..bab6997
--- /dev/null
+++ b/include/pen.h
@@ -0,0 +1,78 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                   pen.h                                   */
+/*                                                                           */
+/*                               Lightpen API                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided "as-is", without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software.  If you use this software  */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated, but is not required.                                      */
+/* 2. Altered source versions must be marked plainly as such; and, must not  */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef _PEN_H
+#define _PEN_H
+
+
+
+/*****************************************************************************/
+/*                               Declarations                                */
+/*****************************************************************************/
+
+
+
+/* A program optionally can set this pointer to a function that gives
+** a calibration value to a driver.  If this pointer isn't NULL,
+** then a driver that wants a value can call that function.
+** pen_adjuster must be set before the driver is installed.
+*/
+extern void __fastcall__ (*pen_adjuster) (unsigned char *pValue);
+
+
+
+/*****************************************************************************/
+/*                                 Functions                                 */
+/*****************************************************************************/
+
+
+
+void __fastcall__ pen_calibrate (unsigned char *XOffset);
+/* Ask the user to help to calibrate a lightpen.  Changes the screen!
+ * A pointer to this function can be put into pen_adjuster.
+ */
+
+void __fastcall__ pen_adjust (const char *filename);
+/* Get a lightpen calibration value from a file if it exists.  Otherwise, call
+ * pen_calibrate() to create a value; then, write it into a file, so that it
+ * will be available at the next time that the lightpen is used.
+ * Might change the screen.
+ * pen_adjust() is optional; if you want to use its feature,
+ * then it must be called before a driver is installed.
+ * Note:  This function merely saves the file-name pointer, and sets
+ * the pen_adjuster pointer.  The file will be read only when a driver
+ * is installed, and only if that driver wants to be calibrated.
+ */
+
+
+
+/* End of pen.h */
+#endif
+
+
+

diff --git a/libsrc/c128/mouseref.s b/libsrc/c128/mouseref.s
index fb83c439f6faab0068f768c08a3587f931a45d10..9b18a1f089e1c60fc2b1d151bb157701a7e0b697 100644 (file)
--- a/libsrc/c128/mouseref.s
+++ b/libsrc/c128/mouseref.s
@@ -1,10 +1,10 @@
 ;\r
 ; Pointer for library references by device drivers.\r
 ;\r
-; 2013-06-23, Greg King\r
+; 2013-07-25, Greg King\r
 ;\r
 \r
-        .export         mouse_libref, _mouse_adjuster\r
+        .export         mouse_libref, _pen_adjuster\r
 \r
         .data\r
 \r
@@ -17,7 +17,7 @@ mouse_libref:                   ; generic label for mouse-kernel
 ; The function might read a value from a file; or, it might ask the user\r
 ; to help calibrate the driver.\r
 ;\r
-; void __fastcall__ (*mouse_adjuster)(unsigned char *) = NULL;\r
+; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL;\r
 ;\r
-_mouse_adjuster:\r
+_pen_adjuster:\r
         .addr   $0000\r

diff --git a/libsrc/c128/pencalib.c b/libsrc/c128/pencalib.c
index cf9a3f92b01f035b3a9e1038cc52e4e597b123ad..7fb342f4d895171d50eb3560c5cd113003165694 100644 (file)
--- a/libsrc/c128/pencalib.c
+++ b/libsrc/c128/pencalib.c
@@ -1,13 +1,14 @@
 /*\r
 ** Calibrate lightpen drivers to the current video hardware.\r
 **\r
-** 2013-06-17, Greg King\r
+** 2013-07-25, Greg King\r
 **\r
 */\r
 \r
 \r
 #include <conio.h>\r
 #include <mouse.h>\r
+#include <pen.h>\r
 \r
 \r
 #define COMMAND1 "Adjust by clicking on line."\r

diff --git a/libsrc/c64/mouseref.s b/libsrc/c64/mouseref.s
index fb83c439f6faab0068f768c08a3587f931a45d10..9b18a1f089e1c60fc2b1d151bb157701a7e0b697 100644 (file)
--- a/libsrc/c64/mouseref.s
+++ b/libsrc/c64/mouseref.s
@@ -1,10 +1,10 @@
 ;\r
 ; Pointer for library references by device drivers.\r
 ;\r
-; 2013-06-23, Greg King\r
+; 2013-07-25, Greg King\r
 ;\r
 \r
-        .export         mouse_libref, _mouse_adjuster\r
+        .export         mouse_libref, _pen_adjuster\r
 \r
         .data\r
 \r
@@ -17,7 +17,7 @@ mouse_libref:                   ; generic label for mouse-kernel
 ; The function might read a value from a file; or, it might ask the user\r
 ; to help calibrate the driver.\r
 ;\r
-; void __fastcall__ (*mouse_adjuster)(unsigned char *) = NULL;\r
+; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL;\r
 ;\r
-_mouse_adjuster:\r
+_pen_adjuster:\r
         .addr   $0000\r

diff --git a/libsrc/c64/pencalib.c b/libsrc/c64/pencalib.c
index d0e6b0ff264140785fce5681c7fd53eeb237deb0..587c5627e8016bf9831b21040f97a466ad83b017 100644 (file)
--- a/libsrc/c64/pencalib.c
+++ b/libsrc/c64/pencalib.c
@@ -1,13 +1,14 @@
 /*\r
 ** Calibrate lightpen drivers to the current video hardware.\r
 **\r
-** 2013-06-17, Greg King\r
+** 2013-07-25, Greg King\r
 **\r
 */\r
 \r
 \r
 #include <conio.h>\r
 #include <mouse.h>\r
+#include <pen.h>\r
 \r
 \r
 #define COMMAND1 "Adjust by clicking on line."\r

diff --git a/libsrc/cbm/penadjust.c b/libsrc/cbm/penadjust.c
old mode 100755 (executable)
new mode 100644 (file)
index f33b3a2..dc1ffe1
--- a/libsrc/cbm/penadjust.c
+++ b/libsrc/cbm/penadjust.c
@@ -1,14 +1,14 @@
 /*\r
 ** Main lightpen driver calibration functions.\r
 **\r
-** 2013-06-23, Greg King\r
+** 2013-07-25, Greg King\r
 */\r
 \r
 \r
 #include <stddef.h>\r
 #include <fcntl.h>\r
 #include <unistd.h>\r
-#include <mouse.h>\r
+#include <pen.h>\r
 \r
 \r
 static const char *name;\r
@@ -40,15 +40,15 @@ static void __fastcall__ adjuster (unsigned char *XOffset)
 /* pen_adjust() is optional; if you want to use its feature,\r
 ** then it must be called before a driver is installed.\r
 ** Note:  This function merely saves the file-name pointer, and sets\r
-** the mouse_adjuster pointer.  The file will be read only when a driver\r
+** the pen_adjuster pointer.  The file will be read only when a driver\r
 ** is installed, and only if that driver wants to be calibrated.\r
 */\r
 void __fastcall__ pen_adjust (const char *filename)\r
 {\r
     if (filename != NULL && filename[0] != '\0') {\r
         name = filename;\r
-        mouse_adjuster = adjuster;\r
+        pen_adjuster = adjuster;\r
     } else {\r
-        mouse_adjuster = pen_calibrate;\r
+        pen_adjuster = pen_calibrate;\r
     }\r
 }\r

diff --git a/samples/mousetest.c b/samples/mousetest.c
index b2d49b072b2e96b342ee327fe878e8372d47f03e..dd90e0990a840df023ffe3332f153fd86c4f3f1c 100644 (file)
--- a/samples/mousetest.c
+++ b/samples/mousetest.c
@@ -3,7 +3,7 @@
 ** Will work for the C64/C128/CBM510/Atari/Apple2.
 **
 ** 2001-09-13, Ullrich von Bassewitz
-** 2013-06-26, Greg King
+** 2013-07-25, Greg King
 **
 */
 
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <mouse.h>
+#include <pen.h>
 #include <conio.h>
 #include <ctype.h>
 #include <dbg.h>