fixed bug in DrawLine function; extended DrawLine behavior

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

diff --git a/doc/geos.sgml b/doc/geos.sgml
index 61e4f837ebc612f629a025df3dd8dbd1a621d259..2c38256dedd02defd057d8ec98813cdda8d94505 100644 (file)
--- a/doc/geos.sgml
+++ b/doc/geos.sgml
@@ -278,10 +278,13 @@ number as set in <tt/SetPattern/ but a true bit pattern.
 
 <sect3>DrawLine
 <p>
-<tt/void DrawLine (struct window *myWindow)/
+<tt/void DrawLine (char mode, struct window *myWindow)/
 <p>
 <tt/top/ parameters of <tt/struct window/ describe the starting point of the line, while
-<tt/bottom/ are for the ending point. Current pattern from <tt/SetPattern/ is used for drawing.
+<tt/bottom/ are for the ending point. If <tt/mode/ is <tt/DRAW_DRAW/ then current pattern from
+<tt/SetPattern/ is used for drawing. If <tt/mode/ is <tt/DRAW_ERASE/ then line is erased from the
+screen. If <tt/mode/ is <tt/DRAW_COPY/ then line is copied from/to back/frontbuffer, according to
+<tt/dispBufferOn/ setting.
 
 <sect2>Point Functions
 <p>

diff --git a/include/geos/ggraph.h b/include/geos/ggraph.h
index 6171cf61d146184e06b6ccee5f7e1c5c090dee32..9a81b718119f825011e063e0b30c7dde1d258b69 100644 (file)
--- a/include/geos/ggraph.h
+++ b/include/geos/ggraph.h
@@ -30,7 +30,7 @@ void __fastcall__ InvertRectangle(void);
 void __fastcall__ ImprintRectangle(void);
 void __fastcall__ RecoverRectangle(void);
 
-void __fastcall__ DrawLine(struct window *topBotCoords);
+void __fastcall__ DrawLine(char mode, struct window *topBotCoords);
 
 void __fastcall__ DrawPoint(struct pixel *myPixel);
 char __fastcall__ TestPoint(struct pixel *myPixel);
@@ -166,10 +166,14 @@ void __fastcall__ GraphicsString(char *myGfxString);
 /* justification */
 #define        SET_RIGHTJUST   0
 #define        SET_LEFTJUST    0x80
-/* C128 x flags */
+/* C128 x-extension flags */
 #define        ADD1_W          0x2000
 #define        DOUBLE_B        0x80
 #define        DOUBLE_W        0x8000
+/* DrawLine mode values */
+#define DRAW_ERASE     0x00
+#define DRAW_DRAW      0x40
+#define DRAW_COPY      0x80
 
 typedef void graphicStr;
 

diff --git a/libsrc/geos/graph/drawline.s b/libsrc/geos/graph/drawline.s
index baa68bce680db119e08655156aeefa935d28c55b..874a58bbd8ec2af967b5d9d06ccd0fe45e5d9a0e 100644 (file)
--- a/libsrc/geos/graph/drawline.s
+++ b/libsrc/geos/graph/drawline.s
@@ -1,12 +1,14 @@
 
 ;
-; Maciej 'YTM/Alliance' Witkowiak
+; Maciej 'YTM/Elysium' Witkowiak
 ;
-; 29.10.99
+; 29.10.99, 15.08.2003
 
-; void DrawLine         (struct window *mywindow);
+; void DrawLine         (char mode, struct window *mywindow);
 
            .import _InitDrawWindow
+           .import popa
+           .importzp tmp1
            .export _DrawLine
 
            .include "../inc/jumptab.inc"
@@ -20,4 +22,7 @@ _DrawLine:
            jsr _InitDrawWindow
            MoveW r2, r11
            PopW r2
+           jsr popa
+           sta tmp1
+           bit tmp1
            jmp DrawLine