WebSVN – Kolibri OS – Diff – /programs/system/docky/trunk/docky.asm

     include "DATA.INC"
     include "NAME.INC"
-    @use_library	 \
-	    mem.Alloc,	 \
-	    mem.Free,	 \
-	    mem.ReAlloc, \
+    @use_library \
+        mem.Alloc, mem.Free, mem.ReAlloc, dll.Load
-	    dll.Load
+;================================================================================
 ;================================================================================
+main:
+; ==== Init ====
+    mcall   SF_SYS_MISC, SSF_HEAP_INIT
+    mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, sizeof.system_colors
-main:
+    call    LOAD_ICONS
 ; ==== Init ====
     mcall   SF_SYSTEM, SSF_GET_ACTIVE_WINDOW
     invoke  ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.ashow_name, 0
     mov     [dock_items.ashow], eax
-    invoke  ini.sections, ini_data.file_name, sections_callback
-; ==== Load colors ====
-    mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, color
-    or	    dword[color.bg],	0x10000000
-    or	    dword[color.frame], 0x10000000
-    or	    dword[color.text],	0x80000000
-; ==== Config LibIMG ====
-    mov     dword[fi.p00], SSF_GET_INFO
-    mov     dword[fi.p16], buf_128
-    mov     dword[fi.p21], img_data.file_name
-    mcall   SF_FILE, fi
-    mov     edx, [buf_128 + 32]
-    imul    edx, 10
-    stdcall mem.Alloc, edx
-    mov     [img_data.rgb_object], eax
-    mov     dword[fi.p00], SSF_READ_FILE
-    mov     dword[fi.p12], edx
-    m2m     dword[fi.p16], dword[img_data.rgb_object]
-    mov     dword[fi.p21], img_data.file_name
-    mcall   SF_FILE, fi
-    cmp     ebx, 0xFFFFFFFF
-    je	    @f
-    stdcall dword[img.decode], dword[img_data.rgb_object], ebx, 0
-    mov     dword[img_data.object], eax
-  ; === ALPHA ===
-    mov     edi, eax
-    add     edi, 8
-    mov     edi, [edi]
-    imul    edi, 128
-    sub     edi, 4
-    add     eax, 24
-    mov     eax, [eax]
- .setalpha:
-    mov     ebx, [eax + edi]
-    shr     ebx, 24
-    cmp     ebx, 0
-    jne     .nonalpha
-    mov     ecx, [color.bg]
-    mov     [eax + edi], ecx
- .nonalpha:
-    sub     edi, 4
-    cmp     edi, 0
-    jne     .setalpha
-  ; === CONVERTING TO BGR
-    stdcall dword[img.toRGB], dword[img_data.object], dword[img_data.rgb_object]
-    stdcall dword[img.destroy], dword[img_data.object]
+    invoke  ini.sections, ini_data.file_name, sections_callback
 ; ==== Config window ====
     mov     eax, dword[dock_items.location]
     and     eax, 1b
     jmp     .set_hw
   @@:
     mcall   SF_GET_SCREEN_SIZE
     shr     eax, 16
  .set_hw:
-    mov     [win.width_opn], eax
+    mov     [win.w_opn], eax
-    mov     [win.width_hdn], eax
+    mov     [win.w_hdn], eax
     ret
 ;-------------------------------------------------------------------------------
  .HORZ_X:
     mcall   SF_GET_SCREEN_SIZE
     shr     eax, 17
-    mov     ecx, [win.width_opn]
+    mov     ecx, [win.w_opn]
     shr     ecx, 1
     sub     eax, ecx
     mov     [win.x_opn], eax
     mov     [win.x_hdn], eax
     ret
 ;-------------------------------------------------------------------------------
  .HORZ_HEIGHT:
-    mov     dword[win.height_hdn], 3
+    mov     dword[win.h_hdn], 3
     ret
 ;-------------------------------------------------------------------------------
  .VERT_WIDTH:
-    mov     dword[win.width_opn], BUTTON_SIZE
+    mov     dword[win.w_opn], BUTTON_SIZE
-    mov     dword[win.width_hdn], 3
+    mov     dword[win.w_hdn], 3
     jmp     .set_vh
   @@:
     mcall   SF_GET_SCREEN_SIZE
     and     eax, 0xFFFF
  .set_vh:
-    mov     [win.height_opn], eax
+    mov     [win.h_opn], eax
-    mov     [win.height_hdn], eax
+    mov     [win.h_hdn], eax
     ret
 ;-------------------------------------------------------------------------------
  .VERT_Y:
     mcall   SF_GET_SCREEN_SIZE
     and     eax, 0xFFFF
     shr     eax, 1
-    mov     esi, [win.height_opn]
+    mov     esi, [win.h_opn]
     shr     esi, 1
     sub     eax, esi
     mov     [win.y_hdn], eax
     mov     [win.y_opn], eax
     ret
 ;-------------------------------------------------------------------------------
  .SETDEF:
-    mov     eax, [win.width_hdn]
+    mov     eax, [win.w_hdn]
-    mov     [win.width], eax
+    mov     [win.w], eax
     mov     eax, [win.x_hdn]
     mov     [win.x], eax
-    mov     eax, [win.height_hdn]
+    mov     eax, [win.h_hdn]
-    mov     [win.height], eax
+    mov     [win.h], eax
     mov     eax, [win.y_hdn]
     mov     [win.y], eax
     cmp     byte[dock_items.ashow],1
     mov     [win.sid], eax
     call    main_loop
 ;-------------------------------------------------------------------------------
-exit:
-    stdcall mem.Free, [img_data.rgb_object]
+exit:
     mcall   SF_SYSTEM, SSF_TERMINATE_THREAD, [nwin.sid]
     mcall   SF_TERMINATE_PROCESS
 ;-------------------------------------------------------------------------------
 align 4
     jmp     main_loop
 ;-------------------------------------------------------------------------------
 DRAW_WINDOW:
     mcall   SF_REDRAW, SSF_BEGIN_DRAW
+    push    dword [sc.work]
+    mcall   SF_STYLE_SETTINGS, SSF_GET_COLORS, sc, sizeof.system_colors
+    pop     eax
+    cmp     dword [sc.work], eax
+    je      @f
+    call    LOAD_ICONS
+  @@:
-    mov     esi, [color.bg]
+    mov     esi, [sc.work]
-    or	    esi, 0x01000000
+    or        esi, 0x01000000
-    mcall   SF_CREATE_WINDOW, <[win.x], [win.width]>, <[win.y], [win.height]>, [color.bg], , [color.frame]
+    mcall   SF_CREATE_WINDOW, <[win.x], [win.w]>, <[win.y], [win.h]>, [sc.work], , [sc.work_dark]
     xor     edi, edi
   @@:
     cmp     edi, [dock_items.count]
-    je	    @f
+    je        @f
     push    edi
     mov     eax, SF_DEFINE_BUTTON
     mov     edx, 0x60000002
-    mov     esi, [color.bg]
+    mov     esi, [sc.work]
     imul    edi, BUTTON_SIZE
     add     edi, 12
     shl     ebx, 16
     add     ebx, 2
     cmp     byte[win.isvert], 1
-    je	    .vert_draw_sep
+    je      .vert_draw_sep
-    mcall   , , <4,  36>, [color.frame]
+    mcall   , , <4,  36>, [sc.work_dark]
     jmp     .end_inner_sep
  .vert_draw_sep:
     sub     ebx, 12 shl 16
     mov     ecx, ebx
-    mcall   , <4, 36>, , [color.frame]
+    mcall   , <4, 36>, , [sc.work_dark]
  .end_inner_sep:
     pop     ecx
     pop     ebx
  .digend:
     imul    ebx, edi, 4
     add     ebx, dock_items.icon
-    mov     ebx, [ebx]
-    imul    ebx, ICON_SIZE_BGR
+    mov     ebx, [ebx]
+    push    edi
-    add     ebx, [img_data.rgb_object]
+    imul    ebx, 32*32*4
+    add     ebx, [icons_inactive]
     mcall   SF_PUT_IMAGE_EXT, , <32, 32>, , 32, 0, 0
-    mcall   SF_PUT_IMAGE, , <32, 32>
+    pop     edi
  ;.button_close:
  ;   jmp     exit
  .button_dock:
-    mov     edi, [win.button_index]
+    mov     edi, [win.btn_index]
     imul    edi, 256
     and     esi, 0xFFFF
     cmp     edi, 0
-    jl	    wnd_hide
+    jl        wnd_hide
     dec     edi
-    cmp     edi, [win.width]
+    cmp     edi, [win.w]
-    jg	    wnd_hide
+    jg        wnd_hide
     cmp     esi, 0
-    jl	    wnd_hide
+    jl        wnd_hide
     dec     esi
-    cmp     esi, [win.height]
+    cmp     esi, [win.h]
-    jg	    wnd_hide
+    jg        wnd_hide
  .set0:
     mov     eax, 100
  .nxtcmp:
-    cmp     [win.button_index], eax
+    cmp     [win.btn_index], eax
-    je	    .nxt2
+    je        .nxt2
-    push    dword[win.button_index]
+    push    dword[win.btn_index]
     pop     dword[win.prev_index]
-    mov     [win.button_index], eax
+    mov     [win.btn_index], eax
  ; ==== DRAW SELECTION ====
     call    DRAW_SELECTION
  .nxt2:
-    mov     eax, [win.button_index]
+    mov     eax, [win.btn_index]
     imul    eax, BUTTON_SIZE
     cmp     byte[win.isvert], 1
-    je	    .vert_name
+    je        .vert_name
     add     eax, [win.x]
     mov     [nwin.x], eax
-    mov     byte[nwin.change_shape], 1
+    mov     byte[nwin.swap_shape], 1
-    mcall   SF_DRAW_RECT, <0, [win.width]>, <[win.height], 1>, [color.frame]
+    mcall   SF_DRAW_RECT, <0, [win.w]>, <[win.h], 1>, [sc.work_dark]
     jmp     .vert_end
  .vert_name:
     add     eax, [win.y]
     add     eax, 14
     mov     [nwin.y], eax
     mcall   SF_SYSTEM, SSF_FOCUS_WINDOW, [win.sid]
-    mov     byte[win.state], 1
-    mov     eax, [win.width_opn]
+    mov     byte[win.state], 1
-    mov     [win.width], eax
-    mov     eax, [win.x_opn]
-    mov     [win.x], eax
-    mov     eax, [win.height_opn]
+    m2m     dword [win.x], dword [win.x_opn]
-    mov     [win.height], eax
-    mov     eax, [win.y_opn]
+    m2m     dword [win.y], dword [win.y_opn]
-    mov     [win.y], eax
+    m2m     dword [win.w], dword [win.w_opn]
+    m2m     dword [win.h], dword [win.h_opn]
     cmp     byte[dock_items.ashow],1
-    je	   .change_nothing
+    je       .change_nothing
-    mcall   SF_CHANGE_WINDOW, [win.x], [win.y], [win.width], [win.height]
+    mcall   SF_CHANGE_WINDOW, [win.x], [win.y], [win.w], [win.h]
     mov     byte[nwin.close], 1
     mcall   SF_SYSTEM, SSF_FOCUS_WINDOW, [win.psid]
     mov     byte[win.state], 0
-    mov     byte[win.button_index], -1
+    mov     byte[win.btn_index], -1
     cmp     byte[dock_items.ashow],1
-    je	   .do_no_hide
+    je       .do_no_hide
-    mov     eax, [win.width_hdn]
-    mov     [win.width], eax
-    mov     eax, [win.x_hdn]
-    mov     [win.x], eax
-    mov     eax, [win.height_hdn]
-    mov     [win.height], eax
+    m2m     dword [win.x], dword [win.x_hdn]
     m2m     dword [win.y], dword [win.y_hdn]
-    mov     eax, [win.y_hdn]
+    m2m     dword [win.w], dword [win.w_hdn]
-    mov     [win.y], eax
+    m2m     dword [win.h], dword [win.h_hdn]
     jne     @f
     xchg    ebx, ecx
     sub     ecx, 0x000C0000
   @@:
-    mcall   SF_DRAW_RECT, , , [color.bg]
+    mcall   SF_DRAW_RECT, , , [sc.work]
     mov     edx, ebx
     shr     ecx, 16
-    mov     dx, cx
+    mov     dx,  cx
     add     edx, 0x00040004
     mov     ebx, [win.prev_index]
     imul    ebx, 4
     add     ebx, dock_items.icon
-    mov     ebx, [ebx]
-    imul    ebx, ICON_SIZE_BGR
+    mov     ebx, [ebx]
-    add     ebx, [img_data.rgb_object]
+    imul    ebx, 32*32*4
     add     ebx, [icons_inactive]
-    mcall   SF_PUT_IMAGE, , <32, 32>
+    mcall   SF_PUT_IMAGE_EXT, , <32, 32>, , 32, 0, 0
-    mov     ebx, [win.button_index]
+    mov     ebx, [win.btn_index]
     imul    ebx, BUTTON_SIZE
     jne     @f
     xchg    ebx, ecx
     sub     ecx, 0x000C0000
   @@:
-    mcall   SF_DRAW_RECT, , , [color.bt]
+    mcall   SF_DRAW_RECT, , , [sc.work_button]
     mov     edx, ebx
     shr     ecx, 16
     mov     dx, cx
     add     edx, 0x00040004
-    mov     ecx, [win.button_index]
+    mov     ebx, [win.btn_index]
-    imul    ecx, 4
+    imul    ebx, 4
-    add     ecx, dock_items.icon
+    add     ebx, dock_items.icon
+    mov     ebx, [ebx]
-    mov     ecx, [ecx]
+    imul    ebx, 32*32*4
+    add     ebx, [icons_active]
+    mcall   SF_PUT_IMAGE_EXT, , <32, 32>, , 32, 0, 0
+    ret
+;-------------------------------------------------------------------------------
-    imul    ecx, ICON_SIZE_BGR
+proc icon32cpy uses ecx edx edi esi, dest:dword, src:dword, len:dword, bgcol:dword
+    mov     edi, [dest]
-    add     ecx, [img_data.rgb_object]
+    mov     esi, [src]
+    mov     ecx, [len]
+    mov     edx, [bgcol]
+.loop:
+    m2m     dword [edi], dword [esi]
-    mov     ebx, sel_img
+    cmp     dword [edi], 0
+    jne     @f
-    mov     edi, 0
+    mov     dword [edi], edx
-  @@:
+   @@:
-    mov     al, byte[ecx + 2]
+    add     edi, 4
-    shl     eax, 8
+    add     esi, 4
-    mov     al, byte[ecx + 1]
+    sub     ecx, 4
+    cmp     ecx, 4
+    jg      .loop
+    ret
-    shl     eax, 8
+endp
+;-------------------------------------------------------------------------------
+LOAD_ICONS:
+    mov     esi, 0 ; esi is a counter of mem_open attempts
-    mov     al, byte[ecx + 0]
+  @@:
+    ; try to open shr memory, if failed then make 5 attempts more
-    or	    eax, 0x10000000
+    mcall   SF_SYS_MISC, SSF_MEM_OPEN,icons_resname ; 0 = SHM_READ
-    cmp     eax, [color.bg]
-    jne     .notbg
-    mov     eax, [color.bt]
+    cmp     eax,0
- .notbg:
+    jne     @f
+    inc     esi
-    mov     byte[ebx + 0], al
+    cmp     esi,10
+    je      exit
-    shr     eax, 8
+    mcall   SF_SLEEP, 70
+    jmp     @b
-    mov     byte[ebx + 1], al
+  @@:
-    shr     eax, 8
+    mov     [shr_icons_ptr], eax
+    mov     [shr_icons_len], edx
-    mov     byte[ebx + 2], al
+    mcall   SF_SYS_MISC, SSF_MEM_FREE,  [icons_active]
+    mcall   SF_SYS_MISC, SSF_MEM_ALLOC, [shr_icons_len]
+    mov     [icons_active], eax
-    add     ebx, 3
-    add     ecx, 3
+    mcall   SF_SYS_MISC, SSF_MEM_FREE,  [icons_inactive]
+    mcall   SF_SYS_MISC, SSF_MEM_ALLOC, [shr_icons_len]
-    add     edi, 3
+    mov     [icons_inactive], eax
-    cmp     edi, 1024 * 3
+    stdcall icon32cpy, [icons_inactive], [shr_icons_ptr], [shr_icons_len], [sc.work]
-    jne     @b
+    stdcall icon32cpy, [icons_active],   [shr_icons_ptr], [shr_icons_len], [sc.work_button]

Subversion Repositories Kolibri OS

(root)/programs/system/docky/trunk/docky.asm – Rev 9444 → 9530