KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

'box_lib.obj' change function 'ted_init_syntax_file'

Browse Source 
git-svn-id: svn://kolibrios.org@2707 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2012-05-31 16:49:37 +00:00
parent e75134c724
commit 9b63edd2e9
5 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/develop/libraries/box_lib/trunk/box_lib.mac
View File

@@ -437,7 +437,7 @@ ted_fun_on_key_ctrl_n equ dword[edi+206] ;... Ctrl+N (ᮧ
ted_fun_on_key_ctrl_s equ dword[edi+210] ;... Ctrl+S
ted_buffer_size equ dword[edi+214] ;ࠧ<><E0A0A7><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD><EFBFBD>/<2F><>⠢<EFBFBD><E2A0A2>
ted_fun_find_err equ dword[edi+218] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD> <20>᫨ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>稫<EFBFBD><E7A8AB> <20><>㤠筮
ted_fun_init_synt_err equ dword[edi+222] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD> <20><><EFBFBD> <20>訡<EFBFBD>筮<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⨨ 䠩<><E4A0A9> ᨭ⠪<E1A8AD><E2A0AA><EFBFBD><EFBFBD>
;ted_fun_init_synt_err equ dword[edi+222] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD> <20><><EFBFBD> <20>訡<EFBFBD>筮<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>⨨ 䠩<><E4A0A9> ᨭ⠪<E1A8AD><E2A0AA><EFBFBD><EFBFBD>
ted_fun_draw_panel_buttons equ dword[edi+226] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ted_fun_draw_panel_find equ dword[edi+230] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>᪠
ted_fun_draw_panel_syntax equ dword[edi+234] ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20>㭪<EFBFBD><E3ADAA><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᨭ⠪<E1A8AD><E2A0AA><EFBFBD><EFBFBD>

30
programs/develop/libraries/box_lib/trunk/t_edit.mac
View File

@@ -685,22 +685,10 @@ endp
align 4
proc ted_init_syntax_file, edit:dword, file:dword, f_name:dword
proc ted_init_syntax_file, edit:dword
pushad
mov edi,dword[edit]
mov eax,70
mov ebx,dword[file]
mov dword[ebx], 0
mov dword[ebx+4], 0
mov dword[ebx+8], 0
mov ecx,ted_syntax_file_size
mov dword[ebx+12], ecx
m2m dword[ebx+16], ted_syntax_file
mov byte[ebx+20], 0
m2m dword[ebx+21], dword[f_name]
int 0x40
mov ecx,0x100
mov edx,ted_arr_key_pos
@@:
@@ -714,22 +702,6 @@ proc ted_init_syntax_file, edit:dword, file:dword, f_name:dword
mov ted_help_text_f1,0
mov ted_help_id,-1 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD><E4A8AA><EFBFBD><EFBFBD> ᫮<><E1ABAE> <20><><EFBFBD> <20><>ࠢ<EFBFBD><E0A0A2>
cmp eax,6
je @f
cmp eax,0
je @f
cmp ax,10
jl .zifra_0_9
mov al,'?'
sub ax,48
.zifra_0_9:
add ax,48
cmp ted_fun_init_synt_err,0
je .no_colors
call ted_fun_init_synt_err
jmp .no_colors
@@:
mov eax,edi ;<3B><><EFBFBD>࠭塞 <20><><EFBFBD>祭<EFBFBD><E7A5AD> edi
mov esi,ted_syntax_file
add edi,ted_offs_count_colors

47
programs/other/t_edit/t_button.inc
View File

@@ -18,7 +18,7 @@ struct symbol
ends
hed db 'TextEditor 19.04.12',0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
hed db 'TextEditor 31.05.12',0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
sc system_colors
;fn_icon db 'te_icon.bmp',0
@@ -197,23 +197,36 @@ ted_save_err_msg:
;description:
; <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [<EFBFBD>ਬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>] <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᨭ⠪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
align 4
proc ted_but_open_syntax, edit:dword
push ebx edi
mov edi,dword[edit]
proc ted_but_open_syntax uses eax ebx ecx edi, edit:dword
mov edi,dword[edit]
cmp ted_panel_id,TED_PANEL_SYNTAX
jne @f
stdcall dword[tl_node_get_data], tree1
pop dword[fn_col_option]
mov ebx,dword[fn_col_option]
copy_path ebx,fn_syntax_dir,file_name_rez,0x0
copy_path file_name_rez,sys_path,file_name,0x0
cmp ted_panel_id,TED_PANEL_SYNTAX
jne @f
stdcall dword[tl_node_get_data], tree1
pop dword[fn_col_option]
mov ebx,dword[fn_col_option]
copy_path ebx,fn_syntax_dir,file_name_rez,0x0
copy_path file_name_rez,sys_path,file_name,0x0
stdcall [ted_init_syntax_file],edi,run_file_70,file_name
call [ted_text_colored]
stdcall [ted_draw],edi
@@:
pop edi ebx
ret
mov ebx,run_file_70
mov dword[ebx], 0
mov dword[ebx+4], 0
mov dword[ebx+8], 0
mov ecx, ted_syntax_file_size
mov dword[ebx+12], ecx
m2m dword[ebx+16], ted_syntax_file
mov byte[ebx+20], 0
m2m dword[ebx+21], file_name
mcall 70
cmp eax,0
jne .end_0
call ted_on_init_synt_err
jmp @f
.end_0:
stdcall [ted_init_syntax_file],edi
call [ted_text_colored]
stdcall [ted_draw],edi
@@:
ret
endp
;description:

2
programs/other/t_edit/t_data.inc
View File

@@ -488,7 +488,7 @@ tedit0: ;
.fun_on_key_ctrl_s dd 0 ;+210 ... Ctrl+S
.buffer_size dd BUF_SIZE ;+214 ࠧ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<EFBFBD><EFBFBD>⠢<EFBFBD><EFBFBD>
.fun_find_err dd ted_on_find_err ;+218 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD>᫨ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>稫<EFBFBD><EFBFBD> <EFBFBD><EFBFBD>㤠筮
.fun_init_synt_err dd ted_on_init_synt_err ;+222 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>訡<EFBFBD>筮<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⨨ 䠩<EFBFBD><EFBFBD> ᨭ⠪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
.fun_init_synt_err dd 0 ;+222
.fun_draw_panel_buttons dd draw_but_toolbar ;+226 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
.fun_draw_panel_find dd draw_panel_find ;+230 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>᪠
.fun_draw_panel_syntax dd draw_panel_syntax ;+234 㪠<EFBFBD><EFBFBD>⥫<EFBFBD> <EFBFBD><EFBFBD> <EFBFBD>㭪<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᨭ⠪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>

18
programs/other/t_edit/t_edit.asm
View File

@@ -169,7 +169,23 @@ mov ecx,ebx
mov ebx,dword[fn_col_option]
copy_path ebx,fn_syntax_dir,file_name_rez,0x0
copy_path file_name_rez,sys_path,file_name,0x0
stdcall [ted_init_syntax_file], tedit0,run_file_70,file_name
mov edi, tedit0
mov ebx,run_file_70
mov dword[ebx], 0
mov dword[ebx+4], 0
mov dword[ebx+8], 0
mov ecx, ted_syntax_file_size
mov dword[ebx+12], ecx
m2m dword[ebx+16], ted_syntax_file
mov byte[ebx+20], 0
m2m dword[ebx+21], file_name
mcall 70
cmp eax,0
jne .end_0
call ted_on_init_synt_err
jmp @f
.end_0:
stdcall [ted_init_syntax_file], edi
;--- get cmd line ---
cmp byte[openfile_path+3],0 ;openfile_path