Merge pull request #435 from boriel/bugfix/input_cursor_bad_position

Prevents cursor misplacement

Author: boriel

src/arch/zx48k/library/input.bas

@@ -72,19 +72,25 @@ END FUNCTION
 ' Function 'PRIVATE' to this module.
 ' Shows a flashing cursor
 ' ------------------------------------------------------------------
-SUB FASTCALL PRIVATEInputShowCursor
+SUB PRIVATEInputShowCursor
     REM Print a Flashing cursor at current print position
-    PRINT AT csrlin(), pos(); OVER 0; FLASH 1; " " + CHR$(8);
+    DIM x, y as UBYTE
+    y = csrlin()
+    x = pos()
+    PRINT AT y, x; OVER 0; FLASH 1; " "; AT y, x;
 END SUB
 
 
 ' ------------------------------------------------------------------
 ' Function 'PRIVATE' to this module.
 ' Hides the flashing cursor
 ' ------------------------------------------------------------------
-SUB FASTCALL PRIVATEInputHideCursor
+SUB PRIVATEInputHideCursor
     REM Print a Flashing cursor at current print position
-    PRINT AT csrlin(), pos(); OVER 0; FLASH 0; " " + CHR$(8);
+    DIM x, y as UBYTE
+    y = csrlin()
+    x = pos()
+    PRINT AT y, x; OVER 0; FLASH 0; " "; AT y, x;
 END SUB
 
 #endif

src/arch/zxnext/library/input.bas

@@ -72,19 +72,25 @@ END FUNCTION
 ' Function 'PRIVATE' to this module.
 ' Shows a flashing cursor
 ' ------------------------------------------------------------------
-SUB FASTCALL PRIVATEInputShowCursor
+SUB PRIVATEInputShowCursor
     REM Print a Flashing cursor at current print position
-    PRINT AT csrlin(), pos(); OVER 0; FLASH 1; " " + CHR$(8);
+    DIM x, y as UBYTE
+    y = csrlin()
+    x = pos()
+    PRINT AT y, x; OVER 0; FLASH 1; " "; AT y, x;
 END SUB
 
 
 ' ------------------------------------------------------------------
 ' Function 'PRIVATE' to this module.
 ' Hides the flashing cursor
 ' ------------------------------------------------------------------
-SUB FASTCALL PRIVATEInputHideCursor
+SUB PRIVATEInputHideCursor
     REM Print a Flashing cursor at current print position
-    PRINT AT csrlin(), pos(); OVER 0; FLASH 0; " " + CHR$(8);
+    DIM x, y as UBYTE
+    y = csrlin()
+    x = pos()
+    PRINT AT y, x; OVER 0; FLASH 0; " "; AT y, x;
 END SUB
 
 #endif