Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9013 → Rev 9014

/programs/fs/kfar/trunk/editor.inc
2220,11 → 2220,11
cmp byte [ebx], al
jz .f7.ret
mov esi, tolower_table
test [find_in_file_dlgdata.flags_case], 10h
test [find_in_file_dlgdata.case.flags], 10h
jz @f
mov esi, identical_table
@@:
test [find_in_file_dlgdata.flags_whole], 10h
test [find_in_file_dlgdata.whole.flags], 10h
setnz al
push eax
push dword [ebp+editor_data.encoding]; always cp866 for now
2239,7 → 2239,7
push ebx esi
push edi
push edi
test [find_in_file_dlgdata.flags_whole], 10h
test [find_in_file_dlgdata.whole.flags], 10h
jnz @f
movzx eax, byte [esi+ebx]
jmp .search_loop_next
2284,7 → 2284,7
jc .f7.nonextblock
.f7.notfound_pop:
; last chance - if we are looking for a whole word, EOF is ok for last symbol
test [find_in_file_dlgdata.flags_whole], 10h
test [find_in_file_dlgdata.whole.flags], 10h
jz @f
mov esi, [ebp + editor_data.last_block]
add esi, ebp
2300,7 → 2300,7
or [ebp + editor_data.cur_delta], -1
sub ebx, ecx
inc ebx
test [find_in_file_dlgdata.flags_whole], 10h
test [find_in_file_dlgdata.whole.flags], 10h
jz @f
inc ebx
@@:
2324,7 → 2324,7
pop edi
; esi:ebx -> last symbol of match, eax = row, edi = delta in lines
pop esi ebx
test [find_in_file_dlgdata.flags_whole], 10h
test [find_in_file_dlgdata.whole.flags], 10h
jz @f
dec ecx
@@:
2550,23 → 2550,23
mov [ebx + dlgtemplate.width], eax
dec eax
dec eax
mov [ebx - find_in_file_dlgdata + find_in_file_dlgdata.width2], eax
mov [ebx + FindInFileDlgdata.efind.x2], eax
shr eax, 1
dec eax
dec eax
mov [ebx - find_in_file_dlgdata + find_in_file_dlgdata.search_x2], eax
mov [ebx + FindInFileDlgdata.search.x2], eax
sub eax, aSearchBLength-1
mov [ebx - find_in_file_dlgdata + find_in_file_dlgdata.search_x1], eax
mov [ebx + FindInFileDlgdata.search.x1], eax
add eax, aSearchBLength+3
mov [ebx - find_in_file_dlgdata + find_in_file_dlgdata.cnl_x1], eax
mov [ebx + FindInFileDlgdata.cnl.x1], eax
add eax, aCancelBLength - 1
mov [ebx - find_in_file_dlgdata + find_in_file_dlgdata.cnl_x2], eax
mov byte [ebx - find_in_file_dlgdata + find_in_file_dlgdata.flags0], 0xC
and byte [ebx - find_in_file_dlgdata + find_in_file_dlgdata.flags1], not 4
and byte [ebx - find_in_file_dlgdata + find_in_file_dlgdata.flags2], not 4
and byte [ebx - find_in_file_dlgdata + find_in_file_dlgdata.flags_case], not 4
and byte [ebx - find_in_file_dlgdata + find_in_file_dlgdata.flags_whole], not 4
mov [ebx + FindInFileDlgdata.cnl.x2], eax
mov byte [ebx + FindInFileDlgdata.efind.flags], 0xC
and byte [ebx + FindInFileDlgdata.search.flags], not 4
and byte [ebx + FindInFileDlgdata.cnl.flags], not 4
and byte [ebx + FindInFileDlgdata.case.flags], not 4
and byte [ebx + FindInFileDlgdata.whole.flags], not 4
push ebx
call DialogBox
cmp eax, find_in_file_dlgdata.search_btn
cmp eax, find_in_file_dlgdata.search
ret