diff --git a/README.md b/README.md index 79442fc..b4aeae0 100644 --- a/README.md +++ b/README.md @@ -50,16 +50,16 @@ Commodore 128 80 column screen editor - version 2 Version v20-20240611-1354: - Bugfix release: - SOLVED: Saving charactersets crashes the program - - SOLVED: If placing chararcters after prefiled filename extra characters are added. + - SOLVED: If placing characters after prefiled filename extra characters are added. Version v20-20240421-1404: - First release of v2 version of VDCSE - Completely rebuild using the Oscar64 compiler (previously CC65) - Added support for multiple VDC text screen modes, including 80x50 (ideal for C64 PETSCII art aspect ratio). NB: Needs a C128 with 64KB VDC RAM to have still also room for swap VDC memory. - Added import and export functions: Import of both raw screen data in PRG files, or BBS Petscii code sequences in SEQ format export to SEQ format. SEQ format can be a.o. used to import from and export to other PETSCII editors like Petmate 9. -- Import functions include a VIC to VDC colour converter. Which is obviously a comprimise as VDC has only one color as alternative for the VIC pairs Orange/Brown (both convert to VDC Dark Yellow) and Light Grey/Medium Grey (both convert to VDC Light Grey), and the other colours have different hues on VDC than on VIC (for example light red from a pink like hue on VIC to red on VDC) +- Import functions include a VIC to VDC colour converter. Which is obviously a compromise as VDC has only one color as alternative for the VIC pairs Orange/Brown (both convert to VDC Dark Yellow) and Light Grey/Medium Grey (both convert to VDC Light Grey), and the other colours have different hues on VDC than on VIC (for example light red from a pink like hue on VIC to red on VDC) - Import can be done to any given coordinate in the existing project, canvas is automatically enlarged if needed to make it fit. -- VDCSE2PRG program generator now supports all screensizes that fit in memory and supports the different screenmodes. Features scrolling for sizes bigger than the screensize: smooth scrolling on 64 KB VDC RAM equiped machine and per char vertical scroll (no horizontal scroll) with 16 KB VDC. Project files can now be selected using a filebrowser. +- VDCSE2PRG program generator now supports all screensizes that fit in memory and supports the different screenmodes. Features scrolling for sizes bigger than the screensize: smooth scrolling on 64 KB VDC RAM equipped machine and per char vertical scroll (no horizontal scroll) with 16 KB VDC. Project files can now be selected using a filebrowser. - Many smaller refinements and bugfixes Version v099-20220324-1527: @@ -69,7 +69,7 @@ Version v099-20220324-1527: - Statusbar shows present mode, co-ordinates, plot screencode (visual and as hexcode), plot color (visual and as number) and shows REV UND BLI ALT if these attributes (reverse, underline, blink and alternate charset) are enabled, shows nothing if disabled. Also hints at F8 for help. - Added Try mode: pressing T shows the present selected character as plotted without cursor blinking. Pressing space in this mode plots the character for real, any other character cancels and returns without plotting. - Tweaked pulldown menus so that the cyan also is visible different from yellow on a monochrome monitor. Added a minus to show the actual selection to also be able to distinguish selected option without needing the colors. -- Added cancel option in all load and save dialogues by pressing ESC or STOP on devide ID or filename input +- Added cancel option in all load and save dialogues by pressing ESC or STOP on device ID or filename input - Small change: title screen shows load progress Version v090-20220309-1618: @@ -202,7 +202,7 @@ Press these keys in main mode for editing: *Moving cursor* -Press the **cursor keys** to move the cursor around the screen. If the canvas size is bigger than the 80x25 screensize, the sreen will scroll on reaching the edges. +Press the **cursor keys** to move the cursor around the screen. If the canvas size is bigger than the 80x25 screensize, the screen will scroll on reaching the edges. Pressing **HOME** will return the cursor to the upper left position. @@ -262,7 +262,7 @@ From left to right, this status bar shows: - X,Y: X and Y co-ordinates of the cursor (co-ordinates of the large full screen, and not only the visible screen, if a larger screen than 80 by 25 characters is selected) - Char: the present selected character to plot, first as actual visual character, then as screencode number in hexadecimal - Color: the present selected color to plot, first as actual visual color, then as color number -- Atrributes: this shows the enabled attributes, REV for Reverse, UND for Underline, BLI for Blink and ALT for Alternate character set. If the abbreviation is shown, the corresponding attribute is enabled, else disabled. +- Attributes: this shows the enabled attributes, REV for Reverse, UND for Underline, BLI for Blink and ALT for Alternate character set. If the abbreviation is shown, the corresponding attribute is enabled, else disabled. - Reference that F8 gives you the help screen The status bar auto hides if the cursor is moved to the lowest visible line on the screen, and pops up again (if enabled in the first place) when the cursor moves up. @@ -339,7 +339,7 @@ Similar to clear, but this will fill the canvas with the present selected [scree ![File menu](https://github.com/xahmol/VDCScreenEditor2/blob/main/screenshots/VDCSE2%20File%20menu.png?raw=true) -In general: pressing **ESC** or **STOP** on any devide ID or filename input dialogue cancels the file operation. +In general: pressing **ESC** or **STOP** on any device ID or filename input dialogue cancels the file operation. *Save screen* @@ -433,7 +433,7 @@ Pick Both, Chars or Color for importing resp. both text and attributes from the Pick Yes or No from the pulldown menu to indicate ifthe colour data in the file to import is coded for VIC colours. If selected yes, the VIC coded colours will be converted to VDC colours. -**NB: The colour conversion is a comprimise** as VDC has only one color as alternative for the VIC pairs Orange/Brown (both convert to VDC Dark Yellow) and Light Grey/Medium Grey (both convert to VDC Light Grey), and the other colours have different hues on VDC than on VIC (for example light red from a pink like hue on VIC to red on VDC) +**NB: The colour conversion is a compromise** as VDC has only one color as alternative for the VIC pairs Orange/Brown (both convert to VDC Dark Yellow) and Light Grey/Medium Grey (both convert to VDC Light Grey), and the other colours have different hues on VDC than on VIC (for example light red from a pink like hue on VIC to red on VDC) ***Uppercase charset?** @@ -441,7 +441,7 @@ In case VIC colour conversion is selected, the dialogue also asks if the importe ***Enter offset char to colour*** -Enter the offset in bytes between the text and attribute data in the file to be imported. Note that only files with first text, and then attribute data are suppported. +Enter the offset in bytes between the text and attribute data in the file to be imported. Note that only files with first text, and then attribute data are supported. Enter 0 if the attribute data is directly after the text data, but enter the offset if there is a gap between the two in the file. @@ -611,7 +611,7 @@ Press the **cursor keys** to move the cursor around the grid. You can move over *Selecting character* -Press **SPACE** or **ENTER** to select the hightlighted characters as new character to plot with. This leaves the palette mode. +Press **SPACE** or **ENTER** to select the highlighted characters as new character to plot with. This leaves the palette mode. *Storing to a favorite slot* @@ -793,12 +793,12 @@ Leave Color write mode by pressing **ESC** or **STOP**. **F8** will show a help VDCSE2PRG is a separate utility to create an executable program file for the C128 of a VDCSE project. All screenmodes, redefined charsets and all screensizes are supported, only limit is that data for the screen and charsets combined must fit in 31.232 bytes (approx. 30 kilobytes). The generated executable program supports: -- All screenmodes supoorted by VDCSE2 +- All screenmodes supported by VDCSE2 - All screensizes, also smaller or bigger than the screensize of the selected screenmode and redefined charsets, as long as it fits in the designated 30 kilobytes target memory -- If the screen is larger than the screensize of the selected screen mode, automated scrolling is supoorted. Note that smooth scroll in both the vertical as horizontal direction is only supoorted on 64 KB VDC RAM machines, on 16 KB VDC RAM machines only vertical per char scroll is supported. +- If the screen is larger than the screensize of the selected screen mode, automated scrolling is supported. Note that smooth scroll in both the vertical as horizontal direction is only supported on 64 KB VDC RAM machines, on 16 KB VDC RAM machines only vertical per char scroll is supported. - The generated program will detect VDC RAM size automatically and choose the proper scroll mode if needed (or exit with a message if horizontal scrolling would be needed given the screensize, while only 16 KB VDC RAM is available.) -This is a seperate utility which can not be started from the VDCSE main program but has to be started seperately by loading the VDCSE2PRG file from disk with for example RUN"VDCSE2PRG",U(device number). +This is a separate utility which can not be started from the VDCSE main program but has to be started separately by loading the VDCSE2PRG file from disk with for example RUN"VDCSE2PRG",U(device number). Running this program first gives a filebrowser to select the VDCSE project file to base the generated program on. The browser filters to show only project files, pick the desired one using the filebrowser interface. @@ -913,7 +913,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf diff --git a/include/bank_minimal.c b/include/bank_minimal.c index ee67d2b..585069e 100644 --- a/include/bank_minimal.c +++ b/include/bank_minimal.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -93,7 +93,7 @@ char bootdevice; char getcurrentdevice() // Return last used device number for IO operations. Default on 8 if still zero. { - // Feading zeropage address containg current device number ($BA) + // Feading zeropage address containing current device number ($BA) char curunit = *(char *)0xba; // Default on 8 if still zero @@ -127,7 +127,7 @@ void bnk_init() // Set 8Kb shared memory size // So set MMU Ram Configuration Register at: // - bit 0-1: %01 for 4 KB common RAM - // - bit 2-3: %01 for bootom of RAM bank 0 is common + // - bit 2-3: %01 for bottom of RAM bank 0 is common // - bit 7: $0 for VIC RAM in bank 0 xmmu.rcr = 0x05; @@ -137,12 +137,12 @@ void bnk_init() } void bnk_exit() -// Retsore to default situtation for shared memory +// Retsore to default situation for shared memory { // Set 8Kb shared memory size // So set MMU Ram Configuration Register at: // - bit 0-1: %00 for 1 KB common RAM - // - bit 2-3: %01 for bootom of RAM bank 0 is common + // - bit 2-3: %01 for bottom of RAM bank 0 is common // - bit 7: $0 for VIC RAM in bank 0 xmmu.rcr = 0x04; } @@ -228,12 +228,12 @@ bool bnk_load(char device, char bank, const char *start, const char *fname) bool bnk_save(char device, char bank, const char *start, const char *end, const char *fname) // Save from the specified bank { - char succes; + char success; krnio_setbnk(bank, 0); krnio_setnam(fname); - succes = krnio_save(device, start, end); + success = krnio_save(device, start, end); krnio_setbnk(0, 0); - return succes; + return success; } #pragma code(code) diff --git a/include/bank_minimal.h b/include/bank_minimal.h index 6cb6139..bf239d1 100644 --- a/include/bank_minimal.h +++ b/include/bank_minimal.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/banking.c b/include/banking.c index 71b9d47..38eac9c 100644 --- a/include/banking.c +++ b/include/banking.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -107,7 +107,7 @@ struct Directory cwd; char getcurrentdevice() // Return last used device number for IO operations. Default on 8 if still zero. { - // Feading zeropage address containg current device number ($BA) + // Feading zeropage address containing current device number ($BA) char curunit = *(char *)0xba; // Default on 8 if still zero @@ -141,7 +141,7 @@ void bnk_init() // Set 8Kb shared memory size // So set MMU Ram Configuration Register at: // - bit 0-1: %10 for 8 KB common RAM - // - bit 2-3: %01 for bootom of RAM bank 0 is common + // - bit 2-3: %01 for bottom of RAM bank 0 is common // - bit 7: $0 for VIC RAM in bank 0 xmmu.rcr = 0x06; @@ -151,12 +151,12 @@ void bnk_init() } void bnk_exit() -// Retsore to default situtation for shared memory +// Retsore to default situation for shared memory { // Set 8Kb shared memory size // So set MMU Ram Configuration Register at: // - bit 0-1: %00 for 1 KB common RAM - // - bit 2-3: %01 for bootom of RAM bank 0 is common + // - bit 2-3: %01 for bottom of RAM bank 0 is common // - bit 7: $0 for VIC RAM in bank 0 xmmu.rcr = 0x04; } @@ -272,7 +272,7 @@ void bnk_cpyfromvdc(char dcr, volatile char *dp, unsigned vdcsrc, unsigned size) void bnk_redef_charset(unsigned vdcdest, char scr, volatile char *sp, unsigned size) // Function to copy charset definition from normal memory to VDC -// Input: Source normal memory address and bank config where charset defintion resides, +// Input: Source normal memory address and bank config where charset definition resides, // Destination address in VDC memory, // Numbers of characters to redefine. // Takes charset definition of 8 bytes per character as input. @@ -321,7 +321,7 @@ void freeDir() } void dir_close(char lfn) -// Closse a directory opened for reading +// Close a directory opened for reading { // Reset channels krnio_clrchn(); @@ -374,7 +374,7 @@ char dir_open(char lfn, unsigned char device) } } - // Return error code or 0 on succcess + // Return error code or 0 on success return error; } @@ -768,14 +768,14 @@ bool bnk_load(char device, char bank, const char *start, const char *fname) bool bnk_save(char device, char bank, const char *start, const char *end, const char *fname) // Save from the specified bank { - char succes; + char success; krnio_setbnk(bank, 0); krnio_setnam(fname); - succes = krnio_save(device, start, end); + success = krnio_save(device, start, end); krnio_setbnk(0, 0); - return succes; + return success; } int bnk_io_read(char fnum, char cr, char * data, int num) diff --git a/include/banking.h b/include/banking.h index 99bc49c..29d2970 100644 --- a/include/banking.h +++ b/include/banking.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/defines.h b/include/defines.h index 5f9b27a..ee4007c 100644 --- a/include/defines.h +++ b/include/defines.h @@ -5,7 +5,7 @@ #define MACOSTART 0x1300 // Start of machine code area #define MACOSIZE 0x0800 // Length of machine code area -/* Bank 0 save data adress mapping */ +/* Bank 0 save data address mapping */ #define OVERLAYBANK0 0xC000 // Start address overlay storage bank 0 /* Bank 1 memory addresses mapping */ diff --git a/include/peekpoke.h b/include/peekpoke.h index 23c666a..f21bfe6 100644 --- a/include/peekpoke.h +++ b/include/peekpoke.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/vdc_core.c b/include/vdc_core.c index cfdba52..996b640 100644 --- a/include/vdc_core.c +++ b/include/vdc_core.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -182,7 +182,7 @@ void vdc_set_multab() } char vdc_set_mode(char mode) -// Function to set one of the preset VDC modes. Returns 1=succes, 0=fail. +// Function to set one of the preset VDC modes. Returns 1=success, 0=fail. { char index = 0; unsigned val; @@ -391,7 +391,7 @@ void vdc_scroll_copy(unsigned dest, unsigned src, char lines, char length) } void vdc_wipe_mem() -// Function to wipe VDC memory to avoid visible screen corruption on VDC mem lauout change +// Function to wipe VDC memory to avoid visible screen corruption on VDC mem layout change { unsigned address = 0; @@ -496,7 +496,7 @@ void vdc_prints_attr(char x, char y, const char *string, char attr) unsigned address = vdc_coords(x, y); char len = strlen(string); - // Check for legth. Return if 0 and use printc in case of only one char + // Check for length. Return if 0 and use printc in case of only one char if(!len) { return; diff --git a/include/vdc_core.h b/include/vdc_core.h index 0a22a6c..be400af 100644 --- a/include/vdc_core.h +++ b/include/vdc_core.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/vdc_menu.c b/include/vdc_menu.c index d4e5412..9e5620b 100644 --- a/include/vdc_menu.c +++ b/include/vdc_menu.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -129,7 +129,7 @@ void menu_placeheader(const char *header) } void menu_placebar(char y) -// Place main meny bar at given line ycoord +// Place main menu bar at given line ycoord { char xcoord = 1; char len; diff --git a/include/vdc_menu.h b/include/vdc_menu.h index a6390c4..098d62e 100644 --- a/include/vdc_menu.h +++ b/include/vdc_menu.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -77,9 +77,9 @@ THE PROGRAMS ARE DISTRIBUTED IN THE HOPE THAT THEY WILL BE USEFUL, BUT WITHOUT A // Define // Set these for menubar and pulldown menu dimensions #define VDC_MENUBAR_MAXOPTIONS 5 // Number of options in main menu bar -#define VDC_MENUBAR_MAXLENGTH 12 // Maxiumum length of main menu bar option names +#define VDC_MENUBAR_MAXLENGTH 12 // Maximum length of main menu bar option names #define VDC_PULLDOWN_NUMBER 8 // Number of pull down menus defined -#define VDC_PULLDOWN_MAXOPTIONS 6 // Maximum number of options for pull down meus +#define VDC_PULLDOWN_MAXOPTIONS 6 // Maximum number of options for pull down menus #define VDC_PULLDOWN_MAXLENGTH 16 // Maximum length of pull down menu option names // Set default colours and styles to use diff --git a/include/vdc_nobnk.c b/include/vdc_nobnk.c index b7bfd2c..7e0a77a 100644 --- a/include/vdc_nobnk.c +++ b/include/vdc_nobnk.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -185,7 +185,7 @@ void vdc_set_multab() } char vdc_set_mode(char mode) -// Function to set one of the preset VDC modes. Returns 1=succes, 0=fail. +// Function to set one of the preset VDC modes. Returns 1=success, 0=fail. { char index = 0; unsigned val; @@ -294,7 +294,7 @@ unsigned vdc_coords(char x, char y) void vdc_redef_charset(unsigned vdcdest, volatile char *sp, unsigned size) // Function to copy charset definition from normal memory to VDC -// Input: Source normal memory address and bank config where charset defintion resides, +// Input: Source normal memory address and bank config where charset definition resides, // Destination address in VDC memory, // Numbers of characters to redefine. // Takes charset definition of 8 bytes per character as input. @@ -463,7 +463,7 @@ void vdc_scroll_copy(unsigned dest, unsigned src, char lines, char length) } void vdc_wipe_mem() -// Function to wipe VDC memory to avoid visible screen corruption on VDC mem lauout change +// Function to wipe VDC memory to avoid visible screen corruption on VDC mem layout change { unsigned address = 0; @@ -568,7 +568,7 @@ void vdc_prints_attr(char x, char y, const char *string, char attr) unsigned address = vdc_coords(x, y); char len = strlen(string); - // Check for legth. Return if 0 and use printc in case of only one char + // Check for length. Return if 0 and use printc in case of only one char if (!len) { return; diff --git a/include/vdc_nobnk.h b/include/vdc_nobnk.h index 791e174..05d86eb 100644 --- a/include/vdc_nobnk.h +++ b/include/vdc_nobnk.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/vdc_win.c b/include/vdc_win.c index 0061d3e..6472acd 100644 --- a/include/vdc_win.c +++ b/include/vdc_win.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -266,7 +266,7 @@ static inline char p2s(char ch) } static inline char s2p(char ch) -// Screencode to PETSCII converion +// Screencode to PETSCII conversion { return ch ^ s2pmap[ch >> 5]; } @@ -1140,7 +1140,7 @@ void vdcwin_win_free() void vdcwin_viewport_init(struct VDCViewport *vp, char sourcebank, char *sourcebase, unsigned sourcewidth, unsigned sourceheight, unsigned viewwidth, unsigned viewheight, char viewsx, char viewsy) // Initialize a viewport of screen data in memory -// Inpuut: Viewport struct to use, source bank and basem source dimensions, view window start coord and dimensions +// Input: Viewport struct to use, source bank and basem source dimensions, view window start coord and dimensions { vp->sourcebank = sourcebank; vp->sourcebase = sourcebase; @@ -1155,7 +1155,7 @@ void vdcwin_cpy_viewport(struct VDCViewport *viewport) // Function to copy a viewport on the source screen map to the VDC // Input: Initialised viewport struct { - // Charachters + // Characters unsigned vdcbase = viewport->view.sp; char *address = viewport->sourcebase + (viewport->sourceyoffset * viewport->sourcewidth) + viewport->sourcexoffset; diff --git a/include/vdc_win.h b/include/vdc_win.h index 0f1d60f..2d019a3 100644 --- a/include/vdc_win.h +++ b/include/vdc_win.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/include/vdcwin_nobnk.c b/include/vdcwin_nobnk.c index 9c2fa78..b77bd3e 100644 --- a/include/vdcwin_nobnk.c +++ b/include/vdcwin_nobnk.c @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. @@ -256,7 +256,7 @@ static inline char p2s(char ch) } static inline char s2p(char ch) -// Screencode to PETSCII converion +// Screencode to PETSCII conversion { return ch ^ s2pmap[ch >> 5]; } @@ -935,7 +935,7 @@ void vdcwin_printwrap(struct VDCWin *win, const char *str) void vdcwin_viewport_init(struct VDCViewport *vp, char *sourcebase, unsigned sourcewidth, unsigned sourceheight, unsigned viewwidth, unsigned viewheight, char viewsx, char viewsy) // Initialize a viewport of screen data in memory -// Inpuut: Viewport struct to use and base source dimensions, view window start coord and dimensions +// Input: Viewport struct to use and base source dimensions, view window start coord and dimensions { vp->sourcebase = sourcebase; vp->sourcewidth = sourcewidth; @@ -949,7 +949,7 @@ void vdcwin_cpy_viewport(struct VDCViewport *viewport) // Function to copy a viewport on the source screen map to the VDC // Input: Initialised viewport struct { - // Charachters + // Characters unsigned vdcbase = viewport->view.sp; char *address = viewport->sourcebase + (viewport->sourceyoffset * viewport->sourcewidth) + viewport->sourcexoffset; @@ -1012,7 +1012,7 @@ void vdcwin_viewportscroll(struct VDCViewport *viewport, char direction) } char vdc_softscroll_init(struct VDCSoftScrollSettings *settings, char mode) -// Initialisize virtual screen for softscroll. Returns 1 on succes, 0 in fail +// Initialisize virtual screen for softscroll. Returns 1 on success, 0 in fail { unsigned vdcsize = settings->width * settings->height; unsigned sourcesize = vdcsize + vdcsize + 48; @@ -1033,7 +1033,7 @@ char vdc_softscroll_init(struct VDCSoftScrollSettings *settings, char mode) vdc_state.disp_skip = settings->width - vdc_state.width; vdc_set_multab(); - // Set up virtual sceen and copy contents to it + // Set up virtual screen and copy contents to it vdc_cls(); vdc_set_charset_address(vdc_state.char_std); vdc_restore_charsets(); diff --git a/include/vdcwin_nobnk.h b/include/vdcwin_nobnk.h index 9f4a98b..68abca4 100644 --- a/include/vdcwin_nobnk.h +++ b/include/vdcwin_nobnk.h @@ -13,7 +13,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/src/bootsect.c b/src/bootsect.c index 8c69ee1..8d43aa7 100644 --- a/src/bootsect.c +++ b/src/bootsect.c @@ -1,7 +1,7 @@ /* Oscar64 VDC Demo -Testing and demonstrating my C128 VDC functions for the Oscar64 C compiller +Testing and demonstrating my C128 VDC functions for the Oscar64 C compiler Written in 2024 by Xander Mol @@ -31,7 +31,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - Screens used in the demo made with my own VDC Screen Editor. diff --git a/src/main.c b/src/main.c index dfaa580..880597d 100644 --- a/src/main.c +++ b/src/main.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf @@ -387,7 +387,7 @@ void loadoverlay(char overlay_select) { // Load memory overlay with given number - // Returns if overlay allready active + // Returns if overlay already active if (overlay_select != overlay_active) { overlay_active = overlay_select; @@ -1660,7 +1660,7 @@ char import_dialogue(char mode, const char *message) if (!mode) { - vdc_prints(21, yc++, "Includes load addres at first 2 bytes?"); + vdc_prints(21, yc++, "Includes load address at first 2 bytes?"); importvars.loadaddr = menu_pulldown(25, yc, VDC_MENU_YESNO, 0); vdc_prints(21, yc++, pulldown_titles[VDC_MENU_YESNO][importvars.loadaddr - 1]); @@ -2064,7 +2064,7 @@ int main(void) plotcursor(); break; - // Character eddit mode + // Character edit mode case 'e': loadoverlay(4); chareditor(); diff --git a/src/overlay1.c b/src/overlay1.c index 67e83f6..6a49820 100644 --- a/src/overlay1.c +++ b/src/overlay1.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf diff --git a/src/overlay2.c b/src/overlay2.c index 09e7899..7baae2b 100644 --- a/src/overlay2.c +++ b/src/overlay2.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf diff --git a/src/overlay3.c b/src/overlay3.c index 4779999..88599fb 100644 --- a/src/overlay3.c +++ b/src/overlay3.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf diff --git a/src/overlay4.c b/src/overlay4.c index d9ca2c6..f4f1035 100644 --- a/src/overlay4.c +++ b/src/overlay4.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf diff --git a/src/overlay5.c b/src/overlay5.c index 5779616..2436f8d 100644 --- a/src/overlay5.c +++ b/src/overlay5.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf @@ -106,7 +106,7 @@ char importread(char device, const char *filename) // Open file and return status status = krnio_open(1, device, 2); - // If open is succesful, read contents + // If open is successful, read contents if (status) { // Skip loadddress if asked diff --git a/src/overlay6.c b/src/overlay6.c index 4d10aaf..71a5417 100644 --- a/src/overlay6.c +++ b/src/overlay6.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf @@ -494,7 +494,7 @@ void import_seq() // Open file and return status status = krnio_open(1, targetdevice, 2); - // If open is succesful, read contents + // If open is successful, read contents if (status) { // Open file for inout @@ -596,7 +596,7 @@ void export_seq() // Open file and return status status = krnio_open(1, targetdevice, 2); - // If open is succesful, read contents + // If open is successful, read contents if (status) { vdc_prints(21, 13, "Exporting data to disk."); diff --git a/src/prg_gen.c b/src/prg_gen.c index 85c466f..ee3aeb7 100644 --- a/src/prg_gen.c +++ b/src/prg_gen.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf @@ -71,7 +71,7 @@ BUT WITHOUT ANY WARRANTY. USE THEM AT YOUR OWN RISK! #include "vdcwin_nobnk.h" #include "bank_minimal.h" -// Viewer data addess. Align with the address of the view struct in view.c +// Viewer data address. Align with the address of the view struct in view.c #define VIEW 0x1c80 #define BASICSTART 0x1c01 #define MEMSTART 0x4600 @@ -387,7 +387,7 @@ void freeDir() } void dir_close(char lfn) -// Closse a directory opened for reading +// Close a directory opened for reading { // Reset channels krnio_clrchn(); @@ -440,7 +440,7 @@ char dir_open(char lfn, unsigned char device) } } - // Return error code or 0 on succcess + // Return error code or 0 on success return error; } diff --git a/src/view.c b/src/view.c index c267746..d7a6d41 100644 --- a/src/view.c +++ b/src/view.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf @@ -119,7 +119,7 @@ void check_charsets() } char right_check() -// Check right boundery +// Check right boundary { if (softscroll.hscroll > 5) { @@ -132,7 +132,7 @@ char right_check() } char down_check() -// Check down boundery +// Check down boundary { if (softscroll.vscroll == 6) { @@ -145,7 +145,7 @@ char down_check() } char left_check() -// Check right boundery +// Check right boundary { if (softscroll.hscroll == softscroll.hscroll_def) { @@ -158,7 +158,7 @@ char left_check() } char up_check() -// Check down boundery +// Check down boundary { if (softscroll.vscroll == 0) { diff --git a/src/visualpetscii.c b/src/visualpetscii.c index 483aee9..999a017 100644 --- a/src/visualpetscii.c +++ b/src/visualpetscii.c @@ -12,7 +12,7 @@ Code and resources from others used: https://github.com/drmortalwombat/oscar64 - Many thanks also to https://github.com/drmortalwombat to provide extrordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. + Many thanks also to https://github.com/drmortalwombat to provide extraordinary support and tips for making this and adapting Oscar64 to my needs faster than I could ask it. - C128 Programmers Reference Guide: For the basic VDC register routines and VDC code inspiration http://www.zimmers.net/anonftp/pub/cbm/manuals/c128/C128_Programmers_Reference_Guide.pdf