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

update 't_edit':

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,4 @@
;<3B><>஬<EFBFBD><E0AEAC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>୮<EFBFBD><E0ADAE><EFBFBD> Maxxxx32, Diamond, Heavyiron
;<3B> <20><>㣨<EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC><EFBFBD>⠬, <20> ⠪<><E2A0AA>
;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<Lrz> www.lrz.land.ru)
;<3B><>஬<EFBFBD><E0AEAC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>୮<EFBFBD><E0ADAE><EFBFBD> <EFBFBD>ᥬ, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD>/ᮢ<>⮬/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...
use32
org 0x0
@@ -18,7 +15,7 @@ MAX_COLOR_WORD_LEN equ 40
maxChars equ 100002 ;(...+2)
BUF_SIZE equ 4096 ;buffer for copy|paste
maxSyntaxFileSize equ 410000
TOOLBAR_ICONS_SIZE equ 1200*18
TOOLBAR_ICONS_SIZE equ 1200*20
include '../../proc32.inc'
;include '../../config.inc'
@@ -88,41 +85,34 @@ icon_tl_sys dd 0 ;㪠
align 4
start:
mcall 48,3,sc,sizeof.system_colors
mcall 48,3,sc,sizeof.system_colors
mcall 68,11
or eax,eax
jz button.exit
mcall 68,11
or eax,eax
jz button.exit
mcall 66,1,1 ;scan code
mcall 40,0xC0000027
mcall 66,1,1 ;scan code
mcall 40,0xC0000027
mov esi,file_name
call strlen
mov ecx,eax
mov edi,openfile_path
cld
rep movsb ;<3B><><EFBFBD><EFBFBD><EFBFBD>㥬 <20><><EFBFBD> 䠩<><E4A0A9> <20> <20><><EFBFBD><EFBFBD><EFBFBD> edit1
mov esi,file_name
call strlen
mov ecx,eax
mov edi,openfile_path
cld
rep movsb ;<3B><><EFBFBD><EFBFBD><EFBFBD>㥬 <20><><EFBFBD> 䠩<><E4A0A9> <20> <20><><EFBFBD><EFBFBD><EFBFBD> openfile_path
load_libraries l_libs_start,load_lib_end
;<3B>஢<EFBFBD>ઠ <20><> ᪮<>쪮 㤠筮 <20><><EFBFBD>㧨<EFBFBD><E3A7A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⥪<EFBFBD>
mov ebp,lib0
mov ebp,lib0
.test_lib_open:
cmp dword [ebp+ll_struc_size-4],0
jz @f
mcall -1 ;exit not correct
@@:
mov ebp,lib1 ;
cmp dword [ebp+ll_struc_size-4],0
jz @f
mcall -1 ;exit not correct
@@:
cmp dword[version_text_edit],3
jge @f
stdcall [mb_create],msgbox_10,thread
mcall -1
@@:
add ebp,ll_struc_size
cmp ebp,load_lib_end
jl .test_lib_open
;---------------------------------------------------------------------
stdcall [ted_init], tedit0
@@ -130,6 +120,10 @@ load_libraries l_libs_start,load_lib_end
; OpenDialog initialisation
stdcall [OpenDialog_Init],OpenDialog_data
mov eax,[sc.work_button_text]
mov [PathShow_data_1.font_color],eax
mov eax,[sc.work_button]
mov [PathShow_data_1.background_color],eax
; init toolbar file
load_image_file 'te_icon.png', bmp_icon,TOOLBAR_ICONS_SIZE*2 ;㬭<><E3ACAD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> 2 <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -223,7 +217,6 @@ mov ecx,ebx
je @f ;if file names exist
mov esi,openfile_path
call strlen ;eax=strlen
mov [edit1.size],eax
call but_no_msg_OpenFile
@@:
@@ -276,23 +269,18 @@ draw_window:
mov edx,txtFile
int 0x40
stdcall [edit_box_draw], dword edit1
stdcall [menu_bar_draw], dword menu_data_1
stdcall [PathShow_draw], dword PathShow_data_1
stdcall [menu_bar_draw], dword menu_data_1
call draw_but_toolbar
call draw_but_toolbar
stdcall [ted_draw], tedit0
stdcall [ted_draw], tedit0
mcall 12,2
ret
mcall 12,2
ret
align 4
mouse:
stdcall [edit_box_mouse], dword edit1
test word [edit1.flags],10b ;ed_focus ;<3B>᫨ <20><> <20> 䮪<><E4AEAA><EFBFBD>, <20><>室<EFBFBD><E5AEA4>
jne still
stdcall [ted_mouse], tedit0
cmp byte[tedit0.panel_id],TED_PANEL_FIND ;if not panel
@@ -313,7 +301,7 @@ mouse:
je button.exit
cmp dword[menu_data_1.cursor_out],3
jne @f
stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
call ted_but_save_file
@@:
cmp dword[menu_data_1.cursor_out],2
jne @f
@@ -369,26 +357,6 @@ key:
mcall 2 ;<3B><><EFBFBD><EFBFBD>砥<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>⮩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
stdcall [tl_key], tree1
test word [edit1.flags],10b;ed_focus ; <20>᫨ <20><> <20> 䮪<><E4AEAA><EFBFBD>, <20><>室<EFBFBD><E5AEA4>
je @f
cmp ah,0x80 ;if key up
ja still
cmp ah,42 ;[Shift] (left)
je still
cmp ah,54 ;[Shift] (right)
je still
cmp ah,56 ;[Alt]
je still
cmp ah,29 ;[Ctrl]
je still
cmp ah,69 ;[Pause Break]
je still
stdcall KeyConvertToASCII, dword conv_tabl
stdcall [edit_box_key], dword edit1
jmp still
@@:
test word [edit2.flags],10b;ed_focus ; <20>᫨ <20><> <20> 䮪<><E4AEAA><EFBFBD>, <20><>室<EFBFBD><E5AEA4>
je @f
cmp ah,0x80 ;if key up
@@ -431,7 +399,7 @@ button:
@@:
cmp ah,5
jne @f
stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
call ted_but_save_file
@@:
cmp ah,6
jne @f
@@ -493,6 +461,14 @@ button:
jne @f
stdcall but_synt_show, tedit0
@@:
cmp ah,21
jne @f
stdcall [ted_but_convert_by_table],tedit0,tbl_1251_866
@@:
cmp ah,22
jne @f
stdcall [ted_but_convert_by_table],tedit0,tbl_866_1251
@@:
cmp ah,200
jne @f
@@ -522,8 +498,20 @@ button:
stdcall dword[tl_data_clear], tree1
mcall -1 ;<3B><>室 <20><> <20>ணࠬ<E0AEA3><E0A0AC>
PathShow_data_1:
.type dd 0 ;+0
.start_y dw 9 ;+4
.start_x dw 222 ;+6
.font_size_x dw 6 ;+8 ; 6 - for font 0, 8 - for font 1
.area_size_x dw 200 ;+10
.font_number dd 0 ;+12 ; 0 - monospace, 1 - variable
.background_flag dd 1 ;+16
.font_color dd 0x0 ;+20
.background_color dd 0xffffff ;+24
.text_pointer dd openfile_path ;+28
.work_area_pointer dd text_work_area ;+32
.temp_text_length dd 0 ;+36
edit1 edit_box 250, 220, 5, 0xffffff, 0xff80, 0xff0000, 0xff, 0x4080, 4090, openfile_path, mouse_dd, 0
edit2 edit_box TED_PANEL_WIDTH-1, 0, 20, 0xffffff, 0xff80, 0xff0000, 0xff, 0x4080, 300, buf_find, mouse_dd, 0
unpac_mem dd 0
@@ -587,17 +575,19 @@ IncludeUGlobals
thread_coords:
rb 1024
stacktop:
sys_path:
sys_path: ;<3B><><EFBFBD><EFBFBD> <20><><EFBFBD>㤠 <20><><EFBFBD><EFBFBD><EFBFBD>⨫<EFBFBD><E2A8AB> <20>ᯮ<EFBFBD><E1AFAE>塞<EFBFBD><EFA5AC> 䠩<>
rb 4096
file_name:
file_name: ;<3B><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>᪠
rb 4096
file_name_rez:
syntax_path: ;<3B><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>砥<EFBFBD><E7A0A5><EFBFBD><EFBFBD> 䠩<><E4A0A9> ᨭ⠪<E1A8AD><E2A0AA><EFBFBD><EFBFBD>
rb 4096
plugin_path:
rb 4096
openfile_path:
openfile_path: ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> 䠩<><E4A0A9> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ࠡ<><E0A0A1><EFBFBD>
rb 4096
filename_area:
text_work_area: ;<3B><><EFBFBD><EFBFBD> <20> 䠩<><E4A0A9>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>뢠<EFBFBD><EBA2A0><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>
rb 4096
filename_area: ;<3B><><EFBFBD> 䠩<><E4A0A9> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
rb 256
file_info:
rb 40