diff --git a/rtl/inc/graph/graphh.inc b/rtl/inc/graph/graphh.inc index d566fed4fa..a1b67b3b57 100644 --- a/rtl/inc/graph/graphh.inc +++ b/rtl/inc/graph/graphh.inc @@ -183,12 +183,6 @@ { + GetGraphMode } { + GetModeRange } {--------------------------------------------------------} -{ LEFT TO DO: } -{ - optimize scaling of stroked fonts } -{ - optimize InternalEllipse() } -{ using linear appx. of sine/cosine tables } -{ - justification for stroked fonts does not work } -{--------------------------------------------------------} { text.inc will crash on aligned requirement machines. } { (packed record for fontrec) } @@ -340,15 +334,17 @@ type D1bit = 11; D2bit = 12; D4bit = 13; - D8bit = 14; - D15bit = 15; - D16bit = 16; - D24bit = 17; { not yet supported } - D32bit = 18; { not yet supported } - D64bit = 19; { not yet supported } + D6bit = 14; { 64 colors Half-brite mode - Amiga } + D8bit = 15; + D12bit = 16; { 4096 color modes HAM mode - Amiga } + D15bit = 17; + D16bit = 18; + D24bit = 19; { not yet supported } + D32bit = 20; { not yet supported } + D64bit = 21; { not yet supported } lowNewDriver = 11; - highNewDriver = 19; + highNewDriver = 21; {$endif newmodes} @@ -369,25 +365,40 @@ type detectMode = 30000; m320x200 = 30001; - m512x384 = 30002; { mac resolution } - m640x200 = 30003; { vga resolution } - m640x350 = 30004; { vga resolution } - m640x400 = 30005; - m640x480 = 30006; - m800x600 = 30007; - m832x624 = 30008; { mac resolution } - m1024x768 = 30009; - m1280x1024 = 30010; - m1600x1200 = 30011; - m2048x1536 = 30012; + m320x256 = 30002; { amiga resolution (PAL) } + m320x400 = 30003; { amiga/atari resolution } + m512x384 = 30004; { mac resolution } + m640x200 = 30005; { vga resolution } + m640x256 = 30006; { amiga resolution (PAL) } + m640x350 = 30007; { vga resolution } + m640x400 = 30008; + m640x480 = 30009; + m800x600 = 30010; + m832x624 = 30011; { mac resolution } + m1024x768 = 30012; + m1280x1024 = 30013; + m1600x1200 = 30014; + m2048x1536 = 30015; lowNewMode = 30001; - highNewMode = 30012; + highNewMode = 30013; resolutions: array[lowNewMode..highNewMode] of TResolutionRec = - ((x:320;y:200),(x:512;y:384),(x:640;y:200),(x:640;y:350),(x:640;y:400), - (x:640;y:480),(x:800;y:600),(x:832;y:624),(x:1024;y:768), - (x:1280;y:1024),(x:1600;y:1200),(x:2048;y:1536)); + ((x:320;y:200), + (x:320;y:256), + (x:320;y:400), + (x:512;y:384), + (x:640;y:200), + (x:640;y:256), + (x:640;y:350), + (x:640;y:400), + (x:640;y:480), + (x:800;y:600), + (x:832;y:624), + (x:1024;y:768), + (x:1280;y:1024), + (x:1600;y:1200), + (x:2048;y:1536)); {$endif newmodes} @@ -667,38 +678,38 @@ const } AnsiToASCIITransTable: TCharsetTransTable = - (#$00, #$01, #$02, #$03, #$04, #$05, #$06, #$07, // $00 - $07 - #$08, #$09, #$0a, #$0b, #$0c, #$0d, #$0e, #$0f, // $08 - $0f - #$10, #$11, #$12, #$13, #$14, #$15, #$16, #$17, // $10 - $17 - #$18, #$19, #$1a, #$1b, #$1c, #$1d, #$1e, #$1f, // $18 - $1f - #$20, #$21, #$22, #$23, #$24, #$25, #$26, #$27, // $20 - $27 - #$28, #$29, #$2a, #$2b, #$2c, #$2d, #$2e, #$2f, // $28 - $2f - #$30, #$31, #$32, #$33, #$34, #$35, #$36, #$37, // $30 - $37 - #$38, #$39, #$3a, #$3b, #$3c, #$3d, #$3e, #$3f, // $38 - $3f - #$40, #$41, #$42, #$43, #$44, #$45, #$46, #$47, // $40 - $47 - #$48, #$49, #$4a, #$4b, #$4c, #$4d, #$4e, #$4f, // $48 - $4f - #$50, #$51, #$52, #$53, #$54, #$55, #$56, #$57, // $50 - $57 - #$58, #$59, #$5a, #$5b, #$5c, #$5d, #$5e, #$5f, // $58 - $5f - #$60, #$61, #$62, #$63, #$64, #$65, #$66, #$67, // $60 - $67 - #$68, #$69, #$6a, #$6b, #$6c, #$6d, #$6e, #$6f, // $68 - $6f - #$70, #$71, #$72, #$73, #$74, #$75, #$76, #$77, // $70 - $77 - #$78, #$79, #$7a, #$7b, #$7c, #$7d, #$7e, #$7f, // $78 - $7f - '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , // $80 - $87 - '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , // $88 - $8f - '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , // $90 - $97 - '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , // $98 - $9f - #$ff, #$ad, #$9b, #$9c, '?' , #$9d, '?' , '?' , // $a0 - $a7 - '?' , '?' , #$a6, #$ae, #$aa, '?' , '?' , '?' , // $a8 - $af - #$f8, #$f1, #$fd, '?' , '?' , #$e6, '?' , #$fa, // $b0 - $b7 - '?' , '?' , #$a7, #$af, #$ac, #$ab, '?' , #$a8, // $b8 - $bf - '?' , '?' , '?' , '?' , #$8e, #$8f, #$92, #$80, // $c0 - $c7 - '?' , #$90, '?' , '?' , '?' , '?' , '?' , '?' , // $c8 - $cf - '?' , #$a5, '?' , '?' , '?' , '?' , #$99, '?' , // $d0 - $d7 - '?' , '?' , '?' , '?' , #$9a, '?' , '?' , #$e1, // $d8 - $df - #$85, #$a0, #$83, '?' , #$84, #$86, #$91, #$87, // $e0 - $e7 - #$8a, #$82, #$88, #$89, #$8d, #$a1, #$8c, #$8b, // $e8 - $ef - '?' , #$a4, #$95, #$a2, #$93, '?' , #$94, #$f6, // $f0 - $f7 - '?' , #$97, #$a3, #$96, #$81, '?' , '?' , #$98); // $f8 - $ff + (#$00, #$01, #$02, #$03, #$04, #$05, #$06, #$07, { $00 - $07 } + #$08, #$09, #$0a, #$0b, #$0c, #$0d, #$0e, #$0f, { $08 - $0f } + #$10, #$11, #$12, #$13, #$14, #$15, #$16, #$17, { $10 - $17 } + #$18, #$19, #$1a, #$1b, #$1c, #$1d, #$1e, #$1f, { $18 - $1f } + #$20, #$21, #$22, #$23, #$24, #$25, #$26, #$27, { $20 - $27 } + #$28, #$29, #$2a, #$2b, #$2c, #$2d, #$2e, #$2f, { $28 - $2f } + #$30, #$31, #$32, #$33, #$34, #$35, #$36, #$37, { $30 - $37 } + #$38, #$39, #$3a, #$3b, #$3c, #$3d, #$3e, #$3f, { $38 - $3f } + #$40, #$41, #$42, #$43, #$44, #$45, #$46, #$47, { $40 - $47 } + #$48, #$49, #$4a, #$4b, #$4c, #$4d, #$4e, #$4f, { $48 - $4f } + #$50, #$51, #$52, #$53, #$54, #$55, #$56, #$57, { $50 - $57 } + #$58, #$59, #$5a, #$5b, #$5c, #$5d, #$5e, #$5f, { $58 - $5f } + #$60, #$61, #$62, #$63, #$64, #$65, #$66, #$67, { $60 - $67 } + #$68, #$69, #$6a, #$6b, #$6c, #$6d, #$6e, #$6f, { $68 - $6f } + #$70, #$71, #$72, #$73, #$74, #$75, #$76, #$77, { $70 - $77 } + #$78, #$79, #$7a, #$7b, #$7c, #$7d, #$7e, #$7f, { $78 - $7f } + '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , { $80 - $87 } + '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , { $88 - $8f } + '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , { $90 - $97 } + '?' , '?' , '?' , '?' , '?' , '?' , '?' , '?' , { $98 - $9f } + #$ff, #$ad, #$9b, #$9c, '?' , #$9d, '?' , '?' , { $a0 - $a7 } + '?' , '?' , #$a6, #$ae, #$aa, '?' , '?' , '?' , { $a8 - $af } + #$f8, #$f1, #$fd, '?' , '?' , #$e6, '?' , #$fa, { $b0 - $b7 } + '?' , '?' , #$a7, #$af, #$ac, #$ab, '?' , #$a8, { $b8 - $bf } + '?' , '?' , '?' , '?' , #$8e, #$8f, #$92, #$80, { $c0 - $c7 } + '?' , #$90, '?' , '?' , '?' , '?' , '?' , '?' , { $c8 - $cf } + '?' , #$a5, '?' , '?' , '?' , '?' , #$99, '?' , { $d0 - $d7 } + '?' , '?' , '?' , '?' , #$9a, '?' , '?' , #$e1, { $d8 - $df } + #$85, #$a0, #$83, '?' , #$84, #$86, #$91, #$87, { $e0 - $e7 } + #$8a, #$82, #$88, #$89, #$8d, #$a1, #$8c, #$8b, { $e8 - $ef } + '?' , #$a4, #$95, #$a2, #$93, '?' , #$94, #$f6, { $f0 - $f7 } + '?' , #$97, #$a3, #$96, #$81, '?' , '?' , #$98); { $f8 - $ff } GraphStringTransTable: PCharsetTransTable = nil; @@ -793,7 +804,11 @@ Function GetDriverName: string; { $Log$ - Revision 1.7 2000-06-18 06:11:21 jonas + Revision 1.8 2000-06-19 01:18:19 carl + * bugfix of comments with tp. + + Added Amiga/Atari graphics modes + + Revision 1.7 2000/06/18 06:11:21 jonas + added missing detectMode stuff for -dnewmodes Revision 1.6 2000/06/17 19:09:23 jonas