WebSVN – Kolibri OS – Diff – /programs/media/jpegview/trunk/jpegview.asm

 ;    version 0.13   3 de junio 2004
 ;                   Octavio Vega
 ;                   unos retoques
 ;    version 0.14   10th August 2004
 ;                   Mike Hibbett Added setting default colours
+;    version 0.15   24th August 2006
+;                   diamond (rewritten to function 70)
+;
                memsize=20000h
                org 0
  PARAMS     =    memsize - 1024
                dd     I_END                   ; size of image
                dd     memsize                 ; memory for app
                dd     memsize - 1024           ; esp
                dd     PARAMS , 0x0               ; I_Param , I_Icon
 include 'lang.inc'
 stack_size=4096 + 1024
   .l1:
     mov     ecx,memsize-fin-stack_size
     mov     edi,fin
     call    add_mem
-    ; Get some memory
-    mov     ecx,16384
-    call    malloc
     mov     [work_area],edi
     call    colorprecalc ;inicializa tablas usadas para pasar de ybr a bgr
     call    draw_window
     call    read_string.rs_done
 boot_set_background:
     mov     ecx,memsize-fin-stack_size  ; size
     mov     edi,fin                     ; pointer
-    call    add_mem             ; mark memory from fin to 0x100000-1024 as free
-    ; Get some memory
-    mov     ecx,16384           ; get 16 Kb of memory
-    call    malloc              ; returns pointer in edi
-    mov     [work_area],edi     ; save it
+    call    add_mem             ; mark memory from fin to 0x100000-1024 as free
     call    colorprecalc        ; calculate colors
     mov     esi,name_string
     call    open
     test    eax,eax
     mov  ebx,1
     int  0x40
     ; Draw the window to the appropriate size - it may have
-    ; been resized by the user
-    mov     eax, 0
+    ; been resized by the user
-    cmp     [winxs], ax
+    cmp     [winxs], 0
     jne     dw_001
-    ; Give the screen some inital defaults
-    mov     ax, 400
-    mov     [winxs], ax
+    ; Give the screen some inital defaults
-    mov     ax, 300
+    mov     [winxs], 400
-    mov     [winys], ax
+    mov     [winys], 300
     mov     ax, 100
     mov     [winxo], ax
     mov     [winxs], ax
     mov     eax, [ebx + 46]
     mov     [winys], ax
 dw_002:
-    mov     bx, [winxo]
-    shl     ebx, 16
+        mov     ebx, dword [winxo-2]
-    mov     bx, [winxs]
+        mov     bx, [winxs]
-    mov     cx, [winyo]
-    shl     ecx, 16
+        mov     ecx, dword [winyo-2]
-    mov     cx, [winys]
+        mov     cx, [winys]
-    mov  eax,0                     ; DRAW WINDOW
+    xor  eax,eax                   ; DRAW WINDOW
     mov  edx,[wcolor]
     add  edx,0x02000000
     mov  esi,0x80557799
     int     0x40
     popa
     ret
 slideshow:
-    test dword[file_dir],-1
+        cmp     [file_dir], 0
-    jnz .exit
+        jnz     .exit
-    test dword[jpeg_st],-1
+        cmp     [jpeg_st], 0
-    jz .exit
+        jz      .exit
-    mov esi,name_string
+        mov     esi, name_string
-    movzx ecx,byte[name_string.cursor]
+        movzx   ecx, byte [name_string.cursor]
-   .l1:
+.l1:
-    cmp byte[esi+ecx],'/'
+        cmp     byte [esi+ecx], '/'
-    je .l2
+        jz      .l2
-    loop .l1
+        loop    .l1
-  .exit:
+.exit:
-    ret
+        ret
-  .l2:
+.l2:
-    mov byte[esi+ecx],0
+        mov     byte [esi+ecx], 0
-    call open
+        call    open
-    mov byte[esi+ecx],'/'
+        mov     byte [esi+ecx], '/'
-    test eax,eax
+        test    eax, eax
-    jz .exit
+        jz      .exit
+        test    byte [fileattr], 0x10
-    mov dword[eax+file_handler.size],-1 ;directory size is always 0
+        jz      .exit
-    mov [file_dir],eax
+        mov     [file_dir], eax
-    inc cl
+        inc     ecx
-    mov [name_string.cursor],cl
         mov     [name_string.cursor], cl
 display_next:
-    mov eax,[file_dir]
+        mov     ebx, [file_dir]
-    test eax,eax
+        test    ebx, ebx
-    jnz .l1
+        jnz     @f
-    ret
+        ret
-   .l1:
+@@:
-    mov ecx,32
+        mov     byte [ebx], 1
+        mov     byte [ebx+12], 1
-    sub esp,ecx
+        mov     dword [ebx+16], dirinfo
-    mov edi,esp
+        mov     eax, 70
-    call read
+        int     0x40
-    cmp ecx,32
+        mov     eax, [file_dir]
-    jnc .l11
+        inc     dword [eax+4]
-   .l10:
+        cmp     ebx, 1
-    add esp,32
+        jz      @f
-    mov eax,dword[file_dir]
+        mov     eax, [file_dir]
-    mov dword[file_dir],0
+        and     [file_dir], 0
-    jmp close
+        jmp     close
-   .l11:
-    mov esi,esp
+@@:
-    movzx edi,byte[name_string.cursor]
+        movzx   edi, byte [name_string.cursor]
+        add     edi, name_string
+        lea     esi, [dirinfo+32+40]
-    add edi,name_string
+@@:
-    lodsb
-    cmp al,0
-    je .l10
-    cmp al,229
-    jne .l0
-    add esp,32
-    jmp display_next
-   .l0:
-    stosb
-    mov cl,7
-   .l2:
-    lodsb
-    cmp al,32
-    jna .l3
+        lodsb
-    stosb
-    loop .l2
-   .l3:
+        stosb
-    lea esi,[esp+8]
-    mov al,'.'
-    stosb
-    mov cl,3
-   .l4:
-    lodsb
-    cmp al,32
+        test    al, al
-    jna .l5
-    stosb
-    loop .l4
-   .l5:
-    mov al,0
-    stosb
+        jnz     @b
-    cmp edi,name_string.end
+        mov     ecx, name_string.end
-    jc .l5
+        sub     ecx, edi
-    add esp,32
+        rep     stosb
     call   print_strings
     mov     esi,name_string
     call    open
     test    eax,eax
     call jpeg_close
     pop ebp
     jmp jpeg_display
 include 'filelib.asm'
 include 'memlib.asm'
 include 'jpeglib.asm'
 ; DATA AREA
 wcolor          dd  0x000000
 x_pointer       dd  0
 x_offset        dd  0
 x_numofbytes    dd  0
 x_numofb2       dd  0
 x_counter       dd  0
-winxo:          dw  0
+winxo           dw  0
-winyo:          dw  0
+winyo           dw  0
-winxs:          dw  0
+winxs           dw  0
-winys:          dw  0
+winys           dw  0
-jpeg_st:        dd  0
+jpeg_st         dd  0
-file_dir:       dd  0
+file_dir        dd  0
-work_area:      dd  0
 tcolor          dd  0x000000
 btcolor         dd  0x224466+0x808080
 name_string:    db '/rd/1/jpegview.jpg',0
-rb 100
+rb 256
     .end:
     .cursor: db 19
     .cursor2: db 0
 .l1           dd 0
 fin:
-I_END:
+I_END:

Subversion Repositories Kolibri OS

(root)/programs/media/jpegview/trunk/jpegview.asm – Rev 132 → 135