XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

't_edit' small fix copy to clipboard

Browse Source 
git-svn-id: svn://kolibrios.org@7036 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2017-09-30 18:05:24 +00:00
parent 7cc546b610
commit c5e4924194
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
programs/develop/libraries/box_lib/trunk/bl_sys.mac
View File

@ -3,6 +3,5 @@ include 'd_button.mac' ;macro implements dinamic_button
include 'menubar.mac' ;macro implements menubar
include 'filebrowser.mac' ;macro implements filebrowser
include 'pathshow.mac' ;macro implements pathshow
include 't_edit.mac' ;macro implements text_editor
include 'frame.mac' ;macro implements frame
include 'progressbar.mac' ;macro implements progressbar

11
programs/develop/libraries/box_lib/trunk/box_lib.asm
View File

@ -39,7 +39,7 @@ include 'checkbox.asm' ;checkbox
;--------------------------------------------------
;radiobutton Group
include 'optionbox.asm' ;macro implements optionbox
include 'optionbox.asm' ;optionbox
;--------------------------------------------------
;scrollbar Group
@ -71,7 +71,7 @@ use_file_browser
;--------------------------------------------------
;tree list
include 'tree_list.asm' ;macro implements tree_list, image_list, list_box
include 'tree_list.asm' ;tree_list, list_box
;--------------------------------------------------
;PathShow Group
@ -81,9 +81,8 @@ use_path_show
;--------------------------------------------------
;text editor
;--------------------------------------------------
align 16
use_text_edit
include 't_edit.asm' ;text_editor
;--------------------------------------------------
;Frame Group
;--------------------------------------------------
@ -118,7 +117,7 @@ proc draw_edge uses eax ebx ecx edx edi esi, box_l:dword, box_t:dword, box_w:dwo
mov esi,dword[col_1]
and esi,111111101111111011111110b
mov eax,13
mov eax,SF_DRAW_RECT
;bottom line
mov edx,dword[col_2]
mov ebx,dword[box_l]

24
programs/develop/libraries/box_lib/trunk/t_edit.mac → programs/develop/libraries/box_lib/trunk/t_edit.asm
View File

@ -20,8 +20,6 @@ macro ColToIndexOffset ind_reg,out_reg {
add out_reg,ted_key_words_data
}
macro use_text_edit
{
TED_PANEL_NULL equ 0 ;­¥â ®âªàë⮩ ¯ ­¥«¨
TED_PANEL_FIND equ 1 ;¯ ­¥«ì ¯®¨áª 
TED_PANEL_SYNTAX equ 2 ;¯ ­¥«ì ¢ë¡®à  ä ©«®¢ ¯®¤á¢¥âª¨
@ -76,7 +74,7 @@ txtBuf db 'Buffer:',0
end if
;EvChar - â ¡«¨æ  ¤«ï 䨫ìâ஢ ­¨ï ¤®¡ ¢«ï¥¬ëå ᨬ¢®«®¢, çâ®-¡ë ­¥ ¯®¯ «¨ «¨è­¨¥ §­ ª¨
align 4
align 16
EvChar db 0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
db 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
@ -2003,20 +2001,20 @@ proc ted_set_undo
jle @f
;if(tex[i].tc>ted_tim_ch){ // ¥á«¨ ᮧ¤ ­¨¥ ᨬ¢®«  ¡ë«® ®â¬¥­¥­®
cmp [edx+10],eax
cmp [edx+symbol.tc],eax
jle .no_u1
mov dword [edx+10],0
mov dword [edx+14],0
mov dword [edx+symbol.tc],0
mov dword [edx+symbol.td],0
mov ebx,[edx+2]
mov ebx,[edx+symbol.perv]
imul ebx,sizeof.symbol
add ebx,ted_tex ;ebx=tex[i].perv
m2m dword [ebx+6],dword [edx+6] ;tex[tex[i].perv].next=tex[i].next;
m2m dword [ebx+symbol.next],dword [edx+symbol.next] ;tex[tex[i].perv].next=tex[i].next;
mov ebx,[edx+6]
mov ebx,[edx+symbol.next]
imul ebx,sizeof.symbol
add ebx,ted_tex ;ebx=tex[i].next
m2m dword [ebx+2],dword [edx+2] ;tex[tex[i].next].perv=tex[i].perv;
m2m dword [ebx+symbol.perv],dword [edx+symbol.perv] ;tex[tex[i].next].perv=tex[i].perv;
cmp ted_ptr_free_symb,edx
jle .no_cor_free
@ -2027,9 +2025,9 @@ proc ted_set_undo
.no_u1:
;else if(tex[i].td>ted_tim_ch) tex[i].td=0; // ¥á«¨ 㤠«¥­¨¥ ᨬ¢®«  ¡ë«® ®â¬¥­¥­®
cmp [edx+14],eax
cmp [edx+symbol.td],eax
jle .no_u2
mov dword [edx+14],0
mov dword [edx+symbol.td],0
.no_u2:
call ted_get_text_next_pos
@ -2616,7 +2614,6 @@ proc ted_but_copy, edit:dword
cmp ecx,12
je .end_f
inc ecx ;ŕ §ŹĽŕ ¤ ­­ëĺ ˘ ĄăäĽŕĽ + ᨏ˘ŽŤ § ˘Ľŕ輭¨ď áâப¨
mov ebx,ted_buffer
mov [ebx],ecx
mcall SF_CLIPBOARD,SSF_WRITE_CB,ecx,ted_buffer
@ -4178,4 +4175,3 @@ align 4
popad
ret
endp
}