diff --git a/data/Vortex86MX-eng/Makefile b/data/Vortex86MX-eng/Makefile index c01360f166..42dda1ee2a 100644 --- a/data/Vortex86MX-eng/Makefile +++ b/data/Vortex86MX-eng/Makefile @@ -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 \ diff --git a/data/eng/Makefile b/data/eng/Makefile index 372e603c65..170b50b8a9 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -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 \ diff --git a/data/eng/fonts/char.mt b/data/eng/fonts/char.mt deleted file mode 100644 index e9b702604c..0000000000 Binary files a/data/eng/fonts/char.mt and /dev/null differ diff --git a/data/eng/fonts/char2.mt b/data/eng/fonts/char2.mt deleted file mode 100644 index d275251663..0000000000 Binary files a/data/eng/fonts/char2.mt and /dev/null differ diff --git a/data/rus/Makefile b/data/rus/Makefile index 8e91dde524..974a9624d0 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -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 \ diff --git a/data/rus/fonts/char.mt b/data/rus/fonts/char.mt deleted file mode 100644 index e9b702604c..0000000000 Binary files a/data/rus/fonts/char.mt and /dev/null differ diff --git a/data/rus/fonts/char2.mt b/data/rus/fonts/char2.mt deleted file mode 100644 index d275251663..0000000000 Binary files a/data/rus/fonts/char2.mt and /dev/null differ diff --git a/kernel/trunk/const.inc b/kernel/trunk/const.inc index 311c16c446..87c669a65b 100644 --- a/kernel/trunk/const.inc +++ b/kernel/trunk/const.inc @@ -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) diff --git a/kernel/trunk/data32.inc b/kernel/trunk/data32.inc index d147213d4f..fcd3afc47d 100644 --- a/kernel/trunk/data32.inc +++ b/kernel/trunk/data32.inc @@ -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 diff --git a/data/Vortex86MX-eng/fonts/char.mt b/kernel/trunk/gui/char.mt similarity index 100% rename from data/Vortex86MX-eng/fonts/char.mt rename to kernel/trunk/gui/char.mt diff --git a/data/Vortex86MX-eng/fonts/char2.mt b/kernel/trunk/gui/char2.mt similarity index 100% rename from data/Vortex86MX-eng/fonts/char2.mt rename to kernel/trunk/gui/char2.mt diff --git a/kernel/trunk/gui/font.inc b/kernel/trunk/gui/font.inc index f7f2c192df..5b098e4147 100644 --- a/kernel/trunk/gui/font.inc +++ b/kernel/trunk/gui/font.inc @@ -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' ;------------------------------------------------------------------------------ \ No newline at end of file diff --git a/kernel/trunk/kernel.asm b/kernel/trunk/kernel.asm index d72ac47d20..729005e3f2 100644 --- a/kernel/trunk/kernel.asm +++ b/kernel/trunk/kernel.asm @@ -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 diff --git a/kernel/trunk/memmap.inc b/kernel/trunk/memmap.inc index c812e9b949..3b035092e7 100644 --- a/kernel/trunk/memmap.inc +++ b/kernel/trunk/memmap.inc @@ -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)