XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

New downloader - some refactoring GUI and invoking OpenDialog

Browse Source 
git-svn-id: svn://kolibrios.org@4243 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2013-11-16 23:38:52 +00:00
parent bf29240050
commit be43029262
1 changed files with 230 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

273
programs/develop/libraries/http/examples/downloader.asm
View File

@ -18,7 +18,19 @@ __DEBUG__ = 1
__DEBUG_LEVEL__ = 1 __DEBUG_LEVEL__ = 1
format binary as "" format binary as ""
;--------------------------------------
frame_1:
.x = 5
.y = 10
.width = 350
.height = 55
;--------------------------------------
frame_2:
.x = 5
.y = 75
.width = 350
.height = 55
;---------------------------------------------------------------------
use32 use32
org 0x0 org 0x0
@ -26,11 +38,11 @@ use32
dd 0x01 ; header version dd 0x01 ; header version
dd START ; entry point dd START ; entry point
dd IM_END ; image size dd IM_END ; image size
dd I_END+0x1000 ; required memory dd I_END ; required memory
dd I_END+0x1000 ; esp dd stacktop ; esp
dd params ; I_PARAM dd params ; I_PARAM
dd 0x0 ; I_Path dd 0x0 ; I_Path
;---------------------------------------------------------------------
include '../../../../macros.inc' include '../../../../macros.inc'
include '../../../../proc32.inc' include '../../../../proc32.inc'
include '../../../../dll.inc' include '../../../../dll.inc'
@ -41,7 +53,7 @@ include '../../http/http.inc'
virtual at 0 virtual at 0
http_msg http_msg http_msg http_msg
end virtual end virtual
;---------------------------------------------------------------------
START: START:
mcall 68, 11 ; init heap so we can allocate memory dynamically mcall 68, 11 ; init heap so we can allocate memory dynamically
@ -50,7 +62,23 @@ START:
stdcall dll.Load, @IMPORT stdcall dll.Load, @IMPORT
test eax, eax test eax, eax
jnz exit jnz exit
;---------------------------------------------------------------------
mov edi,filename_area
mov esi,start_temp_file_name
call copy_file_name_path
mov edi,fname_buf
mov esi,start_file_path
call copy_file_name_path
;OpenDialog initialisation
push dword OpenDialog_data
call [OpenDialog_Init]
; prepare for PathShow
push dword PathShow_data_1
call [PathShow_prepare]
;---------------------------------------------------------------------
; check parameters ; check parameters
cmp byte[params], 0 ; no parameters ? cmp byte[params], 0 ; no parameters ?
je reset_events ; load the GUI je reset_events ; load the GUI
@ -58,18 +86,7 @@ START:
inc [silently] inc [silently]
download: download:
call download_1
DEBUGF 1, "Starting download\n"
invoke HTTP_get, params, 0
test eax, eax
jz fail
mov [identifier], eax
.loop:
invoke HTTP_process, [identifier]
test eax, eax
jnz .loop
test [silently], 0xff test [silently], 0xff
jnz save jnz save
@ -80,7 +97,7 @@ reset_events:
; Report events ; Report events
; defaults + mouse ; defaults + mouse
mcall 40,EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER mcall 40,EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER
;---------------------------------------------------------------------
redraw: redraw:
call draw_window call draw_window
@ -102,7 +119,7 @@ still:
je mouse je mouse
jmp still jmp still
;---------------------------------------------------------------------
key: key:
mcall 2 ; read key mcall 2 ; read key
@ -112,33 +129,56 @@ key:
je download je download
jmp still jmp still
;---------------------------------------------------------------------
button: button:
mcall 17 ; get id mcall 17 ; get id
cmp ah, 26 cmp ah, 26
jne @f jne @f
call save ; invoke OpenDialog
push dword OpenDialog_data
call [OpenDialog_Start]
cmp [OpenDialog_data.status],1
jne still
; prepare for PathShow
push dword PathShow_data_1
call [PathShow_prepare]
call draw_window
jmp still jmp still
@@: @@:
cmp ah, 1 ; button id=1 ? cmp ah, 1 ; button id=1 ?
je exit je exit
jmp download call download_1
jmp save
;---------------------------------------------------------------------
mouse: mouse:
stdcall [edit_box_mouse], edit1 stdcall [edit_box_mouse], edit1
jmp still jmp still
;---------------------------------------------------------------------
exit: exit:
DEBUGF 1, "Exiting\n" DEBUGF 1, "Exiting\n"
invoke HTTP_free, [identifier] ; free buffer invoke HTTP_free, [identifier] ; free buffer
fail: fail:
or eax, -1 ; close this program or eax, -1 ; close this program
mcall mcall
;---------------------------------------------------------------------
download_1:
DEBUGF 1, "Starting download\n"
invoke HTTP_get, params, 0
test eax, eax
jz fail
mov [identifier], eax
.loop:
invoke HTTP_process, [identifier]
test eax, eax
jnz .loop
ret
;---------------------------------------------------------------------
save: save:
mov ebp, [identifier] mov ebp, [identifier]
mov eax, [ebp + http_msg.content_received] mov eax, [ebp + http_msg.content_received]
@ -148,15 +188,27 @@ save:
mov [final_buffer], ebx mov [final_buffer], ebx
mcall 70, fileinfo mcall 70, fileinfo
DEBUGF 1, "File saved\n"
test [silently], 0xff test [silently], 0xff
jnz exit jnz exit
mov ecx, [sc.work_text] mov ecx, [sc.work_text]
or ecx, 0x80000000 or ecx, 0x80000000
mcall 4, <10, 93>, , download_complete mcall 4, <10, frame_2.y+frame_2.height+7>, , download_complete
jmp still jmp still
;---------------------------------------------------------------------
copy_file_name_path:
xor eax,eax
cld
@@:
lodsb
stosb
test eax,eax
jnz @r
ret
;---------------------------------------------------------------------
; ********************************************* ; *********************************************
; ******* WINDOW DEFINITIONS AND DRAW ******** ; ******* WINDOW DEFINITIONS AND DRAW ********
; ********************************************* ; *********************************************
@ -164,47 +216,72 @@ save:
draw_window: draw_window:
mcall 12, 1 ; start window draw mcall 12, 1 ; start window draw
;-----------------------------------
; get system colors ; get system colors
mcall 48, 3, sc, 40 mcall 48, 3, sc, 40
;-----------------------------------
; draw window ; draw window
mov edx, [sc.work] mov edx, [sc.work]
or edx, 0x34000000 or edx, 0x34000000
mcall 0, <50, 370>, <350, 140>, , 0, title mcall 0, <50, 370>, <350, 170>, , 0, title
;-----------------------------------
; draw frames
mov [frame_data.x],dword frame_1.x shl 16+frame_1.width
mov [frame_data.y],dword frame_1.y shl 16+frame_1.height
mov [frame_data.text_pointer],dword select_addr_text
mov eax,[sc.work]
mov [frame_data.font_backgr_color],eax
mov eax,[sc.work_text]
mov [frame_data.font_color],eax
push dword frame_data
call [Frame_draw]
;-----------------------------------
mov [frame_data.x],dword frame_2.x shl 16+frame_2.width
mov [frame_data.y],dword frame_2.y shl 16+frame_2.height
mov [frame_data.text_pointer],dword select_path_text
push dword frame_data
call [Frame_draw]
;-----------------------------------
; draw "url:" text ; draw "url:" text
mov ecx, [sc.work_text] mov ecx, [sc.work_text]
or ecx, 80000000h or ecx, 80000000h
mcall 4, <14, 14>, , type_pls mcall 4, <frame_1.x+10, frame_1.y+15>, , type_pls
;-----------------------------------
; draw editbox ; draw editbox
edit_boxes_set_sys_color edit1, editboxes_end, sc edit_boxes_set_sys_color edit1, editboxes_end, sc
stdcall [edit_box_draw], edit1 stdcall [edit_box_draw], edit1
;-----------------------------------
; draw buttons ; draw buttons
mcall 8, <90, 68>, <54, 16>, 22, [sc.work_button] ; reload mcall 8,<frame_1.x+frame_1.width-(68+15+50+15),68>,<frame_1.y+30,16>,22,[sc.work_button] ; reload
mcall , <166, 50>, <54, 16>, 24 ; stop mcall ,<frame_1.x+frame_1.width-(50+15),50>,<frame_1.y+30,16>, 24 ; stop
mcall , <224, 54>, , 26 ; save
mcall , <frame_2.x+frame_2.width-(54+15),54>,<frame_2.y+30,16>,26 ; save
;-----------------------------------
; draw buttons text ; draw buttons text
mov ecx, [sc.work_button_text] mov ecx, [sc.work_button_text]
or ecx, 80000000h or ecx, 80000000h
mcall 4, <102, 59>, , button_text mcall 4, <frame_1.x+frame_1.width-(68+15+50+15)+10,frame_1.y+35>, , button_text.1
mcall , <frame_1.x+frame_1.width-(50+15)+15,frame_1.y+35>, , button_text.2
mcall , <frame_2.x+frame_2.width-(54+15)+10,frame_2.y+35>, , button_text.3
mcall 13,<frame_2.x+17,frame_2.width-15*2>,<frame_2.y+10,15>,0xffffff
push dword PathShow_data_1
call [PathShow_draw]
mcall 12, 2 ; end window redraw mcall 12, 2 ; end window redraw
ret ret
;---------------------------------------------------------------------
;-----------------------------------------------------------------------------
; Data area ; Data area
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
align 4 align 4
@IMPORT: @IMPORT:
library lib_http, 'http.obj', \ library lib_http, 'http.obj', \
box_lib, 'box_lib.obj' box_lib, 'box_lib.obj', \
proc_lib, 'proc_lib.obj'
import lib_http, \ import lib_http, \
HTTP_get , 'get' , \ HTTP_get , 'get' , \
@ -214,18 +291,24 @@ import lib_http, \
import box_lib, \ import box_lib, \
edit_box_draw, 'edit_box', \ edit_box_draw, 'edit_box', \
edit_box_key, 'edit_box_key', \ edit_box_key, 'edit_box_key', \
edit_box_mouse, 'edit_box_mouse' edit_box_mouse, 'edit_box_mouse', \
PathShow_prepare, 'PathShow_prepare', \
PathShow_draw, 'PathShow_draw', \
Frame_draw, 'frame_draw'
import proc_lib, \
OpenDialog_Init, 'OpenDialog_init', \
OpenDialog_Start, 'OpenDialog_start'
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
fileinfo dd 2, 0, 0 fileinfo dd 2, 0, 0
final_size dd 0 final_size dd 0
final_buffer dd 0 final_buffer dd 0
db '/rd/1/.download', 0 db 0
dd fname_buf
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
mouse_dd dd 0 mouse_dd dd 0
edit1 edit_box 295, 48, 10, 0xffffff, 0xff, 0x80ff, 0, 0x8000, URLMAXLEN, document_user, mouse_dd, ed_focus+ed_always_focus, 7, 7 edit1 edit_box 295, 48, (frame_1.y+10), 0xffffff, 0xff, 0x80ff, 0, 0x8000, URLMAXLEN, document_user, mouse_dd, ed_focus+ed_always_focus, 7, 7
editboxes_end: editboxes_end:
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
@ -235,11 +318,88 @@ include_debug_strings
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
type_pls db 'URL:', 0 type_pls db 'URL:', 0
button_text db 'DOWNLOAD STOP SAVE', 0 button_text:
download_complete db 'File saved as /rd/1/.download', 0 .1: db 'DOWNLOAD',0
.2: db 'STOP',0
.3: db 'SELECT', 0
download_complete db 'FILE SAVED!', 0
title db 'HTTP Downloader', 0 title db 'HTTP Downloader', 0
silently db 0 silently db 0
;---------------------------------------------------------------------
select_addr_text db ' NETWORK ADDRESS: ',0
select_path_text db ' PATH TO SAVE FILE: ',0
;---------------------------------------------------------------------
frame_data:
.type dd 0 ;+0
.x:
.x_size dw 0 ;+4
.x_start dw 0 ;+6
.y:
.y_size dw 0 ;+8
.y_start dw 0 ;+10
.ext_fr_col dd 0x0 ;+12
.int_fr_col dd 0xffffff ;+16
.draw_text_flag dd 1 ;+20
.text_pointer dd 0 ;+24
.text_position dd 0 ;+28
.font_number dd 0 ;+32
.font_size_y dd 9 ;+36
.font_color dd 0x0 ;+40
.font_backgr_color dd 0xffffff ;+44
;---------------------------------------------------------------------
PathShow_data_1:
.type dd 0 ;+0
.start_y dw frame_2.y+14 ;+4
.start_x dw frame_2.x+20 ;+6
.font_size_x dw 6 ;+8 ; 6 - for font 0, 8 - for font 1
.area_size_x dw frame_2.width-35 ;+10
.font_number dd 0 ;+12 ; 0 - monospace, 1 - variable
.background_flag dd 0 ;+16
.font_color dd 0 ;+20
.background_color dd 0 ;+24
.text_pointer dd fname_buf ;+28
.work_area_pointer dd text_work_area ;+32
.temp_text_length dd 0 ;+36
;---------------------------------------------------------------------
OpenDialog_data:
.type dd 1 ; Save
.procinfo dd procinfo ;+4
.com_area_name dd communication_area_name ;+8
.com_area dd 0 ;+12
.opendir_path dd temp_dir_path ;+16
.dir_default_path dd communication_area_default_path ;+20
.start_path dd open_dialog_path ;+24
.draw_window dd draw_window ;+28
.status dd 0 ;+32
.openfile_pach dd fname_buf ;+36
.filename_area dd filename_area ;+40
.filter_area dd Filter
.x:
.x_size dw 420 ;+48 ; Window X size
.x_start dw 200 ;+50 ; Window X position
.y:
.y_size dw 320 ;+52 ; Window y size
.y_start dw 120 ;+54 ; Window Y position
communication_area_name:
db 'FFFFFFFF_open_dialog',0
open_dialog_path:
db '/sys/File Managers/opendial',0
communication_area_default_path:
db '/sys',0
Filter:
dd Filter.end - Filter
.1:
db 'IMG',0
db 'IMA',0
.end:
db 0
start_temp_file_name: db 'some.garbage',0
start_file_path: db '/sys/.download', 0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
document_user db 'http://' document_user db 'http://'
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
@ -251,8 +411,25 @@ params rb URLMAXLEN
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
identifier dd ? identifier dd ?
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
filename_area:
rb 256
;---------------------------------------------------------------------
temp_dir_path:
rb 4096
;---------------------------------------------------------------------
procinfo:
rb 1024
;---------------------------------------------------------------------
fname_buf:
rb 4096
;---------------------------------------------------------------------
text_work_area:
rb 1024
;---------------------------------------------------------------------
rb 4096
stacktop:
;---------------------------------------------------------------------
I_END: I_END:
;---------------------------------------------------------------------