WebSVN – Kolibri OS – Diff – /programs/develop/libraries/box_lib/trunk/t_edit.mac

 ; ¬ ªà®á ¤«ï á¨áâ¥¬®© ¡¨¡«¨®â¥ª¨ box_lib.obj
 ; í«¥¬¥â TextEditor ¤«ï Kolibri OS
-; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 21.01.2016 IgorA
+; ä ©« ¯®á«¥¤¨© à § ¨§¬¥ï«áï 19.02.2016 IgorA
 ;   ª®¤ ¯à¨¬¥¥  GPL2 «¨æ¥§¨ï
 ;input:
 ; edi = pointer to tedit struct
 	bt dword[opt],1 ; ¨§¬¥¨«¨áì à §¬¥àë ®ª  ?
 	jae .no_size
 			mov edx,ted_wnd_l
 			add edx,ted_rec_l
 			mov word[ebx+sb_offs_start_x],dx ;¢ëáâ ¢«ï¥¬ «¥¢ë© ®âáâã¯ £®à¨§. áªà®««¨£
-		mov eax,ted_wnd_h ;calculate lines in page
+			mov eax,ted_wnd_h ;calculate lines in page
 			mov edx,ted_wnd_t
 			add edx,eax
 			mov word[ebx+sb_offs_start_y],dx ;¢ëáâ ¢«ï¥¬ ¢¥àå¨© ®âáâã¯ £®à¨§. áªà®««¨£
 		sub eax,ted_rec_t
 		xor edx,edx
 ;  edi = pointer to tedit struct
 ;output:
 ;  ecx = position to inserted cell
 align 4
 ted_char_add:
+	.loop_b:
+		cmp ecx,ted_tex_end
+		jge .end_f
+		cmp dword[ecx+10],0
+		jne @f
+			cmp dword[ecx+14],0
+			je .loop_e
+		@@:
+		add ecx,sizeof.symbol
+		jmp .loop_b
+align 4
+	.loop_e:
-  .loop_b:
-    cmp ecx,ted_tex_end
-    jge .end_f
-    cmp dword[ecx+10],0
-    jne @f
-      cmp dword[ecx+14],0
-      je .loop_e
-    @@:
-    add ecx,sizeof.symbol
-    jmp .loop_b
-  .loop_e:
-  push eax ebx
+	push eax ebx
-  mov eax,ted_tim_ch
+	mov eax,ted_tim_ch
-  mov dword[ecx+10],eax
+	mov dword[ecx+10],eax
-  mov ax,si
+	mov ax,si
-  mov byte[ecx],al
+	mov byte[ecx],al
-  call ted_get_text_arr_index ; *** eax=pos ***
+	call ted_get_text_arr_index ; *** eax=pos ***
-  mov [ecx+2],eax ;tex[i].perv=pos;
+	mov [ecx+2],eax ;tex[i].perv=pos;
-  m2m dword[ecx+6],dword[edx+6] ;tex[i].next=tex[pos].next;
+	m2m dword[ecx+6],dword[edx+6] ;tex[i].next=tex[pos].next;
-  push edx
+	push edx
-    mov edx,ecx
+		mov edx,ecx
-    call ted_get_text_arr_index ; *** eax=i ***
+		call ted_get_text_arr_index ; *** eax=i ***
-  pop edx
+	pop edx
-  mov [edx+6],eax ;tex[pos].next=i; // ááë«ª¨ ¯¥à¥ ¯à ¢«ï¥¬
+	mov [edx+6],eax ;tex[pos].next=i; // ááë«ª¨ ¯¥à¥ ¯à ¢«ï¥¬
-  mov ebx,[ecx+6]
+	mov ebx,[ecx+6]
-  ConvertIndexToPointer ebx
+	ConvertIndexToPointer ebx
-  mov [ebx+2],eax ;tex[tex[i].next].perv=i; // ...
+	mov [ebx+2],eax ;tex[tex[i].next].perv=i; // ...
-  pop ebx eax
+	pop ebx eax
-  .end_f:
+	.end_f:
-  call ted_text_colored
+	call ted_text_colored
-  ret
+	ret
 ;output:
 ; bl = 0 - no delete
 ; bl = 1 - delete
 align 4
-proc ted_text_del, edit:dword, del_opt:dword
-  push cx edx edi
+proc ted_text_del uses ecx edx edi, edit:dword, del_opt:dword
-  mov edi,dword[edit]
+	mov edi,dword[edit]
-  mov ebx,dword[del_opt]
+	mov ebx,dword[del_opt]
-  xor cl,cl
+	xor cl,cl
-  test ebx,ted_opt_ed_move_cursor
+	test ebx,ted_opt_ed_move_cursor
-  jz @f
+	jz @f
-    call ted_cur_move_left
+		call ted_cur_move_left
-    cmp dl,0
+		cmp dl,0
-    je .no_del
+		je .no_del
-  @@:
+	@@:
-  call ted_get_pos_by_cursor
+	call ted_get_pos_by_cursor
-  cmp ted_gp_opt,1
+	cmp ted_gp_opt,1
-  je .no_del
+	je .no_del
-    test ebx,ted_opt_ed_change_time
+		test ebx,ted_opt_ed_change_time
-    jz @f
+		jz @f
-      inc ted_tim_ch
+			inc ted_tim_ch
-    @@:
+		@@:
-    m2m dword [edx+14], ted_tim_ch
+		m2m dword[edx+14], ted_tim_ch
-    mov cl,1
+		mov cl,1
-  .no_del:
+	.no_del:
-  mov bl,cl
-  pop edi edx cx
+	mov bl,cl
-  ret
+	ret
 endp
 ;input:
 align 4
 proc ted_sel_text_del uses ebx ecx edx esi, del_opt:dword
 	call ted_is_select
 	cmp al,0
 	je .end_f
 		call ted_sel_normalize
 		mov esi,ted_seln_x1
 		mov ecx,ted_seln_y1
 			mov esi,ted_opt_ed_change_time
 			not esi
 			and dword[del_opt],esi ;n_tim=false;
 			call ted_iterat_next
 			jmp @b
+align 4
 		@@:
 		test dword[del_opt],ted_opt_ed_change_time
 		jz @f
 			dec ted_tim_ch
 			xor al,al
 ; edi = pointer to tedit struct
 ;description:
 ; this function need to optimize output
 align 4
 proc ted_draw_cursor_sumb
-  pushad
+pushad
+	mov eax,SF_DRAW_RECT
+	mov ebx,ted_wnd_l
+	add ebx,ted_rec_l
+	mov edx,ted_cur_x
+	imul edx,ted_rec_w
+	add ebx,edx
+	shl ebx,16
+	add ebx,ted_rec_w
-  mov eax,13 ;rect
-  mov ebx,ted_wnd_l
+	mov ecx,ted_wnd_t ;calc rect -> y0,y1
-  add ebx,ted_rec_l
+	add ecx,ted_rec_t
-  mov edx,ted_cur_x
+	mov edx,ted_cur_y
-  imul edx,ted_rec_w
+	imul edx,ted_rec_h
-  add ebx,edx
+	add ecx,edx
-  shl ebx,16
+	shl ecx,16
-  add ebx,ted_rec_w
-  mov ecx,ted_wnd_t ;calc rect -> y0,y1
+	add ecx,ted_rec_h
-  add ecx,ted_rec_t
-  mov edx,ted_cur_y
-  imul edx,ted_rec_h
-  add ecx,edx
+	mov edx,ted_color_wnd_work
-  shl ecx,16
+	push ecx
+		call ted_sel_normalize
-  add ecx,ted_rec_h
+		mov esi,ted_scr_w
-  mov edx,ted_color_wnd_work
-  push ecx
-    call ted_sel_normalize
-    mov esi,ted_scr_w
-	mov ecx,dword[esi+sb_offs_position]
+		mov ecx,dword[esi+sb_offs_position]
-    sub ted_seln_y0,ecx
+		sub ted_seln_y0,ecx
-    sub ted_seln_y1,ecx
+		sub ted_seln_y1,ecx
-    mov ecx,ted_cur_y
+		mov ecx,ted_cur_y
-    cmp ecx,ted_seln_y0
+		cmp ecx,ted_seln_y0
-    jl .no_cur_sel
+		jl .no_cur_sel
-    cmp ecx,ted_seln_y1
+		cmp ecx,ted_seln_y1
-    jg .no_cur_sel
+		jg .no_cur_sel
-    mov edx,ted_color_select ;¬¥ï¥¬ æ¢¥â ä®    æ¢¥â ¢ë¤¥«¥¨ï
+		mov edx,ted_color_select ;¬¥ï¥¬ æ¢¥â ä®    æ¢¥â ¢ë¤¥«¥¨ï
-    mov esi,ted_scr_h
+		mov esi,ted_scr_h
-	cmp ecx,ted_seln_y0
+		cmp ecx,ted_seln_y0
-    jne @f
+		jne @f
-      mov ecx,ted_cur_x
+			mov ecx,ted_cur_x
-      add ecx,dword[esi+sb_offs_position]
-      cmp ecx,ted_seln_x0
+			add ecx,dword[esi+sb_offs_position]
-      jge @f
+			cmp ecx,ted_seln_x0
-      mov edx,ted_color_wnd_work
+			jge @f
-    @@:
+			mov edx,ted_color_wnd_work
+		@@:
-    mov ecx,ted_cur_y
+		mov ecx,ted_cur_y
-    cmp ecx,ted_seln_y1
+		cmp ecx,ted_seln_y1
-    jne .no_cur_sel
+		jne .no_cur_sel
-      mov ecx,ted_cur_x
-      add ecx,dword[esi+sb_offs_position]
+			mov ecx,ted_cur_x
-      cmp ecx,ted_seln_x1
+			add ecx,dword[esi+sb_offs_position]
-      jl .no_cur_sel
+			cmp ecx,ted_seln_x1
-      mov edx,ted_color_wnd_work
-    .no_cur_sel:
-  pop ecx
-  int 0x40 ;à¨á®¢ ¨¥ ¯àï¬®ã£®«ì¨ª
-  call ted_get_pos_by_cursor ;¡¥à¥¬ ¯®§¨æ¨î á¨¬¢®«
-  cmp ted_gp_opt,2
-  jne @f
-    mov eax,4
-    mov esi,1
-    ror ecx,16
-    mov bx,cx
+			jl .no_cur_sel
+			mov edx,ted_color_wnd_work
+		.no_cur_sel:
+	pop ecx
+	int 0x40 ;à¨á®¢ ¨¥ ¯àï¬®ã£®«ì¨ª
+	call ted_get_pos_by_cursor ;¡¥à¥¬ ¯®§¨æ¨î á¨¬¢®«
+	cmp ted_gp_opt,2
+	jne @f
+		mov esi,1
+		ror ecx,16
-    add ebx,0x10001
+		mov bx,cx
-    call ted_get_symb_color
+		add ebx,0x10001
-    call ted_convert_invis_symb
+		call ted_get_symb_color
-    int 0x40 ;à¨á®¢ ¨¥ á¨¬¢®«
+		call ted_convert_invis_symb
-  @@:
+		mcall SF_DRAW_TEXT ;à¨á®¢ ¨¥ á¨¬¢®«
 	@@:
-  popad
+popad
-  ret
+	ret
 endp
 ;input:
 ; edx -> pointer to text
 ; edi -> ãª § â¥«ì   áâàãªâãàã tedit
 ;output:
 ; ecx = color
 ; if ted_mode_color=0 then ecx=ted_color_wnd_text
 align 4
 ted_get_symb_color:
-  mov ecx,ted_color_wnd_text ;§ ¤ ¥¬ æ¢¥â â¥ªáâ  ¯® ã¬®«ç ¨î
+	mov ecx,ted_color_wnd_text ;§ ¤ ¥¬ æ¢¥â â¥ªáâ  ¯® ã¬®«ç ¨î
-  push eax edx
+	push eax edx
-  cmp ted_mode_color,0
+	cmp ted_mode_color,0
-  je .exit
+	je .exit
-    jmp .on_first
+		jmp .on_first
-    @@:
+		@@:
-      call ted_iterat_perv
+			call ted_iterat_perv
-      cmp edx,ted_tex_1
+			cmp edx,ted_tex_1
-      jle .exit
+			jle .exit
-    .on_first:
+		.on_first:
-      xor eax,eax
+			xor eax,eax
-      mov al,byte[edx+1]
+			mov al,byte[edx+1]
-      cmp al,0 ;¥á«¨ al=0 â® æ¢¥â ¥ ¬¥ï¥âáï
+			or al,al ;¥á«¨ al=0 â® æ¢¥â ¥ ¬¥ï¥âáï
-    je @b
+			jz @b
+		cmp eax,ted_colors_text_count
-    cmp eax,ted_colors_text_count
+		jge .exit
-    jge .exit
 		shl ax,2 ;ã¬®¦ ¥¬ ¨¤¥ªá æ¢¥â    4 ¡ ©â
-    shl ax,2 ;ã¬®¦ ¥¬ ¨¤¥ªá æ¢¥â    4 ¡ ©â
+		mov ecx,ted_text_colors ;¯à¨¡ ¢«ï¥¬ á¬¥é¥¨¥ 1-£® æ¢¥â
-    mov ecx,ted_text_colors ;¯à¨¡ ¢«ï¥¬ á¬¥é¥¨¥ 1-£® æ¢¥â
+		add ecx,eax
-    add ecx,eax
+		mov ecx,dword[ecx] ;ãáâ  ¢«¨¢ ¥¬ â¥ªãé¨© æ¢¥â â¥ªáâ  ¯® á¬¥é¥¨î
 		line_num dd ?
 	endl
 	pushad
 	mov edi,dword[edit]
-	mov eax,4 ;draw text
+	mov eax,SF_DRAW_TEXT
 	mov ecx,ted_text_colors
 	mov ecx,dword[ecx]
 			;optimized output \/
 			mov eax,ted_wnd_h
 			add eax,ted_wnd_t
 			cmp bx,ax
 			jg .no_draw_text
-			mov eax,4
+			mov eax,SF_DRAW_TEXT
 			;optimized output /\
 			and ebx,0xffff
 			ror ebx,16
 			add ebx,ted_wnd_l
 			add ebx,ted_rec_l
 			ror ebx,16
 			inc dword[line_num] ;increment line number
 			stdcall ted_clear_line_before_draw,edi,ebx,1,dword[line_num]
 			call ted_opt_draw_line_left
 			jmp @b
+align 4
 		.no_13:
 		int 0x40
 		ror ebx,16
 	mov ecx,ted_wnd_t
 	add ecx,ted_wnd_h
 	shl ecx,16
 	mov cx,word[eax+sb_offs_size_y]
 	inc cx
-	mcall 13,,,ted_color_wnd_capt ;[sc.work]
+	mcall SF_DRAW_RECT,,,ted_color_wnd_capt ;[sc.work]
 	;right-bottom square
 	mov ebx,ted_wnd_l
 	add ebx,ted_wnd_w
 ; edi = pointer to tedit struct
 align 4
 proc ted_draw_main_cursor
   pushad
-  mov eax,13 ;draw cursor
+  mov eax,SF_DRAW_RECT ;draw cursor
   mov ecx,ted_wnd_t ;calc rect -> y0,y1
   add ecx,ted_rec_t
   mov edx,ted_cur_y
   imul edx,ted_rec_h
   int 0x40 ;¢ë¢®¤ ªãàá®à
   call ted_get_pos_by_cursor
   cmp ted_gp_opt,2
-  jne @f
-    mov eax,4 ;draw text
+  jne @f
     mov esi,1
     ror ecx,16
     mov bx,cx
     add ebx,0x10001
       inc cx ; 1->1, 3->2, 5->3, ...
       shr cx,1
       sub bx,cx
     .no_up_tetx:
     mov ecx,ted_color_cur_text
+	or ecx,ted_font_size
     call ted_convert_invis_symb
-    int 0x40
+    mcall SF_DRAW_TEXT
   @@:
   mov eax,4
   mov ebx,ted_wnd_l
   add ebx,ted_rec_l
   shl ebx,16
   add ebx,ted_wnd_t
   add ebx,3
   mov ecx,ted_color_wnd_bord
   or  ecx,0x80000000
   lea edx,[txtRow]
-  int 0x40 ;¢ë¢®¤ ¯®¤¯¨á¨ 'âà®ª '
+  mcall SF_DRAW_TEXT ;¢ë¢®¤ ¯®¤¯¨á¨ 'âà®ª '
   add ebx,0x500000
 		cmp eax,20
 		jle .crop_buf
 			mov eax,20 ;®¡à¥§ª  ¯®¤¯¨á¨ ¤® 20 á¨¬¢®«®¢
 		.crop_buf:
 		mov esi,eax
-		mov eax,4
-		int 0x40 ;¢ë¢®¤ á®¤¥à¦¨¬®£® ¡ãä¥à
+		mcall SF_DRAW_TEXT ;¢ë¢®¤ á®¤¥à¦¨¬®£® ¡ãä¥à
 		sub ebx,50 shl 16
 		lea edx,[txtBuf]
 		mov esi,edx
 		call tl_strlen
-		mov esi,eax
-		mov eax,4
+		mov esi,eax
 		xor ecx,0x40000000 ;ã¡¨à ¥¬ æ¢¥â ä®
-		int 0x40 ;¢ë¢®¤ ¯®¤¯¨á¨ ¤«ï ¡ãä¥à
+		mcall SF_DRAW_TEXT ;¢ë¢®¤ ¯®¤¯¨á¨ ¤«ï ¡ãä¥à
 	@@:
 	popad
 	ret
 		add ebx,ted_wnd_w
 		sub ebx,ted_rec_l
 		mov ecx,ted_wnd_t
 		add ecx,13
 		shl ecx,16
-		add ecx,ted_rec_h
+		add ecx,9 ;9 - ¢ëá®â  0-£® èà¨äâ , áâ ¢¨âì ted_rec_h ¯®ª  ¥é¥ à ®
-		mcall 13,,,ted_color_wnd_capt
+		mcall SF_DRAW_RECT,,,ted_color_wnd_capt
 	cmp ted_help_id,-1
 	je @f
 		mov eax,ted_help_id
 		mov ecx,ted_text_colors
 		add ecx,eax
 		mov ecx,dword[ecx]
 		or	ecx,0xc0000000 ;SetTextStyles
 		mov esi,edi
-		mcall 4,,,,,ted_color_wnd_work
+		mcall SF_DRAW_TEXT,,,,,ted_color_wnd_work
 		mov edi,esi
 		mov esi,edx
 			add edx,ted_help_text_f1
 			inc eax
 			imul eax,6 ;è¨à¨  á¨¬¢®«  ¢ á¨áâ. èà¨äâ¥
 			shl eax,16
 			add ebx,eax
-			mcall 4
+			mcall SF_DRAW_TEXT
 	@@:
 	popad
 	ret
 endp
 ;input:
 ; edi = pointer to tedit struct
 align 4
 proc ted_draw_line_numbers
-  pushad
+pushad
-  ;top panel with caption
+	;top panel with caption
-  mov ebx,ted_wnd_l
+	mov ebx,ted_wnd_l
 ;  add ebx,ted_rec_l
-  shl ebx,16
+	shl ebx,16
-  add ebx,ted_wnd_w
+	add ebx,ted_wnd_w
 ;  sub ebx,ted_rec_l
-  mov edx,ted_color_wnd_work
+	mov edx,ted_color_wnd_work
-  mov ecx,ted_wnd_t
+	mov ecx,ted_wnd_t
-  shl ecx,16
+	shl ecx,16
-  add ecx,ted_rec_t
-  mov eax,13
+	add ecx,ted_rec_t
-  mov edx,ted_color_wnd_capt
+	mov edx,ted_color_wnd_capt
-  int 0x40
+	mcall SF_DRAW_RECT
-  ;line numbers
+	;line numbers
-  mov ebx,0x40000 ;format
+	mov ebx,0x40000 ;format
-  mov ecx,ted_scr_w
+	mov ecx,ted_scr_w
-  mov ecx,dword[ecx+sb_offs_position]
+	mov ecx,dword[ecx+sb_offs_position]
-  inc ecx
+	inc ecx
-  mov edx,3
+	mov edx,3
-  add edx,ted_wnd_l
+	add edx,ted_wnd_l
-  rol edx,16
+	rol edx,16
-  add edx,ted_wnd_t
+	add edx,ted_wnd_t
-  add edx,ted_rec_t
+	add edx,ted_rec_t
-  @@:
+	@@:
 push ebx ecx edx
-  ;left panel with numbers
+	;left panel with numbers
-  mov ebx,ted_wnd_l
+	mov ebx,ted_wnd_l
-  shl ebx,16
+	shl ebx,16
-  add ebx,ted_rec_l
+	add ebx,ted_rec_l
-  mov ecx,ted_rec_h
+	mov ecx,ted_rec_h
-  rol ecx,16
-  mov cx,dx
+	rol ecx,16
-  rol ecx,16
+	mov cx,dx
-  mov eax,13
+	rol ecx,16
-  mov edx,ted_color_wnd_capt
+	mov edx,ted_color_wnd_capt
-  int 0x40 ;à¨áã¥¬ ¯àï¬®ã£®«ì¨ª ¯®¤ ®¬¥à®¬ áâà®ª¨
+	mcall SF_DRAW_RECT ;à¨áã¥¬ ¯àï¬®ã£®«ì¨ª ¯®¤ ®¬¥à®¬ áâà®ª¨
 pop edx ecx ebx
-    mov eax,47
+		mov eax,47
-    mov esi,ted_color_wnd_bord
+		mov esi,ted_color_wnd_bord
-    int 0x40 ;à¨áã¥¬ ®¬¥à áâà®ª¨
+		int 0x40 ;à¨áã¥¬ ®¬¥à áâà®ª¨
-    inc ecx
+		inc ecx
-    add edx,ted_rec_h
+		add edx,ted_rec_h
-    sub edx,ted_wnd_t
+		sub edx,ted_wnd_t
-	mov esi,edx
+		mov esi,edx
-	and esi,0xffff
+		and esi,0xffff
-    cmp esi,ted_wnd_h
+		cmp esi,ted_wnd_h
-    jge @f
+		jge @f
-    add edx,ted_wnd_t
+		add edx,ted_wnd_t
-    jmp @b
+		jmp @b
-  @@:
+align 4
 	@@:
-  popad
+popad
-  ret
+	ret
 	mov esi,dword[eax+sb_offs_position]
     call ted_get_pos_by_coords
   cmp ted_gp_opt,2
   jne .no_draw_text
-;  mov eax,4 ;draw text
+;  mov eax,SF_DRAW_TEXT
   call ted_get_symb_color
   mov esi,1 ;draw 1 symbol
   @@:
     ;call ted_iterat_next
     cmp byte[edx+1],0
     je .no_col_change
       call ted_get_symb_color
     .no_col_change:
-    mov eax,4 ;draw text
+    mov eax,SF_DRAW_TEXT
     cmp byte [edx],13
     jne .no_13
       cmp ted_mode_invis,1
       jne .no_draw_text
 	cmp ted_seln_y1,esi
 	jl .no_select
 		mov edx,ted_color_select ;draw selected line
 	.no_select:
-	mov eax,13 ;rect
-	int 0x40 ;§ ªà áª  ¯®«®© áâà®ª¨ æ¢¥â®¬ ä®  ¨«¨ æ¢¥â®¬ ¢ë¤¥«¥¨ï
+	mcall SF_DRAW_RECT ;§ ªà áª  ¯®«®© áâà®ª¨ æ¢¥â®¬ ä®  ¨«¨ æ¢¥â®¬ ¢ë¤¥«¥¨ï
 	call ted_is_select
-	cmp al,0
+	or al,al
-	je .no_clear
+	jz .no_clear
-	mov al,13 ;rect
+	mov al,SF_DRAW_RECT
 	xor cx,cx
 	add ecx,ted_rec_h
 		cmp ecx,dword[eax+sb_offs_position]
 		je @f
 		call ted_iterat_next
 		cmp edx,ted_tex_1
 		jle @f
-		cmp byte [edx],13
+		cmp byte[edx],13
 		jne @b
 		inc ecx
 		jmp @b
+align 4
 	@@:
 	cmp ecx,dword[eax+sb_offs_position]
 	je @f
 ; ecx = æ¢¥â á¨¬¢®«
 ; edx = ãª § â¥«ì   ¯¥à¢ë© «¥¢ë© á¨¬¢®«
 ;description:
 ; äãªæ¨ï ã¦  ¤«ï ®¯â¨¬¨§ æ¨¨ ¢ë¢®¤  â¥ªáâ
 align 4
-proc ted_opt_draw_line_left
+proc ted_opt_draw_line_left uses ebx
-  push ebx
-  mov ebx,ted_scr_h
+	mov ebx,ted_scr_h
-  mov ebx,dword[ebx+sb_offs_position]
+	mov ebx,dword[ebx+sb_offs_position]
-  cmp ebx,0
+	or ebx,ebx
-  je .ret_f
+	jz .ret_f
-  push eax
+	push eax
-  mov eax,edx
+	mov eax,edx
-  cmp edx,ted_tex
+	cmp edx,ted_tex
-  jne @f
+	jne @f
-    call ted_iterat_next
+		call ted_iterat_next
-    jmp .beg_cycle
+		jmp .beg_cycle
-  @@:
+	@@:
-  cmp ebx,0
+	or ebx,ebx
-  je @f
+	jz @f
-  cmp byte[edx],13
+	cmp byte[edx],13
-  jne @f
+	jne @f
-    call ted_iterat_next
+		call ted_iterat_next
-    .beg_cycle:
+		.beg_cycle:
-  @@:
+	@@:
-    cmp edx,ted_tex_1
+		cmp edx,ted_tex_1
-    jle @f
+		jle @f
-    cmp byte[edx],13
+		cmp byte[edx],13
-    je @f
+		je @f
-    cmp ebx,0
+		or ebx,ebx
-    je @f
+		jz @f
 ;--------------------------------------
 xor eax,eax ;eax ¡ã¤¥â ¬¥ïâìáï
 mov al,byte[edx+1]
-cmp al,0
+or al,al
-je .no_color
+jz .no_color
 cmp eax,ted_colors_text_count
 jge .no_color
-  xor ecx,ecx
+	xor ecx,ecx
-  mov cl,byte[edx+1]
+	mov cl,byte[edx+1]
-  shl cx,2
+	shl cx,2
-  add ecx,ted_text_colors
+	add ecx,ted_text_colors
-  mov ecx,dword[ecx]
+	mov ecx,dword[ecx]
 .no_color:
 ;--------------------------------------
-    mov eax,edx
+		mov eax,edx
+		call ted_iterat_next
-    call ted_iterat_next
+		dec ebx
-    dec ebx
+		jmp @b
-    jmp @b
+align 4
-  @@:
+	@@:
-    mov edx,eax
+		mov edx,eax
-  pop eax
-  .ret_f:
+	pop eax
-  call ted_get_symb_color
+	.ret_f:
-  pop ebx
+	call ted_get_symb_color
-  ret
+	ret
 endp
 	mov ebx,ted_el_focus
 	mov dword[ebx],edi ;áâ ¢¨¬ ä®ªãá
 	push eax
-		shr eax,16
-		and eax,0xffff
+		shr eax,16
 		sub eax,ted_wnd_l
 		sub eax,ted_rec_l

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/box_lib/trunk/t_edit.mac @ 6598 – Rev 6087 → 6256