Subversion Repositories Kolibri OS

Rev

Rev 8262 | Rev 8533 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8262 Rev 8532
Line 1228... Line 1228...
1228 
			dec ebx
 1228 
			dec ebx
1229 
		.u1f:
 1229 
		.u1f:
1230 
		add edx,sizeof.symbol
 1230 
		add edx,sizeof.symbol
1231 
		cmp edx,ted_tex_end
 1231 
		cmp edx,ted_tex_end
1232 
		jge @f ;out of memory
 1232 
		jge @f ;out of memory
1233 
		cmp ebx,0
 1233 
		or ebx,ebx
1234 
		jne .beg_cycle
 1234 
		jnz .beg_cycle
1235 
		mov ted_ptr_free_symb,edx ;¬¥­ï¥¬ 㪠§ â¥«ì ­  ᢮¡®¤­ë© ᨬ¢®«, ¤«ï ¡®«¥¥ ¡ëáâண® ¯®¨áª  ¯ ¬ïâ¨
 1235 
		mov ted_ptr_free_symb,edx ;¬¥­ï¥¬ 㪠§ â¥«ì ­  ᢮¡®¤­ë© ᨬ¢®«, ¤«ï ¡®«¥¥ ¡ëáâண® ¯®¨áª  ¯ ¬ïâ¨
1236 
		jmp .add_all
 1236 
		jmp .add_all
1237 
	@@:
 1237 
	@@:
1238 
	cmp ted_increase_size,0
 1238 
	cmp ted_increase_size,0
1239 
	je .add_all
 1239 
	je .add_all
1240 
		call ted_memory_increase
 1240 
		call ted_memory_increase
1241 
		cmp ebx,0
 1241 
		or ebx,ebx
1242 
		jne .beg_cycle
 1242 
		jnz .beg_cycle
1243 
	.add_all: ;¢á¥ ᨬ¢®«ë ¤®¡ ¢«¥­ë
 1243 
	.add_all: ;¢á¥ ᨬ¢®«ë ¤®¡ ¢«¥­ë
Line 1244... Line 1244...
1244 
 
 1244 
 
1245 
	call ted_text_colored
 1245 
	call ted_text_colored
1246 
	.no_add:
 1246 
	.no_add:
Line 1958... Line 1958...
1958 
  xor eax,eax
 1958 
	xor eax,eax
1959 
  xor ebx,ebx
 1959 
	xor ebx,ebx
1960 
  @@:
 1960 
	@@:
1961 
    call ted_iterat_perv
 1961 
		call ted_iterat_perv
Line 1962... Line 1962...
1962 
 
 1962 
 
1963 
    cmp eax,0
 1963 
		or eax,eax
1964 
    jne .no_col_mov
 1964 
		jnz .no_col_mov
1965 
    inc ebx
 1965 
			inc ebx
Line 1966... Line 1966...
1966 
    .no_col_mov:
 1966 
		.no_col_mov:
1967 
 
 1967 
 
Line 3594... Line 3594...
3594 
	add ecx,ted_rec_t
 3594 
	add ecx,ted_rec_t
3595 
	mov edx,ted_cur_y
 3595 
	mov edx,ted_cur_y
3596 
	imul edx,ted_rec_h
 3596 
	imul edx,ted_rec_h
3597 
	add ecx,edx
 3597 
	add ecx,edx
Line 3598... Line -...
3598 
 
 - 
 
3599 
	cmp ted_cur_ins,1 ;¯à®¢¥àª  ०¨¬  à ¡®âë ªãàá®à  (®¡ëç­ë© ¨«¨ ¢áâ ¢ª )
 - 
 
3600 
	jne @f
 - 
 
3601 
		mov edx,ted_rec_h
 - 
 
3602 
		inc edx   ;1->1, 3->2, 5->3, ...
 - 
 
3603 
		shr edx,1 ;edx = ¢ëá®â  áâப¨ ¤¥«¥­­ ï ­  2 (ª®£¤  ªãàá®à ­¥ ¯®«­ë©)
 - 
 
3604 
		add ecx,edx
 - 
 
3605 
	@@:
 3598 
 
3606 
	shl ecx,16
 3599 
	shl ecx,16
3607 
	add ecx,ted_rec_h
 - 
 
3608 
	cmp ted_cur_ins,1
 - 
 
3609 
	jne @f
 - 
 
3610 
		shr cx,1 ;¤¥«¨¬ ¢ëá®âã ªãàá®à  ­  2
 - 
 
Line 3611... Line 3600...
3611 
	@@:
 3600 
	add ecx,ted_rec_h
3612 
 
 3601 
 
3613 
	mov ebx,ted_wnd_l ;calc rect -> x0,x1
 3602 
	mov ebx,ted_wnd_l ;calc rect -> x0,x1
3614 
	add ebx,ted_rec_l
 3603 
	add ebx,ted_rec_l
3615 
	mov edx,ted_cur_x
 3604 
	mov edx,ted_cur_x
3616 
	imul edx,ted_rec_w
 3605 
	imul edx,ted_rec_w
3617 
	add ebx,edx
 3606 
	add ebx,edx
- 
 
 3607 
	shl ebx,16
- 
 
 3608 
	add ebx,ted_rec_w
- 
 
 3609 
	cmp ted_cur_ins,1 ;¯à®¢¥àª  ०¨¬  à ¡®âë ªãàá®à  (®¡ëç­ë© ¨«¨ ¢áâ ¢ª )
- 
 
 3610 
	jne @f
Line 3618... Line 3611...
3618 
	shl ebx,16
 3611 
		shr bx,2 ;㬥­ìè ¥¬ è¨à¨­ã ªãàá®à 
3619 
	add ebx,ted_rec_w
 3612 
	@@:
Line 3620... Line 3613...
3620 
 
 3613 
 
Line 3626... Line 3619...
3626 
	jne @f
 3619 
	jne @f
3627 
		mov esi,1
 3620 
		mov esi,1
3628 
		ror ecx,16
 3621 
		ror ecx,16
3629 
		mov bx,cx
 3622 
		mov bx,cx
3630 
		add ebx,0x10001
 3623 
		add ebx,0x10001
3631 
		cmp ted_cur_ins,1
 - 
 
3632 
		jne .no_up_tetx
 - 
 
3633 
			mov ecx,ted_rec_h
 - 
 
3634 
			inc cx ; 1->1, 3->2, 5->3, ...
 - 
 
3635 
			shr cx,1
 - 
 
3636 
			sub bx,cx
 - 
 
3637 
		.no_up_tetx:
 - 
 
3638 
		mov ecx,ted_color_cur_text
 3624 
		mov ecx,ted_color_cur_text
3639 
		or ecx,ted_font_size
 3625 
		or ecx,ted_font_size
3640 
		call ted_convert_invis_symb
 3626 
		call ted_convert_invis_symb
3641 
		mcall SF_DRAW_TEXT
 3627 
		mcall SF_DRAW_TEXT
3642 
	@@:
 3628 
	@@:
Line 4360... Line 4346...
4360 
		shl ebx,1
 4346 
		shl ebx,1
4361 
		sub ebx,[ecx+sb_offs_cur_area] ;®â­¨¬ ¥¬ ¯®«®¢¨­ã ¢ëá®âë ®ª­ 
 4347 
		sub ebx,[ecx+sb_offs_cur_area] ;®â­¨¬ ¥¬ ¯®«®¢¨­ã ¢ëá®âë ®ª­ 
4362 
		shr ebx,1
 4348 
		shr ebx,1
4363 
		cmp eax,ebx
 4349 
		cmp eax,ebx
4364 
		jae .no_scroll
 4350 
		jae .no_scroll
- 
 
 4351 
		mov ebx,ted_cur_y ;¯®§¨æ¨ï ªãàá®à 
- 
 
 4352 
		sub ebx,eax       ;- ­®¢ ï ¯®§¨æ¨ï áªà®««¨­£ 
- 
 
 4353 
		add ebx,[ecx+sb_offs_position] ;+ áâ à ï ¯®§¨æ¨ï áªà®««¨­£ 
- 
 
 4354 
		bt ebx,31
- 
 
 4355 
		jnc @f
- 
 
 4356 
			xor ebx,ebx ;¥á«¨ ªãàá®à áâ « ¢ëè¥ ®ª­ , â® áâ ¢¨¬ ­  ¢¥àå­îî áâபã
- 
 
 4357 
		@@:
- 
 
 4358 
		inc ebx
- 
 
 4359 
		cmp ebx,[ecx+sb_offs_cur_area]
- 
 
 4360 
		jle @f
- 
 
 4361 
			mov ebx,[ecx+sb_offs_cur_area] ;¥á«¨ ªãàá®à áâ « ­¨¦¥ ®ª­ , â® áâ ¢¨¬ ­  ­¨¦­îî áâபã
- 
 
 4362 
		@@:
- 
 
 4363 
		dec ebx
- 
 
 4364 
		mov ted_cur_y,ebx
4365 
		mov [ecx+sb_offs_position],eax
 4365 
		mov [ecx+sb_offs_position],eax
4366 
		stdcall ted_draw,edi
 4366 
		stdcall ted_draw,edi
4367 
	.no_scroll:
 4367 
	.no_scroll:
4368 
	pop ecx ebx eax
 4368 
	pop ecx ebx eax
4369 
	ret
 4369 
	ret