KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

update 't_edit', add file 't_edit.ini'

Browse Source 
git-svn-id: svn://kolibrios.org@2817 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2012-06-22 11:36:29 +00:00
parent ad90f24ec3
commit b14aaf5e03
8 changed files with 1934 additions and 1897 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Vortex86MX-eng/Makefile
View File

@ -204,6 +204,7 @@ COPY_FILES:=\
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
develop/t_edit.ini:DEVELOP/T_EDIT.INI:$(PROGS)/other/t_edit/t_edit.ini \
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \

1
data/eng/Makefile
View File

@ -227,6 +227,7 @@ COPY_FILES:=\
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
develop/t_edit.ini:DEVELOP/T_EDIT.INI:$(PROGS)/other/t_edit/t_edit.ini \
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \

1
data/new-stack/Makefile
View File

@ -157,6 +157,7 @@ COPY_FILES:=\
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
develop/t_edit.ini:DEVELOP/T_EDIT.INI:$(PROGS)/other/t_edit/t_edit.ini \
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/english/kfm_keys.txt \
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \

1
data/rus/Makefile
View File

@ -227,6 +227,7 @@ COPY_FILES:=\
develop/te_icon.png:DEVELOP/TE_ICON.PNG:$(PROGS)/other/t_edit/te_icon.png \
develop/tl_nod_16.png:DEVELOP/TL_NOD_16.PNG:$(PROGS)/other/t_edit/tl_nod_16.png \
develop/tl_sys_16.png:DEVELOP/TL_SYS_16.PNG:$(PROGS)/media/log_el/trunk/tl_sys_16.png \
develop/t_edit.ini:DEVELOP/T_EDIT.INI:$(PROGS)/other/t_edit/t_edit.ini \
File|Managers/z_icons.png:File|Managers/Z_ICONS.PNG:$(PROGS)/fs/opendial/z_icons.png \
File|Managers/kfm_keys.txt:File|Managers/KFM_KEYS.TXT:$(PROGS)/fs/kfm/trunk/docs/russian/dos_kolibri/kfm_keys.txt \
File|Managers/buttons.bmp:File|Managers/BUTTONS.BMP:$(PROGS)/fs/kfm/trunk/buttons.bmp \

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

@ -17,8 +17,6 @@ struct symbol
td dd ? ;+14 ∇ガ. 磴<EFBFBD><EFBFBD>⑧<EFBFBD>
ends
hed db 'TextEditor 1.06.12',0 ;¯®¤¯¨áì ®ª­ 
sc system_colors
bmp_icon dd 0

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

@ -2,6 +2,30 @@ fn_col_option dd def_col_file
fn_syntax_dir db 'info/',0
def_col_file db 'default.syn',0
;§­ ç¥­¨ï § ¤ ¢ ¥¬ë¥ ¯® 㬮«ç ­¨î, ¡¥§ ini ä ©« 
ini_def_window_t equ 10
ini_def_window_l equ 10
ini_def_window_w equ 485
ini_def_window_h equ 320
ini_def_symbol_w equ 7
ini_def_symbol_h equ 10
ini_def_scroll_type equ 0
;®¯¨á ­¨¥ ¯ à ¬ â஢ ¤«ï ini ä ©« 
ini_name db 't_edit.ini',0
ini_sec_window db 'Window',0
key_window_t db 't',0
key_window_l db 'l',0
key_window_w db 'w',0
key_window_h db 'h',0
key_symbol_w db 'symbol_w',0
key_symbol_h db 'symbol_h',0
key_scroll_type db 'scroll_type',0
ini_sec_options db 'Options',0
align 4
wnd_s_pos: ;¬¥áâ® ¤«ï ­ áâ஥ª áâ à⮢®© ¯®§¨æ¨¨ ®ª­ 
rq 0
system_dir_0 db '/sys/lib/'
lib_name_0 db 'box_lib.obj',0
@ -14,6 +38,10 @@ lib_name_2 db 'proc_lib.obj',0
system_dir_3 db '/sys/lib/'
lib_name_3 db 'libimg.obj',0
system_dir_4 db '/sys/lib/'
lib_name_4 db 'libini.obj',0
;---------------------------------------------------------------------
align 4
import_box_lib:
@ -24,14 +52,6 @@ import_box_lib:
edit_box_mouse dd aEdit_box_mouse
;version_ed dd aVersion_ed
;check_box_draw dd aCheck_box_draw
;check_box_mouse dd aCheck_box_mouse
;version_ch dd aVersion_ch
;option_box_draw dd aOption_box_draw
;option_box_mouse dd aOption_box_mouse
;version_op dd aVersion_op
scrollbar_ver_draw dd aScrollbar_ver_draw
scrollbar_ver_mouse dd aScrollbar_ver_mouse
scrollbar_hor_draw dd aScrollbar_hor_draw
@ -61,7 +81,7 @@ import_box_lib:
tl_cur_beg dd sz_tl_cur_beg
tl_cur_next dd sz_tl_cur_next
tl_cur_perv dd sz_tl_cur_perv
tl_node_close_open dd sz_tl_node_close_open
;tl_node_close_open dd sz_tl_node_close_open
tl_node_lev_inc dd sz_tl_node_lev_inc
tl_node_lev_dec dd sz_tl_node_lev_dec
@ -99,14 +119,6 @@ dd 0,0
aEdit_box_mouse db 'edit_box_mouse',0
;aVersion_ed db 'version_ed',0
;aCheck_box_draw db 'check_box_draw',0
;aCheck_box_mouse db 'check_box_mouse',0
;aVersion_ch db 'version_ch',0
;aOption_box_draw db 'option_box_draw',0
;aOption_box_mouse db 'option_box_mouse',0
;aVersion_op db 'version_op',0
aScrollbar_ver_draw db 'scrollbar_v_draw',0
aScrollbar_ver_mouse db 'scrollbar_v_mouse',0
aScrollbar_hor_draw db 'scrollbar_h_draw',0
@ -136,7 +148,7 @@ dd 0,0
sz_tl_cur_beg db 'tl_cur_beg',0
sz_tl_cur_next db 'tl_cur_next',0
sz_tl_cur_perv db 'tl_cur_perv',0
sz_tl_node_close_open db 'tl_node_close_open',0
;sz_tl_node_close_open db 'tl_node_close_open',0
sz_tl_node_lev_inc db 'tl_node_lev_inc',0
sz_tl_node_lev_dec db 'tl_node_lev_dec',0
@ -187,48 +199,26 @@ dd 0,0
align 4
import_libimg:
dd alib_init1
;img_is_img dd aimg_is_img
;img_info dd aimg_info
;img_from_file dd aimg_from_file
;img_to_file dd aimg_to_file
;img_from_rgb dd aimg_from_rgb
;img_to_rgb dd aimg_to_rgb
img_to_rgb2 dd aimg_to_rgb2
img_decode dd aimg_decode
;img_encode dd aimg_encode
;img_create dd aimg_create
img_destroy dd aimg_destroy
;img_destroy_layer dd aimg_destroy_layer
;img_count dd aimg_count
;img_lock_bits dd aimg_lock_bits
;img_unlock_bits dd aimg_unlock_bits
;img_flip dd aimg_flip
;img_flip_layer dd aimg_flip_layer
;img_rotate dd aimg_rotate
;img_rotate_layer dd aimg_rotate_layer
;img_draw dd aimg_draw
dd 0,0
alib_init1 db 'lib_init',0
;aimg_is_img db 'img_is_img',0 ;®¯à¥¤¥«ï¥â ¯® ¤ ­­ë¬, ¬®¦¥â «¨ ¡¨¡«¨®â¥ª  ᤥ« âì ¨§ ­¨å ¨§®¡à ¦¥­¨¥
;aimg_info db 'img_info',0
;aimg_from_file db 'img_from_file',0
;aimg_to_file db 'img_to_file',0
;aimg_from_rgb db 'img_from_rgb',0
;aimg_to_rgb db 'img_to_rgb',0 ;¯à¥®¡à §®¢ ­¨¥ ¨§®¡à ¦¥­¨ï ¢ ¤ ­­ë¥ RGB
aimg_to_rgb2 db 'img_to_rgb2',0
aimg_decode db 'img_decode',0 ; ¢â®¬ â¨ç¥áª¨ ®¯à¥¤¥«ï¥â ä®à¬ â £à ä¨ç¥áª¨å ¤ ­­ëå
;aimg_encode db 'img_encode',0
;aimg_create db 'img_create',0
aimg_destroy db 'img_destroy',0
;aimg_destroy_layer db 'img_destroy_layer',0
;aimg_count db 'img_count',0
;aimg_lock_bits db 'img_lock_bits',0
;aimg_unlock_bits db 'img_unlock_bits',0
;aimg_flip db 'img_flip',0
;aimg_flip_layer db 'img_flip_layer',0
;aimg_rotate db 'img_rotate',0
;aimg_rotate_layer db 'img_rotate_layer',0
;aimg_draw db 'img_draw',0
align 4
import_libini:
dd alib_init2
ini_get_str dd aini_get_str
ini_get_int dd aini_get_int
ini_get_color dd aini_get_color
dd 0,0
alib_init2 db 'lib_init',0
aini_get_str db 'ini_get_str',0
aini_get_int db 'ini_get_int',0
aini_get_color db 'ini_get_color',0
;---------------------------------------------------------------------
align 4
@ -240,7 +230,7 @@ wScr:
.size_y dw 300 ; +4
.start_y dw 50 ; +6
.btn_high dd 15 ; +8
.type dd 0 ;+12
.type dd ini_def_scroll_type ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
@ -274,7 +264,7 @@ hScr:
.size_y dw 16 ;+4
.start_y dw 50 ;+6
.btn_high dd 15 ;+8
.type dd 0 ;+12
.type dd ini_def_scroll_type ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
@ -308,7 +298,7 @@ ws_dir_lbox: ;
.size_y dw 30 ;+4
.start_y dw 70 ;+6
.btn_high dd 15 ;+8
.type dd 0 ;+12
.type dd ini_def_scroll_type ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
@ -438,7 +428,7 @@ ends
align 4
tedit0: ;áâàãªâãà  â¥ªá⮢®£® । ªâ®à 
.wnd BOX 0,50,440,150 ;+ 0
.rec BOX 30,23,7,10 ;+16
.rec BOX 30,23,ini_def_symbol_w,ini_def_symbol_h ;+16
.drag_m db 0 ;+32 ¢ë¤¥«¥­¨¥ ®â ¬ëè¨
.drag_k db 0 ;+33 ¢ë¤¥«¥­¨¥ ®â ª« ¢¨ âãàë
.sel TexSelect 0,0,0,0 ;+34 áâàãªâãà  ¢ë¤¥«¥­¨ï
@ -518,6 +508,8 @@ dir_mem rb 32+304*count_of_dir_list_files
if lang eq ru
hed db '’¥ªáâ®¢ë© à¥¤ ªâ®à 22.06.12',0 ;¯®¤¯¨áì ®ª­ 
menu_text_area:
db '” ©«',0
.1:
@ -634,6 +626,8 @@ txtFormatApply db '
else
hed db 'Text editor 22.06.12',0
menu_text_area:
db 'File',0
.1:

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

@ -16,7 +16,7 @@ use32
MAX_COLOR_WORD_LEN equ 40
maxChars equ 100002 ;(...+2)
BUF_SIZE equ 1000 ;buffer for copy|paste
BUF_SIZE equ 4096 ;buffer for copy|paste
maxSyntaxFileSize equ 410000
include '../../proc32.inc'
@ -167,6 +167,30 @@ mov ecx,ebx
stdcall dword[tl_cur_beg],tree1 ;áâ ¢¨¬ ªãàá®à ­  ­ ç «® ᯨ᪠
.end_dir_init:
;--- load ini file ---
copy_path ini_name,sys_path,file_name,0x0
;window startup pozition
stdcall dword[ini_get_int],file_name,ini_sec_window,key_window_l,ini_def_window_l
mov word[wnd_s_pos+2],ax
stdcall dword[ini_get_int],file_name,ini_sec_window,key_window_w,ini_def_window_w
mov word[wnd_s_pos],ax
stdcall dword[ini_get_int],file_name,ini_sec_window,key_window_t,ini_def_window_t
mov word[wnd_s_pos+6],ax
stdcall dword[ini_get_int],file_name,ini_sec_window,key_window_h,ini_def_window_h
mov word[wnd_s_pos+4],ax
;scrool type
stdcall dword[ini_get_int],file_name,ini_sec_window,key_scroll_type,ini_def_scroll_type
mov [wScr.type],eax
mov [hScr.type],eax
mov [ws_dir_lbox.type],eax
;symbol size
stdcall dword[ini_get_int],file_name,ini_sec_window,key_symbol_w,ini_def_symbol_w
mov dword[tedit0.rec.width],eax
stdcall dword[ini_get_int],file_name,ini_sec_window,key_symbol_h,ini_def_symbol_h
mov dword[tedit0.rec.height],eax
lea eax,[eax+eax*2]
mov dword[tedit0.rec.top],eax
;--- load color option file ---
mov ebx,dword[fn_col_option]
copy_path ebx,fn_syntax_dir,file_name_rez,0x0
@ -182,6 +206,8 @@ mov ecx,ebx
call but_no_msg_OpenFile
@@:
align 4
red_win:
call draw_window
@ -212,7 +238,7 @@ draw_window:
mov edx,[sc.work]
or edx,0x73000000
mov edi,hed
mcall 0,(10 shl 16)+485,(10 shl 16)+320
mcall 0,dword[wnd_s_pos],dword[wnd_s_pos+4]
mcall 9,procinfo,-1
mov edi,tedit0 ;§­ ç¥­¨¥ edi ­ã¦­® ¤«ï EvSize ¨ ted_wnd_t
@ -496,6 +522,8 @@ if lang eq ru
err_message_import2 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ ',39,'proc_lib.obj',39,0
err_message_found_lib_3 db '<27>¥ ­ ©¤¥­  ¡¨¡«¨®â¥ª  ',39,'libimg.obj',39,0
err_message_import_3 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ ',39,'libimg.obj',39,0
err_message_found_lib_4 db '<27>¥ ­ ©¤¥­  ¡¨¡«¨®â¥ª  ',39,'libini.obj',39,0
err_message_import_4 db 'Žè¨¡ª  ¯à¨ ¨¬¯®à⥠¡¨¡«¨®â¥ª¨ ',39,'libini.obj',39,0
else
head_f_i:
head_f_l db 'System error',0
@ -507,6 +535,8 @@ else
err_message_import2 db 'Error on load import library ',39,'proc_lib.obj',39,0
err_message_found_lib_3 db 'Sorry I cannot found library ',39,'libimg.obj',39,0
err_message_import_3 db 'Error on load import library ',39,'libimg.obj',39,0
err_message_found_lib_4 db 'Sorry I cannot found library ',39,'libini.obj',39,0
err_message_import_4 db 'Error on load import library ',39,'libini.obj',39,0
end if
;library structures
@ -519,6 +549,8 @@ l_libs_start:
err_message_found_lib2, head_f_l, import_proclib, err_message_import2, head_f_i
lib3 l_libs lib_name_3, sys_path, file_name, system_dir_3,\
err_message_found_lib_3, head_f_l, import_libimg, err_message_import_3, head_f_i
lib4 l_libs lib_name_4, sys_path, file_name, system_dir_4,\
err_message_found_lib_4, head_f_l, import_libini, err_message_import_4, head_f_i
load_lib_end:
IncludeIGlobals

9
programs/other/t_edit/t_edit.ini Normal file
View File

@ -0,0 +1,9 @@
[Window]
t=10
l=10
w=485
h=370
symbol_w=7
symbol_h=11
scroll_type=0
[Options]