From f63fe7829fdf1bf938d246d933953a0934ac9202 Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Sun, 20 Jun 2021 19:43:16 -0400 Subject: [PATCH] EDIT/ATTACHER: Fix to corner case drawing bug in file_ui() --- apps/attacher.c | 2 ++ apps/edit.c | 4 +++- apps/edithelp1.txt | 2 +- apps/email_common.h | 2 +- apps/print65.c | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/attacher.c b/apps/attacher.c index f12c5d8..741dc48 100644 --- a/apps/attacher.c +++ b/apps/attacher.c @@ -335,6 +335,8 @@ struct tabent { */ void file_ui_draw(uint16_t i, uint16_t first, uint16_t selected, uint16_t entries) { struct tabent *entry; + if (i < first) + return; gotoxy(5, i - first + 6); if (i < entries) { entry = (struct tabent*)iobuf + i; diff --git a/apps/edit.c b/apps/edit.c index 825bfcf..ddc4085 100644 --- a/apps/edit.c +++ b/apps/edit.c @@ -1891,7 +1891,7 @@ void init_aux_banks(void) { uint16_t count; clrscr(); revers(1); - cprintf("EDIT.SYSTEM v1.28 Bobbi 2021"); + cprintf("EDIT.SYSTEM v1.29 Bobbi 2021"); revers(0); cprintf("\n\n\n %u x 64KB aux banks -> %uKB\n", banktbl[0], banktbl[0]*64); for (i = 1; i <= banktbl[0]; ++i) { @@ -2044,6 +2044,8 @@ struct tabent { */ void file_ui_draw(uint16_t i, uint16_t first, uint16_t selected, uint16_t entries) { struct tabent *entry; + if (i < first) + return; gotoxy(5, i - first + 6); if (i < entries) { entry = (struct tabent*)iobuf + i; diff --git a/apps/edithelp1.txt b/apps/edithelp1.txt index e299b1a..31275e4 100644 --- a/apps/edithelp1.txt +++ b/apps/edithelp1.txt @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - v1.28 }}} EDIT.SYSTEM HELP }}} Page One + v1.29 }}} EDIT.SYSTEM HELP }}} Page One --------------------------------------+----------------------------------------- Navigation: | Editing: Cursor keys Move the cursor | [Return] Split line diff --git a/apps/email_common.h b/apps/email_common.h index 8aea473..da51e55 100644 --- a/apps/email_common.h +++ b/apps/email_common.h @@ -6,7 +6,7 @@ #include -#define PROGNAME "emai//er v2.1.6" +#define PROGNAME "emai//er v2.1.7" // Configuration params from EMAIL.CFG char cfg_server[40]; // IP of POP3 server diff --git a/apps/print65.c b/apps/print65.c index a92b36f..cd832cd 100644 --- a/apps/print65.c +++ b/apps/print65.c @@ -299,6 +299,7 @@ void main(int argc, char *argv[]) { printf("Ok\n\n"); } + printf("Sending to printer "); if (!w5100_tcp_send()) { error_exit(); }