From ee39c37ecaf60956534272ae3a6de96a943920b8 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 13 May 2012 00:30:49 +0000 Subject: [PATCH] Eolite 1.21 git-svn-id: svn://kolibrios.org@2661 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/fs/Eolite/trunk/Eolite.c-- | 5 ++-- programs/fs/Eolite/trunk/lib/file_system.h | 30 +++++++++++++++++----- programs/fs/Eolite/trunk/lib/kolibri.h | 9 +++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/programs/fs/Eolite/trunk/Eolite.c-- b/programs/fs/Eolite/trunk/Eolite.c-- index a5e934a41..5f0aa5911 100644 --- a/programs/fs/Eolite/trunk/Eolite.c-- +++ b/programs/fs/Eolite/trunk/Eolite.c-- @@ -20,7 +20,7 @@ int BUTTON_HEIGHT=18; #define ONLY_OPEN 2 //переменные -#define title "Eolite File Manager v1.2" +#define title "Eolite File Manager v1.21" dword videlenie=0x94AECE; //цвет выделенного элемента из списка файлов // int but_num, @@ -358,7 +358,8 @@ int pressed_y; inline fastcall void draw_window() { - DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title); + if (GetScreenHeight()<480) DefineAndDrawWindow(20,0,582,GetScreenHeight()-30,0x73,0x10E4DFE1,0,0,title); else + DefineAndDrawWindow(98,90,582,482,0x73,0x10E4DFE1,0,0,title); Form.GetInfo(#Form, SelfInfo); IF (Form.status_window==4) return; //ничего не делать если окно схлопнуто в заголовок IF (Form.height<280) MoveSize(OLD,OLD,OLD,280); diff --git a/programs/fs/Eolite/trunk/lib/file_system.h b/programs/fs/Eolite/trunk/lib/file_system.h index b0162ed3f..e07f6d118 100644 --- a/programs/fs/Eolite/trunk/lib/file_system.h +++ b/programs/fs/Eolite/trunk/lib/file_system.h @@ -26,7 +26,25 @@ struct BDVK{ }; //////////////////////////// -// ірочитать файл // +// Создать файл // +//////////////////////////// +/*f70 create_file_70; +void CreateFile(dword file_size, read_buffer, file_path) +{ + create_file_70.func = 2; + create_file_70.param1 = 0; + create_file_70.param2 = 0; + create_file_70.param3 = file_size; + create_file_70.param4 = read_buffer; + create_file_70.rezerv = 0; + create_file_70.name = file_path; + $mov eax,70 + $mov ebx,#create_file_70.func + $int 0x40 +} */ + +//////////////////////////// +// Прочитать файл // //////////////////////////// f70 read_file_70; void ReadFile(dword pos, file_size, read_buffer, file_path) @@ -44,7 +62,7 @@ void ReadFile(dword pos, file_size, read_buffer, file_path) } /////////////////////////// -// ірочитать папку // +// Прочитать папку // /////////////////////////// f70 read_dir_70; int ReadDir(dword file_count, read_buffer, read_dir_path) @@ -62,7 +80,7 @@ int ReadDir(dword file_count, read_buffer, read_dir_path) } /////////////////////////// -// іапуск программv // +// Запуск программv // /////////////////////////// f70 run_file_70; int RunProgram(dword run_path, run_param) @@ -80,7 +98,7 @@ int RunProgram(dword run_path, run_param) } /////////////////////////// -// Tоздание папки // +// Создание папки // /////////////////////////// f70 create_dir_70; int CreateFolder(dword new_folder_path) @@ -98,7 +116,7 @@ int CreateFolder(dword new_folder_path) } //////////////////////////// -// Lдаление файла/папки // +// Удаление файла/папки // //////////////////////////// f70 del_file_70; int DeleleFile(dword del_file_path) @@ -116,7 +134,7 @@ int DeleleFile(dword del_file_path) } /////////////////////////// -// Tкопировать файл // +// Скопировать файл // /////////////////////////// f70 CopyFile_f; inline fastcall int CopyFile(dword EBX,ECX) diff --git a/programs/fs/Eolite/trunk/lib/kolibri.h b/programs/fs/Eolite/trunk/lib/kolibri.h index a3d28b6a5..89a0e29e2 100644 --- a/programs/fs/Eolite/trunk/lib/kolibri.h +++ b/programs/fs/Eolite/trunk/lib/kolibri.h @@ -195,6 +195,15 @@ inline fastcall dword GetSkinWidth(){ $int 0x40 } +inline fastcall dword GetScreenHeight() +{ + EAX = 14; + EBX = 4; + $int 0x40 + //$shr eax, 16 + $and eax,0x0000FFFF +} + inline fastcall void MoveSize(dword EBX,ECX,EDX,ESI){ EAX = 67; $int 0x40