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: 9932 $
+$Revision: 9941 $
 ;==============================================================================
 align 4
 ; system function 48
 syscall_display_settings:
-        cmp     ebx, 13
+        cmp     ebx, .ftable.size-1
         ja      .ret
         jmp     dword[.ftable + ebx*4]
 dd  .getFontSmoothing
 dd  .setFontSmoothing
 dd  .getFontSize
 dd  .setFontSize
 dd  .setSkinUnicode
+.ftable.size = ($ - .ftable)/4
 .redrawWholeScreen:
         xor     eax, eax
         inc     ebx
         dec     eax
         mov     [draw_limits.right], eax
         mov     eax, [_display.height]
         dec     eax
         mov     [draw_limits.bottom], eax
-        mov     eax, window_data
+        mov     eax, window_data  ; TODO: check pointer
         jmp     redrawscreen
 .setButtonStyle:
 ; in: ecx: 0 = flat, 1 = with gradient
 ; --------------------------
 ;; Set window shape scale:
 ;> ebx = 1
 ;> ecx = scale power (resulting scale is 2^ebx)
 syscall_set_window_shape:
-        mov     edi, [current_slot_idx]
+        mov     edi, [current_slot]
-        shl     edi, BSF sizeof.WDATA
+        mov     edi, [edi + APPDATA.window]
         test    ebx, ebx
         jne     .shape_scale
-        mov     [window_data + edi + WDATA.shape], ecx
+        mov     [edi + WDATA.shape], ecx
 ;--------------------------------------
 align 4
 .shape_scale:
         dec     ebx
         jnz     .exit
-        mov     [window_data + edi + WDATA.shape_scale], ecx
+        mov     [edi + WDATA.shape_scale], ecx
 ;--------------------------------------
 align 4
 .exit:
         ret
 ;------------------------------------------------------------------------------
 align 4
 ;     system function 67
 syscall_move_window:
-        mov     edi, [current_slot_idx]
-        shl     edi, BSF sizeof.WDATA
+        mov     edi, [current_slot]
-        add     edi, window_data
+        mov     edi, [edi + APPDATA.window]
 ;--------------------------------------
 align 4
 .next_window:
         movzx   edi, word[WIN_POS + esi * 2]
         shl     edi, BSF sizeof.WDATA
+        add     edi, window_data
-        test    byte [window_data + edi + WDATA.fl_wstate], WSTATE_USED
+        test    byte [edi + WDATA.fl_wstate], WSTATE_USED
-        jz      .skip_window
         jz      .skip_window
         add     edi, window_data
         test    [edi + WDATA.fl_wstate], WSTATE_MINIMIZED
         jnz     .skip_window
         mov     bl, 0
         xchg    [window_minimize], bl
         dec     bl
         jnz     @f
         call    minimize_window
-        jmp     .exit
+        ret
 ;--------------------------------------
 align 4
 @@:
         call    restore_minimized_window
 ;--------------------------------------
 align 4
 ;< edx = pointer to WDATA struct
 window._.sys_set_window:
-        mov     eax, [current_slot_idx]
-        shl     eax, BSF sizeof.WDATA
+        mov     eax, [current_slot]
-        add     eax, window_data
+        mov     eax, [eax + APPDATA.window]
 ; save window colors
         mov     [eax + WDATA.cl_workarea], edx
         mov     [eax + WDATA.cl_titlebar], esi
         pushad
+        mov     edi, esi
-        mov     edi, esi
+        shl     edi, BSF sizeof.WDATA
-        shl     edi, BSF sizeof.WDATA
+        add     edi, window_data
         cmp     esi, 1
+        jz      .check_for_shaped_window
-        jz      .check_for_shaped_window
         cmp     [edi + WDATA.box.width], 0
-        cmp     [window_data + edi + WDATA.box.width], 0
+        jnz     .check_for_shaped_window
         jnz     .check_for_shaped_window
-        cmp     [window_data + edi + WDATA.box.height], 0
+        cmp     [edi + WDATA.box.height], 0
         jz      .exit
 ;--------------------------------------
 align 4
 .check_for_shaped_window:
-        cmp     [window_data + edi + WDATA.shape], 0
+        cmp     [edi + WDATA.shape], 0
         sub     ecx, eax
         sub     edx, ebx
         inc     ecx
         inc     edx
-        push    [window_data + edi + WDATA.shape_scale]  ; push scale first -> for loop
+        push    [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, [window_data + edi + WDATA.shape]
+        mov     edi, [edi + WDATA.shape]
         jne     @f
         inc     eax
 ;--------------------------------------
 align 4
 @@:
-        mov     edx, [current_slot_idx]
+        mov     edx, [current_slot]
-        shl     edx, BSF sizeof.WDATA
+        mov     edx, [edx + APPDATA.window]
-        add     edx, window_data
         movzx   ebx, [edx + WDATA.fl_wstyle]
         and     bl, 0x0F
         cmp     bl, 3
         je      .draw_caption_style_3
         cmp     bl, 4
         call    drawwindow_I_caption
 ;--------------------------------------
 align 4
 .2:
-        mov     edi, [current_slot_idx]
+        mov     edi, [current_slot]
-        shl     edi, BSF sizeof.WDATA
+        mov     edi, [edi + APPDATA.window]
-        test    [window_data + edi + WDATA.fl_wstyle], WSTYLE_HASCAPTION
+        test    [edi + WDATA.fl_wstyle], WSTYLE_HASCAPTION
         jz      .exit
-        mov     edx, [window_data + edi + WDATA.caption]
+        mov     edx, [edi + WDATA.caption]
         or      edx, edx
         jz      .exit
-        mov     ebp, [edi + window_data + WDATA.box.left - 2]
+        mov     ebp, [edi + WDATA.box.left - 2]
-        mov     bp, word[edi + window_data + WDATA.box.top]
+        mov     bp, word[edi + WDATA.box.top]
-        movzx   eax, [edi + window_data + WDATA.fl_wstyle]
+        movzx   eax, [edi + WDATA.fl_wstyle]
         and     al, 0x0F
         cmp     al, 3
         je      .skinned
         cmp     al, 4
         je      .skinned
         jmp     .not_skinned
 ;--------------------------------------
 align 4
 .skinned:
-        movzx   eax, word[edi + window_data + WDATA.box.width]
+        movzx   eax, word[edi + WDATA.box.width]
         sub     ax, [_skinmargins.left]
         sub     ax, [_skinmargins.right]
 ;--------------------------------------
 align 4
 .not_skinned:
         cmp     al, 1
         je      .exit
-        movzx   eax, word[edi + window_data + WDATA.box.width]
+        movzx   eax, word[edi + WDATA.box.width]
         sub     eax, 16
         js      .exit
         mov     ebx, 80002h
 .dodraw:
         shr     eax, 3
         mov     esi, eax
         add     ebx, ebp
         mov     ecx, [common_colours + 16]
-        mov     al, [window_data + edi + WDATA.captionEncoding]
+        mov     al, [edi + WDATA.captionEncoding]
         test    al, al
         jnz     @f
         mov     al, 1
         cmp     byte [edx], 4
         jnc     @f
 align 4
 ; void __fastcall get_window_rect(struct RECT* rc);
 ; ecx = pointer to RECT
 window._.get_rect:
-        mov     eax, [current_slot_idx]
+        mov     eax, [current_slot]
-        shl     eax, BSF sizeof.WDATA
+        mov     eax, [eax + APPDATA.window]
-        mov     edx, [eax + window_data + WDATA.box.left]
+        mov     edx, [eax + WDATA.box.left]
         mov     [ecx+RECT.left], edx
-        add     edx, [eax + window_data + WDATA.box.width]
+        add     edx, [eax + WDATA.box.width]
         mov     [ecx+RECT.right], edx
-        mov     edx, [eax +window_data + WDATA.box.top]
+        mov     edx, [eax + WDATA.box.top]
         mov     [ecx+RECT.top], edx

Subversion Repositories Kolibri OS

(root)/kernel/trunk/gui/window.inc – Rev 9932 → 9941