From: ol.sc <ol.sc@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 19 Oct 2012 06:53:55 +0000 (+0000)
Subject: Removed cpputs/cpputsxy as they don't work and as there's really very little use... 
X-Git-Tag: V2.14~214
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=17659555f8329e1a01b632cdd5ed299c93ebfbcd;p=cc65

Removed cpputs/cpputsxy as they don't work and as there's really very little use for proprietary extensions of a character API emulated on a graphics systems.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5860 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/doc/geos.sgml b/doc/geos.sgml
index d980414f0..8a5a948a1 100644
--- a/doc/geos.sgml
+++ b/doc/geos.sgml
@@ -39,9 +39,7 @@ than 1541, 1571 or 1581. RAM drives emulating these should work.
 <p>
 <tt/conio/ - simple console input-output is available for command line applications.
 This implementation assumes that one character does fit in 8x8 cell, so output with
-default BSW font, which is has 9 points, might be a bit messy.
-<tt/cputs/ does output characters with fixed width, for proportional spacing use
-<tt/cpputs/ but this function does not update cursor. There is no color support in
+default BSW font, which is has 9 points, might be a bit messy. There is no color support in
 GEOS 2.0 so color functions are disabled. Both 40 and 80 column modes are supported
 and automatically detected.
 <p>
@@ -317,16 +315,6 @@ This function tests if the given pixel is set and returns <tt/true/ (non-zero) o
 
 <sect2>Character and string output
 
-<sect3>cpputs
-<p>
-<tt/cpputsxy (char x, char y, char *myString)/
-<p>
-<tt/cpputs (char *myString)/
-<p>
-Actually this is a part of <tt/conio/, but this function is non-standard. It is
-a variation of <tt/cputs/ that outputs the string with proportional spacing, not
-fixed like <tt/cputs/.
-
 <sect3>PutChar
 <p>
 <tt/void PutChar (char character, char y, unsigned x)/
diff --git a/include/geos/ggraph.h b/include/geos/ggraph.h
index f28199760..d8d2fbf3d 100644
--- a/include/geos/ggraph.h
+++ b/include/geos/ggraph.h
@@ -11,9 +11,6 @@
 #include <geos/gstruct.h>
 #endif
 
-void __fastcall__ cpputs(char *s);
-void __fastcall__ cpputsxy(unsigned x, unsigned y, char *s);
-
 void __fastcall__ SetPattern(char newpattern);
 
 void __fastcall__ HorizontalLine(char pattern, char y, unsigned xstart, unsigned xend);
diff --git a/libsrc/geos-common/conio/Makefile b/libsrc/geos-common/conio/Makefile
index 2a8eac50c..106754541 100644
--- a/libsrc/geos-common/conio/Makefile
+++ b/libsrc/geos-common/conio/Makefile
@@ -11,7 +11,6 @@ S_OBJS +=	_scrsize.o	\
 		chline.o	\
 		clrscr.o	\
 		color.o		\
-		cpputs.o	\
 		cputc.o		\
 		cursor.o	\
 		cvline.o	\
diff --git a/libsrc/geos-common/conio/cpputs.s b/libsrc/geos-common/conio/cpputs.s
deleted file mode 100644
index be81dcf05..000000000
--- a/libsrc/geos-common/conio/cpputs.s
+++ /dev/null
@@ -1,43 +0,0 @@
-;
-; Maciej 'YTM/Elysium' Witkowiak
-;
-; 27.10.2001
-; 05.03.2002
-
-; void cpputsxy (unsigned char x, unsigned char y, char* s);
-; void cpputs (char* s);
-
-; same as cputsxy and cputs but faster and use proportional font spacing
-; does not update cursor position
-
-	    .export _cpputsxy, _cpputs
-	    .import _gotoxy
-	    .import popa
-	    .importzp cursor_x, cursor_y
-
-	    .include "const.inc"
-	    .include "geossym.inc"
-	    .include "jumptab.inc"
-
-_cpputsxy:
-	sta r0L			; Save s for later
-	stx r0H
-	jsr popa		; Get Y
-	jsr _gotoxy		; Set cursor, pop x
-	jmp L0			; Same as cputs...
-
-_cpputs:
-	sta r0L			; Save s
-	stx r0H
-L0:	ldy #0
-	lda (r0),y
-	bne L1			; Jump if there's something
-	rts
-
-L1:	lda cursor_x
-	sta r11L
-	lda cursor_x+1
-	sta r11H
-	lda cursor_y
-	sta r1H
-	jmp PutString