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

 ; èäåÿ: ïåðåáðàòü âñå îêíà, íà÷èíàÿ ñ ñàìîãî íèæíåãî,
 ;       è äëÿ êàæäîãî âûçâàòü setscreen
 align 4
 calculatescreen:
         pushad
+        pushfd
         cli
         mov   esi, 1
         xor   eax, eax
         jbe   .finish
         align 4
       .new_wnd:
-        movzx edi, word [0xC400 + esi * 2]
+        movzx   edi, word [0xC400 + esi * 2]
-        shl   edi, 5
+        shl     edi, 5
+        cmp     [0x3000+edi+0xa], byte 9
+        je      .not_wnd
-        add   edi, window_data
+        add     edi, window_data
         test    [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
         jnz     .not_wnd
         mov     eax,[edi+WDATA.left]
         mov     ebx,[edi+WDATA.top]
       .not_wnd:
         inc   esi
         dec   ebp
         jnz   .new_wnd
       .finish:
-        sti
+        popfd
         popad
 ret
 ;esi                 ; color
         pushad
-        mov   ecx,esi          ; yb,xb -> yb,xe
-     ;<<< 14.11.2004 Ivan Poddubny
-;        mov   eax,r_eax
 ;        shl   eax,16
-;        mov   ax,r_ax
+        mov   ecx,esi          ; yb,xb -> yb,xe
-        mov   eax, r_eax
-        rol   eax, 16
+        mov   eax, r_eax
-     ;>>> 14.11.2004 Ivan Poddubny
+        rol   eax, 16
         mov   ebx,r_ebx
         shl   ebx,16
         mov   bx,r_ebx
 windowactivate:
         ; esi = abs mem position in stack 0xC400+
+        pushad
+     ; if type of current active window is 3,
+     ; it must be redrawn
+        mov   eax, [0x3004]
+        movzx eax, word [0xC400 + eax*2]
+        shl   eax, 5
+        add   eax, window_data
+        mov   ebx, [eax + WDATA.cl_workarea]
+        and   ebx, 0x0f000000
+        cmp   ebx, 0x03000000
+        jne   @f
+        mov   [eax + WDATA.fl_redraw], byte 1
      @@:
         pushad
         push   esi
       movzx   eax, word [esi] ; ax <- process no
       movzx   eax, word [esi]
         mov   bx, [0x3004]  ; number of processes
-        mov   [0xC000+eax*2], bx     ; this is the last (and the upper)
-;* start code - get active process (4) - Mario79
-        cli
-        cmp  [active_process_flag],1
-        jne  @f
-        mov   [active_process_flag],0
-        jmp   end_save_active_process
-    @@:
-        call save_active_process_stack
-    end_save_active_process:
-        mov  [active_process],eax
-        push  eax
-        mov   eax,[active_process]
-        shl   eax,5
-        add   eax,0x3000
-        mov   [eax-twdw+31],byte 1
-        pop   eax
-        sti
-;* end code - get active process (4) - Mario79
+        mov   [0xC000+eax*2], bx     ; this is the last (and the upper)
         ; update on screen -window stack
         xor   esi, esi
       waloop2:
 checkwindowdraw:
+        ; edi = position in window_data+
+        mov   eax, [edi + WDATA.cl_workarea]
+        and   eax, 0x0f000000
         cmp   eax, 0x03000000
-        ; edi = position in window_data+
+        je    .return_yes      ; window type 3
         mov   esi, edi
-        sub   esi, window_data
-        shr   esi, 5
+        sub   esi, window_data
         shr   esi, 5
-        ; esi = process number
         ; esi = process number
         cmp   esi, eax
         ja    .all_wnds_to_top
         movzx eax, word [esi]
         shl   eax, 5
-        add   eax, window_data
+        cmp   [0x3000 + eax + 0xa], byte 9
+        je    .new_check                    ; skip dead windows
-        mov   esi, eax
+        lea   esi, [eax+window_data]
-        mov   ebx, [edi+4]
+        mov   ebx, [edi+4]  ; y0
         mov   edx, [edi+12]
-        add   edx, ebx
+        add   edx, ebx      ; y0e
-        mov   ecx, [esi+4]    ; y check
+        mov   ecx, [esi+4]  ; y  ; y check
         cmp   ecx, edx
-        jae   .new_check
+        jae   .new_check     ; y < y0e
         mov   eax, [esi+12]
-        add   ecx, eax
+        add   ecx, eax       ; ye
-        cmp   ebx, ecx
+        cmp   ebx, ecx       ; y0 >= ye
         ja    .new_check
-        mov   eax, [edi+0]
+        mov   eax, [edi+0]   ; x0
         mov   ecx, [edi+8]
-        add   ecx, eax
+        add   ecx, eax       ; x0e
-        mov   edx, [esi+0]    ; x check
+        mov   edx, [esi+0]   ; x ; x check
         cmp   edx, ecx
-        jae   .new_check
+        jae   .new_check     ; x < x0e
+        mov   ecx, [esi+8]
-        mov   ecx, [esi+8]
+        add   edx, ecx
-        add   edx, ecx
+        cmp   eax, edx
-        cmp   eax, edx
+        ja    .new_check
         add   ecx, eax       ; ecx = x_end
         add   edx, ebx       ; edx = y_end
         mov   edi, [0x3004]
         movzx esi, word [0xC400 + edi * 2]
-        shl   esi, 5
-        movzx esi, byte [esi + 0x3000 + 0xE]
-        call  setscreen ;;;calculatescreen ; setscreen
+        call  setscreen
         popad
         mov  ebx,[0xff01]
         movzx esi, word [0xC000 + ebx * 2]
         lea  esi, [0xC400 + esi * 2]
         call waredraw
-;* start code - get active process (2) - Mario79
-;        mov  eax,[0xff01]
-;        mov  [active_process],eax
-;* end code - get active process  (2) - Mario79
         mov  [0xff01],dword 0  ; activated
         popad
         ret
-    .no_activate_request:
-        cmp   [0xfb40],byte 0    ; mouse buttons pressed ?
+    .no_activate_request:
         jne   .mouse_buttons_pressed
-;        cmp   [window_minimize],2
+        cmp   [0xfb40],byte 0    ; mouse buttons pressed ?
-;        jne   .no_activate_request_1
+        jne   .mouse_buttons_pressed
         cmp   [window_minimize],0
         je   .no_activate_request_2
         cmp   [window_minimize],1
         je    .mouse_buttons_pressed
         mov   esi,[0x3004]
         movzx edi, word [0xC400 + esi * 2]
-        shl   edi, 5
-        add   edi, window_data
-        test    [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
-        jnz     .mouse_buttons_pressed
-;        jne   .no_activate_request_2
-;    .no_activate_request_1:
+        shl   edi, 5
-;        cmp   [window_minimize],1
+        add   edi, window_data
-;        jge   .mouse_buttons_pressed
+        test    [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
-;        jmp   .mouse_buttons_pressed
+        jnz     .mouse_buttons_pressed
         popad
         cmp   [reposition],0
-        je    retwm
-        pushad
-        mov   eax,[edi+00]
-        mov   ebx,[edi+04]
-        mov   ecx,[edi+8]
-        mov   edx,[edi+12]
-        add   ecx,eax
-        add   edx,ebx
-        mov   edi,[0x3004]
-        shl   edi,1
-        add   edi,0xc400
-        movzx esi,byte [edi]
-        shl   esi,5
-        add   esi,0x3000+0xe
-        movzx esi,byte [esi]
-        sub   edi,draw_data
-        shr   edi,5
-        shl   edi,8
-        add   edi,0x80000+0x80
-        ;cmp   [edi],dword 0
-        ;jne   no_rect_shaped_move
-        call  setscreen
-        jmp   move_calculated
-      no_rect_shaped_move:
-        call  calculatescreen
-      move_calculated:
-        popad
+        je    retwm
         mov     [edi+WDATA.fl_redraw],1
         mov   [0xfff5],byte 1 ; no mouse
         call   sys_msg_board_str
         popad
        mov   [window_minimize],0
-;        sti
-        ret
-;temp_mouse_1 dw 0
+        ret
 ;temp_mouse_2 dw 0

Subversion Repositories Kolibri OS

(root)/kernel/trunk/gui/window.inc – Rev 57 → 102