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

bugfix and add new bugs :))

Browse Source 
git-svn-id: svn://kolibrios.org@348 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Alexey Teplov (
2007-02-15 07:44:55 +00:00
parent 0502a61207
commit 2f5bd288b7
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
programs/develop/examples/editbox/trunk/EDITBOX.INC
View File

@@ -1,5 +1,6 @@
; <Lrz> 13.02.2007 <20><>ࠫ <20><> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>栭<EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>襭<EFBFBD> <20><>ࠡ<EFBFBD>⠪<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD> 䮭<EFBFBD> ; <Lrz> 15.02.2007 <20><><EFBFBD><EFBFBD>襭<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD> <20><><EFBFBD>頥<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>⥫쭮 <20><><EFBFBD><EFBFBD>⭥<EFBFBD> ࠡ<EFBFBD>⠥<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ᥭ<EFBFBD><E1A5AD> 0<>0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ed_size <20><><EFBFBD><EFBFBD><EFBFBD> <20> Maxxx32 <20>뫨 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>몮<EFBFBD><EBAAAE><EFBFBD> <20> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD>筨<EFBFBD> <20> ⮬, <20><><EFBFBD> <20><>⨬<EFBFBD><E2A8AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뫠 ᢥ<><E1A2A5><EFBFBD><EFBFBD> <20> ⮬<> <20><><EFBFBD> <20> <20><> <20><><EFBFBD>⨫ ᨬ<><E1A8AC><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> 㤠<><E3A4A0><EFBFBD>, <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <EFBFBD><EFBFBD> <20>뢮<EFBFBD><EBA2AE><EFBFBD>, <20> <EFBFBD><EFBFBD>⮬ <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ᨫ<EFBFBD><E1A8AB> <20><><EFBFBD><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD>, <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠫ 㦥 <20><><EFBFBD><EFBFBD>騩<EFBFBD><E9A8A9>. <20>᫨ <20><> <20>ணࠬ<E0AEA3><E0A0AC> <20><>ࠡ<EFBFBD><E0A0A1>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD> <20><> ed_size, <20>஡<EFBFBD><E0AEA1><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> ᥩ<><E1A5A9><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⮪ <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2><EFBFBD>. ; <Lrz> 13.02.2007 <20><>ࠫ <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>栭<EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>襭<EFBFBD> <20><>ࠡ<EFBFBD>⪠ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ᮢ<EFBFBD><E1AEA2> 䮭<>
; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ᥭ<EFBFBD><E1A5AD> 0<>0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ed_size <20><><EFBFBD><EFBFBD><EFBFBD> <20> Maxxx32 <20>뫨 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>몮<EFBFBD><EBAAAE><EFBFBD> <20> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD>稭<EFBFBD> <20> ⮬, <20><><EFBFBD> <20><>⨬<EFBFBD><E2A8AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뫠 ᢥ<><E1A2A5><EFBFBD><EFBFBD> <20> ⮬<>, <20><><EFBFBD> <20> <20><> <20><><EFBFBD>⨫ ᨬ<><E1A8AC><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> 㤠<><E3A4A0><EFBFBD>, <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20>뢮<EFBFBD><EBA2AE><EFBFBD>, <20> <20><>⮬, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ᨫ<EFBFBD><E1A8AB> <20><><EFBFBD><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠫ 㦥 <20><><EFBFBD><EFBFBD>騩<EFBFBD><E9A8A9>. <20>᫨ <20><>, <20>ணࠬ<E0AEA3><E0A0AC> <20><>ࠡ<EFBFBD><E0A0A1>뢠<EFBFBD><EBA2A0> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ப<EFBFBD> <20><> ed_size, <20>஡<EFBFBD><E0AEA1><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> ᥩ<><E1A5A9><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⮪ <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2><EFBFBD>.
; <Lrz> 01.02.2007 <20><>ࠡ<EFBFBD>⪠ edit_box, <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD>. ; <Lrz> 01.02.2007 <20><>ࠡ<EFBFBD>⪠ edit_box, <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD>.
; <Lrz> 26.01.2007 <20><>ଠ<EFBFBD>쭠<EFBFBD> ࠡ<><E0A0A1><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> .check_offset ; <Lrz> 26.01.2007 <20><>ଠ<EFBFBD>쭠<EFBFBD> ࠡ<><E0A0A1><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ࠢ<EFBFBD><E0A0A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> .check_offset
; <Lrz> 24.01.2007 <20><>䨪ᥫ <20><><EFBFBD><EFBFBD> <20>맢<EFBFBD><EBA7A2><EFBFBD><EFBFBD> <20><> <20>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> )). ; <Lrz> 24.01.2007 <20><>䨪ᥫ <20><><EFBFBD><EFBFBD> <20>맢<EFBFBD><EBA7A2><EFBFBD><EFBFBD> <20><> <20>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> )).
@@ -414,8 +415,8 @@ pusha
mov ecx,ed_pos mov ecx,ed_pos
call .del_char call .del_char
;clear ;clear
mov ebp,ed_size mov ebp,ed_color
call .clear_bg call .sh_cl_
;;;; ;;;;
mov eax,ed_shift_pos mov eax,ed_shift_pos
mov ebx,ed_size mov ebx,ed_size
@@ -594,16 +595,23 @@ popa
;jz .draw_bg_cursor_text ;jz .draw_bg_cursor_text
call .draw_cursor call .draw_cursor
.shift: ;;;;;;;SHIFT .shift: ;;;;;;;SHIFT
;test ed_flags,ed_
;mov ebp,ed_size
;call .clear_bg
test word ed_flags,ed_shift test word ed_flags,ed_shift
je .f_exit je .f_exit
mov ebp,shift_color
call .sh_cl_
jmp .draw_cursor_text
;;;;;;;;;;;;;;;;;;;;;
.f_exit: and word ed_flags,ed_shift_cl
call .enable_null
jmp .draw_cursor_text
.sh_cl_:
;;;;;;SHIFT end ;;;;;;SHIFT end
;<3B><><EFBFBD> <20><>ࠡ<EFBFBD>⪨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD>
or word ed_flags,ed_shift_bac
mov eax,dword ed_pos mov eax,dword ed_pos
mov ebx,dword ed_shift_pos mov ebx,dword ed_shift_pos
cmp eax,ebx cmp eax,ebx
@@ -615,16 +623,13 @@ popa
.sh_n: push ebx .sh_n: push ebx
push eax push eax
.sh_n1: .sh_n1:
; jmp .draw_all2
;;;;;;;;;;;;;;;;;;;;;;;;;
;call .clear_cursor
call .check_offset call .check_offset
call .get_n call .get_n
mov edx,eax ;size of ed_box mov edx,eax ;size of ed_box
; push eax ; push eax
mov ecx,ed_offset mov ecx,ed_offset
add eax,ecx ;eax = w_off= ed_offset+width add eax,ecx ;eax = w_off= ed_offset+width
mov ebp,eax ;save mov edx,eax ;save
pop ebx ;<3B><><EFBFBD><EFBFBD>襥 pop ebx ;<3B><><EFBFBD><EFBFBD>襥
pop eax ;<3B><><EFBFBD><EFBFBD>襥 pop eax ;<3B><><EFBFBD><EFBFBD>襥
@@ -632,23 +637,23 @@ popa
cmp eax,ecx ;<3B>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>襣<EFBFBD> <20> offset. cmp eax,ecx ;<3B>ࠢ<EFBFBD><E0A0A2><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>襣<EFBFBD> <20> offset.
jae .f_f ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> jae .f_f ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
xor eax,eax xor eax,eax
cmp ebp,ebx ;cࠢ<63><E0A0A2><EFBFBD> ࠧ<><E0A0A7><EFBFBD> w_off <20> <20><><EFBFBD><EFBFBD>訬 cmp edx,ebx ;cࠢ<63><E0A0A2><EFBFBD> ࠧ<><E0A0A7><EFBFBD> w_off <20> <20><><EFBFBD><EFBFBD>訬
jb @f jb @f
sub ebx,ecx sub ebx,ecx
jmp .nxt_f jmp .nxt_f
@@: mov ebx,ebp @@: mov ebx,edx
sub ebx,ecx sub ebx,ecx
jmp .nxt_f jmp .nxt_f
.f_f: .f_f:
sub eax,ecx sub eax,ecx
cmp ebp,ebx ;cࠢ<63><E0A0A2><EFBFBD> ࠧ<><E0A0A7><EFBFBD> w_off <20> <20><><EFBFBD><EFBFBD>訬 cmp edx,ebx ;cࠢ<63><E0A0A2><EFBFBD> ࠧ<><E0A0A7><EFBFBD> w_off <20> <20><><EFBFBD><EFBFBD>訬
jle @f jle @f
sub ebx,ecx sub ebx,ecx
sub ebx,eax sub ebx,eax
jmp .nxt_f jmp .nxt_f
@@: @@:
mov ebx,ebp mov ebx,edx
sub ebx,ecx sub ebx,ecx
sub ebx,eax sub ebx,eax
.nxt_f: .nxt_f:
@@ -661,16 +666,14 @@ popa
lea ecx,[edx*2+edx] lea ecx,[edx*2+edx]
shl ecx,1 shl ecx,1
mov bx,cx mov bx,cx
mov edx,shift_color
mov edx,ebp;shift_color
call .draw_bg_eax call .draw_bg_eax
and word ed_flags,1111111111111011b and word ed_flags,1111111111111011b
call .enable_null call .enable_null
jmp .draw_cursor_text ret
;;;;;;;;;;;;;;;;;;;;;
.f_exit: and word ed_flags,ed_shift_cl
call .enable_null
jmp .draw_cursor_text
;<3B>஢<EFBFBD>ઠ <20><><EFBFBD><EFBFBD><EFBFBD>ﭨ<EFBFBD> shift <20><><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> ࠭<><E0A0AD><EFBFBD>? ;<3B>஢<EFBFBD>ઠ <20><><EFBFBD><EFBFBD><EFBFBD>ﭨ<EFBFBD> shift <20><><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> ࠭<><E0A0AD><EFBFBD>?
.sh_enable: .sh_enable:
@@ -683,12 +686,14 @@ popa
or word ed_flags,ed_shift_on or word ed_flags,ed_shift_on
ret ret
@@: test word ed_flags,ed_shift_bac
je @f
mov ebp,ed_color
call .sh_cl_ ;<3B><><EFBFBD><EFBFBD>⪠ <20>뤥<EFBFBD><EBA4A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ࠣ<EFBFBD><E0A0A3><EFBFBD><EFBFBD><EFBFBD>
@@: and word ed_flags,ed_shift_cl @@: and word ed_flags,ed_shift_cl
; ret
.sh_ext_en:
ret ret
.sh_ext_en: mov ebp,ed_size
call .clear_bg
ret
;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>ᥭ<EFBFBD><E1A5AD> 0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ed_size+1 ;<3B>㭪<EFBFBD><E3ADAA><EFBFBD> <20><><EFBFBD>ᥭ<EFBFBD><E1A5AD> 0 <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ed_size+1
.enable_null: .enable_null:
pusha pusha
@@ -814,7 +819,7 @@ pusha
;---------------------------------------------------------- ;----------------------------------------------------------
test eax,1 test eax,1
jnz .mouse_left_button jnz .mouse_left_button
@@: popa popa
ret ret
.mouse_left_button: .mouse_left_button:
@@ -866,25 +871,18 @@ pusha
;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䮪<><E4AEAA><EFBFBD> --------------------------- ;--- <20><><EFBFBD>楤<EFBFBD><E6A5A4><EFBFBD> <20><>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD> 䮪<><E4AEAA><EFBFBD> ---------------------------
;---------------------------------------------------------- ;----------------------------------------------------------
bts word ed_flags,1 bts word ed_flags,1
jc .mouse_pressed jc @f
call .draw_cursor call .draw_cursor
call .draw_border jmp .drc
.mouse_pressed:
popa
ret
;.mouse_end_no_focus:
; call .blur
;popa
;ret
;.blur:
;pusha
._blur: ._blur:
test word ed_flags,ed_always_focus test word ed_flags,ed_always_focus
jne @f jne @f
btr word ed_flags,1 ; <20>᫨ <20><> <20> 䮪<><E4AEAA><EFBFBD>, <20><>室<EFBFBD><E5AEA4> btr word ed_flags,1 ; <20>᫨ <20><> <20> 䮪<><E4AEAA><EFBFBD>, <20><>室<EFBFBD><E5AEA4>
jnc @f jnc @f
call .clear_cursor call .clear_cursor
call .draw_border .drc: call .draw_border
@@: @@:
popa popa
ret ret
@@ -908,7 +906,8 @@ ed_always_focus=100000000000000b
ed_focus=10b ed_focus=10b
ed_shift_on=1000b ed_shift_on=1000b
ed_shift=100b ed_shift=100b
ed_shift_cl=1111111111110011b ed_shift_bac=10000b
ed_shift_cl=1111111111100011b
macro draw_edit_boxes start,end macro draw_edit_boxes start,end
{ {
mov edi,start mov edi,start

1
programs/develop/examples/editbox/trunk/build_ru.bat
View File

@@ -1,2 +1,3 @@
@fasm editbox.asm editbox @fasm editbox.asm editbox
@mtappack editbox
@pause @pause

2
programs/develop/examples/editbox/trunk/editbox.asm
View File

@@ -95,7 +95,7 @@ ed_buffer:
;text_b: db '<27><><EFBFBD>-<2D><> ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD>' ;text_b: db '<27><><EFBFBD>-<2D><> ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD>'
;buffer: dd 0 ;buffer: dd 0
buffer_end: buffer_end:
hed db 'EDITBOX optimization and retype <Lrz> date 26.01.2007',0 hed db 'EDITBOX optimization and retype <Lrz> date 15.02.2007',0
i_end1: i_end1:
rb 1024 rb 1024
i_end: i_end: