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

+}
 ;-----------------------------------------------------------
 ;-----instruments of panel(icon's instruments)--------------
+;-----------------------------------------------------------
+;input:
+; [Current_instrument] - instrument code
-;-----------------------------------------------------------
+;
+; *** instrument codes ***
+;10 - pensil
+;11 - draw brush
+;12 - spray
+;13 - lastik
+;14 - flood fill
+;15 - pipetka
+;16 - draw line
+;17 - draw rectangle
+;18 - draw circle
+;19 - draw ellips
+;20 - draw hard contour
+;21 - allocation of a countour
+;23 - reflection from left to right
+;24 - reflection from up to down
+;40 - brush 1
+;41 - brush 2
+;42 - brush 3
+;43 - brush 4
+;44 - brush 5
+;45 - zoom 1
+;46 - zoom 2
+;47 - zoom 3
+;48 - zoom 4
+;49 - zoom 8
+;50 - zoom 16
+;51 - palette
-TakeButtonInstruments:
+align 4
 TakeButtonInstruments:
 	mov eax,[Current_instrument]
 	mov [Number_Brush],0
 	mov ebx,[Last_instrument]
 	mov [Current_instrument],ebx
-	mov [line_width],1
+	mov [line_width],1
-	jmp still
+	ret
 	no_brush1:
 	;*************************brush 2***********************
 	mov [Number_Brush],1
 	mov ebx,[Last_instrument]
 	mov [Current_instrument],ebx
-	mov [line_width],2
+	mov [line_width],2
-	jmp still
+	ret
 	no_brush2:
 	;*************************brush 3***********************
 	mov [Number_Brush],2
 	mov ebx,[Last_instrument]
 	mov [Current_instrument],ebx
-	mov [line_width],3
+	mov [line_width],3
-	jmp still
+	ret
 	no_brush3:
 	;*************************brush 4***********************
 	mov [Number_Brush],3
 	mov ebx,[Last_instrument]
 	mov [Current_instrument],ebx
-	mov [line_width],4
+	mov [line_width],4
-	jmp still
+	ret
 	no_brush4:
 	;*************************brush 5***********************
 	mov [Number_Brush],4
 	mov ebx,[Last_instrument]
 	mov [Current_instrument],ebx
-	mov [line_width],5
+	mov [line_width],5
-	jmp still
+	ret
 	no_brush5:
 	;*************************pensil************************
 	mov [OldX],eax
 	mov [OldY],ebx
-	no_activated_later:
-;	mov eax,[MaxWorkScreen_SizeX] ???
-;	mov ebx,[MaxWorkScreen_SizeY] ???
+	no_activated_later:
 	mov eax,[PointerToPicture]
 	mov ebx,[ReserveArray]
 	mov ecx,[Picture_SizeX]
 	mov [OldX],eax
 	mov [OldY],ebx
 	call MovePictureToWorkScreen
 	mov [Activate_instrument],1
-	jmp still
+	ret
-	no_pensil:
-	;*************************pipetka***********************
-	cmp eax,15
-	jne no_pipetka
-	mov eax,[ScreenY]
-	mov ebx,[Picture_SizeX]
-	add eax,[PosY]
-	imul eax,ebx
-	add eax,[ScreenX]
-	add eax,[PosX]
-	lea eax,[eax+eax*2]
-	add eax,[PointerToPicture]
-	mov ebx,[eax]
-	and ebx,0xffffff
-	mov [Color],ebx
-	mcall SF_DRAW_RECT, ((ci_panel_x_pos+130) shl 16)+21,\
-		((ci_panel_y_pos+28) shl 16)+21, [Color]
-	jmp still
-	no_pipetka:
+	no_pensil:
 	;*************************draw brush********************
 	cmp eax,11
 	call MovePictureToWorkScreen
 	mov eax,[Current_instrument]
 	mov [Last_instrument],eax
+	ret
+	no_brush:
+	;*************************pipetka***********************
+	cmp eax,15
+	jne no_pipetka
+	mov eax,[ScreenY]
+	mov ebx,[Picture_SizeX]
+	add eax,[PosY]
+	imul eax,ebx
+	add eax,[ScreenX]
+	add eax,[PosX]
+	lea eax,[eax+eax*2]
+	add eax,[PointerToPicture]
+	mov ebx,[eax]
+	and ebx,0xffffff
+	mov [Color],ebx
+	mcall SF_DRAW_RECT, ((ci_panel_x_pos+130) shl 16)+21,\
+		((ci_panel_y_pos+28) shl 16)+21, [Color]
+	ret
+	no_pipetka:
+	;************************lastik*************************
+	cmp eax,13
+	jne no_lastik
+	mov [Last_instrument],eax
+	mov [lastik_is_active],1
-	jmp still
+	jmp lastik_in
-	no_brush:
+	no_lastik:
 	;************************Flood Fill*********************
 	dec esi
 	mov edi,[Color]
 	call flood_fill
-	call MovePictureToWorkScreen
+	call MovePictureToWorkScreen
-	jmp still
+	ret
-	no_FloodFill:
-	;************************lastik*************************
-	cmp eax,13
-	jne no_lastik
-	 mov [Last_instrument],eax
-	 mov [lastik_is_active],1
-	jmp lastik_in
-	no_lastik:
+	no_FloodFill:
-	;*******************************************************
+	;************************spray**************************
 	cmp eax,12
-	jne  no_spray
+	jne no_spray
 	cmp [Activate_instrument],0
 	jne no_null_spray
 	mov [Activate_instrument],1
-	jmp still
+	ret
 	no_null_spray:
 	inc edx
 	cmp edx,20
 	jl brush_y_spray
 	call MovePictureToWorkScreen
-	jmp still
 	ret
 	no_spray:
 	;************************palette************************
 	add esi,4
 	dec edi
 	jnz next_rectangle
 	wait_events:
-	call event
+	mcall SF_WAIT_EVENT
+	cmp eax,1
-	cmp eax,1
+	jne @f
-	je still
+		ret
 	@@:
-	cmp eax,2
-	jne no_keys
+	cmp eax,2
+	jne no_keys
-	mcall SF_GET_KEY
+		mcall SF_GET_KEY
-	no_keys:
+		jmp wait_events
 	no_keys:
 	cmp eax,3
-	jne no_buttons
+	jne no_buttons
-	mcall SF_GET_BUTTON
+		mcall SF_GET_BUTTON
-	no_buttons:
+		jmp wait_events
 	no_buttons:
 	cmp eax,6
 	call drawwin
-	mov eax,[Last_instrument]
-	mov [Current_instrument],eax
+	mov eax,[Last_instrument]
 	mov [Current_instrument],eax
-	jmp still
+	ret
 	no_palette:
 	mov [OldY],ebx
 	mov [Activate_instrument],1
 	xor eax,eax
 	mov ecx,mem_flood_f/4
 	mov edi,[ReserveArray]
+	cld
 	rep stosd
-	jmp still
+	ret
 	no_new_line_xy:
 	;put saved pixels
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_line:
 	mov [OldY],ebx
 	mov [Activate_instrument],1
 	xor eax,eax
 	mov ecx,mem_flood_f/4
 	mov edi,[ReserveArray]
+	cld
 	rep stosd
-	jmp still
+	ret
 	no_new_rectangle_xy:
 	;put saved pixels
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels_rectangle
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_rectangle:
 	mov [OldY],ebx
 	mov [Activate_instrument],1
 	xor eax,eax
 	mov ecx,mem_flood_f/4
 	mov edi,[ReserveArray]
+	cld
 	rep stosd
-	jmp still
+	ret
 	no_new_circle_xy:
 	;put saved pixels
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_circle:
 	;************************zoom 1*************************
 	cmp eax,45
 	jne no_1_
 	mov [k],1
 	call scrollbar_move_00
 	and [Current_instrument],0
 	call drawwin
-	jmp still
+	ret
 	no_1_:
 	;************************zoom 2*************************
 	cmp eax,46
 	jne no_2_
 	mov [k],2
 	call drawwin
-	call scrollbar_move_00
-	and [Current_instrument],0
+	call scrollbar_move_00
-	jmp still
+	and [Current_instrument],0
-	no_2_:
+	ret
 	no_2_:
 	;************************zoom 3*************************
 	cmp eax,47
 	jne no_3_
 	mov [k],3
 	call drawwin
 	call scrollbar_move_00
 	and [Current_instrument],0
-	jmp still
+	ret
 	no_3_:
 	;************************zoom 4*************************
 	cmp eax,48
 	jne no_4_
 	mov [k],4
 	call drawwin
 	call scrollbar_move_00
 	and [Current_instrument],0
-	jmp still
+	ret
 	no_4_:
 	;************************zoom 8*************************
 	cmp eax,49
 	jne no_8_
 	mov [k],8
 	call drawwin
 	call scrollbar_move_00
 	and [Current_instrument],0
-	jmp still
+	ret
 	no_8_:
 	;************************zoom 16************************
 	cmp eax,50
 	jne no_16_
 	mov [k],16
 	and [crossing],0
 	and [finishing_crossing],0
 	xor eax,eax
 	mov ecx,mem_flood_f/4
 	mov edi,[ReserveArray]
+	cld
 	rep stosd
-	jmp still
+	ret
 	no_new_allocation_xy:
 	instrument_not_finished_work:
 	mov al,[instrument_used]
 	mov edx,[ScreenY]
 	mov esi,[SpriteSizeX]
 	mov edi,[SpriteSizeY]
 	add ecx,[PosX]
 	add edx,[PosY]
-	inc esi;eax
+	inc esi
-	inc edi;ebx
+	inc edi
 	call columnus
 	test eax,eax
 	jnz crossing_with_work_area
 	and [Activate_instrument],0
 	and [crossing],0
 	and [instrument_used],0
 	and [DrawSprite_flag],0
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	not_finish_from_instrument_crossing:
 	;calculate line
 	mov ebx,[ReserveArray]
 	mov [rectangular_shade_x],eax
 	mov [rectangular_shade_y],ebx
 	no_save_shades:
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_allocation:
 	;*************reflection from left to right*************
 	dec esi
 	jnz next_line_reflection_x
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_reflection_from_left_to_right:
 	sub edi,esi
 	dec ecx
 	jnz next_lines_reflection
 	call MovePictureToWorkScreen
-	jmp still
+	ret
 	no_reflection_from_up_to_down:
 	;*********************draw hard contour*****************
 	add ebx,[PosY]
 	mov [used_OldX],eax
 	mov [used_OldY],ebx
-	call MovePictureToWorkScreen
+	call MovePictureToWorkScreen
-	jmp still
 	ret
+	no_kontur_:
 	no_kontur_:
 	;************************draw ellips********************
 	cmp eax,19
 	jne no_ellips
 	mov [OldY],ebx
 	mov [Activate_instrument],1
 	xor eax,eax
 	mov ecx,mem_flood_f/4
 	mov edi,[ReserveArray]
+	cld
 	rep stosd
-	jmp still
+	ret
 	no_new_ellips_xy:
 	;put saved pixels
 	;draw calculated pixels on work arrea
 	draw_calc_pixels width_pixels
 	call MovePictureToWorkScreen
-	jmp still
-	no_ellips:
 	;ret
 	no_ellips:

Subversion Repositories Kolibri OS

(root)/programs/media/animage/trunk/icons_instruments.inc – Rev 6359 → 6362