From 17333e4732e679cc85d87c2dd9a8febd1752f2cf Mon Sep 17 00:00:00 2001 From: Greg King Date: Thu, 25 Jul 2013 13:53:15 -0400 Subject: [PATCH] Fixed some line endings. My Git and repositories are configured for POSIX; but sometimes, Windows line endings "sneak" into new files. --- libsrc/c128/mouseref.s | 46 +++++----- libsrc/c128/pencalib.c | 186 ++++++++++++++++++++-------------------- libsrc/c64/mouseref.s | 46 +++++----- libsrc/c64/pencalib.c | 188 ++++++++++++++++++++--------------------- libsrc/cbm/penadjust.c | 108 +++++++++++------------ 5 files changed, 287 insertions(+), 287 deletions(-) diff --git a/libsrc/c128/mouseref.s b/libsrc/c128/mouseref.s index 9b18a1f08..90aeedf3a 100644 --- a/libsrc/c128/mouseref.s +++ b/libsrc/c128/mouseref.s @@ -1,23 +1,23 @@ -; -; Pointer for library references by device drivers. -; -; 2013-07-25, Greg King -; - - .export mouse_libref, _pen_adjuster - - .data - -mouse_libref: ; generic label for mouse-kernel - -; 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. -; -; The function might read a value from a file; or, it might ask the user -; to help calibrate the driver. -; -; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL; -; -_pen_adjuster: - .addr $0000 +; +; Pointer for library references by device drivers. +; +; 2013-07-25, Greg King +; + + .export mouse_libref, _pen_adjuster + + .data + +mouse_libref: ; generic label for mouse-kernel + +; 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. +; +; The function might read a value from a file; or, it might ask the user +; to help calibrate the driver. +; +; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL; +; +_pen_adjuster: + .addr $0000 diff --git a/libsrc/c128/pencalib.c b/libsrc/c128/pencalib.c index 7fb342f4d..b7bd701ec 100644 --- a/libsrc/c128/pencalib.c +++ b/libsrc/c128/pencalib.c @@ -1,93 +1,93 @@ -/* -** Calibrate lightpen drivers to the current video hardware. -** -** 2013-07-25, Greg King -** -*/ - - -#include -#include -#include - - -#define COMMAND1 "Adjust by clicking on line." -#define COMMAND2 "Finish by clicking off bar." - - -/* There is a delay between when the VIC sends its signal, and when the display -** shows that signal. There is another delay between the display and when the -** lightpen says that it saw that signal. Each display and pen is different. -** Therefore, the driver must be calibrated to them. A white bar is painted on -** the screen; and, a line is drawn down the middle of it. When the user -** clicks on that line, the difference between its position and where the VIC -** thinks that the pen is pointing becomes an offset that is subtracted from -** what the VIC sees. -*/ -void __fastcall__ pen_calibrate (unsigned char *XOffset) -{ - unsigned char oldBg = bgcolor (COLOR_BLUE); - unsigned char oldText = textcolor (COLOR_GRAY3); - unsigned char oldRev = revers (1); - unsigned char sprite0Color = VIC.spr_color[0]; - unsigned char width, width2, height, height4, height8; - struct mouse_info info; - - screensize (&width, &height); - width2 = width / 2; - height4 = height / 4; - height8 = height4 * 8; - - /* Draw a bar and line. */ - - clrscr (); - cclearxy (0, height4, height4 * width); - cvlinexy (width2, height4 + 1, height4 - 2); - - /* Print instructions. */ - - revers (0); - cputsxy (width2 - (sizeof COMMAND1) / 2, height / 2 + 1, COMMAND1); - cputsxy (width2 - (sizeof COMMAND2) / 2, height / 2 + 3, COMMAND2); - - VIC.spr_color[0] = COLOR_GRAY2; - mouse_show (); - mouse_move (width2 * 8, height8 / 2); - - for (;;) { - /* Wait for the main button to be released. */ - - do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); - - /* Wait for the main button to be pressed. */ - - do { - mouse_info (&info); - } while (!(info.buttons & MOUSE_BTN_LEFT)); - - /* Find out if the pen is on or off the bar. */ - - if (info.pos.y < height8 || info.pos.y >= height8 * 2) { - break; - } - - /* On the bar; adjust the offset. */ - /* Characters are eight pixels wide. - ** The VIC-II sees every other pixel; - ** so, we use half of the difference. - */ - - *XOffset += (info.pos.x - (width2 * 8 + 8/2)) / 2; - } - - /* Off the bar; wait for the main button to be released. */ - - do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); - - mouse_hide (); - VIC.spr_color[0] = sprite0Color; - revers (oldRev); - textcolor (oldText); - bgcolor (oldBg); - clrscr (); -} +/* +** Calibrate lightpen drivers to the current video hardware. +** +** 2013-07-25, Greg King +** +*/ + + +#include +#include +#include + + +#define COMMAND1 "Adjust by clicking on line." +#define COMMAND2 "Finish by clicking off bar." + + +/* There is a delay between when the VIC sends its signal, and when the display +** shows that signal. There is another delay between the display and when the +** lightpen says that it saw that signal. Each display and pen is different. +** Therefore, the driver must be calibrated to them. A white bar is painted on +** the screen; and, a line is drawn down the middle of it. When the user +** clicks on that line, the difference between its position and where the VIC +** thinks that the pen is pointing becomes an offset that is subtracted from +** what the VIC sees. +*/ +void __fastcall__ pen_calibrate (unsigned char *XOffset) +{ + unsigned char oldBg = bgcolor (COLOR_BLUE); + unsigned char oldText = textcolor (COLOR_GRAY3); + unsigned char oldRev = revers (1); + unsigned char sprite0Color = VIC.spr_color[0]; + unsigned char width, width2, height, height4, height8; + struct mouse_info info; + + screensize (&width, &height); + width2 = width / 2; + height4 = height / 4; + height8 = height4 * 8; + + /* Draw a bar and line. */ + + clrscr (); + cclearxy (0, height4, height4 * width); + cvlinexy (width2, height4 + 1, height4 - 2); + + /* Print instructions. */ + + revers (0); + cputsxy (width2 - (sizeof COMMAND1) / 2, height / 2 + 1, COMMAND1); + cputsxy (width2 - (sizeof COMMAND2) / 2, height / 2 + 3, COMMAND2); + + VIC.spr_color[0] = COLOR_GRAY2; + mouse_show (); + mouse_move (width2 * 8, height8 / 2); + + for (;;) { + /* Wait for the main button to be released. */ + + do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); + + /* Wait for the main button to be pressed. */ + + do { + mouse_info (&info); + } while (!(info.buttons & MOUSE_BTN_LEFT)); + + /* Find out if the pen is on or off the bar. */ + + if (info.pos.y < height8 || info.pos.y >= height8 * 2) { + break; + } + + /* On the bar; adjust the offset. */ + /* Characters are eight pixels wide. + ** The VIC-II sees every other pixel; + ** so, we use half of the difference. + */ + + *XOffset += (info.pos.x - (width2 * 8 + 8/2)) / 2; + } + + /* Off the bar; wait for the main button to be released. */ + + do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); + + mouse_hide (); + VIC.spr_color[0] = sprite0Color; + revers (oldRev); + textcolor (oldText); + bgcolor (oldBg); + clrscr (); +} diff --git a/libsrc/c64/mouseref.s b/libsrc/c64/mouseref.s index 9b18a1f08..90aeedf3a 100644 --- a/libsrc/c64/mouseref.s +++ b/libsrc/c64/mouseref.s @@ -1,23 +1,23 @@ -; -; Pointer for library references by device drivers. -; -; 2013-07-25, Greg King -; - - .export mouse_libref, _pen_adjuster - - .data - -mouse_libref: ; generic label for mouse-kernel - -; 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. -; -; The function might read a value from a file; or, it might ask the user -; to help calibrate the driver. -; -; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL; -; -_pen_adjuster: - .addr $0000 +; +; Pointer for library references by device drivers. +; +; 2013-07-25, Greg King +; + + .export mouse_libref, _pen_adjuster + + .data + +mouse_libref: ; generic label for mouse-kernel + +; 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. +; +; The function might read a value from a file; or, it might ask the user +; to help calibrate the driver. +; +; void __fastcall__ (*pen_adjuster)(unsigned char *) = NULL; +; +_pen_adjuster: + .addr $0000 diff --git a/libsrc/c64/pencalib.c b/libsrc/c64/pencalib.c index 587c5627e..00629d512 100644 --- a/libsrc/c64/pencalib.c +++ b/libsrc/c64/pencalib.c @@ -1,94 +1,94 @@ -/* -** Calibrate lightpen drivers to the current video hardware. -** -** 2013-07-25, Greg King -** -*/ - - -#include -#include -#include - - -#define COMMAND1 "Adjust by clicking on line." -#define COMMAND2 "Finish by clicking off bar." - - -/* -** There is a delay between when the VIC sends its signal, and when the display -** shows that signal. There is another delay between the display and when -** the lightpen says that it saw that signal. Each display and pen is different. -** Therefore, the driver must be calibrated to them. A white bar is painted on -** the screen; and, a line is drawn down the middle of it. When the user clicks -** on that line, the difference between its position and where the VIC thinks -** that the pen is pointing becomes an offset that is subtracted from what the -** VIC sees. -*/ -void __fastcall__ pen_calibrate (unsigned char *XOffset) -{ - unsigned char oldBg = bgcolor (COLOR_BLUE); - unsigned char oldText = textcolor (COLOR_GRAY3); - unsigned char oldRev = revers (1); - unsigned char sprite0Color = VIC.spr_color[0]; - unsigned char width, width2, height, height4, height8; - struct mouse_info info; - - screensize (&width, &height); - width2 = width / 2; - height4 = height / 4; - height8 = height4 * 8; - - /* Draw a bar and line. */ - - clrscr (); - cclearxy (0, height4, height4 * width); - cvlinexy (width2, height4 + 1, height4 - 2); - revers (0); - - /* Print instructions. */ - - cputsxy (width2 - (sizeof COMMAND1) / 2, height / 2 + 1, COMMAND1); - cputsxy (width2 - (sizeof COMMAND2) / 2, height / 2 + 3, COMMAND2); - - VIC.spr_color[0] = COLOR_GRAY2; - mouse_show (); - mouse_move (width2 * 8, height8 / 2); - - for (;;) { - /* Wait for the main button to be released. */ - - do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); - - /* Wait for the main button to be pressed. */ - - do { - mouse_info (&info); - } while (!(info.buttons & MOUSE_BTN_LEFT)); - - /* Find out if the pen is on or off the bar. */ - - if (info.pos.y < height8 || info.pos.y >= height8 * 2) { - break; - } - - /* On the bar; adjust the offset. */ - /* Characters are eight pixels wide. - ** The VIC-II sees every other pixel; - ** so, we use half of the difference. - */ - - *XOffset += (info.pos.x - (width2 * 8 + 8/2)) / 2; - } - - /* Off the bar; wait for the main button to be released. */ - - do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); - - mouse_hide (); - VIC.spr_color[0] = sprite0Color; - revers (oldRev); - textcolor (oldText); - bgcolor (oldBg); - clrscr (); -} +/* +** Calibrate lightpen drivers to the current video hardware. +** +** 2013-07-25, Greg King +** +*/ + + +#include +#include +#include + + +#define COMMAND1 "Adjust by clicking on line." +#define COMMAND2 "Finish by clicking off bar." + + +/* +** There is a delay between when the VIC sends its signal, and when the display +** shows that signal. There is another delay between the display and when +** the lightpen says that it saw that signal. Each display and pen is different. +** Therefore, the driver must be calibrated to them. A white bar is painted on +** the screen; and, a line is drawn down the middle of it. When the user clicks +** on that line, the difference between its position and where the VIC thinks +** that the pen is pointing becomes an offset that is subtracted from what the +** VIC sees. +*/ +void __fastcall__ pen_calibrate (unsigned char *XOffset) +{ + unsigned char oldBg = bgcolor (COLOR_BLUE); + unsigned char oldText = textcolor (COLOR_GRAY3); + unsigned char oldRev = revers (1); + unsigned char sprite0Color = VIC.spr_color[0]; + unsigned char width, width2, height, height4, height8; + struct mouse_info info; + + screensize (&width, &height); + width2 = width / 2; + height4 = height / 4; + height8 = height4 * 8; + + /* Draw a bar and line. */ + + clrscr (); + cclearxy (0, height4, height4 * width); + cvlinexy (width2, height4 + 1, height4 - 2); + revers (0); + + /* Print instructions. */ + + cputsxy (width2 - (sizeof COMMAND1) / 2, height / 2 + 1, COMMAND1); + cputsxy (width2 - (sizeof COMMAND2) / 2, height / 2 + 3, COMMAND2); + + VIC.spr_color[0] = COLOR_GRAY2; + mouse_show (); + mouse_move (width2 * 8, height8 / 2); + + for (;;) { + /* Wait for the main button to be released. */ + + do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); + + /* Wait for the main button to be pressed. */ + + do { + mouse_info (&info); + } while (!(info.buttons & MOUSE_BTN_LEFT)); + + /* Find out if the pen is on or off the bar. */ + + if (info.pos.y < height8 || info.pos.y >= height8 * 2) { + break; + } + + /* On the bar; adjust the offset. */ + /* Characters are eight pixels wide. + ** The VIC-II sees every other pixel; + ** so, we use half of the difference. + */ + + *XOffset += (info.pos.x - (width2 * 8 + 8/2)) / 2; + } + + /* Off the bar; wait for the main button to be released. */ + + do ; while ((mouse_buttons () & MOUSE_BTN_LEFT)); + + mouse_hide (); + VIC.spr_color[0] = sprite0Color; + revers (oldRev); + textcolor (oldText); + bgcolor (oldBg); + clrscr (); +} diff --git a/libsrc/cbm/penadjust.c b/libsrc/cbm/penadjust.c index dc1ffe129..8b788dd33 100644 --- a/libsrc/cbm/penadjust.c +++ b/libsrc/cbm/penadjust.c @@ -1,54 +1,54 @@ -/* -** Main lightpen driver calibration functions. -** -** 2013-07-25, Greg King -*/ - - -#include -#include -#include -#include - - -static const char *name; - - -/* 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. -*/ -static void __fastcall__ adjuster (unsigned char *XOffset) -{ - int fd = open (name, O_RDONLY); - - if (fd < 0) { - pen_calibrate (XOffset); - fd = open (name, O_WRONLY | O_CREAT | O_EXCL); - if (fd >= 0) { - (void) write (fd, XOffset, 1); - close (fd); - } - } else { - (void) read (fd, XOffset, 1); - close (fd); - } -} - - -/* 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. -*/ -void __fastcall__ pen_adjust (const char *filename) -{ - if (filename != NULL && filename[0] != '\0') { - name = filename; - pen_adjuster = adjuster; - } else { - pen_adjuster = pen_calibrate; - } -} +/* +** Main lightpen driver calibration functions. +** +** 2013-07-25, Greg King +*/ + + +#include +#include +#include +#include + + +static const char *name; + + +/* 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. +*/ +static void __fastcall__ adjuster (unsigned char *XOffset) +{ + int fd = open (name, O_RDONLY); + + if (fd < 0) { + pen_calibrate (XOffset); + fd = open (name, O_WRONLY | O_CREAT | O_EXCL); + if (fd >= 0) { + (void) write (fd, XOffset, 1); + close (fd); + } + } else { + (void) read (fd, XOffset, 1); + close (fd); + } +} + + +/* 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. +*/ +void __fastcall__ pen_adjust (const char *filename) +{ + if (filename != NULL && filename[0] != '\0') { + name = filename; + pen_adjuster = adjuster; + } else { + pen_adjuster = pen_calibrate; + } +}