Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 485 → Rev 474

/programs/fs/kfar/trunk/dialogs.inc
315,13 → 315,13
.event:
push 10
pop eax
mcall
int 40h
dec eax
jz .redraw
dec eax
jz .key
or eax, -1
mcall
int 40h
.redraw:
push ebx ebp
call draw_window
329,7 → 329,7
jmp .event
.key:
mov al, 2
mcall
int 40h
shr eax, 8
cmp al, 0xE0
jnz @f
1239,7 → 1239,7
cmp [ctrlstate], 1
sbb ecx, -2
mov edx, layout
mcall
int 0x40
popad
; translate scancode to ASCII
movzx eax, al
/programs/fs/kfar/trunk/filetool.inc
6,7 → 6,7
push 70
pop eax
mov ebx, delinfo
mcall
int 0x40
pop ebx
test eax, eax
jz .ret
102,7 → 102,7
mov [ebx+dirinfo.name-dirinfo], execdata
push 70
pop eax
mcall
int 0x40
; if we get read error, the best available action is try to delete directory itself
test eax, eax
jz @f
/programs/fs/kfar/trunk/kfar.asm
8,7 → 8,6
dd 0, app_path
 
include 'lang.inc'
include '..\..\..\macros.inc'
include 'font.inc'
include 'sort.inc'
include 'kglobals.inc'
61,7 → 60,7
pop eax
push 11
pop ebx
mcall
int 0x40
call init_console
call draw_window
push 66
69,7 → 68,7
push 1
pop ebx
mov ecx, ebx
mcall ; set keyboard mode to scancodes
int 40h ; set keyboard mode to scancodes
mov eax, 200
mov [panel1_nfa], eax
mov [panel2_nfa], eax
250,7 → 249,7
event:
push 10
pop eax
mcall
int 40h
dec eax
jz redraw
dec eax
258,13 → 257,13
; button - we have only one button, close
exit:
or eax, -1
mcall
int 40h
redraw:
; query kbd state from OS
mov al, 66
push 3
pop ebx
mcall
int 0x40
and eax, 0x3F
cmp al, [ctrlstate]
mov [ctrlstate], al
274,7 → 273,7
mov al, 9
mov ebx, procinfo
or ecx, -1
mcall
int 40h
; test if rolled up
; height of rolled up window is [skinh]+3
mov eax, [ebx+46]
284,14 → 283,14
mov al, 12
push 1
pop ebx
mcall
int 0x40
xor eax, eax
; ebx, ecx, edi are ignored by function 0 after first redraw
mov edx, 0x53000000
mcall
int 0x40
mov al, 12
inc ebx
mcall
int 0x40
jmp event
@@:
xor ecx, ecx
365,7 → 364,7
imul esi, font_height
add esi, [skinh]
add esi, 5-1
mcall
int 40h
.resize_draw:
mov ecx, [MemForImage]
call pgfree
395,7 → 394,7
pop eax
push 5
pop ebx
mcall
int 0x40
push eax
sub eax, [esp+2]
inc eax
428,11 → 427,11
add esi, 4
push 67
pop eax
mcall
int 0x40
jmp redraw.resize_draw
key:
mov al, 2
mcall
int 40h
test al, al
jnz event
xchg al, ah
1026,7 → 1025,7
.cmdlinelenok:
push 70
pop eax
mcall
int 40h
xor esi, esi
xchg esi, [restore_semicolon]
test esi, esi
1058,7 → 1057,7
pop eax
push 20
pop ebx
mcall
int 0x40
jmp .ctrl_r
@@:
ret
1236,7 → 1235,7
mov byte [tmpname+1], 0
push 70
pop eax
mcall
int 40h
mov ebx, dirinfo
test eax, eax
jnz .drive_loop_e_done
1252,7 → 1251,7
.drive_loop_i:
push 70
pop eax
mcall
int 40h
mov ebx, dirinfo
test eax, eax
jnz .drive_loop_i_done
1542,7 → 1541,7
mov [ebx + attrinfo.name - attrinfo], esi
push 70
pop eax
mcall
int 0x40
mov cl, byte [attrinfo.attr]
@@:
test cl, 0x10
1611,7 → 1610,7
mov ebx, readinfo
push 70
pop eax
mcall
int 0x40
test eax, eax
jz .copyreadok
cmp eax, 6
1643,7 → 1642,7
mov ebx, writeinfo
push 70
pop eax
mcall
int 0x40
test eax, eax
jz .copywriteok
push edi
1700,7 → 1699,7
mov dword [ebx+21], edi
push 70
pop eax
mcall
int 0x40
; ignore errors
pop dword [delinfo+21]
jmp .copydone
2141,7 → 2140,7
push 70
pop eax
mov ebx, mkdirinfo
mcall
int 0x40
test eax, eax
jz @f
push dword CopyDestEditBuf+12
2436,10 → 2435,10
pop eax
push 1
pop ebx
mcall
int 40h
mov al, 48
mov bl, 4
mcall
int 40h
mov [skinh], eax
mov ebx, [cur_width]
imul ebx, font_width
2449,8 → 2448,8
lea ecx, [eax+ecx+5-1+100*65536]
xor eax, eax
mov edx, 0x53000000
mov edi, title
mcall
mov edi, header
int 40h
mov al, 13
xor edx, edx
cmp [fill_width], 0
2464,7 → 2463,7
mov cx, word [wnd_height]
sub cx, word [skinh]
sub cx, 5-1
mcall
int 0x40
@@:
cmp [fill_height], 0
jz @f
2477,7 → 2476,7
sub ecx, 5-1
shl ecx, 16
mov cx, word [fill_height]
mcall
int 0x40
@@:
; xor ecx, ecx
; call draw_image
2494,12 → 2493,12
mov esi, 8
mov edi, console_colors
xor ebp, ebp
mcall
int 0x40
@@:
mov al, 12
push 2
pop ebx
mcall
int 40h
ret
 
draw_image.nomem:
2511,7 → 2510,7
mov ecx, [skinh-2]
mov cx, word [cur_height]
imul cx, font_height
mcall
int 40h
mov al, 4
mov ebx, 32*65536+32
mov ecx, 0xFFFFFF
2518,7 → 2517,7
mov edx, nomem_draw
push nomem_draw.size
pop esi
mcall
int 40h
ret
 
draw_image:
2715,7 → 2714,7
mov edi, console_colors
push 8
pop esi
mcall
int 40h
.nodraw:
ret
 
3937,7 → 3936,7
push 70
pop eax
mov ebx, dirinfo
mcall
int 40h
test eax, eax
jz .ok
cmp eax, 6
5166,7 → 5165,7
pop esi
ret
 
title db 'Kolibri Far 0.32',0
header db 'Kolibri Far 0.32',0
 
nomem_draw db 'No memory for redraw.',0
.size = $ - nomem_draw
/programs/fs/kfar/trunk/tools.inc
6,7 → 6,7
pop eax
push 12
pop ebx
mcall
int 0x40
pop ebx
ret
 
18,7 → 18,7
pop eax
push 13
pop ebx
mcall
int 0x40
pop ebx
ret
 
30,7 → 30,7
pop eax
push 20
pop ebx
mcall
int 0x40
pop ebx
ret
 
188,7 → 188,7
pop eax
push 19
pop ebx
mcall
int 0x40
mov edi, aInvalidDLL
test eax, eax
jz .sayerr
/programs/fs/kfar/trunk/viewer.inc
62,7 → 62,7
.attr_retry:
push 70
pop eax
mcall
int 40h
test eax, eax
jz @f
lea ebx, [ebp+viewer_data.filename]
105,7 → 105,7
.retry:
push 70
pop eax
mcall
int 40h
mov [ebp+viewer_data.buf_size], ebx
test eax, eax
jz .readok
196,7 → 196,7
mov ebx, readinfo
push 70
pop eax
mcall
int 40h
test eax, eax
jz .readok
cmp eax, 6
978,7 → 978,7
mov [ebx+21], eax
push 70
pop eax
mcall
int 40h
test eax, eax
jz .readok
cmp eax, 6
1030,7 → 1030,7
@@:
push 70
pop eax
mcall
int 40h
test eax, eax
jz @f
cmp eax, 6