Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 8227 → Rev 8271

/programs/media/animage/trunk/palitra256.inc
File deleted
\ No newline at end of file
/programs/media/animage/trunk/animage.asm
146,6 → 146,7
@@:
;OpenDialog initialisation
stdcall [OpenDialog_Init], OpenDialog_data
stdcall [ColorDialog_Init], ColorDialog_data
;---------------------------------------------------------------------
 
align 4
206,7 → 207,6
 
include 'lib_data.inc'
include 'panel_data.inc'
include 'palitra256.inc'
include 'brushes.inc'
include 'spray.inc'
include 'width_lines.inc'
/programs/media/animage/trunk/events_of_window.inc
6,10 → 6,10
mcall SF_THREAD_INFO,procinfo
mov esi,procinfo
 
mov eax,[esi+34]
mov ebx,[esi+38]
mov ecx,[esi+42]
mov edx,[esi+46]
mov eax,[esi+process_information.box.left]
mov ebx,[esi+process_information.box.top]
mov ecx,[esi+process_information.box.width]
mov edx,[esi+process_information.box.height]
mov [Window_CordinatX],eax
mov [Window_CordinatY],ebx
45,10 → 45,8
 
mcall SF_REDRAW,SSF_BEGIN_DRAW
;------------------------------------------------
mov ebx,50 ;[Window_CordinatX]
mov ecx,50 ;[Window_CordinatY]
shl ebx,16
shl ecx,16
mov ebx,50 shl 16 ;[Window_CordinatX]
mov ecx,50 shl 16 ;[Window_CordinatY]
add ebx, [Window_SizeX]
add ecx, [Window_SizeY]
mcall SF_CREATE_WINDOW,,,0x73aabbcc,,name_of_program
69,18 → 67,10
shl ebx, 16
add ebx, [Window_SizeX]
sub ebx, 9
mov ecx, ci_panel_y_pos
shl ecx, 16
add ecx, 51
mov ecx, (ci_panel_y_pos shl 16) + 51
mov edx, 0xD5CDCB
mcall 13
mcall SF_DRAW_RECT
 
;mov eax,ci_panel_x_pos
;mov ebx,ci_panel_y_pos
;mov ecx,[Window_SizeX]
;mov edx,50
;mov esi,1
;sub ecx,5+ci_panel_x_pos+ci_offs_skin_w
call draw_icons
call PrintMousePos
;------------------------------------------------
/programs/media/animage/trunk/icons_instruments.inc
638,100 → 638,18
cmp eax,51
jne no_palette
 
mov eax,20
mov ebx,ci_palete_y_pos
mov ecx,32*10+32*5+7
mov edx,140
mov esi,1
call draw_volume_rectangle
mov [x],20+5
mov [y],ci_palete_y_pos+10
mov edi,256
xor esi,esi
next_rectangle:
mov ebx,[x]
mov ecx,[y]
mov edx,[palitra+esi]
and edx,0xffffff
shl ebx,16
shl ecx,16
add ebx,13
add ecx,13
mcall SF_DRAW_RECT
add [x],15
cmp [x],20+15*32
jl no_new_line
mov [x],20+5
add [y],15
no_new_line:
add esi,4
dec edi
jnz next_rectangle
 
wait_events:
mcall SF_WAIT_EVENT
 
cmp eax,1
stdcall [ColorDialog_Start],ColorDialog_data
; 2 - use another method/not found program
;cmp [ColorDialog_data.status],2
;je no_palette
; 1 - OK, color selected
cmp [ColorDialog_data.status],1
jne @f
ret
mov eax,[ColorDialog_data.color]
mov [Color],eax
@@:
cmp eax,2
jne no_keys
mcall SF_GET_KEY
jmp wait_events
no_keys:
cmp eax,3
jne no_buttons
mcall SF_GET_BUTTON
jmp wait_events
no_buttons:
cmp eax,6
jne wait_events
;call drawwin
 
call GetMouseClick
 
test eax,eax
jz wait_events
call GetMouseCoordinats
mov [x],20+5
mov [y],ci_palete_y_pos+10
mov [counter],0
next_rectangle_column:
mov eax,[x]
mov ebx,[y]
mov ecx,[MouseX]
mov edx,[MouseY]
mov esi,13
mov edi,13
call columnus
test eax,eax
jz no_columnus_color
 
mov eax,[counter]
shl eax,2
mov ebx,[palitra+eax]
and ebx,0xffffff
mov [Color],ebx
no_columnus_color:
 
add [x],15
 
cmp [x],20+15*32
jl no_new_line_column
 
mov [x],20+5
add [y],15
no_new_line_column:
 
inc [counter]
 
cmp [counter],257
jne next_rectangle_column
 
mcall SF_SLEEP,10
 
call drawwin
 
mov eax,[Last_instrument]
mov [Current_instrument],eax
ret
/programs/media/animage/trunk/lib_data.inc
52,6 → 52,29
.end:
db 0
 
align 4
ColorDialog_data:
.type dd 0
.procinfo dd procinfo ;+4
.com_area_name dd cd_communication_area_name ;+8
.com_area dd 0 ;+12
.start_path dd colordialog_path ;+16
.draw_window dd drawwin ;+20
.status dd 0 ;+24
.x:
.x_size dw 510 ;+28 ; Window X size
.x_start dw 10 ;+30 ; Window X position
.y:
.y_size dw 310 ;+32 ; Window y size
.y_start dw 10 ;+34 ; Window Y position
.color_type dd 0 ;+36 ; 0- RGB, 1 or other - reserved
.color dd 0 ;+40 ; Selected color
 
cd_communication_area_name:
db 'FFFFFFFF_color_dialog',0
colordialog_path:
db '/rd/1/colrdial',0
 
;start_temp_file_name: db 'pattern.mgb',0
 
path4 db '/sys/noname.bmp',0
106,11 → 129,15
ProcLib_import:
OpenDialog_Init dd aOpenDialog_Init
OpenDialog_Start dd aOpenDialog_Start
ColorDialog_Init dd aColorDialog_Init
ColorDialog_Start dd aColorDialog_Start
;OpenDialog__Version dd aOpenDialog_Version
dd 0
dd 0
aOpenDialog_Init db 'OpenDialog_init',0
aOpenDialog_Start db 'OpenDialog_start',0
aColorDialog_Init db 'ColorDialog_init',0
aColorDialog_Start db 'ColorDialog_start',0
;aOpenDialog_Version db 'Version_OpenDialog',0
 
align 4
/programs/media/zsea/data.inc
@@ -524,10 +503,6 @@
/programs/media/zsea/load.inc
23,20 → 23,9
cld
rep movsd
mov esi,[cnv_plugin_name_pointer]
mov edi,err_message_found_lib.1
mov ecx,128/4
rep movsd
load_library system_path.1, library_path, system_path, \
[cnv_plugin_import_pointer], plugins_directory
mov esi,[cnv_plugin_name_pointer]
mov edi,err_message_import.1
mov ecx,128/4
rep movsd
load_library system_path.1, path, library_path, system_path, \
err_message_found_lib, head_f_l, \
[cnv_plugin_import_pointer], err_message_import, head_f_i, plugins_directory
 
test eax,eax
jnz START.exit_1
load_convert_plugins_next:
/programs/media/zsea/zSea.asm
47,8 → 47,8
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
include '../../proc32.inc'
;include 'debug.inc'
;include 'load_lib.mac'
include '../../develop/libraries/box_lib/load_lib.mac'
include '../../KOSfuncs.inc'
include '../../load_lib.mac'
@use_library ;use load lib macros
;******************************************************************************
;------------------------------------------------------------------------------