close to the end

labellezohra/sources/data.s

@@ -151,9 +151,13 @@ theWINDOW	dw	$0050
 	ds	4
 	ds	4
 	ds	4
-winRECT	ds	8	; content rect
+winRECT	dw	0	; content rect
+	dw	0
+	dw	200
+	dw	320
 	adrl	$ffffffff
-	adrl	teCONTROL
+*	adrl	teCONTROL
+	ds	4
 	dw	%00000000_00000000
 
 *--- The Text Edit control

labellezohra/sources/game.s

@@ -220,6 +220,9 @@ fondToSourceLocInfo
 	dw	160
 	dw	0,0,200,320
 	
+fondRect
+	dw	0,0,200,320
+
 iconToSourceLocInfo
 	dw	mode_320	; mode 320
 	adrl	$8000	; ptrICON - $8000 on entry, high set after _NewHandle
@@ -477,6 +480,22 @@ init2
 init_icones
 	@loadfile	#pFOND;ptrFOND
 	@loadfile	#pICONES;ptrICONES
+
+	PushLong	ptrFOND	; sauvegarde le fond de la fen<65>tre
+	PushLong	ptrCONTENT
+	PushLong	#32768
+	_BlockMove
+
+	PushLong	#0
+	PushLong	#0
+	PushLong	#wMAIN
+	PushLong	#PAINTMAIN
+	PushLong	#0
+	PushWord	#refIsPointer
+	PushLong	#theWINDOW
+	PushWord	#$800e
+	_NewWindow2
+	PullLong	wiMAIN
 	rts
 
 *-----------------------
@@ -678,9 +697,7 @@ to_2	plx
 	cpx	#nombre_objets
 	bcc	]lp
 	beq	]lp
-	
+	rts
-	jmp	setDESKTOP
-*	rts
 
 *-----------------------
 * TEST_PECHES
@@ -733,9 +750,7 @@ do_2	plx
 	cpx	#nombre_peches
 	bcc	]lp
 	beq	]lp
-
+	rts
-	jmp	setDESKTOP
-*	rts
 
 *-----------------------
 * RETOUR
@@ -1038,25 +1053,29 @@ cree_fenetre
 	asl
 	tax
 	lda	fenetre_y,x
-	sta	winRECT
+*	sta	winRECT
+	sta	teRECT
 	lda	fenetre_x,x
-	sta	winRECT+2
+*	sta	winRECT+2
+	sta	teRECT+2
 	lda	fenetre_yy,x
-	sta	winRECT+4
+*	sta	winRECT+4
+	sta	teRECT+4
 	lda	fenetre_xx,x
-	sta	winRECT+6
+*	sta	winRECT+6
+	sta	teRECT+6
 
 * 2. on en deduit les dimensions du controle
 
-	lda	fenetre_yy,x
+*	lda	fenetre_yy,x
-	sec
+*	sec
-	sbc	fenetre_y,x
+*	sbc	fenetre_y,x
-	sta	teRECT+4
+*	sta	teRECT+4
-	
+*	
-	lda	fenetre_xx,x
+*	lda	fenetre_xx,x
-	sec
+*	sec
-	sbc	fenetre_x,x
+*	sbc	fenetre_x,x
-	sta	teRECT+6
+*	sta	teRECT+6
 
 * 3. on ajoute le texte et sa longueur
 	
@@ -1073,17 +1092,24 @@ cree_fenetre
 	sta	teLEN
 
 * 4. on affiche le tout
-	
+
-	PushLong	#0
-	PushLong	#0
-	PushLong	#wMAIN
-	PushLong	#PAINTMAIN
 	PushLong	#0
+	PushLong	wiMAIN
 	PushWord	#refIsPointer
-	PushLong	#theWINDOW
+	PushLong	#teCONTROL
-	PushWord	#$800e
+	_NewControl2
-	_NewWindow2
+	PullLong	haCONTROL
-	PullLong	wiMAIN
+
+*	PushLong	#0
+*	PushLong	#0
+*	PushLong	#wMAIN
+*	PushLong	#PAINTMAIN
+*	PushLong	#0
+*	PushWord	#refIsPointer
+*	PushLong	#theWINDOW
+*	PushWord	#$800e
+*	_NewWindow2
+*	PullLong	wiMAIN
 	rts
 
 *-----------------------

labellezohra/sources/labellezohra.s

@@ -87,6 +87,9 @@ Second	=	Arrivee+4
 
 *---
 
+modeCopy	=	$0000
+modeForeCopy =	$0004	; QDII Table 16-10
+
 mode_320	=	$00
 mode_640	=	$80
 
@@ -196,18 +199,8 @@ okMEM1	sty	ptrIMAGE
 
 	sty	ptrUNPACK
 	stx	ptrUNPACK+2
-
+	stx	ptrCONTENT+2	; le fond de la fenêtre
-*--- 32KB pour le pseudo desktop
+	
-
-	pha
-	pha
-	PushLong	#$7d08
-	PushWord	myID
-	PushWord	#%11000000_00000000
-	PushLong	#0
-	_NewHandle
-	PullLong	haDESKTOP
-
 *--- Chargement des outils
 
 	pha
@@ -361,6 +354,8 @@ doNOT
 	rep	#$20
 	rts
 
+	mx	%00
+	
 *---
 
 tblKEYVALUE
@@ -404,6 +399,23 @@ domu_3	jmp	aiguillage		; choisit le texte correspondant
 
 domu_4	rts
 
+*----------------------------------- Clic dans le contenu de la fenêtre
+
+doCONTENT	lda	texte_selectionne
+	bne	doco_1
+	rts
+
+doco_1	stz	texte_selectionne
+*	stz	peche_selectionne
+*	stz	objet_selectionne
+
+	PushLong	haCONTROL
+	_DisposeControl
+	
+	PushLong	#0
+	_RefreshDesktop
+	rts
+
 *----------------------------------- Gestion des controles
 
 doCONTROL	lda	taskREC+38
@@ -415,8 +427,30 @@ doCONTROL	lda	taskREC+38
 * FENETRES
 *----------------------------------------
 
-PAINTMAIN	PushLong	wiMAIN
+PAINTMAIN	phb
+	phk
+	plb
+
+	pha
+	pha
+	_GetPort
+	
+	PushLong	wiMAIN
+	_SetPort
+
+	PushLong	#fondToSourceLocInfo
+	PushLong	#fondRect
+	PushWord	#0
+	PushWord	#0
+	PushWord	#modeCopy
+	_PPToPort
+
+	PushLong	wiMAIN
 	_DrawControls
+	
+	_SetPort
+	
+	plb
 	rtl
 
 *-----------------------------------
@@ -1061,31 +1095,6 @@ LZ4_End	sty	lenDATA		; Y = length of unpacked data
 
 lenDATA	ds	4
 
-*-----------------------------------
-* SET THE DESKTOP
-*-----------------------------------
-
-setDESKTOP	_HideCursor
-	PushLong	ptrSCREEN
-	PushLong	haDESKTOP
-	PushLong	#$7d08
-	_PtrToHand
-	_ShowCursor
-
-*	PushWord	#1	; add message of desktop type
-*	PushWord	#2
-*	PushLong	haDESKTOP
-*	_MessageCenter
-	
-*	pha
-*	pha
-*	PushWord	#3	; SetDesktop
-*	PushLong	haDESKTOP
-*	_Desktop
-*	pla
-*	pla
-	rts
-
 *-----------------------------------
 * SAVE THE SHR SCREEN
 *-----------------------------------
@@ -1179,6 +1188,7 @@ ptrBACKGND	adrl	$8000	; $8000: where the screen is saved
 ptrFOND	ds	4	; $0000: fond de jeu
 ptrICONES	adrl	$8000	; $0000: fond d'icônes du jeu
 ptrUNPACK	ds	4	; $0000: where the background picture is laoded
+ptrCONTENT	adrl	$8000	; $8000: the window content
 
 ptrTEXTES	ds	4	; les pointeurs des textes
 
@@ -1299,7 +1309,7 @@ taskTBL	da	doNOT	; 0 Null
 	da	doNOT	; wInDesk
 	da	doNOT	; wInMenuBar
 	da	doNOT	; wCLickCalled
-	da	doNOT	; wInContent - was doCONTENT
+	da	doCONTENT	; wInContent - was doCONTENT
 	da	doNOT	; wInDrag
 	da	doNOT	; wInGrow
 	da	doNOT	; wInGoAway