forked from KolibriOS/kolibrios
KFM - fixed some bugs.
git-svn-id: svn://kolibrios.org@3840 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
43e8b4dc26
commit
e612357931
@ -1,36 +1,48 @@
|
|||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
confirmation_action:
|
confirmation_action:
|
||||||
mov [work_confirmation],0
|
mov [work_confirmation],0
|
||||||
mov [work_confirmation_yes],0
|
mov [work_confirmation_yes],0
|
||||||
jmp .red
|
jmp .red
|
||||||
|
;--------------------------------------
|
||||||
.red_1:
|
.red_1:
|
||||||
call draw_window
|
call draw_window
|
||||||
|
;--------------------------------------
|
||||||
.red:
|
.red:
|
||||||
call draw_confirmation_button
|
call draw_confirmation_button
|
||||||
call draw_confirmation_menu
|
call draw_confirmation_menu
|
||||||
|
;--------------------------------------
|
||||||
.still:
|
.still:
|
||||||
mcall 10
|
mcall 10
|
||||||
cmp eax,1
|
cmp eax,1
|
||||||
je .red_1
|
je .red_1
|
||||||
|
|
||||||
cmp eax,2
|
cmp eax,2
|
||||||
je key_menu_confirmation
|
je key_menu_confirmation
|
||||||
|
|
||||||
cmp eax,3
|
cmp eax,3
|
||||||
jne .still
|
jne .still
|
||||||
|
|
||||||
mcall 17
|
mcall 17
|
||||||
cmp ah,161
|
cmp ah,161
|
||||||
je .no_del
|
je .no_del
|
||||||
|
|
||||||
cmp ah,160
|
cmp ah,160
|
||||||
je .del
|
je .del
|
||||||
|
|
||||||
cmp ah,1
|
cmp ah,1
|
||||||
jne .still
|
jne .still
|
||||||
|
|
||||||
mcall -1
|
mcall -1
|
||||||
|
;--------------------------------------
|
||||||
.del:
|
.del:
|
||||||
mov [work_confirmation_yes],1
|
mov [work_confirmation_yes],1
|
||||||
|
;--------------------------------------
|
||||||
.no_del:
|
.no_del:
|
||||||
call draw_window
|
call draw_window
|
||||||
|
;--------------------------------------
|
||||||
.ret:
|
.ret:
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
draw_confirmation_button:
|
draw_confirmation_button:
|
||||||
mov ecx,[window_high]
|
mov ecx,[window_high]
|
||||||
mov ebx,[window_width]
|
mov ebx,[window_width]
|
||||||
@ -41,15 +53,12 @@ draw_confirmation_button:
|
|||||||
shl ebx,16
|
shl ebx,16
|
||||||
mov cx,15
|
mov cx,15
|
||||||
mov bx,40
|
mov bx,40
|
||||||
mov esi,0xffffff
|
mcall 8,,,0x40000000+160,0xffffff
|
||||||
mov edx,0x40000000+160
|
|
||||||
mov eax,8
|
|
||||||
int 0x40
|
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
inc edx
|
inc edx
|
||||||
int 0x40
|
mcall
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
draw_confirmation_menu:
|
draw_confirmation_menu:
|
||||||
mov ecx,[window_high]
|
mov ecx,[window_high]
|
||||||
mov ebx,[window_width]
|
mov ebx,[window_width]
|
||||||
@ -61,7 +70,7 @@ draw_confirmation_menu:
|
|||||||
shl ebx,16
|
shl ebx,16
|
||||||
mov cx,44
|
mov cx,44
|
||||||
mov bx,120
|
mov bx,120
|
||||||
mcall 13, , ,0x6060ff ;0xff
|
mcall 13,,,0x6060ff
|
||||||
push ebx ecx
|
push ebx ecx
|
||||||
add ebx,15 shl 16
|
add ebx,15 shl 16
|
||||||
add ecx,22 shl 16
|
add ecx,22 shl 16
|
||||||
@ -71,76 +80,92 @@ draw_confirmation_menu:
|
|||||||
push ebx ecx
|
push ebx ecx
|
||||||
cmp [work_confirmation],0
|
cmp [work_confirmation],0
|
||||||
jne @f
|
jne @f
|
||||||
|
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
|
;--------------------------------------
|
||||||
@@:
|
@@:
|
||||||
int 0x40
|
mcall
|
||||||
add ecx,1 shl 16
|
add ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,38
|
mov bx,38
|
||||||
mov cx,13
|
mov cx,13
|
||||||
mov edx,0x6060ff
|
mcall ,,,0x6060ff
|
||||||
int 0x40
|
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
mov edx,0xff0000
|
mov edx,0xff0000
|
||||||
cmp [work_confirmation],0
|
cmp [work_confirmation],0
|
||||||
je @f
|
je @f
|
||||||
|
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
mov edx,0xaa00
|
mov edx,0xaa00
|
||||||
|
;--------------------------------------
|
||||||
@@:
|
@@:
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
shr ecx,16
|
shr ecx,16
|
||||||
mov bx,cx
|
mov bx,cx
|
||||||
add ebx,15 shl 16+5
|
add ebx,15 shl 16+5
|
||||||
mcall 4, ,0x90ffffff,[confirmation_type]
|
mcall 4,,0x90ffffff,[confirmation_type]
|
||||||
add ebx,7 shl 16+20
|
add ebx,7 shl 16+20
|
||||||
mov edx,type_yes
|
mcall ,,,type_yes
|
||||||
int 0x40
|
|
||||||
add ebx,56 shl 16
|
add ebx,56 shl 16
|
||||||
mov edx,type_no
|
mcall ,,,type_no
|
||||||
int 0x40
|
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
key_menu_confirmation:
|
key_menu_confirmation:
|
||||||
mcall 2
|
mcall 2
|
||||||
cmp [extended_key],1
|
cmp [extended_key],1
|
||||||
je .extended_key
|
je .extended_key
|
||||||
test al, al
|
|
||||||
|
test al,al
|
||||||
jnz .end_1
|
jnz .end_1
|
||||||
cmp ah, 0xE0
|
|
||||||
|
cmp ah,0xE0
|
||||||
jne @f
|
jne @f
|
||||||
|
;--------------------------------------
|
||||||
.end_1:
|
.end_1:
|
||||||
jmp confirmation_action.still
|
jmp confirmation_action.still
|
||||||
|
;--------------------------------------
|
||||||
@@:
|
@@:
|
||||||
cmp ah,75
|
cmp ah,75
|
||||||
je confirmation_key_75.1
|
je confirmation_key_75.1
|
||||||
|
|
||||||
cmp ah,77
|
cmp ah,77
|
||||||
je confirmation_key_75.1
|
je confirmation_key_75.1
|
||||||
|
|
||||||
cmp ah,28
|
cmp ah,28
|
||||||
je confirmation_key_28.1
|
je confirmation_key_28.1
|
||||||
|
;--------------------------------------
|
||||||
.end:
|
.end:
|
||||||
cmp ah,1
|
cmp ah,1
|
||||||
jne confirmation_action.still
|
jne confirmation_action.still
|
||||||
|
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
||||||
.extended_key:
|
.extended_key:
|
||||||
mov [extended_key],0
|
mov [extended_key],0
|
||||||
|
;------------------------------------------------------------------------------
|
||||||
confirmation_key_75:
|
confirmation_key_75:
|
||||||
cmp ah,75 ;arrow left
|
cmp ah,75 ; arrow left
|
||||||
je .1
|
je .1
|
||||||
|
|
||||||
cmp ah,77 ; arrow right
|
cmp ah,77 ; arrow right
|
||||||
jne confirmation_key_28
|
jne confirmation_key_28
|
||||||
|
;--------------------------------------
|
||||||
.1:
|
.1:
|
||||||
dec [work_confirmation]
|
dec [work_confirmation]
|
||||||
and [work_confirmation],1
|
and [work_confirmation],1
|
||||||
jmp confirmation_action.red
|
jmp confirmation_action.red
|
||||||
|
;------------------------------------------------------------------------------
|
||||||
confirmation_key_28:
|
confirmation_key_28:
|
||||||
cmp ah,28 ; Enter
|
cmp ah,28 ; Enter
|
||||||
jne confirmation_action.still
|
jne confirmation_action.still
|
||||||
|
;--------------------------------------
|
||||||
.1:
|
.1:
|
||||||
cmp [work_confirmation],0
|
cmp [work_confirmation],0
|
||||||
jne @f
|
jne @f
|
||||||
|
|
||||||
mov [work_confirmation_yes],1
|
mov [work_confirmation_yes],1
|
||||||
|
;--------------------------------------
|
||||||
@@:
|
@@:
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;------------------------------------------------------------------------------
|
@ -97,7 +97,7 @@ editbox_copy_name:
|
|||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
.button_copy:
|
.button_copy:
|
||||||
mov eax,17
|
mov eax,17
|
||||||
int 0x40
|
mcall
|
||||||
test ah,ah
|
test ah,ah
|
||||||
jz .still
|
jz .still
|
||||||
cmp ah,160
|
cmp ah,160
|
||||||
@ -127,7 +127,7 @@ editbox_copy_name:
|
|||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
.key_copy:
|
.key_copy:
|
||||||
mov eax,2
|
mov eax,2
|
||||||
int 0x40
|
mcall
|
||||||
cmp ah,13
|
cmp ah,13
|
||||||
je .exit_with_copy
|
je .exit_with_copy
|
||||||
cmp ah,27
|
cmp ah,27
|
||||||
@ -165,10 +165,10 @@ draw_editbox_copy_name:
|
|||||||
mov esi,0xffffff
|
mov esi,0xffffff
|
||||||
mov edx,0x40000000+160
|
mov edx,0x40000000+160
|
||||||
mov eax,8
|
mov eax,8
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
inc edx
|
inc edx
|
||||||
int 0x40
|
mcall
|
||||||
popa
|
popa
|
||||||
|
|
||||||
push ebx ecx
|
push ebx ecx
|
||||||
@ -182,15 +182,15 @@ draw_editbox_copy_name:
|
|||||||
sub ebx,1 shl 16
|
sub ebx,1 shl 16
|
||||||
mov bx,42
|
mov bx,42
|
||||||
mov cx,17
|
mov cx,17
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
mov edx,0xff7700
|
mov edx,0xff7700
|
||||||
int 0x40
|
mcall
|
||||||
mov edx,0xaa00
|
mov edx,0xaa00
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
|
|
||||||
shr ecx,16
|
shr ecx,16
|
||||||
@ -206,10 +206,10 @@ draw_editbox_copy_name:
|
|||||||
mcall 4, ,0x90ffffff
|
mcall 4, ,0x90ffffff
|
||||||
add ebx,18 shl 16+36
|
add ebx,18 shl 16+36
|
||||||
mov edx,type_yes
|
mov edx,type_yes
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,56 shl 16
|
add ebx,56 shl 16
|
||||||
mov edx,type_no
|
mov edx,type_no
|
||||||
int 0x40
|
mcall
|
||||||
ret
|
ret
|
||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
copy_file_1:
|
copy_file_1:
|
||||||
|
@ -25,7 +25,7 @@ default_box
|
|||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
.button_create:
|
.button_create:
|
||||||
mov eax,17
|
mov eax,17
|
||||||
int 0x40
|
mcall
|
||||||
test ah,ah
|
test ah,ah
|
||||||
jz .still
|
jz .still
|
||||||
cmp ah,160
|
cmp ah,160
|
||||||
@ -49,7 +49,7 @@ default_box
|
|||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
.key_create:
|
.key_create:
|
||||||
mov eax,2
|
mov eax,2
|
||||||
int 0x40
|
mcall
|
||||||
cmp ah,13
|
cmp ah,13
|
||||||
je .exit_with_create
|
je .exit_with_create
|
||||||
cmp ah,27
|
cmp ah,27
|
||||||
@ -87,10 +87,10 @@ draw_create_dir:
|
|||||||
mov esi,0xffffff
|
mov esi,0xffffff
|
||||||
mov edx,0x40000000+160
|
mov edx,0x40000000+160
|
||||||
mov eax,8
|
mov eax,8
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
inc edx
|
inc edx
|
||||||
int 0x40
|
mcall
|
||||||
popa
|
popa
|
||||||
|
|
||||||
push ebx ecx
|
push ebx ecx
|
||||||
@ -104,15 +104,15 @@ draw_create_dir:
|
|||||||
sub ebx,1 shl 16
|
sub ebx,1 shl 16
|
||||||
mov bx,42
|
mov bx,42
|
||||||
mov cx,17
|
mov cx,17
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
mov edx,0xff7700
|
mov edx,0xff7700
|
||||||
int 0x40
|
mcall
|
||||||
mov edx,0xaa00
|
mov edx,0xaa00
|
||||||
add ebx,50 shl 16
|
add ebx,50 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
|
|
||||||
shr ecx,16
|
shr ecx,16
|
||||||
@ -121,10 +121,10 @@ draw_create_dir:
|
|||||||
mcall 4, ,0x90ffffff,create_dir ;[confirmation_type]
|
mcall 4, ,0x90ffffff,create_dir ;[confirmation_type]
|
||||||
add ebx,48 shl 16+36
|
add ebx,48 shl 16+36
|
||||||
mov edx,type_yes
|
mov edx,type_yes
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,56 shl 16
|
add ebx,56 shl 16
|
||||||
mov edx,type_no
|
mov edx,type_no
|
||||||
int 0x40
|
mcall
|
||||||
ret
|
ret
|
||||||
;-------------------------------------------------------------
|
;-------------------------------------------------------------
|
||||||
create_directory_1:
|
create_directory_1:
|
||||||
|
@ -44,18 +44,26 @@ window_width rd 1
|
|||||||
window_status rd 1
|
window_status rd 1
|
||||||
skin_high rd 1
|
skin_high rd 1
|
||||||
fbutton_width rd 1
|
fbutton_width rd 1
|
||||||
|
|
||||||
left_panel_x:
|
left_panel_x:
|
||||||
.size_x rw 1
|
.size_x rw 1
|
||||||
.start_x rw 1
|
.start_x rw 1
|
||||||
|
|
||||||
left_panel_y:
|
left_panel_y:
|
||||||
.size_y rw 1
|
.size_y rw 1
|
||||||
.start_y rw 1
|
.start_y rw 1
|
||||||
|
|
||||||
right_panel_x:
|
right_panel_x:
|
||||||
.size_x rw 1
|
.size_x rw 1
|
||||||
.start_x rw 1
|
.start_x rw 1
|
||||||
|
|
||||||
right_panel_y:
|
right_panel_y:
|
||||||
.size_y rw 1
|
.size_y rw 1
|
||||||
.start_y rw 1
|
.start_y rw 1
|
||||||
|
|
||||||
|
left_panel_y_correct_size_y rw 1
|
||||||
|
right_panel_y_correct_size_y rw 1
|
||||||
|
|
||||||
drawing_panel_folder rb 1 ; 1-left, 2 right
|
drawing_panel_folder rb 1 ; 1-left, 2 right
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
align 4
|
align 4
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -88,7 +88,7 @@ key_80:
|
|||||||
jbe .marked_action ;still
|
jbe .marked_action ;still
|
||||||
mov ax,[left_start_draw_cursor_line]
|
mov ax,[left_start_draw_cursor_line]
|
||||||
add ax,10
|
add ax,10
|
||||||
cmp ax,[left_panel_y.size_y]
|
cmp ax,[left_panel_y_correct_size_y]
|
||||||
jae @f
|
jae @f
|
||||||
.add_1:
|
.add_1:
|
||||||
add [left_start_draw_cursor_line],10
|
add [left_start_draw_cursor_line],10
|
||||||
@ -97,7 +97,7 @@ key_80:
|
|||||||
.all:
|
.all:
|
||||||
sub ecx,10 shl 16
|
sub ecx,10 shl 16
|
||||||
mov edx,0xffffff
|
mov edx,0xffffff
|
||||||
int 0x40
|
mcall
|
||||||
mov [not_clear_lines],1
|
mov [not_clear_lines],1
|
||||||
call draw_folder_data
|
call draw_folder_data
|
||||||
mov [not_clear_lines],0
|
mov [not_clear_lines],0
|
||||||
@ -138,7 +138,7 @@ key_80:
|
|||||||
jbe .marked_action_1 ;still
|
jbe .marked_action_1 ;still
|
||||||
mov ax,[right_start_draw_cursor_line]
|
mov ax,[right_start_draw_cursor_line]
|
||||||
add ax,10
|
add ax,10
|
||||||
cmp ax,[right_panel_y.size_y]
|
cmp ax,[right_panel_y_correct_size_y]
|
||||||
jae @f
|
jae @f
|
||||||
.add_2:
|
.add_2:
|
||||||
add [right_start_draw_cursor_line],10
|
add [right_start_draw_cursor_line],10
|
||||||
@ -178,7 +178,7 @@ key_72:
|
|||||||
.all:
|
.all:
|
||||||
add ecx,10 shl 16
|
add ecx,10 shl 16
|
||||||
mov edx,0xffffff
|
mov edx,0xffffff
|
||||||
int 0x40
|
mcall
|
||||||
mov [not_clear_lines],1
|
mov [not_clear_lines],1
|
||||||
call draw_folder_data
|
call draw_folder_data
|
||||||
mov [not_clear_lines],0
|
mov [not_clear_lines],0
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
; SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
;*****************************************************************************
|
;*****************************************************************************
|
||||||
; KFM v0.47g 24/07/2013
|
; KFM v0.47h 28/07/2013
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
use32
|
use32
|
||||||
org 0x0
|
org 0x0
|
||||||
@ -44,6 +44,7 @@ org 0x0
|
|||||||
;include 'macros.inc'
|
;include 'macros.inc'
|
||||||
include '../../../macros.inc'
|
include '../../../macros.inc'
|
||||||
include '../../../config.inc' ;for nightbuild
|
include '../../../config.inc' ;for nightbuild
|
||||||
|
;include '../../../debug.inc' ;for nightbuild
|
||||||
|
|
||||||
include 'editbox.inc'
|
include 'editbox.inc'
|
||||||
;use_edit_box
|
;use_edit_box
|
||||||
|
@ -280,7 +280,7 @@ draw_left_menu:
|
|||||||
imul cx,10
|
imul cx,10
|
||||||
mov edx,0xffffcc
|
mov edx,0xffffcc
|
||||||
mov eax,13
|
mov eax,13
|
||||||
int 0x40
|
mcall
|
||||||
call draw_menu_Selection
|
call draw_menu_Selection
|
||||||
call draw_menu_data
|
call draw_menu_data
|
||||||
ret
|
ret
|
||||||
@ -294,7 +294,7 @@ draw_right_menu:
|
|||||||
imul cx,10
|
imul cx,10
|
||||||
mov edx,0xffffcc
|
mov edx,0xffffcc
|
||||||
mov eax,13
|
mov eax,13
|
||||||
int 0x40
|
mcall
|
||||||
call draw_menu_Selection
|
call draw_menu_Selection
|
||||||
call draw_menu_data
|
call draw_menu_data
|
||||||
ret
|
ret
|
||||||
@ -322,7 +322,7 @@ draw_menu_Selection:
|
|||||||
mov cx,10
|
mov cx,10
|
||||||
mov edx,0xbbffbb
|
mov edx,0xbbffbb
|
||||||
mov eax,13
|
mov eax,13
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx ebx
|
pop ecx ebx
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
|
@ -22,7 +22,7 @@ progress_bar_delete:
|
|||||||
je .end
|
je .end
|
||||||
sub ebx,13
|
sub ebx,13
|
||||||
mov edx,delete_type
|
mov edx,delete_type
|
||||||
int 0x40
|
mcall
|
||||||
.end:
|
.end:
|
||||||
popa
|
popa
|
||||||
mov [draw_all_progressbar],0
|
mov [draw_all_progressbar],0
|
||||||
@ -53,7 +53,7 @@ progress_bar_copy:
|
|||||||
@@:
|
@@:
|
||||||
mov edx,0xff0000
|
mov edx,0xff0000
|
||||||
.continue_1:
|
.continue_1:
|
||||||
int 0x40
|
mcall
|
||||||
call calculate_progress_data_2
|
call calculate_progress_data_2
|
||||||
shr ecx,16
|
shr ecx,16
|
||||||
mov bx,cx
|
mov bx,cx
|
||||||
@ -74,7 +74,7 @@ progress_bar_copy:
|
|||||||
mov edx,move_type_1
|
mov edx,move_type_1
|
||||||
.continue:
|
.continue:
|
||||||
|
|
||||||
int 0x40
|
mcall
|
||||||
.end:
|
.end:
|
||||||
popa
|
popa
|
||||||
mov [draw_all_progressbar],0
|
mov [draw_all_progressbar],0
|
||||||
@ -92,7 +92,7 @@ clear_text_area_1:
|
|||||||
mov bx,ax
|
mov bx,ax
|
||||||
mov eax,13
|
mov eax,13
|
||||||
mov edx, 0x6060ff
|
mov edx, 0x6060ff
|
||||||
int 0x40
|
mcall
|
||||||
pop ebx
|
pop ebx
|
||||||
@@:
|
@@:
|
||||||
ret
|
ret
|
||||||
@ -124,7 +124,7 @@ calculate_progress_data_2:
|
|||||||
sub si,bx
|
sub si,bx
|
||||||
mov bx,si
|
mov bx,si
|
||||||
mov edx,0xffffff
|
mov edx,0xffffff
|
||||||
int 0x40
|
mcall
|
||||||
pop ebx
|
pop ebx
|
||||||
@@:
|
@@:
|
||||||
ret
|
ret
|
||||||
@ -135,7 +135,7 @@ calculate_progress_data_3:
|
|||||||
cmp [draw_all_progressbar],0
|
cmp [draw_all_progressbar],0
|
||||||
je @f
|
je @f
|
||||||
mov edx, 0x6060ff
|
mov edx, 0x6060ff
|
||||||
int 0x40
|
mcall
|
||||||
@@:
|
@@:
|
||||||
add ebx,10 shl 16
|
add ebx,10 shl 16
|
||||||
sub ebx,20
|
sub ebx,20
|
||||||
@ -164,7 +164,7 @@ calculate_progress_data_6:
|
|||||||
mov ebp,[current_progress_value]
|
mov ebp,[current_progress_value]
|
||||||
call calculate_progress_data_1
|
call calculate_progress_data_1
|
||||||
mov bx,[temp_progress_value]
|
mov bx,[temp_progress_value]
|
||||||
int 0x40
|
mcall
|
||||||
call calculate_progress_data_2
|
call calculate_progress_data_2
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
@ -343,15 +343,15 @@ calculate_for_draw_scroll_bar:
|
|||||||
mov bx,14
|
mov bx,14
|
||||||
add ecx,16 shl 16
|
add ecx,16 shl 16
|
||||||
sub cx,31
|
sub cx,31
|
||||||
int 0x40
|
mcall
|
||||||
popa
|
popa
|
||||||
xor edx,edx
|
xor edx,edx
|
||||||
push ebx
|
push ebx
|
||||||
mov bx,1
|
mov bx,1
|
||||||
int 0x40
|
mcall
|
||||||
push ecx
|
push ecx
|
||||||
add ebx,15 shl 16
|
add ebx,15 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx
|
pop ecx
|
||||||
pop ebx
|
pop ebx
|
||||||
mov [draw_scroll_character],1
|
mov [draw_scroll_character],1
|
||||||
@ -419,14 +419,14 @@ draw_scroll_bar_srectangle:
|
|||||||
mov cx,1
|
mov cx,1
|
||||||
cmp [draw_scroll_character],2
|
cmp [draw_scroll_character],2
|
||||||
je .draw_center
|
je .draw_center
|
||||||
int 0x40
|
mcall
|
||||||
pusha
|
pusha
|
||||||
add ecx,1 shl 16
|
add ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov cx,14
|
mov cx,14
|
||||||
mov bx,14
|
mov bx,14
|
||||||
mov edx,0xbbddff
|
mov edx,0xbbddff
|
||||||
int 0x40
|
mcall
|
||||||
xor edx,edx
|
xor edx,edx
|
||||||
cmp [draw_scroll_character],1
|
cmp [draw_scroll_character],1
|
||||||
jne .draw_down
|
jne .draw_down
|
||||||
@ -434,42 +434,42 @@ draw_scroll_bar_srectangle:
|
|||||||
mov bx,7
|
mov bx,7
|
||||||
add ecx,8 shl 16
|
add ecx,8 shl 16
|
||||||
mov cx,1
|
mov cx,1
|
||||||
int 0x40
|
mcall
|
||||||
sub ecx,1 shl 16
|
sub ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,5
|
mov bx,5
|
||||||
int 0x40
|
mcall
|
||||||
sub ecx,1 shl 16
|
sub ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,3
|
mov bx,3
|
||||||
int 0x40
|
mcall
|
||||||
sub ecx,1 shl 16
|
sub ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,1
|
mov bx,1
|
||||||
int 0x40
|
mcall
|
||||||
jmp .continue
|
jmp .continue
|
||||||
.draw_down:
|
.draw_down:
|
||||||
add ebx,3 shl 16
|
add ebx,3 shl 16
|
||||||
mov bx,7
|
mov bx,7
|
||||||
add ecx,5 shl 16
|
add ecx,5 shl 16
|
||||||
mov cx,1
|
mov cx,1
|
||||||
int 0x40
|
mcall
|
||||||
add ecx,1 shl 16
|
add ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,5
|
mov bx,5
|
||||||
int 0x40
|
mcall
|
||||||
add ecx,1 shl 16
|
add ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,3
|
mov bx,3
|
||||||
int 0x40
|
mcall
|
||||||
add ecx,1 shl 16
|
add ecx,1 shl 16
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,1
|
mov bx,1
|
||||||
int 0x40
|
mcall
|
||||||
.continue:
|
.continue:
|
||||||
popa
|
popa
|
||||||
add ecx,15 shl 16
|
add ecx,15 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx
|
pop ecx
|
||||||
ret
|
ret
|
||||||
|
|
||||||
@ -497,11 +497,11 @@ draw_scroll_bar_srectangle:
|
|||||||
.draw_center_continue:
|
.draw_center_continue:
|
||||||
mov bx,14
|
mov bx,14
|
||||||
mov edx,0xbbddff
|
mov edx,0xbbddff
|
||||||
int 0x40
|
mcall
|
||||||
xor edx,edx
|
xor edx,edx
|
||||||
mov cx,1
|
mov cx,1
|
||||||
sub ecx,1 shl 16
|
sub ecx,1 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx
|
pop ecx
|
||||||
cmp [scroll_pointer_1],1
|
cmp [scroll_pointer_1],1
|
||||||
jne .right_1
|
jne .right_1
|
||||||
@ -517,15 +517,15 @@ draw_scroll_bar_srectangle:
|
|||||||
mov bx,10
|
mov bx,10
|
||||||
add ecx,4 shl 16
|
add ecx,4 shl 16
|
||||||
mov cx,1
|
mov cx,1
|
||||||
int 0x40
|
mcall
|
||||||
add ecx,3 shl 16
|
add ecx,3 shl 16
|
||||||
sub ebx,1 shl 16
|
sub ebx,1 shl 16
|
||||||
mov bx,12
|
mov bx,12
|
||||||
int 0x40
|
mcall
|
||||||
add ebx,1 shl 16
|
add ebx,1 shl 16
|
||||||
mov bx,10
|
mov bx,10
|
||||||
add ecx,3 shl 16
|
add ecx,3 shl 16
|
||||||
int 0x40
|
mcall
|
||||||
.continue_1:
|
.continue_1:
|
||||||
popa
|
popa
|
||||||
ror ecx,16
|
ror ecx,16
|
||||||
@ -537,7 +537,7 @@ draw_scroll_bar_srectangle:
|
|||||||
add ecx,[right_scroll_compens]
|
add ecx,[right_scroll_compens]
|
||||||
.draw_center_continue_2:
|
.draw_center_continue_2:
|
||||||
rol ecx,16
|
rol ecx,16
|
||||||
int 0x40
|
mcall
|
||||||
pop ecx
|
pop ecx
|
||||||
ret
|
ret
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
@ -19,6 +19,7 @@ left_sort_files:
|
|||||||
sub ecx,[left_folder_data]
|
sub ecx,[left_folder_data]
|
||||||
mov ebx,[appl_memory]
|
mov ebx,[appl_memory]
|
||||||
add ecx,ebx
|
add ecx,ebx
|
||||||
|
add ecx,4 ; äëÿ ñòðàõîâêè
|
||||||
push ebx
|
push ebx
|
||||||
mov [appl_memory],ecx
|
mov [appl_memory],ecx
|
||||||
mcall 64,1
|
mcall 64,1
|
||||||
@ -46,6 +47,7 @@ left_sort_files:
|
|||||||
rep movsd
|
rep movsd
|
||||||
; sub memory for sorting
|
; sub memory for sorting
|
||||||
pop ecx
|
pop ecx
|
||||||
|
add ecx,4 ; äëÿ ñòðàõîâêè
|
||||||
mov [appl_memory],ecx
|
mov [appl_memory],ecx
|
||||||
mcall 64,1
|
mcall 64,1
|
||||||
cmp [exit_to_dir],0
|
cmp [exit_to_dir],0
|
||||||
@ -138,6 +140,12 @@ left_type_sort_1:
|
|||||||
je .1
|
je .1
|
||||||
ja .add_counter
|
ja .add_counter
|
||||||
.no_add_counter:
|
.no_add_counter:
|
||||||
|
; pushad
|
||||||
|
; pushfd
|
||||||
|
; dps 'left_type_sort'
|
||||||
|
; newline
|
||||||
|
; popfd
|
||||||
|
; popad
|
||||||
call move_area_for_bdvk
|
call move_area_for_bdvk
|
||||||
pop edi esi
|
pop edi esi
|
||||||
jmp .end
|
jmp .end
|
||||||
@ -579,9 +587,29 @@ move_area_for_bdvk:
|
|||||||
sub ecx,ebx
|
sub ecx,ebx
|
||||||
sub ecx,eax
|
sub ecx,eax
|
||||||
shr ecx,2
|
shr ecx,2
|
||||||
|
; pushad
|
||||||
|
; pushfd
|
||||||
|
; dph [appl_memory]
|
||||||
|
; newline
|
||||||
|
; dps 'ECX:'
|
||||||
|
; dpd ecx
|
||||||
|
; newline
|
||||||
|
; dps 'ESI:'
|
||||||
|
; dpd esi
|
||||||
|
; newline
|
||||||
|
; dps 'EDI:'
|
||||||
|
; dpd edi
|
||||||
|
; newline
|
||||||
|
; popfd
|
||||||
|
; popad
|
||||||
std
|
std
|
||||||
rep movsd
|
rep movsd
|
||||||
|
; pushad
|
||||||
|
; pushfd
|
||||||
|
; dps 'move_area_for_bdvk END'
|
||||||
|
; newline
|
||||||
|
; popfd
|
||||||
|
; popad
|
||||||
; mov eax,ecx
|
; mov eax,ecx
|
||||||
; mov ebx,304
|
; mov ebx,304
|
||||||
; mov edx,0
|
; mov edx,0
|
||||||
@ -654,6 +682,7 @@ right_sort_files:
|
|||||||
push ecx
|
push ecx
|
||||||
sub ecx,[right_folder_data]
|
sub ecx,[right_folder_data]
|
||||||
add ecx,[esp]
|
add ecx,[esp]
|
||||||
|
add ecx,4 ; äëÿ ñòðàõîâêè
|
||||||
mov [appl_memory],ecx
|
mov [appl_memory],ecx
|
||||||
mcall 64,1
|
mcall 64,1
|
||||||
mov edi,[esp]
|
mov edi,[esp]
|
||||||
@ -680,6 +709,7 @@ right_sort_files:
|
|||||||
rep movsd
|
rep movsd
|
||||||
; sub memory for sorting
|
; sub memory for sorting
|
||||||
pop ecx
|
pop ecx
|
||||||
|
add ecx,4 ; äëÿ ñòðàõîâêè
|
||||||
mov [appl_memory],ecx
|
mov [appl_memory],ecx
|
||||||
mcall 64,1
|
mcall 64,1
|
||||||
cmp [exit_to_dir],0
|
cmp [exit_to_dir],0
|
||||||
@ -766,6 +796,12 @@ right_type_sort_1:
|
|||||||
je .1
|
je .1
|
||||||
ja .add_counter
|
ja .add_counter
|
||||||
.no_add_counter:
|
.no_add_counter:
|
||||||
|
; pushad
|
||||||
|
; pushfd
|
||||||
|
; dps 'left_type_sort'
|
||||||
|
; newline
|
||||||
|
; popfd
|
||||||
|
; popad
|
||||||
call move_area_for_bdvk
|
call move_area_for_bdvk
|
||||||
pop edi esi
|
pop edi esi
|
||||||
jmp .end
|
jmp .end
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
header_text db 'Kolibri File Manager v0.47g 24/07/2013',0
|
header_text db 'Kolibri File Manager v0.47h 28/07/2013',0
|
||||||
;---------------------------------------------------------------------
|
;---------------------------------------------------------------------
|
||||||
fbutton_name:
|
fbutton_name:
|
||||||
.f1 db '1 Help',0
|
.f1 db '1 Help',0
|
||||||
|
Loading…
Reference in New Issue
Block a user