KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

The fonts char.mt and char2.mt are included in the kernel is now.

Browse Source 
git-svn-id: svn://kolibrios.org@2640 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2012-04-20 22:22:57 +00:00
parent fb4a67c38c
commit 8f439a5b9a
14 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/Vortex86MX-eng/Makefile
View File

@ -253,8 +253,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
File|Managers/icons.ini:File|Managers/ICONS.INI \
File|Managers/kfar.ini:File|Managers/KFAR.INI \
File|Managers/kfm.ini:File|Managers/KFM.INI \
fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \
fonts/char.mt:FONTS/CHAR.MT \
fonts/bold.chr:FONTS/BOLD.CHR \
games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \
games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \
games/xonix:GAMES/XONIX games/megamaze:GAMES/MEGAMAZE \

3
data/eng/Makefile
View File

@ -261,8 +261,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
File|Managers/icons.ini:File|Managers/ICONS.INI \
File|Managers/kfar.ini:File|Managers/KFAR.INI \
File|Managers/kfm.ini:File|Managers/KFM.INI \
fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \
fonts/char.mt:FONTS/CHAR.MT \
fonts/bold.chr:FONTS/BOLD.CHR \
games/checkers:GAMES/CHECKERS \
games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \
games/reversi:GAMES/REVERSI games/rforces:GAMES/RFORCES \

BIN
data/eng/fonts/char.mt
View File

Binary file not shown.

BIN
data/eng/fonts/char2.mt
View File

Binary file not shown.

3
data/rus/Makefile
View File

@ -253,8 +253,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \
File|Managers/icons.ini:File|Managers/ICONS.INI \
File|Managers/kfar.ini:File|Managers/KFAR.INI \
File|Managers/kfm.ini:File|Managers/KFM.INI \
fonts/bold.chr:FONTS/BOLD.CHR fonts/char2.mt:FONTS/CHAR2.MT \
fonts/char.mt:FONTS/CHAR.MT \
fonts/bold.chr:FONTS/BOLD.CHR \
games/appdata.dat:GAMES/APPDATA.DAT games/ataka:GAMES/ATAKA \
games/basekurs.kla:GAMES/BASEKURS.KLA games/checkers:GAMES/CHECKERS \
games/kosilka:GAMES/KOSILKA games/kosskin.gfx:GAMES/KOSSKIN.GFX \

BIN
data/rus/fonts/char.mt
View File

Binary file not shown.

BIN
data/rus/fonts/char2.mt
View File

Binary file not shown.

3
kernel/trunk/const.inc
View File

@ -263,9 +263,6 @@ DONT_SWITCH equ (OS_BASE+0x000FFFF)
TMP_STACK_TOP equ 0x006CC00
FONT_II equ (OS_BASE+0x006DC00)
FONT_I equ (OS_BASE+0x006E600)
sys_pgdir equ (OS_BASE+0x006F000)
DRIVE_DATA equ (OS_BASE+0x0070000)

7
kernel/trunk/data32.inc
View File

@ -49,7 +49,7 @@ keymap_alt:
if lang eq ru
boot_fonts db '˜à¨äâë § £à㦥­ë',0
; boot_fonts db '˜à¨äâë § £à㦥­ë',0
boot_memdetect db 'Š®«¨ç¥á⢮ ®¯¥à â¨¢­®© ¯ ¬ïâ¨',' ',' Œ¡',0
boot_tss db '“áâ ­®¢ª  TSSs',0
boot_cpuid db '—⥭¨¥ CPUIDs',0
@ -73,7 +73,7 @@ if preboot_blogesc
boot_tasking db '‚ᥠ£®â®¢® ¤«ï § ¯ã᪠, ­ ¦¬¨âॠESC ¤«ï áâ àâ ',0
end if
else
boot_fonts db 'Fonts loaded',0
; boot_fonts db 'Fonts loaded',0
boot_memdetect db 'Determining amount of memory',0
boot_tss db 'Setting TSSs',0
boot_cpuid db 'Reading CPUIDs',0
@ -135,9 +135,6 @@ else
ud_user_message db 'Error: unsupported processor instruction',0
end if
char db '/sys/FONTS/CHAR.MT',0
char2 db '/sys/FONTS/CHAR2.MT',0
bootpath db '/KOLIBRI '
bootpath2 db 0
vmode db '/sys/drivers/VMODE.MDR',0

0
data/Vortex86MX-eng/fonts/char.mt → kernel/trunk/gui/char.mt
View File

0
data/Vortex86MX-eng/fonts/char2.mt → kernel/trunk/gui/char2.mt
View File

8
kernel/trunk/gui/font.inc
View File

@ -228,4 +228,12 @@ draw_text_to_user_area:
mov [eax], ecx ; store pixel
popad
ret
;------------------------------------------------------------------------------
align 4
FONT_I:
file 'char.mt'
;------------------------------------------------------------------------------
align 4
FONT_II:
file 'char2.mt'
;------------------------------------------------------------------------------

8
kernel/trunk/kernel.asm
View File

@ -671,15 +671,15 @@ end if
; LOAD FONTS I and II
stdcall read_file, char, FONT_I, 0, 2304
stdcall read_file, char2, FONT_II, 0, 2560
; stdcall read_file, char, FONT_I, 0, 2304
; stdcall read_file, char2, FONT_II, 0, 2560
mov [MOUSE_PICTURE], dword mousepointer
mov [_display.check_mouse], check_mouse_area_for_putpixel
mov [_display.check_m_pixel], check_mouse_area_for_getpixel
mov esi, boot_fonts
call boot_log
; mov esi, boot_fonts
; call boot_log
; Display APIC status
mov esi, boot_APIC_found

4
kernel/trunk/memmap.inc
View File

@ -147,8 +147,8 @@
; 0x8006CC00 -> 6DBFF stack at boot time (4Kb)
;
; 0x8006DC00 -> 6E5FF basic text font II
; 0x8006E600 -> 6Efff basic text font I
; 0x8006DC00 -> 6E5FF free (2560)
; 0x8006E600 -> 6Efff free (2560)
; 0x8006F000 -> 6FFFF main page directory
; 0x80070000 -> 7FFFF data of retrieved disks and partitions (Mario79)