Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 1361 → Rev 1390

/programs/other/t_edit/load_lib.mac
File deleted
/programs/other/t_edit/t_edit.asm
21,8 → 21,7
 
 
include '../../macros.inc'
;include '../../develop/libraries/box_lib/load_lib.mac'
include 'load_lib.mac' ;include old file
include '../../develop/libraries/box_lib/load_lib.mac'
include '../../develop/libraries/box_lib/trunk/tree_list.mac'
include '../../develop/libraries/box_lib/trunk/editbox.mac'
 
71,8 → 70,8
call Clear
 
;-------------------------------------------------
mov ecx,maxColWords*sizeof.TexColViv
add ecx,40
mov ecx,maxColWords*sizeof.TexColViv+40
;add ecx,40
call mem_Alloc
mov [options_file],eax
mov [options_file_end],eax
91,7 → 90,7
mov edi,buf_cmd_lin
rep movsb
 
copy_path fn_icon,sys_path,file_name
copy_path fn_icon,sys_path,file_name,0x0
 
mov eax,70 ;load icon file
mov [run_file_70.func_n], 0
130,7 → 129,7
call dword[tl_data_init]
;---------------------------------------------------------------------
; ÷èòàåì bmp ôàéë ñ êóðñîðàìè è ëèíèÿìè
copy_path fn_icon_tl_sys,sys_path,file_name
copy_path fn_icon_tl_sys,sys_path,file_name,0x0
 
mov ecx,3*256*13
call mem_Alloc
153,7 → 152,7
@@:
;---------------------------------------------------------------------
; ÷èòàåì bmp ôàéë ñ èêîíêàìè óçëîâ
copy_path fn_icon_tl_nod,sys_path,file_name
copy_path fn_icon_tl_nod,sys_path,file_name,0x0
 
mov ecx,3*256*2
call mem_Alloc
175,7 → 174,7
mov dword[tree1.data_img],0
@@:
;------------------------------------------------------------------------------
copy_path fn_syntax_dir,sys_path,file_name ;áåðåì ïóòü ê ïàïêå ñ ôàéëàìè ñèíòàêñèñà
copy_path fn_syntax_dir,sys_path,file_name,0x0 ;áåðåì ïóòü ê ïàïêå ñ ôàéëàìè ñèíòàêñèñà
mov eax,70
mov ebx,tree_file_struct
int 0x40
/programs/other/t_edit/t_work.inc
68,7 → 68,7
tex_1 dd 0 ;text first symbol pointer
tex_end dd 0 ;text end memory pointer
 
hed db 'TextEditor 30.12.09',0 ;ïîäïèñü îêíà
hed db 'TextEditor 05.02.10',0 ;ïîäïèñü îêíà
sc system_colors
 
wndMain BOX 0,50,440,150
250,12 → 250,9
InitColText:
push eax ebx ecx esi edi
 
; mov ebx,fn_col_option
; mov esi,sys_path
; mov edi,file_name
mov ebx,dword[fn_col_option]
copy_path ebx,fn_syntax_dir,file_name_rez
copy_path file_name_rez,sys_path,file_name
copy_path ebx,fn_syntax_dir,file_name_rez,0x0
copy_path file_name_rez,sys_path,file_name,0x0
 
mov eax,70
mov [run_file_70.func_n], 0
277,7 → 274,6
add edi,4
loop @b
 
 
;init: ColColor, ColWords, ...
mov dword[ColColor],1
mov dword[ColWords],0
339,13 → 335,6
add ecx,dword[Col]
mov dword[tex_help_f1],ecx
 
;copy new colors in dir_list
; m2m dword[eax+28],dword[WND_WORK_COLOR]
; m2m dword[eax+32],dword[SELECT_COLOR]
; m2m dword[eax+36],dword[WND_CAPT_COLOR]
; m2m dword[eax+40],dword[WND_TEXT_COLOR]
; m2m dword[eax+44],dword[CUR_TEXT_COLOR]
.no_colors:
pop edi esi ecx ebx eax
ret
1757,3 → 1746,32
pop ecx ebx
ret
 
;-----------------------------------------------------------------------------
;ôóíêöèÿ äëÿ âûäåëåíèÿ ïàìÿòè
;input:
; ecx = size data
;otput:
; eax = pointer to memory
align 4
mem_Alloc:
push ebx
mov eax,68
mov ebx,12
int 0x40
pop ebx
ret
;-----------------------------------------------------------------------------
;ôóíêöèÿ äëÿ îñâîáîæäåíèÿ ïàìÿòè
;input:
; ecx = pointer to memory
align 4
mem_Free:
push eax ebx
cmp ecx,0
jz @f
mov eax,68
mov ebx,13
int 0x40
@@:
pop ebx eax
ret