855 flag to prevent background drawing on the field (#856)

* Use HINT to set the wash color #853

* Add ini key to disable background rendering on field #853

* Let config ui pref module set the flag to prevent bg rendiner on field #855

* Default to no field background #855

* Remove unused white space #855

---------

Co-authored-by: Falk Rehwagen <[email protected]>

Author: bluewaysw

Library/Pref/ConfigUI/configui.asm

@@ -1029,22 +1029,26 @@ UICombo	struct
 	UIC_launcher	nptr.TCHAR
 	UIC_font	FontID
 	UIC_hasTaskbar	word
+	UIC_disBGRender word
 UICombo ends
 
 uicombos UICombo <
 	offset MotifStr,
 	offset GeoManagerStr,
 	offset BerkeleyStr,
+	FALSE,
 	FALSE
 >,<
 	offset ISUIStr,
 	offset ISDeskStr,
 	offset EsquireStr,
+	TRUE,
 	TRUE
 >,<
 	offset MotifStr,
 	offset ISDeskStr,
 	offset BerkeleyStr,
+	TRUE,
 	TRUE
 >
 
@@ -1054,6 +1058,7 @@ fontIDKey 		char "fontid", 0
 systemCat 		char "system", 0
 editableTextFontIDKey 	char "editableTextFontID", 0
 taskBarEnabledKey 	char "taskBarEnabled", 0
+backgroundDisabledOnField char "backgroundDisabledOnField", 0
 
 if ERROR_CHECK
 LocalDefNLString MotifStr <"motifec.geo", 0>
@@ -1133,6 +1138,16 @@ SetUIOptions	proc	near
 		call	InitFileWriteBoolean
 		pop	di, ax
 
+	;
+	; handle [ui] backgroundDisabledOnField = key
+	;
+		push	di
+		mov	si, offset uiCategory
+		mov	dx, offset backgroundDisabledOnField
+		mov	ax, cs:uicombos[di].UIC_disBGRender
+		call	InitFileWriteBoolean
+		pop	di
+
 	;
 	; restore ds for the correct object at ds:si
 	;

Library/SpecUI/CommonUI/CWin/cwinFieldInit.asm

@@ -1344,6 +1344,10 @@ REVISION HISTORY:
 
 ------------------------------------------------------------------------------@
 
+
+backgroundCategoryString	char	"ui", C_NULL
+backgroundDisabledOnField	char	"backgroundDisabledOnField", C_NULL
+
 OLFieldOpenWin	method	dynamic OLFieldClass, MSG_VIS_OPEN_WIN
 EC<	call	VisCheckVisAssumption	; Make sure vis data exists >
 
@@ -1423,6 +1427,22 @@ OFOW_noBG:
 OFOW_gotColor:
 endif
 endif
+	; if rendering is disabled for the field
+	mov	di, ax
+	push	ds, si
+	mov	cx, cs
+	mov	ds, cx
+	mov	si, offset backgroundCategoryString
+	mov	dx, offset backgroundDisabledOnField
+	call	InitFileReadBoolean
+	pop	ds, si
+	jc	useDefault		; not found
+	cmp	ax, 0xFFFF
+	mov	ax, di
+	jne	useDefault
+	or	ah, mask WCF_PLAIN
+
+useDefault:
 	mov	bp, si			; set up chunk of this object in bp
 					; pass handle of video driver
 	mov	di, ds:[LMBH_handle]	; pass obj descriptor of this object

TechDocs/Markdown/Tools/tini.md

@@ -2156,6 +2156,17 @@ color to be used.
 	backgroundcolor = 0
 	backgroundcolor = 12
 
+#### backgroundDisabledOnField
+
+`backgroundDisabledOnField = <Boolean>`
+
+If true, this key tells GEOS no to render the configured background image
+on the field. This is useful if ISDesk is used as launcher which is fullscreen
+and renders the background image itself.
+
+	backgroundDisabledOnField = true
+	backgroundDisabledOnField = false
+
 #### deleteStateFilesAfterCrash
 
 `deleteStateFilesAfterCrash = <Boolean>`

Tools/build/product/bbxensem/Template/geos.ini

@@ -71,6 +71,7 @@ AMENGLISH(NTDEMO(background = Meadows))
 GERMAN(NTDEMO(background = Sandstein \[800x600\]))
 backgroundattr = center
 scheme = Meadows
+backgroundDisabledOnField = true
 
 [motif options]
 taskBarEnabled = true