Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7574 → Rev 7575

/programs/other/t_edit/t_button.inc
163,20 → 163,25
@@:
 
cmp ah,1
je .exit
jne @f
call ted_Exit
jmp still
@@:
 
cmp ah,199
je .exit
jne still
call ted_Exit
jmp still
jmp still
.exit:
align 4
ted_Exit:
cmp dword[wnd_k_words_run],0
je @f
push ebx ecx
mcall SF_SYSTEM, SSF_TERMINATE_THREAD_ID,[wnd_k_words_run]
pop ecx ebx
test eax,eax
jnz still
mov dword[wnd_k_words_run],0
;test eax,eax
@@:
cmp dword[exit_code],1
je @f
185,7 → 190,7
jne @f
stdcall [mb_create],msgbox_2,thread ;message: save buf in file?
stdcall [mb_setfunctions],msgbox_2E_funct
jmp still
ret
@@:
stdcall mem.Free,[bmp_icon]
cmp dword[unpac_mem],0
192,10 → 197,10
je @f
stdcall mem.Free,[unpac_mem]
@@:
stdcall [ted_delete], tedit0
stdcall [tl_data_clear], tree1
mcall SF_TERMINATE_PROCESS ;¢ë室 ¨§ ¯à®£à ¬¬ë
;ret
 
;input:
; al = ª®¤ ®è¨¡ª¨
/programs/other/t_edit/t_edit.asm
39,7 → 39,9
 
mcall SF_SYS_MISC,SSF_HEAP_INIT
or eax,eax
jz button.exit
jnz @f
call ted_Exit
@@:
 
mcall SF_KEYBOARD,SSF_SET_INPUT_MODE,1 ;scan code
mcall SF_SET_EVENTS_MASK,0xC0000027
200,7 → 202,10
still:
mcall SF_WAIT_EVENT
cmp dword[exit_code],1
je button.exit
jne @f
call ted_Exit
jmp still
@@:
 
cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
jz red_win
210,7 → 215,7
jz button
cmp al,6 ;¬ëèì
jne @f
jmp mouse
call mouse
@@:
jmp still
 
228,7 → 233,7
bt eax,24 ;¤¢®©­®© 饫çñª «¥¢®© ª­®¯ª®©
jnc @f
stdcall [ted_but_select_word], tedit0
jmp still
ret
@@:
stdcall [ted_mouse], tedit0
.no_edit:
241,7 → 246,7
jne @f
stdcall [tl_mouse], tree1
@@:
jmp still
ret
;---------------------------------------------------------------------
 
;output:
/programs/other/t_edit/wnd_k_words.inc
27,7 → 27,7
mov edi,tedit0
mov edx,ted_key_words_count
add dword[tree3.info_max_count],edx ;áâ ¢¨¬ ç¨á«® 㧫®¢, à ¢­®¥ ª®««¨ç¥áâ¢ã ª«î祢ëå á«®¢ ¢ ä ©«¥ ¯®¤á¢¥âª¨ (+2 ­  ­ ç «® ¨ ª®­¥æ ᯨ᪠)
stdcall dword[tl_data_init], tree3
stdcall [tl_data_init], tree3
mov eax,dword[icon_tl_sys]
mov dword[tree3.data_img],eax
mov eax,dword[tree1.data_img_sys]
56,7 → 56,7
mcall ,,,4
 
mov ebx,[bmp_icon]
add ebx,7*IMAGE_TOOLBAR_ICON_SIZE
add ebx,(ID_BUT_FIND-ID_BUT_0)*IMAGE_TOOLBAR_ICON_SIZE
mcall SF_PUT_IMAGE,,(20 shl 16)+20,(5 shl 16)+5 ;­ ©â¨
 
sub ebx,2*IMAGE_TOOLBAR_ICON_SIZE
63,6 → 63,20
mov edx,(30 shl 16)+5 ;ª®¯¨à®¢ âì
int 0x40
 
mcall SF_THREAD_INFO,procinfo,-1
mov eax,[procinfo.box.height]
cmp eax,90
jge @f
mov eax,90 ;min size
@@:
sub eax,58
cmp [tree3.box_height],eax
je @f
mov [tree3.box_height],eax
mov word[w_scr_t3.y_size],ax
;need call tb_scrol_resize
@@:
 
mov dword[w_scr_t3.all_redraw],1
stdcall [scrollbar_ver_draw], w_scr_t3
stdcall [tl_draw], tree3
93,7 → 107,7
.exit:
mov dword[tree3.data_img],0 ;ç¨á⨬ 㪠§ â¥«¨ ­  ¨ª®­ª¨ çâ®-¡ë ¨å ­¥ 㤠«¨« ¤¥áâàãªâ®à
mov dword[tree3.data_img_sys],0 ;â. ª. ®­¨ ¥é¥ ¨á¯®«ì§ãîâìáï ¢ ¤à㣨å í«¥¬¥­â å
stdcall dword[tl_data_clear], tree3
stdcall [tl_data_clear], tree3
mov dword[wnd_k_words_run],0 ;®¡­ã«ï¥¬ ID ®ª­ 
mcall SF_TERMINATE_PROCESS
 
128,7 → 142,8
mov edi,tedit0
cmp ted_syntax_file,0
je @f
stdcall dword[tl_info_clear], tree3
stdcall [tl_info_clear], tree3
and dword[tree3.style], not tl_cursor_pos_limited
 
mov ebx,ted_key_words_data
mov ecx,ted_key_words_count
138,21 → 153,22
test al,al
jnz .end_add
;ª«î祢®¥ á«®¢®
stdcall dword[tl_node_add], tree3, (1 shl 16), ebx
stdcall dword[tl_cur_next], tree3
stdcall [tl_node_add], tree3, (1 shl 16), ebx
stdcall [tl_cur_next], tree3
mov edx,[ebx+MAX_COLOR_WORD_LEN]
or edx,edx
jz .end_add
;á¯à ¢ª  ¯® ª«î祢®¬ã á«®¢ã
add edx,ted_help_text_f1
stdcall dword[tl_node_add], tree3, 1, edx
stdcall dword[tl_cur_next], tree3
stdcall [tl_node_add], tree3, 1, edx
stdcall [tl_cur_next], tree3
.end_add:
add ebx,MAX_COLOR_WORD_LEN+8 ;sizeof.TexColViv
loop .cycle_0
 
stdcall dword[tl_cur_beg], tree3
stdcall dword[tl_draw], tree3
stdcall [tl_cur_beg], tree3
or dword[tree3.style], tl_cursor_pos_limited ;®£à ­¨ç¨¢ ¥¬ ¤¢¨¦¥­¨¥ ªãàá®à  ¢ ¯à¥¤¥« å ᯨ᪠
stdcall [tl_draw], tree3
jmp .no_select_0
@@:
cmp ah,4