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

         mov   edi, [0x3004]
         movzx esi, word [0xC400 + edi * 2]
         call  setscreen
         popad
-        cmp   [0xff01], dword 1 ; if > 1 then activate process
-        jbe   .not_activate
-;;;        mov   eax, 10            ; wait for putimages to finish
-;;;        call  delay_hs
         mov   [edi+31],byte 1  ; redraw flag for app
         mov   [0xfb44],byte 0  ; mouse down checks
-        ret
-     .not_activate:
-;        mov   eax,5            ; wait for putimages to finish
-;        call  delay_hs
-        mov   [edi+31],byte 1  ; redraw flag for app
-        mov   ecx, 25 ;100
-     .waitflagdown:
-        dec   ecx
-        jz    .nowait
-;        mov   eax, 2
-;        call  delay_hs
-        cmp   [edi+31], byte 0 ; wait flag to drop
-        jnz   .waitflagdown
-      .nowait:
-;        mov   ecx,10
-;      .wait:
-;        mov   eax,1           ; wait for draw to finish
-;        call  delay_hs
-;        loop  .wait
-        mov   [0xfb44],byte 0
         ret
         mov   [0xfff4],byte 0  ; no mouse background
         mov   [0xfff5],byte 0  ; draw mouse
         ret
+; eax = window number on screen
+; corrupts registers and [dl*]
+minimize_window:
+        movzx eax, word [0xC400+eax*2]
+        shl   eax, 5
+        add   eax, window_data
+        test  [eax+WDATA.fl_wstate], WSTATE_MINIMIZED
+        jnz   .skip_redrawings
+        pushfd
+        cli
+        or    [eax+WDATA.fl_wstate], WSTATE_MINIMIZED
+        mov   edi, eax
+        call  calculatescreen
+        mov   eax, [edi+WDATA.left]
+        mov   [dlx], eax
+        add   eax, [edi+WDATA.width]
+        mov   [dlxe], eax
+        mov   eax, [edi+WDATA.top]
+        mov   [dly], eax
+        add   eax, [edi+WDATA.height]
+        mov   [dlye], eax
+        xor   esi, esi
+        xor   eax, eax
+        call  redrawscreen
+        popfd
+.skip_redrawings:
+        ret
+; eax = window number on screen
+; corrupts registers and [dl*]
+restore_minimized_window:
+        pushfd
+        cli
+        movzx esi, word [0xC400+eax*2]
+        mov   edi, esi
+        shl   edi, 5
+        add   edi, window_data
+        test  [edi+WDATA.fl_wstate], WSTATE_MINIMIZED
+        jz    .skip_redrawings
+        mov   [edi+WDATA.fl_redraw], 1
+        and   [edi+WDATA.fl_wstate], not WSTATE_MINIMIZED
+        cmp   eax, [0x3004] ; the uppermost window
+        jnz   .no_uppermost
+        mov   eax, [edi+WDATA.left]
+        mov   ebx, [edi+WDATA.top]
+        mov   ecx, eax
+        mov   edx, ebx
+        add   ecx, [edi+WDATA.width]
+        add   edx, [edi+WDATA.height]
+        call  setscreen
+        jmp   .done
+.no_uppermost:
+        call  calculatescreen
+.done:
+        mov   [0xfff4],byte 0 ; no mouse under
+.skip_redrawings:
+        popfd
+        ret
 iglobal
   window_moving   db 'K : Window - move/resize',13,10,0
   window_moved    db 'K : Window - done',13,10,0
 endg
 ; check window touch
 align 4
 checkwindows:
         pushad
-        cmp  [0xff01],dword 1  ; activate request from app ?
+        cmp   [window_minimize], 0
-        jbe  .no_activate_request
+        je    .no_minimizing
-        mov  edi,[0xff01]     ; process number
-        shl  edi,5
+        mov   eax, [0x3004]       ; the uppermost window
-        add  edi,window_data
+        mov   bl, 0
-        mov  ebx,[0xff01]
-        movzx esi, word [0xC000 + ebx * 2]
+        xchg  [window_minimize], bl
-        lea  esi, [0xC400 + esi * 2]
-        call waredraw
+        cmp   bl, 1
+        jne   .restore
+        call  minimize_window
-        mov  [0xff01],dword 0  ; activated
+        jmp   .continue
-        popad
+  .restore:
-        ret
+        call  restore_minimized_window
-    .no_activate_request:
-        cmp   [0xfb40],byte 0    ; mouse buttons pressed ?
-        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
+  .continue:
-        test    [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
+  .no_minimizing:
-        jnz     .mouse_buttons_pressed
     .no_activate_request_2:
-        mov   [window_minimize],0
+        cmp   [0xfb40],byte 0    ; mouse buttons pressed ?
-        popad
+        jne   .mouse_buttons_pressed
-        ret
+        popad
         ret
     .mouse_buttons_pressed:
         mov   esi,[0x3004]
         inc   esi
       cwloop:
         cmp   esi,2
         jb   .exit
         .temp_window_minimize_1:
         dec   esi
         movzx edi, word [0xC400 + esi * 2] ; ebx
-        shl   edi, 5
-        add   edi, window_data
-;        mov   edi, ebx
+        shl   edi, 5
-        mov   ecx, [edi+0]
+        add   edi, window_data
-        mov   edx, [edi+4]
+;        mov   edi, ebx
         mov   ecx, [edi+0]
         cmp   eax, ecx
         jae   cwloop
         cmp   ebx, edx
         jae   cwloop
-      .window_minimize_no_check_mouse:
         pushad
         mov   eax, esi
         mov   ebx, [0x3004]
         cmp   eax, ebx      ; is this window active?
         push  esi
         mov   esi, window_moving
         call  sys_msg_board_str
         pop   esi
-        mov   ecx, [timer_ticks] ;[0xfdf0]    ; double-click ?
+        mov   ecx, [timer_ticks]     ; double-click ?
         mov   edx, ecx
         sub   edx, [latest_window_touch]
         mov   [latest_window_touch], ecx
     @@: mov     [reposition],cl
-        cmp   [reposition],1         ; save new position and size
-        jne   no_bounds_save
+        cmp   [reposition],1         ; save new position and size
         jne   no_bounds_save
         push  esi edi ecx
         mov   esi,edi
         mov   ecx,2
         shl   edi,8
         add   edi,0x80000+0x90
         cld
         rep   movsd
         pop   ecx edi esi
-        ;
       no_bounds_save:
         pushad                             ; WINDOW SHADE/FULLSCREEN
         sub   edx,window_data
         shr   edx,5
         shl   edx,8
         add   edx,0x80000                 ; process base at 0x80000+
-        cmp     [window_minimize],0
-        je      no_wnd_minimize_restore
-        mov     [reposition],1
-  wnd_minimize:
-        cmp     [window_minimize],1
-        jne     wnd_restore
-        or      [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
-        jmp     no_wnd_minimize_restore
-  wnd_restore:
-        cmp     [window_minimize],2
-        jne     no_wnd_minimize_restore
-        and     [edi+WDATA.fl_wstate],not WSTATE_MINIMIZED
-  no_wnd_minimize_restore:
         cmp   [do_resize],2               ; window shade ?
         jne   no_window_shade
         mov   [reposition],1
         mov    esi,window_moved
         call   sys_msg_board_str
-        popad
-       mov   [window_minimize],0
+        popad
         ret

Subversion Repositories Kolibri OS

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