remove superfluous ".code" line

[cc65] / libsrc / tgi / tgi_textstyle.s

diff --git a/libsrc/tgi/tgi_textstyle.s b/libsrc/tgi/tgi_textstyle.s
index 2f7c2bcface5c219ac4d46f3f2a740df491b8679..47a58a38012287440c46a30c27f503288690befe 100644 (file)
--- a/libsrc/tgi/tgi_textstyle.s
+++ b/libsrc/tgi/tgi_textstyle.s
@@ -1,43 +1,100 @@
 ;
-; Ullrich von Bassewitz, 22.06.2002
+; Ullrich von Bassewitz, 2009-10-30
 ;
-; void __fastcall__ tgi_textstyle (unsigned char magx, unsigned char magy,
-;                                  unsigned char dir);
-; /* Set the style for text output. */
 
 
         .include        "tgi-kernel.inc"
 
-        .import         popax, incsp2
+        .import         popa, popax
+
+
+;-----------------------------------------------------------------------------
+; Calculate either the total height or the total width of a bitmapped
+; character, depending on the value in Y. On entry, X contains the scaling
+; factor. Since it is usually small, we multiplicate by doing repeated adds.
+; The function returns zero in X and the calculated value in A.
+
+.proc   charsize_helper
+
+        lda     _tgi_fontwidth,y
+        jmp     @L2
+@L1:    clc
+        adc     _tgi_fontwidth,y
+@L2:    dex
+        bne     @L1
+        sta     _tgi_charwidth,y
+        rts
+
+.endproc
+
+;-----------------------------------------------------------------------------
+; void __fastcall__ tgi_textstyle (unsigned width, unsigned height,
+;                                  unsigned char dir, unsigned char font);
+; /* Set the style for text output. The scaling factors for width and height
+;  * are 8.8 fixed point values. This means that $100 = 1 $200 = 2 etc.
+;  * dir is one of the TGI_TEXT_XXX constants. font is one of the TGI_FONT_XXX
+;  * constants.
+;  */
+;
 
 .proc   _tgi_textstyle
 
-        pha
-        jsr     popax                   ; Get magx/magy in one call
-        tay
-        pla
+        sta     _tgi_font               ; Remember the font to use
+        jsr     popa
+        sta     _tgi_textdir            ; Remember the direction
 
-; A = textdir, X = textmagx, Y = textmagy
+; Pop the height and run directly into tgi_textscale
 
-        cmp     #TGI_TEXT_HORIZONTAL
-        beq     DirOk
-        cmp     #TGI_TEXT_VERTICAL
-        beq     DirOk
-Fail:   jmp     tgi_inv_arg             ; Invalid argument
-DirOk:  cpy     #$00
-        beq     Fail                    ; Cannot have magnification of zero
-        cpx     #$00
-        beq     Fail                    ; Cannot have magnification of zero
+        jsr     popax
+
+.endproc
 
-; Parameter check ok, store them
+;-----------------------------------------------------------------------------
+; void __fastcall__ tgi_textscale (unsigned width, unsigned height);
+; /* Set the scaling for text output. The scaling factors for width and height
+;  * are 8.8 fixed point values. This means that $100 = 1 $200 = 2 etc.
+;  */
 
-        stx     _tgi_textmagx
-        sty     _tgi_textmagy
-        sta     _tgi_textdir
+.proc   _tgi_textscale
 
-; Call the driver, parameters are passed in registers
+; The height value is in 8.8 fixed point. Store it and calculate a rounded
+; value for scaling the bitmapped system font in the driver.
 
+        sta     _tgi_textscaleh+0
+        stx     _tgi_textscaleh+1
+        asl     a                       ; Check value behind comma
+        bcc     @L1
+        inx                             ; Round
+@L1:    stx     _tgi_textscaleh+2       ; Store rounded value
+
+; Calculate the total height of the bitmapped font and remember it.
+
+        ldy     #1
+        jsr     charsize_helper
+
+; The width value is in 8.8 fixed point. Store it and calculate a rounded
+; value for scaling the bitmapped system font in the driver.
+
+        jsr     popax                   ; height
+        sta     _tgi_textscalew+0
+        stx     _tgi_textscalew+1
+        asl     a                       ; Check value behind comma
+        bcc     @L2
+        inx                             ; Round
+@L2:    stx     _tgi_textscalew+2       ; Store rounded value
+
+; Calculate the total width of the bitmapped font and remember it.
+
+        ldy     #0
+        jsr     charsize_helper
+
+; Load values and call the driver, parameters are passed in registers
+
+        ldx     _tgi_textscalew+2
+        ldy     _tgi_textscaleh+2
+        lda     _tgi_textdir
         jmp     tgi_textstyle
 
 .endproc
 
+