WebSVN – Kolibri OS – Diff – /kernel/trunk/gui/window.inc

 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 9911 $
+$Revision: 9926 $
 ;==============================================================================
         mov     eax, ebx
         mov     ebx, ecx
         mov     ecx, edx
         mov     edx, [current_slot_idx]
         shl     edx, BSF sizeof.WDATA
-        add     eax, [edx + window_data + WDATA.box.left]
+        add     eax, [window_data + edx + WDATA.box.left]
-        add     ebx, [edx + window_data + WDATA.box.top]
+        add     ebx, [window_data + edx + WDATA.box.top]
-        mov     edi, [current_slot]
-        add     eax, [edi+APPDATA.wnd_clientbox.left]
+        add     eax, [window_data + edx + WDATA.clientbox.left]
-        add     ebx, [edi+APPDATA.wnd_clientbox.top]
+        add     ebx, [window_data + edx + WDATA.clientbox.top]
         xor     edi, edi ; no force
         and     ecx, 0xFBFFFFFF  ;negate 0x04000000 save to mouseunder area
         jmp     __sys_putpixel
 ;------------------------------------------------------------------------------
         pop     esi
         jnz     .err
         mov     eax, [current_slot_idx]
         shl     eax, BSF sizeof.WDATA
-        mov     ebp, [eax + window_data + WDATA.box.left]
-        push    esi
-        mov     esi, [current_slot]
+        mov     ebp, [window_data + eax + WDATA.box.left]
-        add     ebp, [esi+APPDATA.wnd_clientbox.left]
+        add     ebp, [window_data + eax + WDATA.clientbox.left]
         shl     ebp, 16
-        add     ebp, [eax + window_data + WDATA.box.top]
+        add     ebp, [window_data + eax + WDATA.box.top]
-        add     bp, word[esi+APPDATA.wnd_clientbox.top]
-        pop     esi
+        add     bp, word[window_data + eax + WDATA.clientbox.top]
         test    ecx, 0x08000000  ; redirect the output to the user area
         jnz     @f
         add     ebx, ebp
 align 4
         movzx   ecx, ax ; ecx - x.size
         shr     eax, 16 ; eax - x.coord
         movzx   edx, bx ; edx - y.size
         shr     ebx, 16 ; ebx - y.coord
-        mov     esi, [current_slot]
+        mov     esi, [current_slot_idx]
+        shl     esi, BSF sizeof.WDATA
-        add     eax, [esi + APPDATA.wnd_clientbox.left]
+        add     eax, [window_data + esi + WDATA.clientbox.left]
-        add     ebx, [esi + APPDATA.wnd_clientbox.top]
+        add     ebx, [window_data + esi + WDATA.clientbox.top]
         add     ecx, eax
         add     edx, ebx
         jmp     vesa20_drawbar
 .drectr:
 align 4
 ; system function 38
 syscall_drawline:
         mov     edi, [current_slot_idx]
         shl     edi, BSF sizeof.WDATA
-        movzx   eax, word[edi + window_data + WDATA.box.left]
+        movzx   eax, word[window_data + edi + WDATA.box.left]
         mov     ebp, eax
-        mov     esi, [current_slot]
-        add     ebp, [esi+APPDATA.wnd_clientbox.left]
+        add     ebp, [window_data + edi + WDATA.clientbox.left]
-        add     ax, word[esi+APPDATA.wnd_clientbox.left]
+        add     ax, word[window_data + edi + WDATA.clientbox.left]
         add     ebp, ebx
         shl     eax, 16
-        movzx   ebx, word[edi + window_data + WDATA.box.top]
+        movzx   ebx, word[window_data + edi + WDATA.box.top]
         add     eax, ebp
         mov     ebp, ebx
-        add     ebp, [esi+APPDATA.wnd_clientbox.top]
+        add     ebp, [window_data + edi + WDATA.clientbox.top]
-        add     bx, word[esi+APPDATA.wnd_clientbox.top]
+        add     bx, word[window_data + edi + WDATA.clientbox.top]
         add     ebp, ecx
         shl     ebx, 16
         xor     edi, edi
         add     ebx, ebp
         mov     ecx, edx
 ; --------------------------
 ;; Set window shape scale:
 ;> ebx = 1
 ;> ecx = scale power (resulting scale is 2^ebx)
 syscall_set_window_shape:
-        mov     edi, [current_slot]
+        mov     edi, [current_slot_idx]
+        shl     edi, BSF sizeof.WDATA
         test    ebx, ebx
         jne     .shape_scale
-        mov     [edi + APPDATA.wnd_shape], ecx
+        mov     [window_data + edi + WDATA.shape], ecx
 ;--------------------------------------
 align 4
 .shape_scale:
         dec     ebx
         jnz     .exit
-        mov     [edi + APPDATA.wnd_shape_scale], ecx
+        mov     [window_data + edi + WDATA.shape_scale], ecx
 ;--------------------------------------
 align 4
 .exit:
         ret
 @@:
         cmp     dl, 4
         jc      @f
         xor     edx, edx
 @@:
-        mov     [edi*8 + SLOT_BASE + APPDATA.wnd_caption], ecx
+        mov     [window_data + edi + WDATA.caption], ecx
-        mov     [edi*8 + SLOT_BASE + APPDATA.captionEncoding], dl
+        mov     [window_data + edi + WDATA.captionEncoding], dl
         jmp     window._.draw_window_caption
 ;------------------------------------------------------------------------------
 align 4
 align 4
 .next_window:
         movzx   edi, word[WIN_POS + esi * 2]
         shl     edi, BSF sizeof.WDATA        ;size of TASKDATA and WDATA = 32 bytes
-        cmp     byte [SLOT_BASE + edi*8 + APPDATA.state], TSTATE_FREE
+        cmp     byte [SLOT_BASE + edi*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.state], TSTATE_FREE
         je      .skip_window
         add     edi, window_data
 align 4
 .loop:
         movzx   edi, word[WIN_POS + eax * 2]
         shl     edi, BSF sizeof.WDATA
 ; it is a unused slot?
-        cmp     byte [SLOT_BASE + edi*8 + APPDATA.state], TSTATE_FREE
+        cmp     byte [SLOT_BASE + edi*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.state], TSTATE_FREE
         je      @f
 ; it is a hidden thread?
-        lea     esi, [SLOT_BASE + edi*8 + APPDATA.app_name]
+        lea     esi, [SLOT_BASE + edi*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.app_name]
         cmp     [esi], byte '@'
         je      @f
 ; is it already minimized?
         test    [edi + window_data+WDATA.fl_wstate], WSTATE_MINIMIZED
         jnz     @f
         test    cl, WSTATE_MAXIMIZED
         jnz     .exit
         mov     eax, edi
         sub     eax, window_data
-        shl     eax, 3
+        shl     eax, (BSF sizeof.APPDATA - BSF sizeof.WDATA)
         add     eax, SLOT_BASE
         mov     eax, [_skinh]
         mov     [window_topleft + 8 * 3 + 4], eax
         mov     [window_topleft + 8 * 4 + 4], eax
-        mov     ecx, edi
-        sub     edi, window_data
-        shl     edi, 3
+        mov     ecx, edi
         test    [ecx + WDATA.fl_wstyle], WSTYLE_CLIENTRELATIVE
         jz      .whole_window
         movzx   eax, [ecx + WDATA.fl_wstyle]
         and     eax, 0x0F
         mov     eax, [eax * 8 + window_topleft + 0]
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.left], eax
+        mov     [ecx + WDATA.clientbox.left], eax
         shl     eax, 1
         neg     eax
         add     eax, [ecx + WDATA.box.width]
         inc     eax  ;Leency: as window is created width+1 so client the same
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.width], eax
+        mov     [ecx + WDATA.clientbox.width], eax
         movzx   eax, [ecx + WDATA.fl_wstyle]
         and     eax, 0x0F
         push    [eax * 8 + window_topleft + 0]
         mov     eax, [eax * 8 + window_topleft + 4]
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.top], eax
+        mov     [ecx + WDATA.clientbox.top], eax
         neg     eax
         sub     eax, [esp]
         add     eax, [ecx + WDATA.box.height]
         inc     eax  ;Leency: as window is created height+1 so client the same
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.height], eax
+        mov     [ecx + WDATA.clientbox.height], eax
         add     esp, 4
         jmp     .exit
 ;--------------------------------------
 align 4
 .whole_window:
         xor     eax, eax
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.left], eax
+        mov     [ecx + WDATA.clientbox.left], eax
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.top], eax
+        mov     [ecx + WDATA.clientbox.top], eax
         mov     eax, [ecx + WDATA.box.width]
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.width], eax
+        mov     [ecx + WDATA.clientbox.width], eax
         mov     eax, [ecx + WDATA.box.height]
-        mov     [edi + SLOT_BASE + APPDATA.wnd_clientbox.height], eax
+        mov     [ecx + WDATA.clientbox.height], eax
 ;--------------------------------------
 align 4
         push    ecx edi
         mov     cl, [edi + WDATA.fl_wstyle]
+        mov     eax, [edi + WDATA.cl_frames]
         mov     eax, [edi + WDATA.cl_frames]
-        sub     edi, window_data
+        mov     esi, [esp]
-        shl     edi, 3
+        sub     edi, window_data
-        add     edi, SLOT_BASE
+        shl     edi, (BSF sizeof.APPDATA - BSF sizeof.WDATA)
         and     cl, 0x0F
         xor     eax, eax
 ;--------------------------------------
 align 4
 @@:
-        mov     [edi + APPDATA.wnd_caption], eax
+        mov     [esi + WDATA.caption], eax
         mov     esi, [esp]
-        add     edi, APPDATA.saved_box
+        add     edi, SLOT_BASE + APPDATA.saved_box
         movsd
         movsd
   ff_scale dd ?
 end virtual
-        pushad
-        cmp     esi, 1
+        pushad
         jz      .check_for_shaped_window
+        mov     edi, esi
+        shl     edi, BSF sizeof.WDATA
+        cmp     esi, 1
-        mov     edi, esi
+        jz      .check_for_shaped_window
         shl     edi, BSF sizeof.WDATA
         cmp     [window_data + edi + WDATA.box.width], 0
         jnz     .check_for_shaped_window
         cmp     [window_data + edi + WDATA.box.height], 0
         jz      .exit
 ;--------------------------------------
-align 4
-.check_for_shaped_window:
-        mov     edi, esi
-        shl     edi, BSF sizeof.APPDATA
+align 4
-        add     edi, SLOT_BASE
+.check_for_shaped_window:
-        cmp     [edi + APPDATA.wnd_shape], 0
+        cmp     [window_data + edi + WDATA.shape], 0
         jne     .shaped_window
         sub     ecx, eax
         sub     edx, ebx
         inc     ecx
         inc     edx
-        push    [edi + APPDATA.wnd_shape_scale]  ; push scale first -> for loop
+        push    [window_data + edi + WDATA.shape_scale]  ; push scale first -> for loop
         ; get WinMap start  -> ebp
         push    eax
         mov     eax, [d_width_calc_area + ebx*4]
         add     eax, [esp]
         add     eax, [_display.win_map]
         mov     ebp, eax
-        mov     edi, [edi + APPDATA.wnd_shape]
+        mov     edi, [window_data + edi + WDATA.shape]
         push    eax ebx edx esi
         mov     eax, edi
         sub     eax, window_data
-        shr     eax, 5
+        shr     eax, BSF sizeof.WDATA
         movzx   eax, word[WIN_STACK + eax * 2]  ; get value of the curr process
         cmp     esi, eax
         ja      .exit.no_redraw
         movzx   edx, word[esi]
         shl     edx, BSF sizeof.WDATA ; size of TASKDATA and WDATA is 32 bytes
-        cmp     byte [SLOT_BASE + edx*8 - sizeof.APPDATA + APPDATA.state], TSTATE_FREE
+        cmp     byte [SLOT_BASE + edx*(sizeof.APPDATA/sizeof.WDATA) - sizeof.APPDATA + APPDATA.state], TSTATE_FREE
         je      .next_window
         mov     eax, [edi + WDATA.box.top]
         inc     eax
 ;--------------------------------------
 align 4
 @@:
         mov     edx, [current_slot_idx]
-        shl     edx, 5
+        shl     edx, BSF sizeof.WDATA
         add     edx, window_data
         movzx   ebx, [edx + WDATA.fl_wstyle]
         and     bl, 0x0F
         cmp     bl, 3
         je      .draw_caption_style_3
 ;--------------------------------------
 align 4
 .2:
         mov     edi, [current_slot_idx]
         shl     edi, BSF sizeof.WDATA
-        test    [edi + window_data + WDATA.fl_wstyle], WSTYLE_HASCAPTION
+        test    [window_data + edi + WDATA.fl_wstyle], WSTYLE_HASCAPTION
         jz      .exit
-        mov     edx, [edi * 8 + SLOT_BASE + APPDATA.wnd_caption]
+        mov     edx, [window_data + edi + WDATA.caption]
         or      edx, edx
         jz      .exit
         mov     ebp, [edi + window_data + WDATA.box.left - 2]
 .dodraw:
         shr     eax, 3
         mov     esi, eax
         add     ebx, ebp
         mov     ecx, [common_colours + 16]
-        mov     al, [edi*8 + SLOT_BASE + APPDATA.captionEncoding]
+        mov     al, [window_data + edi + WDATA.captionEncoding]
         test    al, al
         jnz     @f
         mov     al, 1
         cmp     byte [edx], 4
         jnc     @f
 align 4
 .next_window:
         movzx   edi, word[WIN_POS + esi * 2]
         shl     edi, BSF sizeof.WDATA         ;size of TASKDATA and WDATA = 32 bytes
-        cmp     byte [SLOT_BASE + edi*8 + APPDATA.state], TSTATE_FREE
+        cmp     byte [SLOT_BASE + edi*(sizeof.APPDATA/sizeof.WDATA) + APPDATA.state], TSTATE_FREE
         je      .skip_window
         add     edi, window_data

Subversion Repositories Kolibri OS

(root)/kernel/trunk/gui/window.inc @ 9941 – Rev 9911 → 9926