WebSVN – Kolibri OS – Diff – /programs/media/animage/trunk/icons_instruments.inc

+macro square_width_put
+{
+local .no_put_to_screen
+local .next_color_put
+local .vertical_width_put
+local .horizontal_width_put
+	mov ebx,[ReserveArray]
+	mov eax,[ebx]
+	test eax,eax
+	jz .no_put_to_screen
+	mov ecx,[ebx]
+	add ebx,4
+	xor ebp,ebp
+	.next_color_put:
+	;put saved pixels in ReserveArray
+	push ecx
+	mov [counter2],5
+	mov edi,[ebx]
+	push edi
+	.vertical_width_put:
+		mov [counter],5
+		.horizontal_width_put:
+			mov edx,[ebx+4807*4+ebp]
+			;and edx,0xffffff
+			mov [edi],dx
+			shr edx,16
+			mov [edi+2],dl
+		add edi,3
+		add ebp,4
+		dec [counter]
+		jnz .horizontal_width_put
+		mov ecx,[Picture_SizeX]
+		sub ecx,5
+		lea ecx,[ecx+ecx*2]
+		add edi,ecx
+	dec [counter2]
+	jnz .vertical_width_put
+	pop edi
+	pop ecx
+	add ebx,4
+	dec ecx
+	jnz .next_color_put
+	.no_put_to_screen:
+}
+macro square_width_save
+{
+local .next_color_save
+local .vertical_width_save
+local .horizontal_width_save
+	mov ebx,[ReserveArray]
+	mov [ebx],eax
+	mov ecx,eax
+	add ebx,4
+	xor ebp,ebp
+	.next_color_save:
+	;save color of pixel in ReserveArray
+	push ecx
+	mov [counter2],5
+	mov edi,[ebx]
+	.vertical_width_save:
+		mov [counter],5
+		.horizontal_width_save:
+			mov eax,edi
+			mov edx,[eax]
+			;and edx,0xffffff
+			mov [ebx+4807*4+ebp],dx
+			shr edx,16
+			mov [ebx+4807*4+2+ebp],dl
+		add edi,3
+		add ebp,4
+		dec [counter]
+		jnz .horizontal_width_save
+		mov ecx,[Picture_SizeX]
+		sub ecx,5
+		lea ecx,[ecx+ecx*2]
+		add edi,ecx
+	dec [counter2]
+	jnz .vertical_width_save
+	pop ecx
+	add ebx,4
+	dec ecx
+	jnz .next_color_save
+}
 ;-----------------------------------------------------------
 ;-----instruments of panel(icon's instruments)--------------
 ;-----------------------------------------------------------
 TakeButtonInstruments:
 	mov [line_width],3
 	jmp still
 	no_brush3:
-	;************************brush 4************************
+	;*************************brush 4***********************
 	cmp eax,43
 	jne no_brush4
 	mov [line_width],4
 	jmp still
 	no_brush4:
-	;************************brush 5************************
+	;*************************brush 5***********************
 	cmp eax,44
 	jne no_brush5
 	call MovePictureToWorkScreen
 	mov [Activate_instrument],1
 	jmp still
 	no_pensil:
-	;**********************pipetka**************************
+	;*************************pipetka***********************
 	cmp eax,15
 	jne no_pipetka
 	mcall SF_DRAW_RECT, 136*65536+20, 65*65536+21, [Color]
 	jmp still
 	no_pipetka:
-	;**********************draw brush***********************
+	;*************************draw brush********************
 	cmp eax,11
 	mov [Last_instrument],eax
 	jmp still
 	no_brush:
-	;************************Flood Fill*******************
+	;************************Flood Fill*********************
 	cmp eax,14
 	jne no_FloodFill
 	 mov [lastik_is_active],1
 	jmp lastik_in
 	no_lastik:
-	;******************************************************
+	;*******************************************************
 	cmp eax,12
 	jne  no_spray
 	call MovePictureToWorkScreen
 	jmp still
 	no_spray:
-	;***********************palette*************************
+	;************************palette************************
 	cmp eax,51
 	jne no_palette
 	rep stosd
 	jmp still
 	no_new_line_xy:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_line_to_screen_line
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_line:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
+	;put saved pixels
-	vertical_width_put:
-	   and [counter],0
-	   horizontal_width_put:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_put
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_put
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_line
-	no_put_line_to_screen_line:
+	square_width_put
 	;calculate line
 	mov ebx,[ReserveArray]
 	jl no_minimum_y_line
 	mov edi,ebp
 	no_minimum_y_line:
-	call calculate_line
-	;call calculate_rectangle
-	mov [counter],eax
+	call calculate_line
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_line:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	vertical_width_save:
-	   and [counter],0
-	   horizontal_width_save:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_save
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_save
-	pop ecx
-	add ebx,4
-	dec ecx
+	;save color pixels in ReserveArray
-	jnz next_color_save_line
+	square_width_save
 	;draw calculated pixels on work arrea
 	call MovePictureToWorkScreen
 	jmp still
 	no_line:
-	;*********************************DRAW RECTANGLE****************************
+	;************************draw rectangle*****************
 	cmp eax,17
 	rep stosd
 	jmp still
 	no_new_rectangle_xy:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_rectangle_to_screen_line
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_rectangle:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
+	;put saved pixels
-	vertical_width_put_rectangle:
-	   and [counter],0
-	   horizontal_width_put_rectangle:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_put_rectangle
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_put_rectangle
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_rectangle
-	no_put_rectangle_to_screen_line:
+	square_width_put
 	;calculate line
 	mov ebx,[ReserveArray]
 	jl no_minimum_y_rectangle
 	mov edi,ebp
 	no_minimum_y_rectangle:
-	call calculate_rectangle
-	mov [counter],eax
+	call calculate_rectangle
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_rectangle:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	vertical_width_save_rectangle:
-	   and [counter],0
-	   horizontal_width_save_rectangle:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_save_rectangle
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_save_rectangle
-	pop ecx
-	add ebx,4
-	dec ecx
+	;save color pixels in ReserveArray
-	jnz next_color_save_rectangle
+	square_width_save
 	;draw calculated pixels on work arrea
 	call MovePictureToWorkScreen
 	jmp still
 	no_rectangle:
-	;*********************************DRAW CIRCLE****************************
+	;************************draw circle********************
 	cmp eax,18
 	rep stosd
 	jmp still
 	no_new_circle_xy:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_line_to_screen_circle
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_circle:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
+	;put saved pixels
-	vertical_width_put_circle:
-	   and [counter],0
-	   horizontal_width_put_circle:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_put_circle
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_put_circle
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_circle
-	no_put_line_to_screen_circle:
+	square_width_put
 	mov esi,[ScreenX]
 	mov edi,[ScreenY]
 	shl edx,16
 	add edx,[y]
 	mov esi,[Radius]
 	call calculate_circle
-	mov [counter],eax
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_circle:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
+	;save color pixels in ReserveArray
-	vertical_width_save_circle:
-	   and [counter],0
-	   horizontal_width_save_circle:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_save_circle
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_save_circle
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_save_circle
+	square_width_save
 	;draw calculated pixels on work arrea
 	mov ebx,[ReserveArray]
 	and [Current_instrument],0
 	call drawwin
 	jmp still
 	no_1_:
-	;*************************zoom 2************************
+	;************************zoom 2*************************
 	cmp eax,46
 	jne no_2_
 	mov [k],2
 	call drawwin
 	and [Current_instrument],0
 	jmp still
 	no_2_:
-	;*************************zoom 3************************
+	;************************zoom 3*************************
 	cmp eax,47
 	jne no_3_
 	mov [k],3
 	call drawwin
 	mov [Scroll1CoordinatX],9
 	mov [Scroll2CoordinatY],89
 	and [Current_instrument],0
 	jmp still
 	no_3_:
-	;*************************zoom 4************************
+	;************************zoom 4*************************
 	cmp eax,48
 	jne no_4_
 	mov [Scroll2CoordinatY],89
 	and [Current_instrument],0
 	jmp still
 	no_16_:
-	;***************allocation of a countour*********************
+	;***************allocation of a countour****************
 	cmp eax,21
 	jne no_allocation
 	mov [ScreenX],eax
 	mov [ScreenY],ebx
 	no_change_coordinats:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_line_to_screen_allocation
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_allocation:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
-	vertical_width_put_allocation:
-	   and [counter],0
-	   horizontal_width_put_allocation:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
+	;put saved pixels
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],1;5
-	   jne horizontal_width_put_allocation
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,1;5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],1;5
-	jne vertical_width_put_allocation
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_allocation
-	no_put_line_to_screen_allocation:
+	square_width_put
 	cmp [DrawSprite_flag],1
 	jl no_minimum_y_allocation
 	mov edi,ebp
 	no_minimum_y_allocation:
-	call calculate_rectangle
-	mov [counter],eax
+	call calculate_rectangle
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_allocation:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	vertical_width_save_allocation:
-	   and [counter],0
-	   horizontal_width_save_allocation:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],1;5
-	   jne horizontal_width_save_allocation
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,1;5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],1;5
-	jne vertical_width_save_allocation
-	pop ecx
-	add ebx,4
-	dec ecx
+	;save color pixels in ReserveArray
-	jnz next_color_save_allocation
+	square_width_save
 	cmp [DrawSprite_flag],1
 	call MovePictureToWorkScreen
 	jmp still
 	no_allocation:
-	;*************reflection from left to right******************
+	;*************reflection from left to right*************
 	cmp eax,23
 	jne no_reflection_from_left_to_right
 	lea ecx,[ecx+ecx*2]
 	add ecx,[PointerToPicture]
 	mov edx,[ReserveArray]
 	and edi,0
 	copy_to_array_line_reflection_y:
-	xor eax,eax
 	mov eax,[ecx]
 	mov ebp,edi
 	lea ebp,[ebp+ebp*2]
 	mov [edx+ebp],ax
 	shr eax,16
 	call MovePictureToWorkScreen
 	jmp still
 	no_reflection_from_left_to_right:
-	;*************reflection from up to down******************
+	;*************reflection from up to down****************
 	cmp eax,24
 	jne no_reflection_from_up_to_down
 	mov esi,[Picture_SizeX]
 	call MovePictureToWorkScreen
 	jmp still
 	no_reflection_from_up_to_down:
-	;*********************draw hard contour*******************
+	;*********************draw hard contour*****************
 	cmp eax,20
 	rep stosd
 	no_new_konture_xy:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_line_to_screen_konture
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_konture:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
-	vertical_width_put_konture:
-	   and [counter],0
-	   horizontal_width_put_konture:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_put_konture
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_put_konture
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_konture
 	;put saved pixels
-	no_put_line_to_screen_konture:
+	square_width_put
 	;calculate line
 	jl no_minimum_y_konture
 	mov edi,ebp
 	no_minimum_y_konture:
-	call calculate_line
-	;call calculate_rectangle
-	mov [counter],eax
+	call calculate_line
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_konture:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	vertical_width_save_konture:
-	   and [counter],0
-	   horizontal_width_save_konture:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_save_konture
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_save_konture
-	pop ecx
-	add ebx,4
-	dec ecx
+	;save color pixels in ReserveArray
-	jnz next_color_save_konture
+	square_width_save
 	;draw calculated pixels on work arrea
 	call MovePictureToWorkScreen
 	jmp still
 	no_kontur_:
-	;************************Draw ellips***********************
+	;************************draw ellips********************
 	cmp eax,19
 	rep stosd
 	jmp still
 	no_new_ellips_xy:
-	;put saved pixels
-	mov ebx,[ReserveArray]
-	mov eax,[ebx]
-	test eax,eax
-	jz no_put_line_to_screen_ellips
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_put_ellips:
-	;put saved pixels in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
-	push edi
+	;put saved pixels
-	vertical_width_put_ellips:
-	   and [counter],0
-	   horizontal_width_put_ellips:
-	      mov edx,[ebx+4807*4+ebp]
-	      and edx,0xffffff
-	      mov [edi],dx
-	      shr edx,16
-	      mov [edi+2],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_put_ellips
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_put_ellips
-	pop edi
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_put_ellips
 	square_width_put
 	no_put_line_to_screen_ellips:
 	mov esi,[ScreenX]
 	mov esi,[a_ellips]
 	shl esi,16
 	add esi,[b_ellips]
 	call calculate_ellips
-	mov [counter],eax
-	;save color pixels in ReserveArray
-	mov eax,[counter]
-	mov ebx,[ReserveArray]
-	mov [ebx],eax
-	mov ecx,[ebx]
-	add ebx,4
-	xor ebp,ebp
-	next_color_save_ellips:
-	;save color of pixel in ReserveArray
-	push ecx
-	and [counter2],0
-	mov edi,[ebx]
+	;save color pixels in ReserveArray
-	vertical_width_save_ellips:
-	   and [counter],0
-	   horizontal_width_save_ellips:
-	      mov eax,edi
-	      mov edx,[eax]
-	      and edx,0xffffff
-	      mov [ebx+4807*4+ebp],dx
-	      shr edx,16
-	      mov [ebx+4807*4+2+ebp],dl
-	   add edi,3
-	   add ebp,4
-	   inc [counter]
-	   cmp [counter],5
-	   jne horizontal_width_save_ellips
-	   mov ecx,[Picture_SizeX]
-	   sub ecx,5
-	   lea ecx,[ecx+ecx*2]
-	   add edi,ecx
-	inc [counter2]
-	cmp [counter2],5
-	jne vertical_width_save_ellips
-	pop ecx
-	add ebx,4
-	dec ecx
-	jnz next_color_save_ellips
+	square_width_save
 	;draw calculated pixels on work arrea
 	mov ebx,[ReserveArray]

Subversion Repositories Kolibri OS

(root)/programs/media/animage/trunk/icons_instruments.inc @ 6352 – Rev 6352 → 6354