Subversion Repositories Kolibri OS

Compare Revisions

No changes between revisions

Regard whitespace Rev 2121 → Rev 2125

/programs/develop/info3ds/data.inc
1,7 → 1,7
if lang eq ru
capt db 'info 3ds ¢¥àá¨ï 23.08.11',0 ;¯®¤¯¨áì ®ª­ 
capt db 'info 3ds ¢¥àá¨ï 26.08.11',0 ;¯®¤¯¨áì ®ª­ 
else
capt db 'info 3ds version 23.08.11',0 ;window caption
capt db 'info 3ds version 26.08.11',0 ;window caption
end if
 
MAX_FILE_LEVEL equ 20 ;¬ ªá¨¬ «ì­ë© ã஢¥­ì ¢«®¦¥­­®á⨠¡«®ª®¢ ¤«ï  ­ «¨§ 
81,6 → 81,7
block_3ds CHUNK_TRACKCAMTGT, 3,0,txt_b004
 
;--- ¤ «¥¥ ­¥ ¢® ¢á¥å ¡«®ª å ᬮ£ ­ ©â¨ ®¯¨á ­¨¥ ­  àãá᪮¬ ï§ëª¥
block_3ds 0x4111, 3,1,txt_4111
block_3ds 0x4150, 3,1,txt_4150
block_3ds 0x4165, 3,1,txt_4165
block_3ds 0x4610, 3,1,txt_4610
153,6 → 154,7
txt_b004 db '®¢¥¤¥­¨¥ "楫¨" ª ¬¥àë',0
 
;--- ¤ «¥¥ ­¥ ¢® ¢á¥å ¡«®ª å ᬮ£ ­ ©â¨ ®¯¨á ­¨¥ ­  àãá᪮¬ ï§ëª¥
txt_4111 db '”« £¨ ¢¥à設',0
txt_4150 db 'Smoothing group list',0
txt_4165 db 'Object color in editor',0
txt_4610 db ' ¯à ¢«¥­­ë© ᢥâ',0
224,6 → 226,7
txt_b004 db 'Camera target information',0
 
;---
txt_4111 db 'Vertex flags',0
txt_4150 db 'Smoothing group list',0
txt_4165 db 'Object color in editor',0
txt_4610 db 'Spotlight',0
269,9 → 272,12
txt_no_3ds db 'Žâªàëâë© ä ©« ­¥ ¢ ä®à¬ â¥ *.3ds',0
txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
txt_3ds_err_sizes db '‚®§¬®¦­® ä ©« ¯®¢à¥¦¤¥­',0
txt_count db 'Š®«¨ç¥á⢮',0
txt_3ds_offs:
db '‘¬¥é¥­¨¥: '
.dig: rb 8
db '  §¬¥à: '
.siz: rb 8
db 0
else
txt_open_3ds db 'Open file:',0
278,8 → 284,11
txt_no_3ds db 'Žâªàëâë© ä ©« ­¥ ¢ ä®à¬ â¥ *.3ds',0
txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
txt_3ds_err_sizes db '‚®§¬®¦­® ä ©« ¯®¢à¥¦¤¥­',0
txt_count db 'Count',0
txt_3ds_offs:
db 'Offset: '
.dig: rb 8
db ' Size: '
.siz: rb 8
db 0
end if
/programs/develop/info3ds/info3ds.asm
184,6 → 184,9
jz button
cmp al,6
jne @f
mcall 9,procinfo,-1
cmp ax,word[procinfo+4]
jne @f ;®ª­® ­¥  ªâ¨¢­®
call mouse
@@:
jmp still
212,8 → 215,9
cmp ebx,0
je @f
mov eax,dword[ebx] ;¯®«ãç ¥¬ §­ ç¥­¨¥ ᤢ¨£  ¢ë¡à ­­®£® ¡«®ª  ®â­®á¨â¥«ì­® ­ ç «  ä ©« 
mov ecx,dword[ebx+4]
mov ecx,dword[ebx+4] ;à §¬¥à ¡«®ª 
stdcall hex_in_str, txt_3ds_offs.dig, eax,8
stdcall hex_in_str, txt_3ds_offs.siz, ecx,8
 
add eax,dword[open_file_lif] ;¯®«ãç ¥¬ §­ ç¥­¨¥ ᤢ¨£  ¢ ¯ ¬ïâ¨
cmp dword[offs_last_timer],eax
312,6 → 316,16
mov edi,capt
int 0x40
 
mcall 9,procinfo,-1
mov eax,dword[procinfo.box.height]
cmp eax,250
jge @f
mov eax,250
@@:
sub eax,65
mov dword[tree1.box_height],eax
mov word[w_scr_t1+4],ax ;­®¢ë¥ à §¬¥àë áªà®««¨­£ 
 
mov eax,8
mov ebx,(5 shl 16)+20
mov ecx,(5 shl 16)+20
520,6 → 534,22
sub ecx,edi
jmp .next_bl
@@:
cmp dx,CHUNK_VERTLIST ;ᯨ᮪ ¢¥à設
je .vertexes
cmp dx,0x4111 ;ä« £¨ ¢¥à設
je .vertexes
cmp dx,CHUNK_FACELIST ;ᯨ᮪ £à ­¥©
je .vertexes
jmp @f
.vertexes: ;®¡à ¡®âª  ¡«®ª®¢, ᮤ¥à¦ é¨å ¤ ­­ë¥ ¢¥à設
stdcall add_3ds_object, ID_ICON_DATA,ebx,2,txt_count ;ç¨á«® ¢¥à設 ¨«¨ £à ­¥©
add esi,2
sub ecx,2
stdcall add_3ds_object, ID_ICON_DATA,ebx,ecx,0 ;¤ ­­ë¥ ¢¥à設
sub esi,8 ;¢®ááâ ­®¢«¥­¨¥ esi
call block_next
jmp .end_f
@@:
; ***  ­ «¨§ ¡«®ª  á ¤ ­­ë¬¨ ¯® 㬮«ç ­¨î (¡¥§ ¢ë¤¥«¥­¨ï ¯®¤¡«®ª®¢)
stdcall add_3ds_object, ID_ICON_DATA,ebx,ecx,0
sub esi,6 ;¢®ááâ ­®¢«¥­¨¥ esi
/programs/develop/libraries/box_lib/trunk/doc/box_lib.htm
24,7 → 24,7
<li>d_button</li>
<li>menubar</li>
<li>filebrowser</li>
<li>filepath</li>
<li><a href="pathshow\pathshow.htm">pathshow</a></li>
<li><a href="tree_list\info_treelist.htm">tree_list</a></li>
<li><a href="t_edit\t_edit.htm">text_editor</a></li>
</ul>
38,6 → 38,6
<p>Èãîðü Àôàíàñüåâ aka IgorA</p>
 
<hr>
<p>Äîêóìåíòàöèÿ îáíîâëÿëàñü ïîñëåäíèé ðàç 29.04.10.</p>
<p>Äîêóìåíòàöèÿ îáíîâëÿëàñü ïîñëåäíèé ðàç 26.08.11.</p>
</body>
</html>
/programs/develop/libraries/box_lib/trunk/doc/pathshow/pathshow.htm
0,0 → 1,64
<html>
<head>
<title>ýëåìåíò PathShow</title>
<meta http-equiv="content-type" content="text/html; charset=WINDOWS-1251">
<link href="../style.css" type=text/css rel=stylesheet>
</head>
 
<body>
<p><a href="../box_lib.htm">Íà ãëàâíóþ &uarr;</a></p>
<h1>Îãëàâëåíèå</h1>
<p><a href="#vveden">Ââåäåíèå</a></p>
<p><a href="#funct">Ôóíêöèè</a></p>
<ul>
<li><a href="#fun_prepare">PathShow_prepare</a></li>
<li><a href="#fun_draw">PathShow_draw</a></li>
</ul>
<p><a href="#struc_pathshow">Ñòðóêòóðà PathShow</a></p>
 
<h1><a name="vveden">Ââåäåíèå</a></h1>
<p>Êîìïîíåíò <b>PathShow</b> - ïðåäíàçíà÷åí äëÿ îòîáðàæåíèÿ ïóòè ê ôàéëó èëè äèðåêòîðèè, ñ óñå÷åíèåì èìåíè ïîõîæèì íà óñå÷åíèå âûâîäèìîå FAR'îì, åñëè íå âëàçèò â îáëàñòü âûäåëåííóþ äëÿ âûâîäà.  òåêóùåì âèäå ïîääåðæèâàåò îáà ñèñòåìíûõ øðèôòà.</p>
 
<h1><a name="funct">Ôóíêöèè</a></h1>
 
<h4><a name="fun_prepare">PathShow_prepare</a></h4>
<p>Ïîäãîòàâëèâàåò ñòðîêó ïåðåä âûâîäîì íà ýêðàí. Íóæíî âûçûâàòü ýòó ôóíêöèþ êàæäûé ðàç êîãäà ìåíÿåòñÿ ïóòü ê ôàéëó.</p>
<p>Ïðèìåð èñïîëüçîâàíèÿ:</p>
<pre>; ïîäãîòîâêà PathShow
push dword PathShow_data_1
call [PathShow_prepare]</pre>
 
<h4><a name="fun_draw">PathShow_draw</a></h4>
<p>Ðèñóåò ýëåìåíò íà ýêðàíå.</p>
<p>Ïðèìåð èñïîëüçîâàíèÿ:</p>
<pre>; ðèñîâàíèå PathShow
push dword PathShow_data_1
call [PathShow_draw]</pre>
 
<h1><a name="struc_pathshow">Ñòðóêòóðà PathShow</a></h1>
 
<pre>PathShow_data_1:
.type dd 0 ;+0
.start_y dw 28 ;+4
.start_x dw 172 ;+6
.font_size_x dw 6 ;+8 ; 6 - for font 0, 8 - for font 1
.area_size_x dw 200 ;+10
.font_number dd 0 ;+12 ; 0 - monospace, 1 - variable
.background_flag dd 0 ;+16
.font_color dd 0x0 ;+20
.background_color dd 0x0 ;+24
.text_pointer dd openfile_pach ;+28
.work_area_pointer dd text_work_area ;+32
.temp_text_length dd 0 ;+36</pre>
 
<p><b>.start_y</b> - îòñòóï ñâåðõó</p>
<p><b>.start_x</b> - îòñòóï ñëåâà</p>
<p><b>.background_flag</b> - åñëè 1 òî èñïîëüçîâàòü <i>.background_color</i> äëÿ çàëèâêè</p>
<p><b>.background_color</b> - öâåò ôîíîâîé çàëèâêè</p>
<p><b>.text_pointer</b> - óêàçàòåëü íà îáëàñòü äàííûõ ñ èñõîäíîé ñòðîêîé ñèìâîëîâ</p>
<p><b>.work_area_pointer</b> - óêàçàòåëü íà îáëàñòü äàííûõ, ãäå áóäåò ñôîðìèðîâàíà âûâîäèìàÿ ñòðîêà ñèìâîëîâ</p>
<hr>
<p>Äîêóìåíòàöèÿ îáíîâëÿëàñü ïîñëåäíèé ðàç 26.08.11.</p>
 
</body>
</html>
/programs/develop/libraries/box_lib/trunk/doc/pathshow
Property changes:
Added: bugtraq:number
+true
\ No newline at end of property
/programs/other/t_edit/t_button.inc
18,7 → 18,7
ends
 
 
hed db 'TextEditor 22.08.11',0 ;¯®¤¯¨áì ®ª­ 
hed db 'TextEditor 26.08.11',0 ;¯®¤¯¨áì ®ª­ 
sc system_colors
 
fn_icon db 'te_icon.bmp',0
230,7 → 230,7
mov ted_panel_id,TED_PANEL_FIND
mov ted_wnd_l,TED_PANEL_WIDTH
.e_if:
stdcall EvSize,edi
call EvSize
stdcall [ted_draw],edi
pop edi
ret
303,7 → 303,7
mov ted_panel_id,TED_PANEL_SYNTAX
mov ted_wnd_l,TED_PANEL_WIDTH
.e_if:
stdcall EvSize,edi
call EvSize
stdcall [ted_draw],edi
pop edi
ret
/programs/other/t_edit/t_draw.inc
260,11 → 260,12
ret
endp
 
MIN_M_WND_H equ 100
MIN_M_WND_H equ 100 ;ìèíèìàëüíàÿ âûñîòà ãëàâíîãî îêíà
;input:
; edi = pointer to tedit struct
align 4
proc EvSize, edit:dword
EvSize:
pushad
mov edi,dword[edit]
mov ebx,ted_scr_h
mov esi,ted_scr_w
 
299,7 → 300,6
 
popad
ret
endp
 
;input:
; ecx = 0x4000____
/programs/other/t_edit/t_edit.asm
194,18 → 194,21
 
align 4
still:
mov eax,10
mcall
mcall 10
 
cmp al,1 ;¨§¬. ¯®«®¦¥­¨¥ ®ª­ 
cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
jz red_win
cmp al,2
jz key
cmp al,3
jz button
cmp al,6
jz mouse
 
cmp al,6 ;¬ëèì
jne @f
mcall 9,procinfo,-1
cmp ax,word[procinfo+4]
jne @f ;®ª­® ­¥  ªâ¨¢­®
jmp mouse
@@:
jmp still
 
align 4
212,18 → 215,14
draw_window:
mcall 12,1
 
xor eax,eax
mov ebx,10*65536+485
mov ecx,10*65536+320
mov edx,[sc.work]
or edx,0x73000000
mov edi,hed
int 0x40
mcall 0,(10 shl 16)+485,(10 shl 16)+320
 
mov edi,tedit0
 
mcall 9,procinfo,-1
stdcall EvSize,edi
mov edi,tedit0 ;§­ ç¥­¨¥ edi ­ã¦­® ¤«ï EvSize ¨ ted_wnd_t
call EvSize
 
mov eax,13 ;¢¥àå­¨© ¯àאַ㣮«ì­¨ª, ¤«ï ®ç¨á⪨ ¢¥àå­¥© ¯ ­¥«¨
xor ebx,ebx
290,26 → 289,23
.menu_bar_1:
mov [menu_data_1.get_mouse_flag],1
; mouse event for Menu 1
push dword menu_data_1
call [menu_bar_mouse]
cmp [menu_data_1.click],dword 1
stdcall [menu_bar_mouse],dword menu_data_1
cmp dword[menu_data_1.click],1
jne .mnu_1
cmp [menu_data_1.cursor_out],dword 4
cmp dword[menu_data_1.cursor_out],4
je button.exit
cmp [menu_data_1.cursor_out],dword 3
cmp dword[menu_data_1.cursor_out],3
jne @f
stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
@@:
cmp [menu_data_1.cursor_out],dword 2
cmp dword[menu_data_1.cursor_out],2
jne @f
call ted_but_open_file
@@:
cmp [menu_data_1.cursor_out],dword 1
cmp dword[menu_data_1.cursor_out],1
jne @f
call ted_but_new_file
@@:
;cmp [menu_data_1.cursor_out],dword 0
;jne @f
.mnu_1:
jmp still
;---------------------------------------------------------------------
/programs/other/t_edit_synt/te_data.inc
11,7 → 11,7
 
align 4
boxlib_import:
dd alib_init2 ;ôóíêöèÿ çàïóñêàåòñÿ ìàêðîñîì 1 ðàç ïðè ïîäêëþ÷åíèè áèáèëèîòåêè, ïîòîìó â ïðîãðàììå ìåòêà íà íåå íå íóæíà
dd alib_init2 ;äã­ªæ¨ï § ¯ã᪠¥âáï ¬ ªà®á®¬ 1 à § ¯à¨ ¯®¤ª«î祭¨¨ ¡¨¡¨«¨®â¥ª¨, ¯®â®¬ã ¢ ¯à®£à ¬¬¥ ¬¥âª  ­  ­¥¥ ­¥ ­ã¦­ 
 
edit_box_draw dd aEdit_box_draw
edit_box_key dd aEdit_box_key
84,6 → 84,10
ted_text_colored dd sz_ted_text_colored
;version_text_edit dd sz_ted_version
 
PathShow_prepare dd sz_PathShow_prepare
PathShow_draw dd sz_PathShow_draw
;Version_path_show dd szVersion_path_show
 
dd 0,0
alib_init2 db 'lib_init',0
 
157,9 → 161,13
sz_ted_but_find_next db 'ted_but_find_next',0
sz_ted_text_colored db 'ted_text_colored',0
;sz_ted_version db 'version_text_edit',0
 
sz_PathShow_prepare db 'PathShow_prepare',0
sz_PathShow_draw db 'PathShow_draw',0
;szVersion_path_show db 'version_PathShow',0
;---------------------------------------------------------------------
align 4
ws_dir_lbox: ;äî÷åðíèé ñêðîëëèíã äëÿ ýëåìåíòà ListBox
ws_dir_lbox: ;¤®ç¥à­¨© áªà®««¨­£ ¤«ï í«¥¬¥­â  ListBox
.x:
.size_x dw 16 ;+0
.start_x dw 0 ;+2
169,8 → 177,7
.btn_high dd 15 ;+8
.type dd 1 ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
rb 4+4
.bckg_col dd 0xeeeeee ;+28
.frnt_col dd 0xbbddff ;+32
.line_col dd 0 ;+36
178,17 → 185,7
.delta dw 0 ;+44
.delta2 dw 0 ;+46
.run_x:
.r_size_x dw 0 ;+48
.r_start_x dw 0 ;+50
.run_y:
.r_size_y dw 0 ;+52
.r_start_y dw 0 ;+54
.m_pos dd 0 ;+56
.m_pos_2 dd 0 ;+60
.m_keys dd 0 ;+64
.run_size dd 0 ;+68
.position2 dd 0 ;+72
.work_size dd 0 ;+76
rb 2*4+4*6
.all_redraw dd 0 ;+80
.ar_offset dd 1 ;+84
;---------------------------------------------------------------------
212,6 → 209,10
 
dir_mem rb 32+304*count_of_dir_list_files
 
edit1 edit_box 310+16-CAPT_PATH_WIDTH, 210+CAPT_PATH_WIDTH, 25, 0xffffff, 0xff, 0xff0000, 0, 0x80, MAX_COLOR_WORD_LEN, ed_buffer.127, mouse_dd, 0
 
ed_buffer: ;⥪áâ ¤«ï edit
.127: rb MAX_COLOR_WORD_LEN+2
;------------------------------------------------------------------------------
struct TexSelect
x0 dd ?
292,8 → 293,7
.btn_high dd 15 ; +8
.type dd 1 ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
rb 4+4
.bckg_col dd 0xeeeeee ;+28
.frnt_col dd 0xbbddff ;+32
.line_col dd 0x808080 ;+36
301,17 → 301,7
.delta dw 0 ;+44
.delta2 dw 0 ;+46
.run_x:
.r_size_x dw 0 ;+48
.r_start_x dw 0 ;+50
.run_y:
.r_size_y dw 0 ;+52
.r_start_y dw 0 ;+54
.m_pos dd 0 ;+56
.m_pos_2 dd 0 ;+60
.m_keys dd 0 ;+64
.run_size dd 0 ;+68
.position2 dd 0 ;+72
.work_size dd 0 ;+76
rb 2*4+4*6
.all_redraw dd 0 ;+80
.ar_offset dd 1 ;+84
;---------------------------------------------------------------------
326,8 → 316,7
.btn_high dd 15 ;+8
.type dd 1 ;+12
.max_area dd 100 ;+16
.cur_area dd 30 ;+20
.position dd 0 ;+24
rb 4+4
.bckg_col dd 0xeeeeee ;+28
.frnt_col dd 0xbbddff ;+32
.line_col dd 0x808080 ;+36
335,20 → 324,23
.delta dw 0 ;+44
.delta2 dw 0 ;+46
.run_x:
.r_size_x dw 0 ;+48
.r_start_x dw 0 ;+50
.run_y:
.r_size_y dw 0 ;+52
.r_start_y dw 0 ;+54
.m_pos dd 0 ;+56
.m_pos_2 dd 0 ;+60
.m_keys dd 0 ;+64
.run_size dd 0 ;+68
.position2 dd 0 ;+72
.work_size dd 0 ;+76
rb 2*4+4*6
.all_redraw dd 0 ;+80
.ar_offset dd 1 ;+84
;---------------------------------------------------------------------
PathShow_data_1:
.type dd 0 ;+0
.start_y dw 10 ;+4
.start_x dw 210+CAPT_PATH_WIDTH ;+6
.font_size_x dw 6 ;+8 ; 6 - for font 0, 8 - for font 1
.area_size_x dw 310+16-CAPT_PATH_WIDTH ;+10
.font_number dd 0 ;+12 ; 0 - monospace, 1 - variable
.background_flag dd 1 ;+16
.font_color dd 0x0 ;+20
.background_color dd 0xffffff ;+24
.text_pointer dd file_name ;+28
.work_area_pointer dd file_name_rez ;+32
.temp_text_length dd 0 ;+36
 
align 4
str_file_70:
/programs/other/t_edit_synt/te_syntax.asm
201,9 → 201,8
mov edx,txt_out_file
int 0x40
 
mov ebx,(215+CAPT_PATH_WIDTH) shl 16 + 10
mov edx,file_name
int 0x40
push dword PathShow_data_1
call [PathShow_draw]
 
stdcall [edit_box_draw],dword edit1
stdcall [tl_draw],dword tree1
313,7 → 312,7
;@@:
ret
 
hed db 'TextEditor syntax file converter 22.08.11',0 ;¯®¤¯¨áì ®ª­ 
hed db 'TextEditor syntax file converter 26.08.11',0 ;¯®¤¯¨áì ®ª­ 
 
txt122 db '‡ £à. ä ©«',0
txt148 db '‘®åà. ä ©«',0
320,11 → 319,6
txt_inp_file db 'ˆáå. ä ©«:',0
txt_out_file db '‚ëå. ä ©«:',0
 
edit1 edit_box 305+16-CAPT_PATH_WIDTH, 215+CAPT_PATH_WIDTH, 25, 0xffffff, 0xff, 0xff0000, 0, 0x80, MAX_COLOR_WORD_LEN, ed_buffer.127, mouse_dd, 0
 
ed_buffer: ;⥪áâ ¤«ï edit
.127: rb MAX_COLOR_WORD_LEN+2
 
err_message_found_lib0 db 'Sorry I cannot found library box_lib.obj',0
head_f_i0:
head_f_l0 db 'System error',0
350,6 → 344,4
rb 4096
file_name_rez:
rb 4096
file_info:
rb 40
mem:
/programs/other/t_edit_synt/te_work.inc
151,8 → 151,9
add eax,sizeof.TexColViv
loop @b
;stdcall [ted_init_scroll_bars], tedit0,4
;stdcall [ted_draw], tedit0
; ïîäãîòîâêà äëÿ PathShow
push dword PathShow_data_1
call [PathShow_prepare]
call draw_window
 
.no_colors: