Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2506 → Rev 2507

/programs/media/log_el/trunk/log_el.asm
50,7 → 50,7
include 'le_signal.inc'
 
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 23.03.12',0 ;¯®¤¯¨áì ®ª­ 
caption db '‹®£¨ç¥áª¨¥ í«¥¬¥­âë 26.03.12',0 ;¯®¤¯¨áì ®ª­ 
 
panel_0_coord_top equ 5 ;¢¥àå­ïï ª®®à¤¨­ â  0-£® à鸞 ¯ ­¥«¨ ¨­áâà㬥­â®¢
panel_1_coord_top equ 35
164,7 → 164,7
image_data dd 0 ;㪠§ â¥«ì ­  ¢à¥¬¥­­ãî ¯ ¬ïâì. ¤«ï ­ã¦¥­ ¯à¥®¡à §®¢ ­¨ï ¨§®¡à ¦¥­¨ï
 
IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*20
IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*24
image_data_toolbar dd 0
 
TREE_ICON_SYS16_BMP_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*11+54 ;à §¬¥à bmp ä ©«  á á¨á⥬­ë¬¨ ¨ª®­ª ¬¨
498,12 → 498,21
cmp byte[pen_mode],4
jne @f
bt esi,1
jc @f
jc .rotate
;०¨¬ ᮧ¤ ­¨ï í«¥¬¥­â®¢
stdcall shem_element_creat, eax,ebx
stdcall pole_paint, pole
stdcall [buf2d_draw], buf_0
jmp .end_buf_wnd
.rotate:
;¯®¢®à®â í«¥¬¥­â®¢ ­  90 £à ¤ãᮢ
stdcall element_is_click,eax,ebx
test eax,eax
jz .end_buf_wnd
inc byte[eax+sp_offs_el_angle]
and byte[eax+sp_offs_el_angle],3 ;¤«ï ª®­âà®«ï ­  ¯¥à¥¯®«­¥­¨¥
call redraw_pole
jmp .end_buf_wnd
@@:
 
.end_buf_wnd:
605,7 → 614,7
 
; *** à¨á®¢ ­¨¥ £« ¢­®£® ®ª­  (¢ë¯®«­ï¥âáï 1 à § ¯à¨ § ¯ã᪥) ***
xor eax,eax
mov ebx,(20 shl 16)+520
mov ebx,(20 shl 16)+580
mov ecx,(20 shl 16)+415
mov edx,[sc.work]
or edx,(3 shl 24)+0x10000000+0x20000000
715,6 → 724,18
add ebx,IMAGE_TOOLBAR_ICON_SIZE
add edx,(30 shl 16) ;center
int 0x40
add ebx,IMAGE_TOOLBAR_ICON_SIZE
add edx,(25 shl 16) ;m
int 0x40
add ebx,IMAGE_TOOLBAR_ICON_SIZE
add edx,(25 shl 16) ;m
int 0x40
add ebx,IMAGE_TOOLBAR_ICON_SIZE
add edx,(25 shl 16) ;m
int 0x40
add ebx,IMAGE_TOOLBAR_ICON_SIZE
add edx,(25 shl 16) ;m
int 0x40
 
; *** à¨á®¢ ­¨¥ ¡ãä¥à  ***
stdcall [buf2d_draw], buf_0
770,7 → 791,7
mov ecx,(16 shl 16)+16
mov edx,(62 shl 16)+panel_1_coord_top+2
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE*16
add ebx,IMAGE_TOOLBAR_ICON_SIZE*15
int 0x40
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE
815,7 → 836,7
mov ecx,(16 shl 16)+16
mov edx,(7 shl 16)+panel_2_coord_top+2 ;¨ª®­ª  áâ५ 
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE*11
add ebx,IMAGE_TOOLBAR_ICON_SIZE*19
int 0x40
 
add ebx,IMAGE_TOOLBAR_ICON_SIZE
1451,10 → 1472,10
je .cycle1_end
cmp word[esi],el_icon_elems ;¯®«ã祭¨¥ ç¥à¥§ esi ⨯ ¨ª®­ª¨
jne .end_add_p1
stdcall [tl_node_poi_get_data], esi, tree1
pop ecx
; stdcall [tl_node_poi_get_data], esi, tree1
; pop ecx
inc dword[shem_elems]
 
if 0
xor edx,edx ;edx - ­®¬¥à ¢å®¤­®© ­®£¨
@@:
stdcall el_get_leg_coords, ecx,edx
1473,7 → 1494,7
jmp @b
@@:
;mov edx,(1 shl 16) ;edx - ­®¬¥à ¢ë室­®© ­®£¨
 
end if
.end_add_p1:
stdcall dword[tl_node_poi_get_next_info],esi,tree1
pop esi ;¯¥à¥å®¤¨¬ ª á«¥¤ã饬ã 㧫ã
2286,7 → 2307,7
buf_0: dd 0 ;
.l: dw 170 ;+4 left
.t: dw panel_1_coord_top ;+6 top
.w: dd 335 ;+8 w
.w: dd 395 ;+8 w
.h: dd 340 ;+12 h
.color: dd 0 ;+16 color
db 24 ;+20 bit in pixel
2529,16 → 2550,15
; edi = string buffer
;output:
align 4
convert_int_to_str:
pushad
mov dword[edi+1],0;0x20202020
proc convert_int_to_str uses eax ecx edx edi
mov dword[edi+1],0
call .str
popad
ret
endp
 
align 4
.str:
mov ecx,0x0a ;§ ¤ ¥âáï á¨á⥬  áç¨á«¥­¨ï ¨§¬¥­ïîâáï ॣ¨áâàë ebx,eax,ecx,edx ¢å®¤­ë¥ ¯ à ¬¥âàë eax - ç¨á«®
mov ecx,0x0a ;§ ¤ ¥âáï á¨á⥬  áç¨á«¥­¨ï ¨§¬¥­ïîâáï ॣ¨áâàë eax,ecx,edx ¢å®¤­ë¥ ¯ à ¬¥âàë eax - ç¨á«®
;¯à¥à¥¢®¤ ç¨á«  ¢ ASCII áâப㠢§®¤­ë¥ ¤ ­­ë¥ ecx=á¨á⥬  áç¨á«¥­ï edi  ¤à¥á ªã¤  § ¯¨á뢠âì, ¡ã¤¥¬ áâபã, ¯à¨ç¥¬ ª®­¥æ ¯¥à¥¬¥­­®©
cmp eax,ecx ;áà ¢­¨âì ¥á«¨ ¢ eax ¬¥­ìè¥ ç¥¬ ¢ ecx â® ¯¥à¥©â¨ ­  @@-1 â.¥. ­  pop eax
jb @f