Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4565 → Rev 4566

/programs/develop/tinypad/trunk/data/tp-udata.inc
108,6 → 108,7
temp_buf dd ?
copy_buf dd ?
clipboard_buf dd ?
size_of_moving_area dd ?
 
label color_tbl dword
.text dd ?
/programs/develop/tinypad/trunk/tinypad.asm
41,7 → 41,6
TRUE = 1
FALSE = 0
 
;include 'debug.inc'
;define __DEBUG__ 1
;define __DEBUG_LEVEL__ 1
;include '../../../debug-fdo.inc'
/programs/develop/tinypad/trunk/tp-clipboard.asm
96,14 → 96,14
.yes_valid_text:
call know_number_line_breaks
mov [copy_count],ebx
; correction of erroneous buffer size
mov eax,[clipboard_buf]
sub esi,eax
mov [eax],esi
 
; multiple by 6
shl ebx,1
lea ebx,[ebx*3]
 
; calculating a desired size
mov eax,[clipboard_buf]
mov eax,[eax]
sub eax,4*3
249,7 → 249,7
lodsb
test al,al
jz .end_of_data_1
jz .end_of_data
cmp al,0x0d
je .check_0x0a
281,17 → 281,8
dec ecx
jnz @b
;--------------------------------------
.end_of_data_1:
cmp [esi-2],byte 0x0d
je .end_of_data
 
cmp [esi-2],byte 0x0a
je .end_of_data
 
inc ebx
.end_of_data:
add ebx,2
inc esi
;--------------------------------------
.end_of_data:
inc ebx
ret
;-----------------------------------------------------------------------------
/programs/develop/tinypad/trunk/tp-key.asm
610,7 → 610,12
add [esp],eax
add esi,eax
mov ecx,[copy_size]
mov edi,[copy_count]
test edi,edi
dec edi
jnz @f
sub ecx,sizeof.EDITOR_LINE_DATA
@@:
mov edi,[cur_editor.Lines]
add edi,[cur_editor.Lines.Size] ;*** add edi,[edi-4]
dec edi
621,6 → 626,7
add ecx,[cur_editor.Caret.X]
neg ecx
lea ecx,[esi+ecx+1]
mov [size_of_moving_area],ecx
std
rep movsb
 
655,11 → 661,22
 
pop ecx
sub ecx,ebx
ja @f
 
pusha
mov esi,edi
sub edi,sizeof.EDITOR_LINE_DATA
mov ecx,[size_of_moving_area]
cld
rep movsb
popa
jmp .save_cur_editor_values
@@:
add [edi-sizeof.EDITOR_LINE_DATA+EDITOR_LINE_DATA.Size],ecx
call .check_columns
mov ecx,eax
rep movsb
 
.save_cur_editor_values:
mov [cur_editor.Caret.X],eax
mov [cur_editor.SelStart.X],eax
mov eax,[copy_count]
716,7 → 733,6
@@: pop eax
ret
endp
 
;-----------------------------------------------------------------------------
proc key.ctrl_d ;///// INSERT SEPARATOR //////////////////////////////////////
;-----------------------------------------------------------------------------