Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7649 → Rev 7134

/programs/fs/mfar/trunk/macros.inc
File deleted
\ No newline at end of file
/programs/fs/mfar/trunk/mf-copy.inc
2,7 → 2,7
;///// COPYING ////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func copy_file
__func copy_file
pushad
 
cmp [active_panel],0
126,7 → 126,7
 
;------------------------------------------------------------------------------
 
func draw_window_copy_main
__func draw_window_copy_main
mcall2 MF_FILLRECT,oX+tW*2,tW*76,oY+tH*7,tH*8,0x00C0C0C0
 
mmov esi,oX+tW*4+2,oX+tW*75+3
168,7 → 168,7
 
;------------------------------------------------------------------------------
 
func draw_copy_input
__func draw_copy_input
mcall2 MF_FILLRECT,oX+tW*6,tW*68,oY+tH*10,tH,0x00008080
 
mov edx,fc_info.path
/programs/fs/mfar/trunk/mf-sort.inc
11,7 → 11,7
dd compare_by_extension
 
; AL = panel
func mfar_sort
__func mfar_sort
pusha
cmp al,0
jne ._00
69,7 → 69,7
 
; ESI = pointer to 1st file info
; EDI = pointer to 2nd file info
func compare_by_name
__func compare_by_name
mov ecx,11
push edi esi
repe cmpsb
102,7 → 102,7
 
; ESI = pointer to 1st file info
; EDI = pointer to 2nd file info
func compare_by_extension
__func compare_by_extension
push edi esi
mov ecx,3
add esi,8
/programs/fs/mfar/trunk/mfar.asm
26,6 → 26,7
; +0004C300:FFFB3CFF - dinamically allocated for copy, view, edit etc.
;
 
include 'lang.inc'
include 'macros.inc'
include 'menuet.inc'
include 'mfar.inc'
289,14 → 290,14
;///// DRAW WINDOW ////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_window
__func draw_window
mcall MF_WINPROPS,WP_GETSYSCLRS,sc,sizeof.system_colors
 
mcall MF_WNDDRAW,WD_BEGINDRAW
mov edx,[fc.background]
or edx,$14000000
mov edi,caption
or edx,WS_SKINNED
mcall2 MF_DEFWINDOW,90,oX+tW*80+4,45,oY+tH*25+4
mcall1 MF_DRAWTEXT,8,8,[sc.grab_text],caption,caption.size
 
mmov esi,oX+2,oX+tW*39+2
mmov edi,oY+3,oY+tH*22+3
339,7 → 340,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_window_full
__func draw_window_full
call draw_window
mov edx,1
call get_files_data
359,7 → 360,7
align 4
len dd ?
 
func get_normal_path
__func get_normal_path
pusha
mov ecx,5
rep movsb
393,7 → 394,7
; EAX = length needed
; ECX = current length
; EDI = path string
func get_path_ellipses
__func get_path_ellipses
cmp ecx,eax
jbe @f
pushad
415,7 → 416,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_path
__func draw_path
pushad
cmp [active_panel],0
jne ._00
443,7 → 444,7
;------------------------------------------------------------------------------
 
; AL = panel
func draw_files
__func draw_files
push eax
mmov ecx,oY+tH*2-1,tH*FPC
mov edx,[fc.background]
518,7 → 519,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func draw_bottom_keys
__func draw_bottom_keys
pushad
mcall2 MF_FILLRECT,oX-1,tW*80+1,oY+tH*24-1,tH+1,[fc.pathbg]
dec ecx
550,7 → 551,7
; ESI = X1*65536+X2
; EDI = Y1*65536+Y2
; EDX = color
func draw_frame
__func draw_frame
mov ecx,edi
mov ebx,edi
shr ebx,16
577,7 → 578,7
;------------------------------------------------------------------------------
 
; EDX = pointer to file data
func get_file_color
__func get_file_color
push esi
mov cl,[edx+11]
test cl,(FA_HIDDEN or FA_SYSTEM)
631,7 → 632,7
;------------------------------------------------------------------------------
 
; EDI = color
func draw_sel
__func draw_sel
pushad
cmp [active_panel],0
jne ._00
714,7 → 715,7
;------------------------------------------------------------------------------
 
; AL = panel
func draw_file_info
__func draw_file_info
push eax
mmov ecx,oY+tH*21,tH
mov edx,[fc.background]
789,7 → 790,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func get_file_name
__func get_file_name
pushad
mov eax,[esi+0]
mov [f_name+0],eax
809,7 → 810,7
;------------------------------------------------------------------------------
 
; ESI = pointer to file data
func get_file_info
__func get_file_info
pushad
mov eax,[esi+12]
mov dword[f_info],FS_READ
887,7 → 888,7
;------------------------------------------------------------------------------
 
; DL = panel
func get_files_data
__func get_files_data
pushad
mov [d_tcnt],0
mov [d_ttsz],0
984,7 → 985,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func execute_current_file
__func execute_current_file
pushad
cmp [active_panel],0
jne ._00
1079,7 → 1080,7
;//////////////////////////////////////////////////////////////////////////////
;------------------------------------------------------------------------------
 
func delete_current_file
__func delete_current_file
pushad
popad
ret
1123,12 → 1124,12
dd read_area
dd MEM_FOR_OS
.path:
rb 255
rb 200
 
f_plen0 dd 5
f_plen1 dd 5
 
sz caption,'MFAR : PRE-ALPHA-8.1',0
sz caption,'MFAR : PRE-ALPHA-8.1'
sz fcfile,'MFAR DAT'
sz p_hd,'/HD/1',0
sz p_rd,'/RD/1',0
/programs/fs/mfar/trunk/build_en.bat
1,4 → 1,4
@erase lang.inc
@echo lang fix en >lang.inc
@fasm mfar.asm mfar
@erase lang.inc
@pause
/programs/fs/mfar/trunk/build_ru.bat
1,4 → 1,4
@erase lang.inc
@echo lang fix ru >lang.inc
@fasm mfar.asm mfar
@erase lang.inc
@pause
/programs/fs/mfar/trunk/menuet.inc
137,17 → 137,16
SND_PLAYBLOCK = 1
SND_SETFORMAT = 2
SF_SETLENGTH = 1
;MF_HDWRITEFILE = 56
;MF_HDDELFILE = 57
MF_FSACCESS = 70
FS_READ = 999999
FS_READ_FILE = 0
FS_READ_FOLDER = 1
FS_WRITE_FILE = 2
MF_HDWRITEFILE = 56
MF_HDDELFILE = 57
MF_FSACCESS = 58
FS_READ = 0
FS_WRITE = 1
FS_DELETE = 2
FS_APPEND = 3
FS_EXECUTE = 7
FS_DELETE = 8
FS_CREATE_FOL = 9
FS_LBAREAD = 8
FS_LBAWRITE = 9
FS_EXECUTE = 16
MF_SYSTRACE = 59
ST_GETEVENTS = 0
MF_IPC = 60