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

 ;; Copyright (C) MenuetOS 2000-2004 Ville Mikael Turjanmaa      ;;
 ;; Distributed under terms of the GNU General Public License    ;;
 ;;                                                              ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1859 $
+$Revision: 1899 $
 ;==============================================================================
 ;///// public functions ///////////////////////////////////////////////////////
 ;==============================================================================
-window.BORDER_SIZE = 5
+window.BORDER_SIZE = 4
 	mov	ecx, [edi + WDATA.box.top]
 	and	cl, 0xFE
     @@: cmp	edx, -1
 	jne	@f
 	mov	edx, [edi + WDATA.box.width]
-	and	dl, 0xFC
+;	and	dl, 0xFC
     @@: cmp	esi, -1
 	jne	@f
 	mov	esi, [edi + WDATA.box.height]
-	and	esi, 0xFFFFFFFE
+;	and	esi, 0xFFFFFFFE
     @@: push	esi edx ecx ebx
 	mov	eax, esp
 	mov	bl, [edi + WDATA.fl_wstate]
 	cmp	eax, ebx
 	jle	.fix_vertical
 	mov	eax, [edi + WDATA.box.width]
 	sub	eax, ebx
 	jle	@f
-	and	bl, 0xFC			; <<<<<<<
+;	and	bl, 0xFC			; <<<<<<<
 	mov	[edi + WDATA.box.width], ebx
     @@: sub	ebx, [edi + WDATA.box.width]
-	and	bl, 0xFC			; <<<<<<<
+;	and	bl, 0xFC			; <<<<<<<
 	mov	[edi + WDATA.box.left], ebx
   .fix_vertical:
 	mov	eax, [edi + WDATA.box.top]
 	cmp	eax, ebx
 	jle	.fix_client_box
 	mov	eax, [edi + WDATA.box.height]
 	sub	eax, ebx
 	jle	@f
-	and	bl, 0xFE			; <<<<<<<
+;	and	bl, 0xFE			; <<<<<<<
 	mov	[edi + WDATA.box.height], ebx
     @@: sub	ebx, [edi + WDATA.box.height]
-	and	bl, 0xFE			; <<<<<<<
+;	and	bl, 0xFE			; <<<<<<<
 	mov	[edi + WDATA.box.top], ebx
 	jmp	.fix_client_box
   .fix_maximized:
 	mov	ebx, edx
 	shl	ebx, 16
 	add	ebx, edx
 	mov	eax, [esi + WDATA.box.left]
 	inc	eax
 	shl	eax, 16
 	add	eax, [esi + WDATA.box.left]
 	add	eax, [esi + WDATA.box.width]
 	dec	eax
 	mov	ecx, [esi + WDATA.cl_titlebar]
 	movzx	eax, bx
 	mov	[edi + WDATA.box.width], eax
 	movzx	eax, cx
 	mov	[edi + WDATA.box.height], eax
 	sar	ebx, 16
-	and	bl, 0xFC		; <<<<<<<<
+;	and	bl, 0xFC		; <<<<<<<<
 	sar	ecx, 16
-	and	cl, 0xFE		; <<<<<<<<
+;	and	cl, 0xFE		; <<<<<<<<
 	mov	[edi + WDATA.box.left], ebx
 	mov	[edi + WDATA.box.top], ecx
   ff_x	   dd ?
   ff_y	   dd ?
   ff_width dd ?
   ff_xsz   dd ?
   ff_ysz   dd ?
+  ff_map   dd ?
   ff_scale dd ?
 end virtual
 	; get x&y size
 	sub	ecx, eax
 	sub	edx, ebx
 	inc	ecx
 	inc	edx
+	shr	ecx, 2          ; 1 tile = 4 pix
+        shr     edx, 1          ; 1 tile = 2 lines
 	; get WinMap start
 	push	esi
 	mov	edi, [_WinMapWidth]
+	mov	esi, edi
-	mov	esi, edi
+        shr     ebx, 1
 	imul	edi, ebx
-	shr	eax, 1
-     	shr	eax, 1
+	shr	eax, 2
 	add	edi, eax
 	add	edi, [_WinMapAddress]
-	pop	eax
+	pop	eax             ; al = process#
-	mov	ah, al
+;	mov	ah, al
-	push	ax
+;	push	ax
-	shl	eax, 16
+;	shl	eax, 16
+;	pop	ax              ; eax = 4 dup PROCESS_NUM
-	pop	ax
+        sub     esi, ecx        ; map line increment (bytes)
-  .next_line:
+	mov	ebx, ecx        ; map line width
-	push	ecx
+  .next_line:
-	shr	ecx, 2
+;        shr     ecx, 2          ; 1dword = 4 tiles
-	rep	stosd
+;	rep	stosd           ; filling the screen map
-	mov	ecx, [esp]
+;	mov	ecx, ebx
-	and	ecx, 3
+;	and	ecx, 3          ; 0 to 3 tiles remaining
 	rep	stosb
-	pop	ecx
-	add	edi, esi
+	mov	ecx, ebx
-	sub	edi, ecx
+	add	edi, esi
-	dec	edx
-	jnz	.next_line
+	dec	edx
         jnz	.next_line
 	jmp	.exit
   .shaped_window:
-	;  for (y=0; y <= x_size; y++)
+	;  for (y=0; y <= y_size; y++)
 	;      for (x=0; x <= x_size; x++)
 	inc	ecx
 	inc	edx
-	push	[edi + APPDATA.wnd_shape_scale]  ; push scale first -> for loop
+	push	[edi + APPDATA.wnd_shape_scale]                 ; push scale first -> for loop
-	; get WinMap start  -> ebp
-	push	eax
-	mov	eax, [_WinMapWidth] ; <<<<
+	push	ebx
-	imul	eax, ebx
-	mov	ebp, [esp]
+	push	eax
-	shr	ebp, 1
-	shr	ebp, 1
+	mov	ebp, eax
+	shr	ebp, 2
+	add	ebp, [_WinMapAddress]
+	mov	eax, [_WinMapWidth]
+        shr     ebx, 1
-	add	ebp, eax
+	imul	eax, ebx
-	add	ebp, [_WinMapAddress]
+	add	ebp, eax	; ebp = map origin
+	mov	edi, [edi + APPDATA.wnd_shape]
+	pop	eax
 	pop	ebx
 	mov	edi, [edi + APPDATA.wnd_shape]
-	pop	eax
+        push    ebp                                             ; for loop - screen map origin
 	; eax = x_start
 	; ebx = y_start
+	; ecx = x_size
-	; ecx = x_size
+	; edx = y_size
-	; edx = y_size
+	; esi = process_number
-	; esi = process_number
+	; edi = &shape
-	; edi = &shape
+        ; ebp = [ff_map]
 	;       [scale]
 	push	edx ecx ; for loop - x,y size
         push	edx ecx                                         ; for loop - x,y size
 	shr	edx, cl
 	imul	eax, ebx
 	add	eax, edx
 	pop	edx ebx
 	add	eax, edi
-	call	.read_byte
+	call	.read_byte		; al= shaped window pix-mask at a given point
 	test	al,al
 	jz	@f
 	mov	eax, esi
-	mov	[ebp], al
+	mov	[ebp], al               ; a tile belongs to the window if the 1st pixel's mask = 1
 	; -- end body --
-    @@: inc	ebp
+    @@:
-	inc	edx
+	add	edx, 4
+        inc     ebp
 	cmp	edx, [ff_xsz]
 	jb	.ff_new_x
-	sub	ebp, [ff_xsz]
-	add	ebp, [ff_x]
-	add	ebp, [Screen_Max_X]  ; screen.x
-	inc	ebp
+	inc	ebx
 	inc	ebx
+	cmp	ebx, [ff_ysz]
+	jnb	@f
+	mov	ebp, [ff_map]
+	add	ebp, [_WinMapWidth]     ; even line: jump to next map row
-	cmp	ebx, [ff_ysz]
+	mov	[ff_map], ebp
-	jb	.ff_new_y
+	jmp	.ff_new_y
+@@:
-	add	esp, 24
 	add	esp, 7*4
   .exit:
 	popad
 	ret
   .read_byte:
-	; eax - address
+	; eax - buffer address
-	; esi - slot
+	; esi - slot#
 	push	eax ecx edx esi
 	xchg	eax, esi
-	lea	ecx, [esp + 12]
+	lea	ecx, [esp + 12]         ; buffer addr = stacked [eax] to return
-	mov	edx, 1
+	mov	edx, 1                  ; buffer size
-	call	read_process_memory
+	call	read_process_memory     ; (core/taskman.inc) returns #bytes read
-	pop	esi edx ecx eax
+	pop	esi edx ecx eax         ; eax = PID
 	ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-A/trunk/gui/window.inc @ 1929 – Rev 1859 → 1899