changeset 2165:01d37afeb71e

Fixed flaw in making window descriptors
author boisy
date Thu, 22 May 2008 03:42:16 +0000
parents 5c72f810e5d5
children 82f372a8dec9
files level2/modules/w.asm level2/modules/w1.asm level2/modules/w10.asm level2/modules/w11.asm level2/modules/w12.asm level2/modules/w13.asm level2/modules/w14.asm level2/modules/w15.asm level2/modules/w2.asm level2/modules/w3.asm level2/modules/w4.asm level2/modules/w5.asm level2/modules/w6.asm level2/modules/w7.asm level2/modules/w8.asm level2/modules/w9.asm
diffstat 16 files changed, 31 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/level2/modules/w.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   0          number of columns for display
 szy      set   0          number for rows for display
-wnum     set   $FF        window number
 sty      set   0          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   $FF        window number
          fcb   $00        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
--- a/level2/modules/w1.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w1.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   27         number of columns for display
 szy      set   11         number for rows for display
-wnum     set   1          window number
 sty      set   1          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   1          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W1/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w10.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w10.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   10         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W10/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w11.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w11.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   11         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W11/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w12.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w12.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   12         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W12/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w13.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w13.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   13         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W13/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w14.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w14.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   14         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W14/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w15.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w15.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   15         window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W15/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w2.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w2.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   12         number of columns for display
 szy      set   11         number for rows for display
-wnum     set   2          window number
 sty      set   $FF        window type
 cpx      set   28         x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   2          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W2/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w3.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w3.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   40         number of columns for display
 szy      set   12         number for rows for display
-wnum     set   3          window number
 sty      set   $FF        window type
 cpx      set   0          x cursor position
 cpy      set   12         y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   3          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W3/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w4.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w4.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   60         number of columns for display
 szy      set   11         number for rows for display
-wnum     set   4          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   4          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W4/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w5.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w5.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   19         number of columns for display
 szy      set   11         number for rows for display
-wnum     set   5          window number
 sty      set   $FF        window type
 cpx      set   61         x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   5          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W5/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w6.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w6.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   12         number for rows for display
-wnum     set   6          window number
 sty      set   $FF        window type
 cpx      set   0          x cursor position
 cpy      set   12         y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   6          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W6/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w7.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w7.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   7          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W7/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w8.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w8.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   8          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W8/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/
 
--- a/level2/modules/w9.asm	Wed May 21 21:55:08 2008 +0000
+++ b/level2/modules/w9.asm	Thu May 22 03:42:16 2008 +0000
@@ -23,7 +23,6 @@
 * Window descriptor definitions
 szx      set   80         number of columns for display
 szy      set   24         number for rows for display
-wnum     set   7          window number
 sty      set   2          window type
 cpx      set   0          x cursor position
 cpy      set   0          y cursor position
@@ -64,7 +63,7 @@
          fcb   $00        acia xoff char
          fcb   szx        (szx) number of columns for display
          fcb   szy        (szy) number of rows for display
-         fcb   wnum       window number
+         fcb   9          window number
          fcb   $01        data in rest of descriptor valid
          fcb   sty        (sty) window type
          fcb   cpx        (cpx) x cursor position
@@ -74,8 +73,7 @@
          fcb   prn3       (prn3) border color
 initsize equ   *
 
-name     fcc   /W/
-         fcb   176+wnum
+name     fcs   /W9/
 mgrnam   fcs   /SCF/
 drvnam   fcs   /VTIO/