update 't_edit':

1) convert cp1251-866, cp866-1251
2) use PathShow
3) modify element t_edit in box_lib.obj

git-svn-id: svn://kolibrios.org@4308 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2013-11-28 10:35:07 +00:00
parent c4ddb68d5f
commit e07b6d7a9a
7 changed files with 196 additions and 134 deletions
@@ -311,9 +311,9 @@ dd sz_PathShow_prepare, path_show.prepare
dd sz_PathShow_draw, path_show.draw
dd szVersion_path_show, 0x00010001
dd sz_ted_but_save_file, ted_but_save_file
dd sz_ted_but_sumb_upper, ted_but_sumb_upper
dd sz_ted_but_sumb_lover, ted_but_sumb_lover
dd sz_ted_but_convert_by_table, ted_but_convert_by_table
dd sz_ted_can_save, ted_can_save
dd sz_ted_clear, ted_clear
dd sz_ted_delete, ted_delete
@@ -325,6 +325,7 @@ dd sz_ted_is_select, ted_is_select
dd sz_ted_key, ted_key
dd sz_ted_mouse, ted_mouse
dd sz_ted_open_file, ted_open_file
dd sz_ted_save_file, ted_save_file
dd sz_ted_text_add, ted_text_add
dd sz_ted_but_select_word, ted_but_select_word
dd sz_ted_but_cut, ted_but_cut
@@ -335,7 +336,7 @@ dd sz_ted_but_redo, ted_but_redo
dd sz_ted_but_reverse, ted_but_reverse
dd sz_ted_but_find_next, ted_but_find_next
dd sz_ted_text_colored, ted_text_colored
dd sz_ted_version, 0x00000003
dd sz_ted_version, 0x00000004
dd sz_Frame_draw, frame.draw
dd szVersion_frame, 0x00010001
@@ -416,9 +417,9 @@ sz_PathShow_prepare db 'PathShow_prepare',0
sz_PathShow_draw db 'PathShow_draw',0
szVersion_path_show db 'version_PathShow',0
sz_ted_but_save_file db 'ted_but_save_file',0
sz_ted_but_sumb_upper db 'ted_but_sumb_upper',0
sz_ted_but_sumb_lover db 'ted_but_sumb_lover',0
sz_ted_but_convert_by_table db 'ted_but_convert_by_table',0
sz_ted_can_save db 'ted_can_save',0
sz_ted_clear db 'ted_clear',0
sz_ted_delete db 'ted_delete',0
@@ -430,6 +431,7 @@ sz_ted_is_select db 'ted_is_select',0
sz_ted_key db 'ted_key',0
sz_ted_mouse db 'ted_mouse',0
sz_ted_open_file db 'ted_open_file',0
sz_ted_save_file db 'ted_save_file',0
sz_ted_text_add db 'ted_text_add',0
sz_ted_but_select_word db 'ted_but_select_word',0
sz_ted_but_cut db 'ted_but_cut',0
@@ -1,6 +1,6 @@
; ¬ ªà®á ¤«ï á¨á⥬­®© ¡¨¡«¨®â¥ª¨ box_lib.obj
; í«¥¬¥­â TextEditor ¤«ï Kolibri OS
; ä ©« ¯®á«¥¤­¨© à § ¨§¬¥­ï«áï 18.11.2013 IgorA
; ä ©« ¯®á«¥¤­¨© à § ¨§¬¥­ï«áï 27.11.2013 IgorA
; ­  ª®¤ ¯à¨¬¥­¥­  GPL2 «¨æ¥­§¨ï
;input:
@@ -1264,6 +1264,38 @@ ted_char_add:
call ted_text_colored
ret
;description:
; äã­ªæ¨ï ¤«ï ᬥ­ë ª®¤¨à®¢®ª
;input:
; table - â ¡«¨æ  ¤«ï ¯¥à¥ª®¤¨à®¢ª¨
align 4
proc ted_but_convert_by_table uses eax edx edi esi, edit:dword, table:dword
mov edi,dword[edit]
mov esi,dword[table]
mov edx,ted_tex
.cycle:
;¯¥à¥å®¤¨¬ ­  á«¥¤ãî騩 ᨬ¢®«
mov edx,dword[edx+6]
cmp edx,1
jle .end_text
imul edx,sizeof.symbol
add edx,ted_tex
movzx eax,byte[edx]
add eax,esi
mov al,byte[eax]
cmp al,0
je @f
mov byte[edx],al ;¬¥­ï¥¬ ª®¤¨à®¢ªã ᨬ¢®« 
@@:
jmp .cycle
.end_text:
;cmp esi,0
;je @f
stdcall ted_draw,edi ;®¡­®¢«ï¥¬ ®ª­®
;@@:
ret
endp
;input:
; edi = pointer to tedit struct
@@ -4038,7 +4070,7 @@ ted_wnd_main_mouse_scroll:
ret
align 4
proc ted_but_save_file, edit:dword, file:dword, f_name:dword
proc ted_save_file, edit:dword, file:dword, f_name:dword
pushad
mov edi,dword[edit]