WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm

Rev 2320		Rev 2322
Line 8...		Line 8...
8	macro gptick origin, r, tick	8	macro gptick origin, r, tick
9	{ dw (origin mod 32) shl 11 + (r mod 8) shl 8 + (tick mod 256) }	9	{ dw (origin mod 32) shl 11 + (r mod 8) shl 8 + (tick mod 256) }
Line 10...		Line 10...
10		10
11	macro ritick x, y, tick	11	macro ritick x, y, tick
Line 12...		Line 12...
12	{ dw (x mod 16) shl 12 + (y mod 32) shl 8 + (tick mod 2) }	12	{ dw (x mod 16) shl 12 + (y mod 16) shl 8 + (tick mod 2) }
13		13
Line 14...		Line 14...
14	macro cstick x, y, r, tick	14	macro cstick x, y, r, tick
-		15	{ dw (x mod 16) shl 12 + (y mod 16) shl 8 + 0xC0 + (r mod 2) shl 2 + (tick mod 4) }
15	{ dw (x mod 16) shl 12 + (y mod 32) shl 8 + 0xC0 + (r mod 2) shl 2 + (tick mod 4) }	16
16		17	macro lntick x, y, r, len
17	macro lntick x, y, r, len	18	{
18	{ if len < 8	19	if len in <2, 3, 4, 5, 6, 7>
19	dw (x mod 16) shl 12 + (y mod 32) shl 8 + (rmod 4) shl 3 + len	20	dw ((x mod 16) shl 12 + (y mod 16) shl 8 + (r mod 4) shl 3 + len)
-		21	else
Line 20...		Line 22...
20	else	22	dw ((x mod 16) shl 12 + (y mod 16) shl 8 + (r mod 4) shl 3 + ((len-8) mod 8) + 0xE0)
21	dw (x mod 16) shl 12 + (y mod 32) shl 8 + (rmod 4) shl 3 + ((len-8) mod 8) + 0xE0	23	end if
Line 22...		Line 24...
22	end if}	24	}
23		25
24	;align 8	26	;align 8
25	;sdsh_data:	27	;sdsh_data:
26		28
27	.numfonts db 2 ; number of system fonts	29	.numfonts db 2 ; number of system fonts
28	.numsptks db 32 ; number of special ticks	30	.numsptks db 32 ; number of special ticks
29	.numticks dw ? ; total number of ticks	31	.numticks dw ? ; total number of ticks
30	.sp_ticks dd .special_ticks ; special table	32	;.sp_ticks dd .special_ticks ; special table
31	.ticktble dd .tick_table ; general table	33	.ticktble dd .tick_table ; general table
Line 32...		Line 34...
32	.pix4 db 34	34	;.pix4 db 34
33	.pix5 db 42	35	;.pix5 db 42
34	.pix6 db 50	36	;.pix6 db 50
35	.pix7 db 58	37	;.pix7 db 58
Line 52...		Line 54...
52	.fnt0.rs dw 0 ; + 2: reserved	54	.fnt0.rs dw 0 ; + 2: reserved
53	.fnt0.tab dd .table0 ; + 4	55	.fnt0.tab dd .table0 ; + 4
54	.fnt0.org dd .origs0 ; + 8	56	.fnt0.org dd .origs0 ; + 8
55		57
Line 56...		Line 58...
56	align 16	58	;align 16
57	; System font #1: 7x10	59	;; System font #1: 7x10
58	.fnt1.x db 7 ; X-width	60	;.fnt1.x db 7 ; X-width
59	.fnt1.y db 9 ; Y-heigth	61	;.fnt1.y db 9 ; Y-heigth
60	.fnt1.rs dw 0 ; reserved	62	;.fnt1.rs dw 0 ; reserved
61	.fnt1.tab dd .table1	63	;.fnt1.tab dd .table1
62	.fnt1.org dd .origs1	64	;.fnt1.org dd .origs1
Line 63...		Line 65...
63		65
64	align 4	66	align 4
65	.origs0:	67	.origs0:
66	db 0x00 ; zero	68	db 0x00 ; zero
67	db 0x02 ; 1 s/7Xæëÿ	69	db 0x02 ; 1 s/7XæëÿW
68	db 0x05 ; 2 6W~ç	70	db 0x05 ; 2 6W~ç
69	db 0x06 ; 3 ^*Sâú	71	db 0x06 ; 3 ^*Sâú
70	db 0x08 ; 4 \ÆÚ	72	db 0x08 ; 4 \ÆÚ
71	db 0x32 ; 5 0(adqceku{	73	db 0x32 ; 5 0(adqceku{
Line 75...		Line 77...
75	db 0x18 ; 9 )9D	77	db 0x18 ; 9 )9D
76	db 0x44 ; 10 *8B	78	db 0x44 ; 10 *8B
77	db 0x03 ; 11 $	79	db 0x03 ; 11 $
78	db 0x46 ; 12 vJVgæ	80	db 0x46 ; 12 vJVgæ
79	db 0x35 ; 13 5}ßì	81	db 0x35 ; 13 5}ßìM
80	db 0x15 ; 14 4	82	db 0x15 ; 14 4
81	db 0x45 ; 15 9e	83	db 0x45 ; 15 9e
82	db 0x16 ; 16 abphinÛ	84	db 0x16 ; 16 abphinÛ
83	db 0x13 ; 17 f	85	db 0x13 ; 17 f
84	db 0x48 ; 18 Y	86	db 0x48 ; 18 Y
85	db 0x22 ; 19 j&ä	87	db 0x22 ; 19 j&ä
Line 165...		Line 167...
165	db 00110000b, 00001100b ;82: 5	167	db 00110000b, 00001100b ;82: 5
166	db 0, 0 ;83:	168	db 0, 0 ;83:
167	db 0, 0 ;84:	169	db 0, 0 ;84:
168	db 0, 0 ;85:	170	db 0, 0 ;85:
169	times 4 (db 0, 0) ;86..89	171	db 0, 0, 0, 0, 0, 0, 0, 0 ;86..89
170	.v9:	172	.v9:
171	db 0, 0, 0 ;90:	173	db 0, 0, 0 ;90:
172	db 0, 0, 0 ;91:	174	db 0, 0, 0 ;91:
173	db 0, 0, 0 ;92:	175	db 0, 0, 0 ;92:
174	db 0, 0, 0 ;93:	176	db 0, 0, 0 ;93:
175	.v10:	177	.v10:
Line 251...		Line 253...
251	dw (.ch0_73 -.chars)*16 + 3 ; #73 I	253	dw (.ch0_73 -.chars)*16 + 3 ; #73 I
252	dw (.ch0_74 -.chars)*16 + 2 ; #74 J	254	dw (.ch0_74 -.chars)*16 + 2 ; #74 J
253	dw (.ch0_75 -.chars)*16 + 3 ; #75 K	255	dw (.ch0_75 -.chars)*16 + 3 ; #75 K
254	dw (.ch0_76 -.chars)*16 + 2 ; #76 L	256	dw (.ch0_76 -.chars)*16 + 2 ; #76 L
255	dw (.ch0_78 -.chars)*16 + 3 ; #78 N	257	dw (.ch0_77 -.chars)*16 + 3 ; #77 M
-		258	dw (.ch0_78 -.chars)*16 + 3 ; #78 N
256	dw (.ch0_79 -.chars)*16 + 2 ; #79 O	259	dw (.ch0_79 -.chars)*16 + 2 ; #79 O
257	dw (.ch0_80 -.chars)*16 + 2 ; #80 P	260	dw (.ch0_80 -.chars)*16 + 2 ; #80 P
258	dw (.ch0_81 -.chars)*16 + 3 ; #81 Q	261	dw (.ch0_81 -.chars)*16 + 3 ; #81 Q
259	dw (.ch0_82 -.chars)*16 + 3 ; #82 R	262	dw (.ch0_82 -.chars)*16 + 3 ; #82 R
260	dw (.ch0_83 -.chars)*16 + 3 ; #83 S	263	dw (.ch0_83 -.chars)*16 + 3 ; #83 S
Line 413...		Line 416...
413	dw (.ch0_239-.chars)*16 + 3 ; #239 ÿ	416	dw (.ch0_239-.chars)*16 + 3 ; #239 ÿ
414	dw (.ch0_240-.chars)*16 + 5 ; #240 ¨	417	dw (.ch0_240-.chars)*16 + 5 ; #240 ¨
415	dw (.ch0_241-.chars)*16 + 4 ; #241 ¸	418	dw (.ch0_241-.chars)*16 + 4 ; #241 ¸
416	times 14 dw 0 ; #242-255	419	times 14 dw 0 ; #242-255
417		420	diff10 "check font0 table size: ", .table0, $
-		421
Line 418...		Line 422...
418	; ----------------------------------------------------	422	; ----------------------------------------------------
419	align 4	423	align 4
420	.chars:	424	.chars:
421	dw 0	425	dw 0
422	.ch0_33: !	426	.ch0_33: ; !
423	ritick 2, 2, 0	427	ritick 2, 2, 0
424	lntick 2, 4, 2, 5	428	lntick 2, 4, 2, 5
425	.ch0_34: ; "	429	.ch0_34: ; "
426	.ch0_39: ; '	430	.ch0_39: ; '
427	lntick 1, 8, 2, 2	431	lntick 1, 8, 2, 2
428	lntick 3, 8, 2, 2	432	lntick 3, 8, 2, 2
429	.ch0_36: ; $	433	.ch0_36: ; $
430	lntick 2, 2, 2, 5	434	lntick 2, 2, 2, 5
431	gptick 11, 0, v11_1	435	gptick 11, 0, 98
432	.ch0_37: ; %	436	.ch0_37: ; %
433	cstick 0, 9, 0, 0	437	cstick 0, 9, 0, 0
434	lntick 0, 3, 1, 5	438	lntick 0, 3, 1, 5
435	cstick 3, 3, 0, 0	439	cstick 3, 3, 0, 0
436	.ch0_38: ; &	440	.ch0_38: ; &
Line 469...		Line 473...
469	.ch0_48: ; 0	473	.ch0_48: ; 0
470	.ch0_79: ; O	474	.ch0_79: ; O
471	.ch0_142: ; Î	475	.ch0_142: ; Î
472	.ch0_81: ; Q	476	.ch0_81: ; Q
473	gptick 5, 4, v10_1	477	gptick 5, 4, 94
474	lntick 4, 4, 2, 4	478	lntick 4, 4, 2, 4
475	lntick 3, 1, 0, 2	479	lntick 3, 1, 0, 2
476	.ch0_49: ; 1	480	.ch0_49: ; 1
477	.ch0_124: ; \|	481	.ch0_124: ; \|
478	lntick 2, 2, 2, 7	482	lntick 2, 2, 2, 7
479	ritick 1, 6, 0	483	ritick 1, 6, 0
Line 492...		Line 496...
492	gptick 14, 2, 32	496	gptick 14, 2, 32
493	lntick 0, 4, 0, 5	497	lntick 0, 4, 0, 5
494	lntick 3, 2, 2, 7	498	lntick 3, 2, 2, 7
495	.ch0_54: ; 6	499	.ch0_54: ; 6
496	gptick 14, 0, v10_2	500	gptick 14, 0, 95
497	gptick 2, 0, 44	501	gptick 2, 0, 44
498	.ch0_56: ; 8	502	.ch0_56: ; 8
499	gptick 10, 6, 60	503	gptick 10, 6, 60
500	.ch0_57: ; 9	504	.ch0_57: ; 9
501	gptick 9, 0, v10_2	505	gptick 9, 0, 95
502	gptick 15, 0, 44	506	gptick 15, 0, 44
503	.ch0_60: ; <	507	.ch0_60: ; <
504	gptick 7, 4, 74	508	gptick 7, 4, 74
505	.ch0_62: ; >	509	.ch0_62: ; >
506	gptick 8, 4, 74	510	gptick 8, 4, 74
507	.ch0_63: ; ?	511	.ch0_63: ; ?
Line 522...		Line 526...
522	.ch0_67: ; C	526	.ch0_67: ; C
523	.ch0_145: ; Ñ	527	.ch0_145: ; Ñ
524	ritick 5, 3, 0	528	ritick 5, 3, 0
525	.ch0_71: ; G	529	.ch0_71: ; G
526	gptick 5, 4, v10_1	530	gptick 5, 4, 94
527	gptick 4, 5, 43	531	gptick 4, 5, 43
528	.ch0_68: ; D	532	.ch0_68: ; D
529	gptick 9, 0, 74	533	gptick 9, 0, 74
530	.ch0_76: ; L	534	.ch0_76: ; L
531	lntick 0, 2, 2, 7	535	lntick 0, 2, 2, 7
532	lntick 1, 2, 0, 4	536	lntick 1, 2, 0, 4
Line 554...		Line 558...
554	lntick 2, 2, 0, 3	558	lntick 2, 2, 0, 3
555	lntick 0, 8, 0, 5	559	lntick 0, 8, 0, 5
556	.ch0_77: ; M	560	.ch0_77: ; M
557	.ch0_140: ; M	561	.ch0_140: ; M
558	gptick 3, 5, 2, 32	562	gptick 13, 2, 32
559	ritick 1, 7, 0	563	ritick 1, 7, 0
560	.ch0_78: ; N	564	.ch0_78: ; N
561	lntick 0, 2, 2, 7	565	lntick 0, 2, 2, 7
562	lntick 4, 2, 2, 7	566	lntick 4, 2, 2, 7
563	lntick 3, 4, 3, 3	567	lntick 3, 4, 3, 3
564	.ch0_85: ; U	568	.ch0_85: ; U
565	lntick 1, 2, 0, 3	569	lntick 1, 2, 0, 3
566	.ch0_87: ; W	570	.ch0_87: ; W
567	lntick 0, 3, 2, 6	571	lntick 0, 3, 2, 6
568	lntick 4, 3, 2, 6	572	lntick 4, 3, 2, 6
569	gptick 0, 2, 1, 48	573	gptick 1, 1, 48
570	.ch0_86: ; V	574	.ch0_86: ; V
571	lntick 0, 7, 0, 2	575	lntick 0, 7, 0, 2
572	lntick 4, 7, 0, 2	576	lntick 4, 7, 0, 2
573	.ch0_118: ; v	577	.ch0_118: ; v
574	.ch0_121: ; y	578	.ch0_121: ; y
575	gptick 12, 6, 74	579	gptick 12, 6, 74
Line 664...		Line 668...
664	.ch0_114: ; r	668	.ch0_114: ; r
665	lntick 1, 2, 2, 5	669	lntick 1, 2, 2, 5
666	gptick 21, 1, 32	670	gptick 21, 1, 32
667	.ch0_115: ; s	671	.ch0_115: ; s
668	gptick 1, 0, v11_1	672	gptick 1, 0, 98
669	.ch0_116: ; t	673	.ch0_116: ; t
670	gptick 16, 0, 43	674	gptick 16, 0, 43
671	gptick 20, 3, 32	675	gptick 20, 3, 32
672	lntick 3, 2, 0, 2	676	lntick 3, 2, 0, 2
673	.ch0_117: ; u	677	.ch0_117: ; u
674	.ch0_227: ; ó	678	.ch0_227: ; ó
Line 968...		Line 972...
968	.ch0_218: ;	972	.ch0_218: ;
969	lntick 2, 4, 0, 3	973	lntick 2, 4, 0, 3
970	lntick 2, 0, 2, 4	974	lntick 2, 0, 2, 4
971	>	975
Line -...		Line 976...
-		976	diff10 "font0 size ", .chars, $
Line 972...		Line 977...
972	>	977	>

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-A/trunk/gui/fonts/sd_data.asm – Rev 2320 → 2322