WebSVN – Kolibri OS – Diff – /kernel/branches/gfx_kernel/gui/window.inc

 setwindowdefaults:
         pushad
         xor   eax,eax
-        mov   ecx,0xc000
+        mov   ecx,WIN_STACK
        @@:
         inc   eax
         add   ecx,2
         mov   [ecx+0x000],ax          ; process no
         mov   [ecx+0x400],ax          ; positions in stack
-        cmp   ecx,0xc400-2            ; the more high, the more surface
+        cmp   ecx,WIN_POS-2            ; the more high, the more surface
         jnz   @b
         xor   ebx, ebx
         mov   ecx, [0xFE00]
         mov   edx, [0xFE04]
 	call	[setscreen]
-        mov     ebp, [0x3004]        ; number of processes
+        mov     ebp, [TASK_COUNT]        ; number of processes
         cmp     ebp, 1
         jbe     .finish
         align 4
       .new_wnd:
-        movzx   edi, word [0xC400 + esi * 2]
+        movzx   edi, word [WIN_POS + esi * 2]
         shl     edi, 5
-        cmp     [0x3000+edi+TASKDATA.state], byte 9
+        cmp     [CURRENT_TASK+edi+TASKDATA.state], byte 9
         je      .not_wnd
         jle     @f
         mov     edx, [esp+RECT.bottom]
      @@:
         push    esi
-        movzx   esi, word [0xC400 + esi * 2]
+        movzx   esi, word [WIN_POS + esi * 2]
 	call	[setscreen]
         pop     esi
      jne  dspl00
      mov  [windowtypechanged],dword 0
   redraw_screen_direct:
      mov  [dlx],dword 0
      mov  [dly],dword 0
-     mov  eax,[0xfe00]
+     mov  eax,[ScreenWidth]
      mov  [dlxe],eax
-     mov  eax,[0xfe04]
+     mov  eax,[ScreenHeight]
      mov  [dlye],eax
      mov  eax,window_data
      call redrawscreen
    dspl00:
      popad
    dspl1:
      cmp  eax,2       ; set common window colours
      jne  no_com_colours
      mov  [windowtypechanged],dword 1
-     mov  esi,[0x3010]
+     mov  esi,[TASK_BASE]
      add  esi,TASKDATA.mem_start
      add  ebx,[esi]
      mov  esi,ebx
      mov  edi,common_colours
      ret
    no_com_colours:
      cmp  eax,3       ; get common window colours
      jne  no_get_com
-     mov  esi,[0x3010]
+     mov  esi,[TASK_BASE]
      add  esi,TASKDATA.mem_start
      add  ebx,[esi]
      mov  edi,ebx
      mov  esi,common_colours
         jne     no_set_workarea
         movsx   eax,word[esp+16+2]
         movsx   ebx,word[esp+16]
         cmp     eax,ebx
         jge     .lp1
-        or      eax,eax;[0xFE00]
+        or      eax,eax;[ScreenWidth]
         jl      @f
         mov     [screen_workarea.left],eax
-    @@: cmp     ebx,[0xFE00]
+    @@: cmp     ebx,[ScreenWidth]
         jg      .lp1
         mov     [screen_workarea.right],ebx
   .lp1: movsx   eax,word[esp+24+2]
         movsx   ebx,word[esp+24]
         cmp     eax,ebx
         jge     .lp2
         or      eax,eax;[0xFE04]
         jl      @f
         mov     [screen_workarea.top],eax
-    @@: cmp     ebx,[0xFE04]
+    @@: cmp     ebx,[ScreenHeight]
         jg      .lp2
         mov     [screen_workarea.bottom],ebx
   .lp2: call    repos_windows
         mov     eax, 0
         mov     ebx, 0
-        mov     ecx, [0xfe00]
+        mov     ecx, [ScreenWidth]
-        mov     edx, [0xfe04]
+        mov     edx, [ScreenHeight]
 	call	[calculatescreen]
 ;    jmp    redraw_screen_direct
     .exit:
         popad
         ret
    no_get_skinmargins:
         cmp     eax,8       ; set window skin
         jne     no_set_skin
         mov     eax,ebx
-        mov     edi,[0x3010]
+        mov     edi,[TASK_BASE]
         add     ebx,[edi+TASKDATA.mem_start]        ; abs start of info block
         pushd   [ebx+0] [ebx+4] [ebx+8] [ebx+12]
         mov     dword[ebx+0],0        ; read
         mov     dword[ebx+4],0        ; from the beginning
         rep     movsd
         call    parse_skin_data
     pushad
         mov     eax, 0
         mov     ebx, 0
-        mov     ecx, [0xfe00]
+        mov     ecx, [ScreenWidth]
-        mov     edx, [0xfe04]
+        mov     edx, [ScreenHeight]
         call    [calculatescreen]
     popad
         mov     dword[esp+32+36],0
         jmp     redraw_screen_direct
   .exit:
      popad
      ret
 repos_windows:
-        mov     ecx,[0x3004]
+        mov     ecx,[TASK_COUNT]
-        mov     esi,0x20*2
+        mov     edi,0x20*2
-    mov    byte[0x0000fff0],1
+    mov    byte[REDRAW_BACKGROUND],1
         dec     ecx
         jge    @f
         ret
-    @@: mov    [esi+WDATA.fl_redraw],1
+    @@: mov     [edi+WDATA.fl_redraw],1
-    test    [esi+WDATA.fl_wstate],WSTATE_MAXIMIZED
+        test    [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
         jz      .lp2
         mov     eax,[screen_workarea.left]
-        mov     [esi+WDATA.box.left],eax
+        mov     [edi+WDATA.box.left],eax
         sub     eax,[screen_workarea.right]
         neg     eax
-        mov     [esi+WDATA.box.width],eax
+        mov     [edi+WDATA.box.width],eax
         mov     eax,[screen_workarea.top]
-        mov     [esi+WDATA.box.top],eax
+        mov     [edi+WDATA.box.top],eax
-        test    [esi+WDATA.fl_wstate],WSTATE_ROLLEDUP
+        test    [edi+WDATA.fl_wstate],WSTATE_ROLLEDUP
         jnz     .lp1
         sub     eax,[screen_workarea.bottom]
+        neg     eax
+        mov     [edi+WDATA.box.height],eax
-        neg     eax
+  .lp1:
-        mov     [esi+WDATA.box.height],eax
+        call    set_window_clientbox
-  .lp1: add     esi,0x20
+        add     edi,0x20
         loop    @b
         ret
-  .lp2: mov     eax,[esi+WDATA.box.left]
+  .lp2: mov     eax,[edi+WDATA.box.left]
-        add     eax,[esi+WDATA.box.width]
+        add     eax,[edi+WDATA.box.width]
-    mov    ebx,[0x0000fe00]
+    mov    ebx,[ScreenWidth]
 ;    inc    ebx
     cmp    eax,ebx
     jle    .lp4
-        mov     eax,[esi+WDATA.box.width]
+        mov     eax,[edi+WDATA.box.width]
     sub    eax,ebx
     jle    .lp3
-        mov     [esi+WDATA.box.width],ebx
+        mov     [edi+WDATA.box.width],ebx
-  .lp3: sub     ebx,[esi+WDATA.box.width]
+  .lp3: sub     ebx,[edi+WDATA.box.width]
-        mov     [esi+WDATA.box.left],ebx
+        mov     [edi+WDATA.box.left],ebx
-  .lp4: mov     eax,[esi+WDATA.box.top]
+  .lp4: mov     eax,[edi+WDATA.box.top]
-        add     eax,[esi+WDATA.box.height]
+        add     eax,[edi+WDATA.box.height]
-    mov    ebx,[0x0000fe04]
+    mov    ebx,[ScreenHeight]
 ;    inc    ebx
     cmp    eax,ebx
     jle    .lp6
-        mov     eax,[esi+WDATA.box.height]
+        mov     eax,[edi+WDATA.box.height]
     sub    eax,ebx
     jle    .lp5
-        mov     [esi+WDATA.box.height],ebx
+        mov     [edi+WDATA.box.height],ebx
-  .lp5: sub     ebx,[esi+WDATA.box.height]
+  .lp5: sub     ebx,[edi+WDATA.box.height]
-        mov     [esi+WDATA.box.top],ebx
-  .lp6: add     esi,0x20
-        loop    @b
+        mov     [edi+WDATA.box.top],ebx
-    ret
+  .lp6: jmp     .lp1
 uglobal
     mov   eax,[timer_ticks]
     cmp   [new_window_starting],eax
     jb    swml1
-    mov   [0xfff4],byte 0  ; no mouse background
+    mov   [MOUSE_BACKGROUND],byte 0  ; no mouse background
-    mov   [0xfff5],byte 0  ; draw mouse
+    mov   [DONT_DRAW_MOUSE],byte 0  ; draw mouse
         inc   eax
         shl   eax,16
         add   eax,[esi+WDATA.box.left]
         add   eax,[esi+WDATA.box.width]
         sub   eax,1
+        push  edx
+        mov   edx,0x80000000
+        mov   ecx,[esi+WDATA.cl_titlebar]
+        and   ecx,edx
+        cmp   ecx,edx
+        jnz   .nofa
         mov   ecx,[esi+WDATA.cl_titlebar]
-	test	ecx,0x80000000
-	jz	.nofa
         sub   ecx,0x00040404
         mov   [esi+WDATA.cl_titlebar],ecx
+        and   ecx,0x00ffffff
+        jmp   .faj
   .nofa:
-  .faj:
+        mov   ecx,[esi+WDATA.cl_titlebar]
         and   ecx,0x00ffffff
+  .faj:
+        pop   edx
         mov   edi,0
         call  [draw_line]
         inc   edx
         cmp   edx,[esp]
         jl    .drwi
+drawwindow_I:
 drawwindow_I:
         pushad
-        pushad
+        or      [edx+WDATA.fl_wdrawn], 4
         shl   ebx,16
         add   ebx,[edx+WDATA.box.top]
         add   ebx,[edx+WDATA.box.height]
         call  draw_rectangle
+        and     [edx+WDATA.fl_wdrawn], not 4
+        test    [edx+WDATA.fl_wdrawn], 2
+        jz      @f
+        call    drawwindowframes
+@@:
         call    drawwindow_I_caption
         mov   edx,[esi+WDATA.box.top]      ; inside work area
         mov   eax,1
         mov   ebx,21
         mov   ecx,[esi+WDATA.box.width]
         mov   edx,[esi+WDATA.box.height]
         mov   edi,[esi+WDATA.cl_workarea]
+	test  edi,0x40000000
+	jnz   noinside
         call  [drawbar]
       noinside:
     add   bx, word [edi+WDATA.box.height]
         mov   esi,[edi+WDATA.cl_frames]
         shr   esi,1
         and   esi,0x007f7f7f
         push  esi
+        or      [edi+WDATA.fl_wdrawn], 4
         call  draw_rectangle
+        and     [edi+WDATA.fl_wdrawn], not 4
+        test    [edi+WDATA.fl_wdrawn], 2
+        jz      @f
+        call    drawwindowframes
+@@:
         mov   ecx,3
       dw3l:
         add   eax,1*65536-1
         add   ebx,1*65536-1
         mov   esi,[edi+WDATA.cl_frames]
         mov   ecx,[esi+WDATA.box.width]
         mov   edx,[esi+WDATA.box.height]
         sub   ecx,4
         sub   edx,4
         mov   edi,[esi+WDATA.cl_workarea]
+	test  edi,0x40000000
+	jnz   noinside2
         call  [drawbar]
       noinside2:
         pushad
      ; if type of current active window is 3,
      ; it must be redrawn
-        mov   eax, [0x3004]
+        mov   eax, [TASK_COUNT]
-        movzx eax, word [0xC400 + eax*2]
+        movzx eax, word [WIN_POS + eax*2]
         shl   eax, 5
         add   eax, window_data
         mov   ebx, [eax + WDATA.cl_workarea]
         mov   [eax + WDATA.fl_redraw], byte 1
      @@:
         push   esi
       movzx   eax, word [esi] ; ax <- process no
-      movzx   eax, word [0xC000+eax*2] ; ax <- position in window stack
+      movzx   eax, word [WIN_STACK+eax*2] ; ax <- position in window stack
         xor   esi, esi        ; drop others
       waloop:
-        cmp   esi, dword [0x3004]
+        cmp   esi, dword [TASK_COUNT]
         jae   wacont
         inc   esi
-        lea   edi, [0xC000 + esi*2]
+        lea   edi, [WIN_STACK + esi*2]
         mov   bx, [edi] ; position of the current process
         cmp   bx, ax
         jbe   @f
       wacont:
                             ; set to no 1
         pop   esi           ;   esi = pointer at 0xC400
       movzx   eax, word [esi]
-        mov   bx, [0x3004]  ; number of processes
+        mov   bx, [TASK_COUNT]  ; number of processes
-        mov   [0xC000+eax*2], bx     ; this is the last (and the upper)
+        mov   [WIN_STACK+eax*2], bx     ; this is the last (and the upper)
         ; update on screen -window stack
+        xor   esi, esi
-        xor   esi, esi
+      waloop2:
-      waloop2:
+        mov   edi, [TASK_COUNT]
-	cmp	esi,[0x3004]
+        cmp   esi, edi
         jae   wacont2
         inc   esi
-        movzx ebx, word [esi*2 + 0xC000]
+        movzx ebx, word [esi*2 + WIN_STACK]
-        mov   [ebx*2 + 0xC400], si
+        mov   [ebx*2 + WIN_POS], si
         jmp   waloop2
       wacont2:
-        mov   [0xf400], byte 0           ; empty keyboard buffer
+        mov   [KEY_COUNT], byte 0           ; empty keyboard buffer
-        mov   [0xf500], byte 0           ; empty button buffer
+        mov   [BTN_COUNT], byte 0           ; empty button buffer
         popad
         sub   esi, window_data
         shr   esi, 5
         ; esi = process number
-        movzx eax, word [0xC000 + esi * 2] ; get value of the curr process
+        movzx eax, word [WIN_STACK + esi * 2] ; get value of the curr process
-        lea   esi, [0xC400 + eax * 2]      ; get address of this process at 0xC400
+        lea   esi, [WIN_POS + eax * 2]      ; get address of this process at 0xC400
         push  esi
       .new_check:
         pop   esi
         add   esi, 2
         push  esi
-        mov   eax, [0x3004]
+        mov   eax, [TASK_COUNT]
-        lea   eax, word [0xC400 + eax * 2] ; number of the upper window
+        lea   eax, word [WIN_POS + eax * 2] ; number of the upper window
         cmp   esi, eax
         call  checkwindowdraw      ; draw window on activation ?
         test  ecx, ecx
         jz    .do_not_draw
         popad
-        mov   [0xfb44], byte 1     ; do draw mouse
+        mov   [MOUSE_DOWN], byte 1     ; do draw mouse
         call  windowactivate
         ; update screen info
 	call	[calc_clipping_rects]
         pushad
-        mov   edi, [0x3004] ; the last process (number)
+        mov   edi, [TASK_COUNT] ; the last process (number)
-        movzx esi, word [0xC400 + edi * 2]
+        movzx esi, word [WIN_POS + edi * 2]
         shl   esi, 5
         add   esi, window_data
     mov   edx, [esi + WDATA.box.height] ; sy
         add   ecx, eax       ; ecx = x_end
         add   edx, ebx       ; edx = y_end
-        mov   edi, [0x3004]
+        mov   edi, [TASK_COUNT]
-        movzx esi, word [0xC400 + edi * 2]
+        movzx esi, word [WIN_POS + edi * 2]
         call  [setscreen]
         popad
     mov   [edi + WDATA.fl_redraw], 1  ; redraw flag for app
-    mov   [0xfb44],byte 0             ; mouse down checks
+    mov   [MOUSE_DOWN],byte 0             ; mouse down checks
         ret
      .do_not_draw:
         popad
         call  windowactivate
-        mov   [0xfb44],byte 0  ; mouse down checks
+        mov   [MOUSE_DOWN],byte 0  ; mouse down checks
-        mov   [0xfff4],byte 0  ; no mouse background
+        mov   [MOUSE_BACKGROUND],byte 0  ; no mouse background
-        mov   [0xfff5],byte 0  ; draw mouse
+        mov   [DONT_DRAW_MOUSE],byte 0  ; draw mouse
         ret
 ; eax = window number on screen
 ; corrupts registers and [dl*]
 restore_minimized_window:
         pushfd
         cli
-        movzx esi, word [0xC400+eax*2]
+        movzx esi, word [WIN_POS+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
+        cmp   eax, [TASK_COUNT] ; the uppermost window
         jnz   .no_uppermost
         mov   eax, [edi+WDATA.box.left]
         mov   ebx, [edi+WDATA.box.top]
         mov   ecx, eax
         mov   edx, ebx
         mov   edx, ebx
         add   ecx, [edi+WDATA.box.width]
         add   edx, [edi+WDATA.box.height]
         call  [calculatescreen]
 .done:
-        mov   [0xfff4],byte 0 ; no mouse under
+        mov   [MOUSE_BACKGROUND],byte 0 ; no mouse under
 .skip_redrawings:
         popfd
         ret
 checkwindows:
         pushad
         cmp   [window_minimize], 0
         je    .no_minimizing
-        mov   eax, [0x3004]       ; the uppermost window
+        mov   eax, [TASK_COUNT]       ; the uppermost window
         mov   bl, 0
         xchg  [window_minimize], bl
         cmp   bl, 1
         jne   .restore
   .restore:
         call  restore_minimized_window
   .continue:
   .no_minimizing:
-        cmp   [0xfb40],byte 0    ; mouse buttons pressed ?
+        cmp   [BTN_DOWN],byte 0    ; mouse buttons pressed ?
         jne   .mouse_buttons_pressed
         popad
         ret
     .mouse_buttons_pressed:
-        mov   esi,[0x3004]
+        mov   esi,[TASK_COUNT]
         inc   esi
       cwloop:
         cmp   esi,2
         jb   .exit
         dec   esi
-        movzx edi, word [0xC400 + esi * 2] ; ebx
+        movzx edi, word [WIN_POS + esi * 2] ; ebx
         shl   edi, 5
         mov   eax,ecx
         mov   ebx,edx
         test    [edi+WDATA.fl_wstate],WSTATE_MINIMIZED
         jnz     cwloop
-       movzx  eax, word [0xfb0a]
+       movzx  eax, word [MOUSE_X]
-       movzx  ebx, word [0xfb0c]
+       movzx  ebx, word [MOUSE_Y]
 	cmp	eax,ecx
 	jl	cwloop
         cmp   ebx, edx
 	jg	cwloop
         pushad
         mov   eax, esi
-        mov   ebx, [0x3004]
+        mov   ebx, [TASK_COUNT]
         cmp   eax, ebx      ; is this window active?
         jz    .move_resize_window
         ; eax = position in windowing stack
         ; redraw must ?
-        lea   esi, [0xC400 + esi * 2]
+        lea   esi, [WIN_POS + esi * 2]
         call  waredraw
         add   esp, 32
       .exit:
-        popad
-        ret
+        popad
         ret
    .move_resize_window:    ; MOVE OR RESIZE WINDOW
    .move_resize_window:    ; MOVE OR RESIZE WINDOW
         mov   edx, ecx
         sub   edx, [latest_window_touch]
         mov   [latest_window_touch], ecx
         mov   [latest_window_touch_delta], edx
-        mov   cl, [0xfb40]     ; save for shade check
+        mov   cl, [BTN_DOWN]     ; save for shade check
         mov   [do_resize], cl
      no_emulation_righ_button:
     mov   ecx, [edi + WDATA.box.left]
         pop   edx ecx eax
         sub   eax, ecx
         sub   ebx, edx
-        mov   esi, [0xfb0a]
+        mov   esi, [MOUSE_X]
-        mov   [0xf300], esi
+        mov   [WIN_TEMP_XY], esi
         push  eax;ad           ; wait for putimages to finish
         jnz     @f
         call  drawwindowframes
     @@:
         mov   [reposition],0
-        mov   [0xfb44],byte 1   ; no reaction to mouse up/down
+        mov   [MOUSE_DOWN],byte 1   ; no reaction to mouse up/down
         ; move window
       newchm:
-        mov   [0xfff5],byte 1
+        mov   [DONT_DRAW_MOUSE],byte 1
         call  checkidle
         call  checkVga_N13
-        mov   [0xfff4],byte 0
+        mov   [MOUSE_BACKGROUND],byte 0
         call  [draw_pointer]
         pushad
         call   stack_handler
         popad
-        mov   esi,[0xf300]
+        mov   esi,[WIN_TEMP_XY]
-        cmp   esi,[0xfb0a]
+        cmp   esi,[MOUSE_X]
         je    cwb
-        movzx ecx,word[0xfb0a]
+        movzx ecx,word[MOUSE_X]
-        movzx edx,word[0xfb0c]
+        movzx edx,word[MOUSE_Y]
         sub   ecx,eax
         sub   edx,ebx
         mov   edx,edi
         sub   edx,window_data
         ;shr   edx,5
         ;shl   edx,8
         ;add   edx,0x80000                 ; process base at 0x80000+
-    lea   edx, [0x80000 + edx*8]
+    lea   edx, [SLOT_BASE + edx*8]
-        movzx eax,word [0xfb0a]
+        movzx eax,word [MOUSE_X]
     cmp   eax,[edi + WDATA.box.left]
         jl    nnepx
     sub   eax,[edi + WDATA.box.left]
         cmp   eax,32 ; [edx+0x90+8]
         mov   [npxe],eax
       nnepx:
         call    get_rolledup_height
         mov     ebx,eax
-        movzx eax,word [0xfb0c]
+        movzx eax,word [MOUSE_Y]
     cmp   eax,[edi + WDATA.box.top]
         jl    nnepy
     sub   eax,[edi + WDATA.box.top]
         cmp     eax,ebx ; [edx+0x90+12]
         test    [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
         jnz     @f
         call  drawwindowframes
     @@:
-        mov   esi,[0xfb0a]
+        mov   esi,[MOUSE_X]
-        mov   [0xf300],esi
+        mov   [WIN_TEMP_XY],esi
       cwb:
-        cmp   [0xfb40],byte 0
+        cmp   [BTN_DOWN],byte 0
         jne   newchm
                                      ; new position done
-        mov     [0xfff5],byte 1
+        mov     [DONT_DRAW_MOUSE],byte 1
         mov     cl,0
         test    [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
         jnz     @f
     mov   [edi + WDATA.box.top],eax
         mov   eax,[npxe]
     mov   [edi + WDATA.box.width],eax
         mov   eax,[npye]
     mov   [edi + WDATA.box.height],eax
+        call    set_window_clientbox
     @@: mov     [reposition],cl
         jnz   @f
         add   ecx,2
     @@: sub   edi,window_data
         shr   edi,5
         shl   edi,8
-        add   edi,0x80000+APPDATA.saved_box
+        add   edi,SLOT_BASE+APPDATA.saved_box
         cld
         rep   movsd
         pop   ecx edi esi
       no_bounds_save:
         je    no_window_sizing
         mov   edx,edi
         sub   edx,window_data
         shr   edx,5
         shl   edx,8
-        add   edx,0x80000                 ; process base at 0x80000+
+        add   edx,SLOT_BASE                 ; process base at 0x80000+
         cmp   [do_resize],2               ; window shade ?
         jne   no_window_shade
         test    [edi+WDATA.fl_wstate],WSTATE_MAXIMIZED
         jz      @f
         mov     eax,[screen_workarea.bottom]
         sub     eax,[screen_workarea.top]
     @@: mov     [edi+WDATA.box.height],eax
+        call    set_window_clientbox
       no_window_shade:
         jnz     @f
         sub     eax,[screen_workarea.bottom]
         neg     eax
         mov     [edi+WDATA.box.height],eax
     @@:
-        jmp   no_fullscreen_restore
+        jmp     restore_from_fullscreen.clientbox
       restore_from_fullscreen:
         and     [edi+WDATA.fl_wstate],not WSTATE_MAXIMIZED
         push    [edi+WDATA.box.height]
         push  edi                         ; restore
         lea   esi, [edx + APPDATA.saved_box]
         pop     eax
         test    [edi+WDATA.fl_wstate],WSTATE_ROLLEDUP
         jz      @f
         mov     [edi+WDATA.box.height],eax
     @@:
+    .clientbox:
+        call    set_window_clientbox
       no_fullscreen_restore:
       no_window_sizing:
         popad
         cmp   [reposition],0
         je    retwm
-        mov   [0xfff5],byte 1 ; no mouse
+        mov   [DONT_DRAW_MOUSE],byte 1 ; no mouse
 	call	[calc_clipping_rects]
         mov   eax,edi
         call  redrawscreen
         mov     [edi+WDATA.fl_redraw],1
         mov   ecx,100         ; wait to avoid mouse residuals
       waitre2:
-        mov   [0xfff5],byte 1
+        mov   [DONT_DRAW_MOUSE],byte 1
         call  checkidle
         cmp     [edi+WDATA.fl_redraw],0
   mpy     dd 0x0
 endg
 ; draw negative window frames
-drawwindowframes:
+; draw negative window frames
+drawwindowframes:
+        pushad
+        cli
         mov   ecx,0x01000000
-        pushad
+        mov   edi,1
         mov   eax,[npx]
         shl   eax,16
         add   eax,[npx]
         add   eax,[npxe]
         add   eax,65536*1-1
-        mov   ebx,[npy]
-        shl   ebx,16
-        add   ebx,[npy]
-        mov   ecx,0x01000000
+        mov   ebx,[npy]
-        push  edi
-        mov   edi,1
+        shl   ebx,16
-        call  [draw_line]
+        add   ebx,[npy]
-        pop   edi
+        call  [draw_line]
         mov   ebx,[npy]
         add   ebx,[npye]
         shl   ebx,16
         add   ebx,[npy]
         add   ebx,[npye]
-        mov   ecx,0x01000000
-        push  edi
-        mov   edi,1
         call  [draw_line]
-        pop   edi
         mov   eax,[npx]
         shl   eax,16
         add   eax,[npx]
         mov   ebx,[npy]
         shl   ebx,16
         add   ebx,[npy]
-        add   ebx,[npye]
-        mov   ecx,0x01000000
-        push  edi
-        mov   edi,1
+        add   ebx,[npye]
-        call  [draw_line]
-        pop   edi
+        call  [draw_line]
         mov   eax,[npx]
         add   eax,[npxe]
         shl   eax,16
         add   eax,[npx]
         add   eax,[npxe]
         mov   ebx,[npy]
         shl   ebx,16
-        add   ebx,[npy]
-        add   ebx,[npye]
-        mov   ecx,0x01000000
-        push  edi
+        add   ebx,[npy]
-        mov   edi,1
-        call  [draw_line]
-        mov   edi,[0x3000]
-        shl   edi,5
-        add   edi,window_data
+        add   ebx,[npye]
+        call  [draw_line]
         mov   [edi+WDATA.fl_wdrawn],byte 1
-        pop   edi
 .ret:
-        popad
+        sti
 ;  eax = 1    shape area scale
 ;      ebx    2^ebx scale
      test eax, eax
      jne  rsw_no_address
-     mov  eax,[0x3000]
+     mov  eax,[CURRENT_TASK]
      shl  eax,8
-     mov  [eax+0x80000+APPDATA.wnd_shape],ebx
+     mov  [eax+SLOT_BASE+APPDATA.wnd_shape],ebx
    rsw_no_address:
      cmp  eax,1
      jne  rsw_no_scale
-     mov  eax,[0x3000]
+     mov  eax,[CURRENT_TASK]
      shl  eax,8

Subversion Repositories Kolibri OS

(root)/kernel/branches/gfx_kernel/gui/window.inc – Rev 129 → 384