From: izydorst Date: Fri, 8 Mar 2002 16:49:31 +0000 (+0000) Subject: conio with fixed width and proortional font support X-Git-Tag: V2.12.0~2435 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=93fd8803c1602d32a04fb03d8645a42b10651220;p=cc65 conio with fixed width and proortional font support git-svn-id: svn://svn.cc65.org/cc65/trunk@1180 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- diff --git a/libsrc/geos/conio/_scrsize.s b/libsrc/geos/conio/_scrsize.s new file mode 100644 index 000000000..ea79357d8 --- /dev/null +++ b/libsrc/geos/conio/_scrsize.s @@ -0,0 +1,31 @@ + +; +; Maciej 'YTM/Elysium' Witkowiak +; +; Screen size variables +; +; 6.3.2001 + + + .include "../inc/geossym.inc" + + .export xsize, ysize + .constructor initscrsize + +.code + +initscrsize: + lda graphMode + bpl L1 + lda #80 ; 80 columns (more or less) + .byte $2c +L1: lda #40 ; 40 columns (more or less) + sta xsize + lda #24 ; something like that for Y size + sta ysize + rts + +.bss + +xsize: .res 1 +ysize: .res 1 diff --git a/libsrc/geos/conio/cchvline.s b/libsrc/geos/conio/cchvline.s deleted file mode 100644 index 3d32196c9..000000000 --- a/libsrc/geos/conio/cchvline.s +++ /dev/null @@ -1,29 +0,0 @@ - -; -; Maciej 'YTM/Elysium' Witkowiak -; -; 27.10.2001 - -; void cclearxy (unsigned char x, unsigned char y, unsigned char length); -; void cclear (unsigned char length); -; void chlinexy (unsigned char x, unsigned char y, unsigned char length); -; void chline (unsigned char length); -; void cvlinexy (unsigned char x, unsigned char y, unsigned char length); -; void cvline (unsigned char length); - - .export _cclearxy, _cclear - .export _chlinexy, _chline - .export _cvlinexy, _cvline - .import popa - -; unimplemented, will do nothing now - -_cclearxy: -_chlinexy: -_cvlinexy: - - jsr popa -_cclear: -_chline: -_cvline: - rts diff --git a/libsrc/geos/conio/cclear.s b/libsrc/geos/conio/cclear.s new file mode 100644 index 000000000..ec68e7a26 --- /dev/null +++ b/libsrc/geos/conio/cclear.s @@ -0,0 +1,47 @@ +; +; Maciej 'YTM/Elysium' Witkowiak +; +; 06.03.2002 + +; void cclearxy (unsigned char x, unsigned char y, unsigned char length); +; void cclear (unsigned char length); + + .include "../inc/jumptab.inc" + .include "../inc/geossym.inc" + .include "../inc/cursor.inc" + + .export _cclearxy, _cclear + .import popa, _gotoxy, fixcursor + +_cclearxy: + pha ; Save the length + jsr popa ; Get y + jsr _gotoxy ; Call this one, will pop params + pla ; Restore the length + +_cclear: + cmp #0 ; Is the length zero? + beq L9 ; Jump if done + tax + lda cursor_x ; left start + sta r3L + lda cursor_x+1 + sta r3L+1 + lda cursor_y ; level + sta r2L + clc + adc #8 + sta r2H + txa ; right end + clc + adc cursor_c + sta cursor_c + sta r4L + ldx #r4 + ldy #3 + jsr DShiftLeft + lda #0 ; pattern + jsr SetPattern + jsr Rectangle + jsr fixcursor +L9: rts diff --git a/libsrc/geos/conio/chline.s b/libsrc/geos/conio/chline.s new file mode 100644 index 000000000..ea431fe3e --- /dev/null +++ b/libsrc/geos/conio/chline.s @@ -0,0 +1,45 @@ +; +; Maciej 'YTM/Elysium' Witkowiak +; +; 06.03.2002 + +; void chlinexy (unsigned char x, unsigned char y, unsigned char length); +; void chline (unsigned char length); + + .include "../inc/jumptab.inc" + .include "../inc/geossym.inc" + .include "../inc/cursor.inc" + + .export _chlinexy, _chline + .import popa, _gotoxy, fixcursor + +_chlinexy: + pha ; Save the length + jsr popa ; Get y + jsr _gotoxy ; Call this one, will pop params + pla ; Restore the length + +_chline: + cmp #0 ; Is the length zero? + beq L9 ; Jump if done + tax + lda cursor_x ; left start + sta r3L + lda cursor_x+1 + sta r3L+1 + lda cursor_y ; level + sec + sbc #4 ; in the middle of a cell + sta r11L + txa ; right end + clc + adc cursor_c + sta cursor_c + sta r4L + ldx #r4 + ldy #3 + jsr DShiftLeft + lda #%11111111 ; pattern + jsr HorizontalLine + jsr fixcursor +L9: rts diff --git a/libsrc/geos/conio/cpputs.s b/libsrc/geos/conio/cpputs.s new file mode 100644 index 000000000..6fc142b4a --- /dev/null +++ b/libsrc/geos/conio/cpputs.s @@ -0,0 +1,45 @@ + +; +; 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 + + .include "../inc/const.inc" + .include "../inc/geossym.inc" + .include "../inc/jumptab.inc" + .include "../inc/cursor.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 diff --git a/libsrc/geos/conio/cvline.s b/libsrc/geos/conio/cvline.s new file mode 100644 index 000000000..e104dfecf --- /dev/null +++ b/libsrc/geos/conio/cvline.s @@ -0,0 +1,46 @@ +; +; Maciej 'YTM/Elysium' Witkowiak +; +; 06.03.2002 + +; void cvlinexy (unsigned char x, unsigned char y, unsigned char length); +; void cvline (unsigned char length); + + .include "../inc/jumptab.inc" + .include "../inc/geossym.inc" + .include "../inc/cursor.inc" + + .export _cvlinexy, _cvline + .import popa, _gotoxy, fixcursor + +_cvlinexy: + pha ; Save the length + jsr popa ; Get y + jsr _gotoxy ; Call this one, will pop params + pla ; Restore the length + +_cvline: + cmp #0 ; Is the length zero? + beq L9 ; Jump if done + tax + lda cursor_x ; x position + clc + adc #4 ; in the middle of cell + sta r4L + lda cursor_x+1 + adc #0 + sta r4L+1 + lda cursor_y ; top start + sta r3L + txa ; bottom end + clc + adc cursor_r + sta cursor_r + sta r3H + asl r3H + asl r3H + asl r3H + lda #%11111111 ; pattern + jsr VerticalLine + jsr fixcursor +L9: rts diff --git a/libsrc/geos/system/ctype.s b/libsrc/geos/system/ctype.s new file mode 100644 index 000000000..4c50e09c1 --- /dev/null +++ b/libsrc/geos/system/ctype.s @@ -0,0 +1,311 @@ +; +; Ullrich von Bassewitz, 02.06.1998 +; +; Character specification table. +; + +; The tables are readonly, put them into the rodata segment + +.rodata + +; Value that must be added to a lower case char to make it an upper case +; char (example: for ASCII, this must be $E0). + + + .export __cdiff + +__cdiff: + .byte $80 + + +; The following 256 byte wide table specifies attributes for the isxxx type +; of functions. Doing it by a table means some overhead in space, but it +; has major advantages: +; +; * It is fast. If it were'nt for the slow parameter passing of cc65, one +; could even define macros for the isxxx functions (this is usually +; done on other platforms). +; +; * It is highly portable. The only unportable part is the table itself, +; all real code goes into the common library. +; +; * We save some code in the isxxx functions. +; +; +; Bit assignments: +; +; 0 - Lower case char +; 1 - Upper case char +; 2 - Numeric digit +; 3 - Hex digit (both, lower and upper) +; 4 - Control character +; 5 - The space character itself +; 6 - Other whitespace (that is: '\f', '\n', '\r', '\t' and '\v') +; 7 - Space or tab character + + +; The table is taken from Craig S. Bruce technical docs for the ACE os + + .export __ctype + +__ctype: + .byte $10 ; 0/00 ___rvs_@___ + .byte $10 ; 1/01 ___rvs_a___ + .byte $10 ; 2/02 ___rvs_b___ + .byte $10 ; 3/03 ___rvs_c___ + .byte $10 ; 4/04 ___rvs_d___ + .byte $10 ; 5/05 ___rvs_e___ + .byte $10 ; 6/06 ___rvs_f___ + .byte $10 ; 7/07 _BEL/rvs_g_ + .byte $10 ; 8/08 ___rvs_h___ + .byte $D0 ; 9/09 _TAB/rvs_i_ + .byte $50 ; 10/0a _BOL/rvs_j_ + .byte $10 ; 11/0b ___rvs_k___ + .byte $10 ; 12/0c ___rvs_l___ + .byte $50 ; 13/0d _CR_/rvs_m_ + .byte $10 ; 14/0e ___rvs_n___ + .byte $10 ; 15/0f ___rvs_o___ + .byte $10 ; 16/10 ___rvs_p___ + .byte $50 ; 17/11 _VT_/rvs_q_ + .byte $10 ; 18/12 ___rvs_r___ + .byte $10 ; 19/13 ___rvs_s___ + .byte $50 ; 20/14 _BS_/rvs_t_ + .byte $10 ; 21/15 ___rvs_u___ + .byte $10 ; 22/16 ___rvs_v___ + .byte $10 ; 23/17 ___rvs_w___ + .byte $10 ; 24/18 ___rvs_x___ + .byte $10 ; 25/19 ___rvs_y___ + .byte $10 ; 26/1a ___rvs_z___ + .byte $10 ; 27/1b ___rvs_[___ + .byte $10 ; 28/1c ___rvs_\___ + .byte $10 ; 29/1d ___rvs_]___ + .byte $10 ; 30/1e ___rvs_^___ + .byte $10 ; 31/1f _rvs_under_ + .byte $A0 ; 32/20 ___SPACE___ + .byte $00 ; 33/21 _____!_____ + .byte $00 ; 34/22 _____"_____ + .byte $00 ; 35/23 _____#_____ + .byte $00 ; 36/24 _____$_____ + .byte $00 ; 37/25 _____%_____ + .byte $00 ; 38/26 _____&_____ + .byte $00 ; 39/27 _____'_____ + .byte $00 ; 40/28 _____(_____ + .byte $00 ; 41/29 _____)_____ + .byte $00 ; 42/2a _____*_____ + .byte $00 ; 43/2b _____+_____ + .byte $00 ; 44/2c _____,_____ + .byte $00 ; 45/2d _____-_____ + .byte $00 ; 46/2e _____._____ + .byte $00 ; 47/2f _____/_____ + .byte $0C ; 48/30 _____0_____ + .byte $0C ; 49/31 _____1_____ + .byte $0C ; 50/32 _____2_____ + .byte $0C ; 51/33 _____3_____ + .byte $0C ; 52/34 _____4_____ + .byte $0C ; 53/35 _____5_____ + .byte $0C ; 54/36 _____6_____ + .byte $0C ; 55/37 _____7_____ + .byte $0C ; 56/38 _____8_____ + .byte $0C ; 57/39 _____9_____ + .byte $00 ; 58/3a _____:_____ + .byte $00 ; 59/3b _____;_____ + .byte $00 ; 60/3c _____<_____ + .byte $00 ; 61/3d _____=_____ + .byte $00 ; 62/3e _____>_____ + .byte $00 ; 63/3f _____?_____ + + .byte $00 ; 64/40 _____@_____ + .byte $09 ; 65/41 _____a_____ + .byte $09 ; 66/42 _____b_____ + .byte $09 ; 67/43 _____c_____ + .byte $09 ; 68/44 _____d_____ + .byte $09 ; 69/45 _____e_____ + .byte $09 ; 70/46 _____f_____ + .byte $01 ; 71/47 _____g_____ + .byte $01 ; 72/48 _____h_____ + .byte $01 ; 73/49 _____i_____ + .byte $01 ; 74/4a _____j_____ + .byte $01 ; 75/4b _____k_____ + .byte $01 ; 76/4c _____l_____ + .byte $01 ; 77/4d _____m_____ + .byte $01 ; 78/4e _____n_____ + .byte $01 ; 79/4f _____o_____ + .byte $01 ; 80/50 _____p_____ + .byte $01 ; 81/51 _____q_____ + .byte $01 ; 82/52 _____r_____ + .byte $01 ; 83/53 _____s_____ + .byte $01 ; 84/54 _____t_____ + .byte $01 ; 85/55 _____u_____ + .byte $01 ; 86/56 _____v_____ + .byte $01 ; 87/57 _____w_____ + .byte $01 ; 88/58 _____x_____ + .byte $01 ; 89/59 _____y_____ + .byte $01 ; 90/5a _____z_____ + .byte $00 ; 91/5b _____[_____ + .byte $00 ; 92/5c _____\_____ + .byte $00 ; 93/5d _____]_____ + .byte $00 ; 94/5e _____^_____ + .byte $00 ; 95/5f _UNDERLINE_ + .byte $00 ; 96/60 _A`_grave__ + .byte $00 ; 97/61 _A'_acute__ + .byte $00 ; 98/62 _A^_circum_ + .byte $00 ; 99/63 _A~_tilde__ + .byte $00 ; 100/64 _A"_dieres_ + .byte $00 ; 101/65 _A__ring___ + .byte $00 ; 102/66 _AE________ + .byte $00 ; 103/67 _C,cedilla_ + .byte $00 ; 104/68 _E`_grave__ + .byte $00 ; 105/69 _E'_acute__ + .byte $00 ; 106/6a _E^_circum_ + .byte $00 ; 107/6b _E"_dieres_ + .byte $00 ; 108/6c _I`_grave__ + .byte $00 ; 109/6d _I'_acute__ + .byte $00 ; 110/6e _I^_circum_ + .byte $00 ; 111/6f _I"_dieres_ + .byte $00 ; 112/70 _D-_Eth_lr_ + .byte $00 ; 113/71 _N~_tilde__ + .byte $00 ; 114/72 _O`_grave__ + .byte $00 ; 115/73 _O'_acute__ + .byte $00 ; 116/74 _O^_circum_ + .byte $00 ; 117/75 _O~_tilde__ + .byte $00 ; 118/76 _O"_dieres_ + .byte $00 ; 119/77 __multiply_ + .byte $00 ; 120/78 _O/_slash__ + .byte $00 ; 121/79 _U`_grave__ + .byte $00 ; 122/7a _U'_acute__ + .byte $00 ; 123/7b _U^_circum_ + .byte $00 ; 124/7c _U"_dieres_ + .byte $00 ; 125/7d _Y'_acute__ + .byte $00 ; 126/7e _cap_thorn_ + .byte $00 ; 127/7f _Es-sed_B__ + + .byte $00 ; 128/80 __bullet___ + .byte $00 ; 129/81 __v_line___ + .byte $00 ; 130/82 __h_line___ + .byte $00 ; 131/83 ___cross___ + .byte $00 ; 132/84 _tl_corner_ + .byte $00 ; 133/85 _tr_corner_ + .byte $00 ; 134/86 _bl_corner_ + .byte $00 ; 135/87 _br_corner_ + .byte $00 ; 136/88 ___l_tee___ + .byte $00 ; 137/89 ___r_tee___ + .byte $00 ; 138/8a ___t_tee___ + .byte $00 ; 139/8b ___b_tee___ + .byte $00 ; 140/8c ___heart___ + .byte $00 ; 141/8d __diamond__ + .byte $00 ; 142/8e ___club____ + .byte $00 ; 143/8f ___spade___ + .byte $00 ; 144/90 _s_circle__ + .byte $00 ; 145/91 __circle___ + .byte $00 ; 146/92 ___pound___ + .byte $10 ; 147/93 _CLS/check_ + .byte $00 ; 148/94 ____pi_____ + .byte $00 ; 149/95 ____+/-____ + .byte $00 ; 150/96 __divide___ + .byte $00 ; 151/97 __degree___ + .byte $00 ; 152/98 _c_checker_ + .byte $00 ; 153/99 _f_checker_ + .byte $00 ; 154/9a _solid_sq__ + .byte $00 ; 155/9b __cr_char__ + .byte $00 ; 156/9c _up_arrow__ + .byte $00 ; 157/9d _down_arro_ + .byte $00 ; 158/9e _left_arro_ + .byte $00 ; 159/9f _right_arr_ + .byte $00 ; 160/a0 _req space_ + .byte $00 ; 161/a1 _!_invertd_ + .byte $00 ; 162/a2 ___cent____ + .byte $00 ; 163/a3 ___pound___ + .byte $00 ; 164/a4 __currency_ + .byte $00 ; 165/a5 ____yen____ + .byte $00 ; 166/a6 _|_broken__ + .byte $00 ; 167/a7 __section__ + .byte $00 ; 168/a8 __umulaut__ + .byte $00 ; 169/a9 _copyright_ + .byte $00 ; 170/aa __fem_ord__ + .byte $00 ; 171/ab _l_ang_quo_ + .byte $00 ; 172/ac ____not____ + .byte $00 ; 173/ad _syl_hyphn_ + .byte $00 ; 174/ae _registerd_ + .byte $00 ; 175/af _overline__ + .byte $00 ; 176/b0 __degrees__ + .byte $00 ; 177/b1 ____+/-____ + .byte $00 ; 178/b2 _2_supersc_ + .byte $00 ; 179/b3 _3_supersc_ + .byte $00 ; 180/b4 ___acute___ + .byte $00 ; 181/b5 ____mu_____ + .byte $00 ; 182/b6 _paragraph_ + .byte $00 ; 183/b7 __mid_dot__ + .byte $00 ; 184/b8 __cedilla__ + .byte $00 ; 185/b9 _1_supersc_ + .byte $00 ; 186/ba __mas_ord__ + .byte $00 ; 187/bb _r_ang_quo_ + .byte $00 ; 188/bc ____1/4____ + .byte $00 ; 189/bd ____1/2____ + .byte $00 ; 190/be ____3/4____ + .byte $00 ; 191/bf _?_invertd_ + + .byte $00 ; 192/c0 _____`_____ + .byte $0A ; 193/c1 _____A_____ + .byte $0A ; 194/c2 _____B_____ + .byte $0A ; 195/c3 _____C_____ + .byte $0A ; 196/c4 _____D_____ + .byte $0A ; 197/c5 _____E_____ + .byte $0A ; 198/c6 _____F_____ + .byte $02 ; 199/c7 _____G_____ + .byte $02 ; 200/c8 _____H_____ + .byte $02 ; 201/c9 _____I_____ + .byte $02 ; 202/ca _____J_____ + .byte $02 ; 203/cb _____K_____ + .byte $02 ; 204/cc _____L_____ + .byte $02 ; 205/cd _____M_____ + .byte $02 ; 206/ce _____N_____ + .byte $02 ; 207/cf _____O_____ + .byte $02 ; 208/d0 _____P_____ + .byte $02 ; 209/d1 _____Q_____ + .byte $02 ; 210/d2 _____R_____ + .byte $02 ; 211/d3 _____S_____ + .byte $02 ; 212/d4 _____T_____ + .byte $02 ; 213/d5 _____U_____ + .byte $02 ; 214/d6 _____V_____ + .byte $02 ; 215/d7 _____W_____ + .byte $02 ; 216/d8 _____X_____ + .byte $02 ; 217/d9 _____Y_____ + .byte $02 ; 218/da _____Z_____ + .byte $00 ; 219/db _____{_____ + .byte $00 ; 220/dc _____|_____ + .byte $00 ; 221/dd _____}_____ + .byte $00 ; 222/de _____~_____ + .byte $00 ; 223/df ___HOUSE___ + .byte $00 ; 224/e0 _a`_grave__ + .byte $00 ; 225/e1 _a'_acute__ + .byte $00 ; 226/e2 _a^_circum_ + .byte $00 ; 227/e3 _a~_tilde__ + .byte $00 ; 228/e4 _a"_dieres_ + .byte $00 ; 229/e5 _a__ring___ + .byte $00 ; 230/e6 _ae________ + .byte $00 ; 231/e7 _c,cedilla_ + .byte $00 ; 232/e8 _e`_grave__ + .byte $00 ; 233/e9 _e'_acute__ + .byte $00 ; 234/ea _e^_circum_ + .byte $00 ; 235/eb _e"_dieres_ + .byte $00 ; 236/ec _i`_grave__ + .byte $00 ; 237/ed _i'_acute__ + .byte $00 ; 238/ee _i^_circum_ + .byte $00 ; 239/ef _i"_dieres_ + .byte $00 ; 240/f0 _o^x_Eth_s_ + .byte $00 ; 241/f1 _n~_tilda__ + .byte $00 ; 242/f2 _o`_grave__ + .byte $00 ; 243/f3 _o'_acute__ + .byte $00 ; 244/f4 _o^_circum_ + .byte $00 ; 245/f5 _o~_tilde__ + .byte $00 ; 246/f6 _o"_dieres_ + .byte $00 ; 247/f7 __divide___ + .byte $00 ; 248/f8 _o/_slash__ + .byte $00 ; 249/f9 _u`_grave__ + .byte $00 ; 250/fa _u'_acute__ + .byte $00 ; 251/fb _u^_circum_ + .byte $00 ; 252/fc _u"_dieres_ + .byte $00 ; 253/fd _y'_acute__ + .byte $00 ; 254/fe _sm_thorn__ + .byte $00 ; 255/ff _y"_dieres_ +