From 49f31ec9bc120a39be3d5f47f0a7fb35fc904061 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 10 Nov 2018 13:07:49 +0000 Subject: [PATCH] menu.dat: small update terminal: use big fonts menu: fix thread height rdsave, opendial: use system colors git-svn-id: svn://kolibrios.org@7548 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/settings/menu.dat | 9 ++-- data/et/settings/menu.dat | 3 +- data/it/settings/menu.dat | 5 ++- data/rus/settings/menu.dat | 5 ++- data/sp/settings/menu.dat | 5 ++- programs/develop/h2d2b/trunk/h2d2b.asm | 3 +- programs/fs/opendial/opendial.asm | 4 +- programs/system/menu/trunk/menu.asm | 3 +- programs/system/rdsave/trunk/rdsave.asm | 7 +++- programs/system/terminal/build.bat | 2 + programs/system/terminal/terminal.asm | 56 ++++++++++++++----------- 11 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 programs/system/terminal/build.bat diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index f44a3cf933..86eccfa921 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -29,13 +29,14 @@ UnvWater /sys/demos/unvwater #2 **** 3D demos **** ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 -Heart* /kolibrios/3d/3dsheart +3D-cube /sys/3d/3dcube2 +Ray tracing /sys/3d/ray View3DS /sys/3d/view3ds Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav #3 **** GRAPHICS **** Kolibri Image Viewer /sys/media/kiv -zSea* Image Viewer /kolibrios/media/zsea/zsea +zSea* Image Viewer /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra @@ -44,7 +45,7 @@ Pixie (MP3 player) /sys/media/pixie/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay* Video player /kolibrios/media/fplay MidAMP /sys/media/midamp -#5 **** PROGRAMMING **** +#5 **** DEVELOPMENT **** Examples > /@6 KPack Archiver /sys/kpack Flat Assembler /sys/develop/fasm @@ -52,6 +53,7 @@ Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Base Converter /sys/develop/h2d2b +Character table /sys/ASCIIVju Key ASCII-codes /sys/develop/keyascii Key SCAN-codes /sys/develop/scancode #6 **** EXAMPLES **** @@ -131,7 +133,6 @@ File system benchmark /sys/fspeed #17 **** ACCESSIBILITY **** Screen magnifier /sys/magnify Screen keyboard /sys/zkey -Character table /sys/ASCIIVju #18 **** EMULATORS **** DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox e80* (ZX Spectrum) /kolibrios/emul/e80/e80 diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index 537f092b83..2bd90c3072 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -29,7 +29,8 @@ UnvWater /sys/demos/unvwater #2 **** 3D demos **** ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 -Heart /sys/3d/3dsheart +3D-cube /sys/3d/3dcube2 +Ray tracing /sys/3d/ray View3DS /sys/3d/view3ds Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 8333616902..588c3b3a0d 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -29,7 +29,8 @@ UnvWater /sys/demos/unvwater #2 **** 3D demos **** ScreenSaver /sys/3d/crownscr Labirinto 3D /sys/3d/free3d04 -Cuore 3D /sys/3d/3dsheart +3D-cube /sys/3d/3dcube2 +Ray tracing /sys/3d/ray View3DS /sys/3d/view3ds Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav @@ -51,6 +52,7 @@ Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b +Tavola caratteri /sys/ASCIIVju Codici ASCII /sys/develop/keyascii SCAN-codes /sys/develop/scancode #6 **** EXAMPLES **** @@ -129,7 +131,6 @@ FSPEED speed of FS /sys/fspeed #17 **** SYSTEM SPECIAL **** Lente di ingrandimento /sys/magnify Tastiera da schermo /sys/zkey -Tavola caratteri /sys/ASCIIVju #18 **** EMULATORS **** DOSBox DOS Emulator /KolibriOS/emul/DosBox/dosbox e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 477cff7efe..73ae310326 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -29,7 +29,8 @@ UnvWater /sys/demos/unvwater #2 **** Демки -> 3D **** Скринсейвер /sys/3d/crownscr 3D-Лабиринт /sys/3d/free3d04 -Сердце /sys/3d/3dsheart +3D-Куб /sys/3d/3dcube2 +Ray tracing /sys/3d/ray Просмотрщик 3DS /sys/3d/view3ds Шестерёнки /sys/3d/gears FlatWave /sys/3d/flatwav @@ -54,6 +55,7 @@ Diff tool /sys/develop/diff Отладчик /sys/develop/mtdbg Пипетка /sys/pipetka Hex2Dec2Bin /sys/develop/h2d2b +Таблица символов /sys/ASCIIVju ASCII-коды /sys/develop/keyascii SCAN-коды /sys/develop/scancode #6 **** Разработка -> Примеры **** @@ -101,7 +103,6 @@ FSPEED ско #12 **** Система -> Спец.возможности **** Экранная лупа /sys/magnify Экранная клавиатура /sys/zkey -Таблица символов /sys/ASCIIVju #13 **** Обработка данных **** Калькулятор /sys/calc Редактор Tinypad /sys/tinypad diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index c415143b63..48ae655781 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -29,7 +29,8 @@ UnvWater /sys/demos/unvwater #2 **** 3D **** ScreenSaver /sys/3d/crownscr 3D-labyrinth /sys/3d/free3d04 -Heart /sys/3d/3dsheart +3D-cube /sys/3d/3dcube2 +Ray tracing /sys/3d/ray View3DS /sys/3d/view3ds Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav @@ -52,6 +53,7 @@ Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b +Tabla de caracteres /sys/ASCIIVju Cвdigos ASCII /sys/develop/keyascii Cвdigos SCAN /sys/develop/scancode #6 **** EJEMPLOS **** @@ -130,7 +132,6 @@ FSPEED speed of FS /sys/fspeed #17 **** ACCESIBILIDAD **** Ampliaciвn de pantalla /sys/magnify Teclado en pantalla /sys/zkey -Tabla de caracteres /sys/ASCIIVju #18 **** EMULATORS **** DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) /kolibrios/emul/e80/e80 diff --git a/programs/develop/h2d2b/trunk/h2d2b.asm b/programs/develop/h2d2b/trunk/h2d2b.asm index 2d6437dc98..37daa11211 100644 --- a/programs/develop/h2d2b/trunk/h2d2b.asm +++ b/programs/develop/h2d2b/trunk/h2d2b.asm @@ -212,7 +212,8 @@ mouse: @@: mcall , 10*65536, ,(WIN_W-92)*65536+46, ; 10-ная mcall , 8*65536+256,,(WIN_W-76)*65536+78, ; 16-ная - mcall 4, (WIN_W-102)*65536+58, 0x90000000, minus, 1 + mov ecx,esi + mcall 4, (WIN_W-102)*65536+61, , minus, 1 mcall 38, 15*65536+WIN_W-15, 137*65536+137, [sys_colors.work_graph] stdcall [edit_box_draw], edit1 mcall 12, 2 ; функция 12: сообщить ОС об отрисовке окна diff --git a/programs/fs/opendial/opendial.asm b/programs/fs/opendial/opendial.asm index e507b0157b..d3ceac0923 100644 --- a/programs/fs/opendial/opendial.asm +++ b/programs/fs/opendial/opendial.asm @@ -1772,7 +1772,9 @@ draw_file_name: mov bx,[file_browser_data_1.start_y] add bx,[file_browser_data_1.size_y] add bx,9 - mcall 4,,0x80000000,message_file_name + mov ecx,[w_work_text] + add ecx,0x80000000 + mcall 4,,,message_file_name ret ;--------------------------------------------------------------------- draw_dir_path: diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index cc0a4e4b39..d5a4bb3419 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -722,8 +722,7 @@ align 4 .1: shl ecx,16 add ecx,eax ; ecx = [ Y_START | Y_SIZE ] - dec ecx - + movzx ebx,[edi + x_start] shl ebx,16 mov bx,140 ; ebx = [ X_START | X_SIZE ] diff --git a/programs/system/rdsave/trunk/rdsave.asm b/programs/system/rdsave/trunk/rdsave.asm index b97858beee..806aab64fe 100644 --- a/programs/system/rdsave/trunk/rdsave.asm +++ b/programs/system/rdsave/trunk/rdsave.asm @@ -356,8 +356,11 @@ draw_window: mcall ,<215,75>, ,cancel mcall ,<315,36>, ,select - mov ecx,[sc.work] - mov dword [frame_data.font_backgr_color],ecx + m2m dword [frame_data.font_backgr_color],[sc.work] + m2m dword [frame_data.font_color],[sc.work_text] + m2m dword [frame_data.ext_fr_col],[sc.work_graph] + m2m dword [frame_data.int_fr_col],[sc.work_3d_light] + push dword frame_data call [Frame_draw] diff --git a/programs/system/terminal/build.bat b/programs/system/terminal/build.bat new file mode 100644 index 0000000000..6eac5b43d1 --- /dev/null +++ b/programs/system/terminal/build.bat @@ -0,0 +1,2 @@ +@fasm -m 16384 terminal.asm terminal +@pause \ No newline at end of file diff --git a/programs/system/terminal/terminal.asm b/programs/system/terminal/terminal.asm index 41a3348e8d..74418f5bff 100644 --- a/programs/system/terminal/terminal.asm +++ b/programs/system/terminal/terminal.asm @@ -105,54 +105,58 @@ draw_window: or edx, 0x34000000 xor esi, esi mov edi, str_title - mcall 0, 50 shl 16 + 400, 30 shl 16 + 180 + mcall 0, 50 shl 16 + 415, 30 shl 16 + 195 - mov ebx, 5 shl 16 + 15 - mov ecx, 0x80000000 + mov ebx, 5 shl 16 + 12 + mov ecx, 0x90000000 or ecx, [sc.work_text] mov edx, str_port mcall 4 - mov ebx, 5 shl 16 + 35 + add ebx, 25 mov edx, str_speed mcall - mov ebx, 5 shl 16 + 55 + add ebx, 25 mov edx, str_data mcall - mov ebx, 5 shl 16 + 75 + add ebx, 25 mov edx, str_stop mcall - mov ebx, 180 shl 16 + 10 + mov ebx, 195 shl 16 + 12 mov edx, str_parity mcall - mov ebx, 270 shl 16 + 10 + mov ebx, 280 shl 16 + 12 mov edx, str_flow mcall + edit_boxes_set_sys_color edit1,editboxes_end,sc invoke edit_box_draw, edit1 invoke edit_box_draw, edit2 invoke edit_box_draw, edit3 invoke edit_box_draw, edit4 + option_boxes_set_sys_color sc, Option_boxs1 + option_boxes_set_sys_color sc, Option_boxs2 invoke option_box_draw, Option_boxs1 invoke option_box_draw, Option_boxs2 + check_boxes_set_sys_color2 ch1,ch1_end,sc ;set color invoke check_box_draw, ch1 mov esi, [sc.work_button] - mcall 8, 270 shl 16 + 100, 105 shl 16 + 16, 0x10 + mcall 8, 280 shl 16 + 100, 115 shl 16 + 22, 0x10 - mov ecx, 0x80000000 + mov ecx, 0x90000000 or ecx, [sc.work_button_text] - mcall 4, 300 shl 16 + 110, , str_open + mcall 4, 315 shl 16 + 119, , str_open mov edx, [sc.work_graph] - mcall 38, 0 shl 16 + 390, 135 shl 16 + 135 + mcall 38, 0 shl 16 + 405, 145 shl 16 + 145 - mov ecx, 0x80000000 + mov ecx, 0x90000000 or ecx, [sc.work_text] - mcall 4, 5 shl 16 + 142, , [errormsg] + mcall 4, 5 shl 16 + 150, , [errormsg] mcall 12, 2 ret @@ -424,10 +428,11 @@ import console,\ con_get_flags, 'con_get_flags',\ con_kbhit, 'con_kbhit' -edit1 edit_box 60, 90, 10, 0xffffff, 0x6f9480, 0, 0, 0, 8, ed_port, mouse_dd, ed_focus, 4, 4 -edit2 edit_box 60, 90, 30, 0xffffff, 0x6a9480, 0, 0, 0, 7, ed_speed, mouse_dd, ed_figure_only, 4, 4 -edit3 edit_box 60, 90, 50, 0xffffff, 0x6a9480, 0, 0, 0, 1, ed_data, mouse_dd, ed_figure_only, 1, 1 -edit4 edit_box 60, 90, 70, 0xffffff, 0x6a9480, 0, 0, 0, 1, ed_stop, mouse_dd, ed_figure_only, 1, 1 +edit1 edit_box 60, 112, 10, 0xffffff, 0x6f9480, 0, 0, 0x10000000, 8, ed_port, mouse_dd, ed_focus, 4, 4 +edit2 edit_box 60, 112, 35, 0xffffff, 0x6a9480, 0, 0, 0x10000000, 7, ed_speed, mouse_dd, ed_figure_only, 4, 4 +edit3 edit_box 60, 112, 60, 0xffffff, 0x6a9480, 0, 0, 0x10000000, 1, ed_data, mouse_dd, ed_figure_only, 1, 1 +edit4 edit_box 60, 112, 85, 0xffffff, 0x6a9480, 0, 0, 0x10000000, 1, ed_stop, mouse_dd, ed_figure_only, 1, 1 +editboxes_end: ed_port db "COM1",0,0,0,0,0,0 ed_speed db "9600",0,0,0 @@ -435,19 +440,20 @@ ed_data db "8",0 ed_stop db "1",0 option_group1 dd op1 -op1 option_box option_group1, 180, 27, 6, 12, 0xffffff, 0, 0, str_none, 4 -op2 option_box option_group1, 180, 44, 6, 12, 0xffffff, 0, 0, str_odd, 3 -op3 option_box option_group1, 180, 61, 6, 12, 0xffffff, 0, 0, str_even, 4 -op4 option_box option_group1, 180, 78, 6, 12, 0xffffff, 0, 0, str_mark, 4 -op5 option_box option_group1, 180, 95, 6, 12, 0xffffff, 0, 0, str_space, 5 +op1 option_box option_group1, 195, 30, 6, 12, 0xffffff, 0, 0, str_none, 4 +op2 option_box option_group1, 195, 47, 6, 12, 0xffffff, 0, 0, str_odd, 3 +op3 option_box option_group1, 195, 64, 6, 12, 0xffffff, 0, 0, str_even, 4 +op4 option_box option_group1, 195, 81, 6, 12, 0xffffff, 0, 0, str_mark, 4 +op5 option_box option_group1, 195, 98, 6, 12, 0xffffff, 0, 0, str_space, 5 option_group2 dd op6 -op6 option_box option_group2, 270, 27, 6, 12, 0xffffff, 0, 0, str_none, 4 +op6 option_box option_group2, 280, 30, 6, 12, 0xffffff, 0, 0, str_none, 4 ;op7 option_box option_group2, 270, 44, 6, 12, 0xffffff, 0, 0, str_xon, 8, 10b ;op8 option_box option_group2, 270, 61, 6, 12, 0xffffff, 0, 0, str_rts, 7, 1b ;op9 option_box option_group2, 270, 78, 6, 12, 0xffffff, 0, 0, str_dsr, 7 -ch1 check_box2 5 shl 16 + 12, 105 shl 16 + 12, 5, 0xffffff, 0x000000, 0x000000, str_echo, ch_flag_middle +ch1 check_box2 5 shl 16 + 12, 119 shl 16 + 12, 5, 0xffffff, 0x000000, 0, str_echo, ch_flag_middle +ch1_end: Option_boxs1 dd op1, op2, op3, op4, op5, 0 Option_boxs2 dd op6, 0 ;op7, op8, op9, 0