ARTtmp branch folded in

.gitattributes

 hdr/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
+**/s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
 *,ffb gitlab-language=bbcbasic linguist-language=bbcbasic linguist-detectable=true
 **/c/** gitlab-language=c linguist-language=c linguist-detectable=true

Makefile

@@ -68,15 +68,23 @@ clean:
 	${RM} ${TARGET}
 	@echo ${COMPONENT}: cleaned
 
-resources:
+resources: resources-${CMDHELP}
+	@echo ${COMPONENT}: resource files copied
+
+resources_common:
 	${MKDIR} ${RESDIR}.${COMPONENT}
 	${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
-	${CP} Resources.${LOCALE}.<Machine>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
-	${CP} Resources.${LOCALE}.<Machine>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
-	-${CP} Resources.${LOCALE}.<Machine>.TileN ${RESDIR}.${COMPONENT}.TileN ${CPFLAGS}
-	-${CP} Resources.${LOCALE}.<Machine>.TileV ${RESDIR}.${COMPONENT}.TileV ${CPFLAGS}
-	${CP} Resources.${LOCALE}.<Machine>.Tools ${RESDIR}.${COMPONENT}.Tools ${CPFLAGS}
-	@echo ${COMPONENT}: resource files copied
+	${CP} Resources.${LOCALE}.<System>.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
+	${CP} Resources.${LOCALE}.<System>.Sprites ${RESDIR}.${COMPONENT}.Sprites ${CPFLAGS}
+	-${CP} Resources.${LOCALE}.<System>.TileN ${RESDIR}.${COMPONENT}.TileN ${CPFLAGS}
+	-${CP} Resources.${LOCALE}.<System>.TileV ${RESDIR}.${COMPONENT}.TileV ${CPFLAGS}
+	${CP} Resources.${LOCALE}.<System>.Tools ${RESDIR}.${COMPONENT}.Tools ${CPFLAGS}
+
+resources-None: resources_common
+	@
+
+resources-: resources_common
+	print Resources.${LOCALE}.CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
 
 ${TARGET}: ${SOURCE}
 	${AS} ${ASFLAGS} ${SOURCE}

Options/s/!Common

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Options common to all systems. Hopefully all these options are uncontentious - they are either
+; prototype or debugging options, or options that are unlikely to be changed for a particular
+; build. If a new project needs to change one of these options, you will need to move the option
+; out of this file and into the !Default file.
+;
+; Note that this file is read _after_ the system options file.
+;
+
+;------------------------------------------------------------------------------
+;
+; The following variables control prototype features - it is strongly
+; suggested that these are only used in control environments and are set to
+; false for release versions of the Window Manager.
+;
+
+;
+; "redrawlast"  makes the redraw event lowest priority (except for null) a la Windows,
+;               but requires alot more work to make it work sensibly as it a horrible
+;               hack to see what would happen.
+;
+;               See "PrivateDoc.RedrawLast" for some further thoughts.
+;
+	Option	redrawlast,		false
+
+;------------------------------------------------------------------------------
+
+
+	Option	DoubleIcon,		false		; allow double-clicking on icon bar
+	Option	BounceClose,		false		; debounce close icon, sadly fails for anything that
+							; then does a get pointer info to check which mouse button
+	Option	standalone,		false		; include messages / templates
+	Option	fastborders,		true		; use PutSpriteAtUserCoords for border plotting
+	Option	fixrmatools,		false
+	Option	slabinout,		false		; slab in selected 'slab out' icons.
+	Option	fixslabalignment,	true		; Fix redraw of non-aligned 3D icons
+	Option	tilewithspriteops,	false
+	Option	PokeBorder,		false		; controls border colour on portables
+	Option	ErrorServiceCall,	true		; send service call for Wimp_ReportError
+	Option	NewErrorSystem,		true		; enable watchdog and so forth
+	Option	Bits30and23,		false		; use bits 30 and 23 of error number
+	Option	WatchdogTimer,		true		; use timer interupt for watchdog
+	Option	AllowMatrix,		false
+	Option	FreePoolWCF,		true
+	Option	SnapShot,		false
+	Option	UseClipX0,		false		; use clipx0 rather than call kernel
+	Option	Swapping,		false		; Swap tasks out to disk.
+	Option	StickyMenus,		false
+	Option	hvblip,			true		; allow blips on scroll bars
+	Option	mousecache,		false		; cache mouse position
+	Option	togglebits,		true		; shift toggle thingy
+	Option	AutoScroll,		false		; automatically add scroll bars in low res.
+	Option	Mode22,			false:LAND:AutoScroll	; cater for low res modes
+	Option	RealDarwin,		false		; use bitmapped darwin font
+	Option	NoDarwin,		true		; don't even alias it.
+
+        END
+

Options/s/!Debug

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;========================================================================================
+; Debugging options.
+;
+; To debug the Wimp, set debug to true, then turn on the debugXXX options of your choice.
+;========================================================================================
+;
+	Option	hostvdu,   true                ; destination for debug output
+	Option	debug_flush, true              ; flushing if going to file
+
+	Option	DebugMemory, false
+
+	Option	debug,	   false               ; ONLY FALSE IF NO DEBUGGING
+	OptionD	omd,       false
+	OptionD	sm,        false
+	OptionD	nk,        false               ; Neil's special debugs
+	OptionD	pk,        false               ; special 2
+	OptionD	ptr,       false               ; pointer window
+	OptionD	tmp,       false               ; templates
+	OptionD	fp,        false               ; FP register saving
+	OptionD	sv,        false               ; all service calls
+	OptionD	dy,        false               ; ChangeDynamicArea monitoring
+	OptionD	sw,        false               ; switching
+	OptionD	co,        false               ; command window
+	OptionD	xx,        false               ; misc
+	OptionD	x1,        false               ; misc II
+	OptionD	ic,        false               ; icons
+	OptionD	icb,       false               ; icon bar
+	OptionD	sc,        false               ; set caret
+	OptionD	ms,        false               ; message passing
+	OptionD	task,      false               ; for wholesale debugging!
+	OptionD	task1,     false               ; for exception handlers etc.
+	OptionD	task2,     false               ; for entry points
+	OptionD	task3,     false               ; check for single-tasking errors
+	OptionD	task4,     false               ; Idle poll performance monitoring
+	OptionD	ints,      false
+	OptionD	extent,    false
+	OptionD	escape,    false               ; trap escape enabled on Wimp_Poll
+	OptionD	crw,       false               ; window creation
+	OptionD	opn,       false               ; window opening
+	OptionD	child,     false               ; child windows
+	OptionD	mode,      false               ; mode changing
+	OptionD	bpr,       false               ; braindead panic redraw debugging
+	OptionD	swp,       false               ; Swapping of tasks to disk.
+	OptionD	spr,       false               ; Wimp sprite ops
+	OptionD	bo,        false               ; Special borders
+	OptionD	valid,     false               ; Service_ValidateAddress
+	OptionD	fl,        false               ; Filter handling debugging
+	OptionD	am,        false               ; Auto opening of submenus
+	OptionD	ff,        false               ; Fancy font for system text
+	OptionD	ub,        false               ; User definable scroll bars
+	OptionD	val,       false               ; New validation string commands (K)
+	OptionD	check,     false               ; Check for inconsistent window stacks and flags
+	OptionD	err,       false               ; Wimp_ReportError and errors in general
+	OptionD	autoopen,  false               ; For opening of wimp's own windows
+	OptionD	rma,       false
+	OptionD	perth,     false               ; For Perth power managerment
+	OptionD	colours,   false               ; For use of ColourTrans
+	OptionD	sprite,    false               ; For sprite caching
+	OptionD	msgsel,    false               ; Selective message passing
+	OptionD	menu,      false               ; New menu handling (indirection and bits)
+	OptionD	tools,     false               ; Tool caching and ToolSprite commands
+	OptionD	tools2,    false               ; Plotting and clicking
+	OptionD	borders,   false               ; border plotting on icons
+	OptionD	inverse,   false               ; Colour inversion/highlighting
+	OptionD	font,      false               ; anti-aliased fonts in icons
+	OptionD	fcol,      false               ; colour of antialiased fonts
+	OptionD	die,       false               ; Die entry
+	OptionD	systmpl,   false               ; Loading Wimp's templates
+	OptionD	key,       false               ; ProcessKey handling
+	OptionD	scroll,    false               ; Funky scroll bars
+	OptionD	poll,      false               ; PollWord list management
+	OptionD	menuparam, false               ; CreateMenu parameters
+	OptionD	exit,      false               ; ExitWimp
+	OptionD	L40,       false               ; Fancy font in L40-type icons
+	OptionD	menuw,     false               ; Automatic calculation of menu width
+	OptionD	temp,      false
+	OptionD	mjs,       false               ; Mike's debugs
+	OptionD	mjs2,      false               ; Mike's debugs 2
+	OptionD	mjs3,      false               ; Mike's debugs 3
+	OptionD	mjs4,      false               ; Mike's debugs 4 (TransferBlock)
+
+	END

Options/s/!Default

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Default settings for system specific options. This file is read before the system options files,
+; and sets the default values for these options, if not set in the system options file.
+;
+
+	Option	sixteenmeg, 		false			; if true, assume app space ends at 16 meg.
+	Option	Stork,			true			; try saving power by calling Portable_Idle
+
+	Option	Medusa,			true			; support Medusa Memory management
+	Option	BounceClose,		false			; debounce close icon
+	Option	windowsprite,		true			; use tile_1 for colour 1 work areas
+	Option	outlinefont,		true			; replace VDU 5 rendering of text with outline font
+	Option	UseDynamicArea,		true    		; use a dynamic area on medusa for the sprite pool
+	Option	ChildWindows,		true			; support for nested child windows
+	Option	PlotSpritesFromPalette, true			; Use palette entries, not translation table
+                                            			; (this means funny paletted sprites plot
+                                            			; better in 16bpp+ modes)
+	Option	STB,			false			; Running on an STB/NC-like device
+	Option	NoCommandPrompt, 	false			; Don't show "Press SPACE..." when closing command
+								; window
+	Option	DontCheckModeOnInit, 	false			; Don't validate the configured Wimp mode in module
+								; init, do it on startup
+	Option	ShrinkableAreas, 	false:LAND:Medusa 	; Support shrinkable dynamic areas
+	Option	BlendedFonts,		false			; Blend fonts directly with window backgrounds
+	Option	KeyboardMenus,		false			; Allow keyboard control of menus
+	Option	DeleteRight,		false			; Delete key deletes right
+	Option	DisableShiftF12,	false			; Disable Shift-F12 iconbar toggling
+	Option	NCMenus,		false			; Use NC menu style
+	Option	Twitter,		false			; Anti-twitter on redraws
+	Option	TwitterOnlyMenus,	false:LAND:Twitter 	; Anti-twitter only menus
+	Option	RegisterWIMPSymbolFont,	true			; Register WIMPSymbol font
+	Option	NKmessages1,		false			; message queue optimisation (using lastpointer)
+	Option	NKmessages2,		true			; message queue optimisation
+								; (remove multiple memory change messages)
+	Option	UseAMBControl,		true			; delegate task memory management to OS_AMBControl
+	Option	StrongARM,		true
+	Option	FPE4,			true			; assume FPE 4.00 or later present
+								; Icon bar pops to front when pointer
+	Option	PoppingIconBar,		true:LAND::LNOT:DisableShiftF12	; at bottom of screen
+	Option	IconiseButton,		false			; Windows given iconise button
+	Option	ChocolateScreen,	false			; Clean cached screen after redraw loops
+	Option	StretchErrorButtons,	true			; Stretch buttons in error box to fit text
+
+	Option	RegisterMessages,	false
+	Option	RegisterTools2D,	false
+	Option	RegisterTools3D,	false
+	Option	RegisterSprites,	false
+	Option	RegisterSprites22,	false
+	Option	RegisterTemplates,	false
+
+        END

Options/s/RO310

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Wimp options for a RISC OS 3.10 build of the Window Manager
+;
+
+	Option	Stork,			false			; try saving power by calling Portable_Idle
+
+	Option	Medusa,			false			; support Medusa Memory management
+	Option	UseDynamicArea,		false    		; use a dynamic area on medusa for the sprite pool
+	Option	PlotSpritesFromPalette, false			; Use palette entries, not translation table
+                                            			; (this means funny paletted sprites plot
+                                            			; better in 16bpp+ modes)
+	Option	ShrinkableAreas, 	false:LAND:Medusa 	; Support shrinkable dynamic areas
+								; (remove multiple memory change messages)
+	Option	UseAMBControl,		false			; delegate task memory management to OS_AMBControl
+	Option	StrongARM,		false
+	Option	FPE4,			false			; assume FPE 4.00 or later present
+
+	ASSERT	International_Help = 0
+
+        END

Options/s/RO350

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Wimp options for a RISC OS 3.50 build of the Window Manager
+;
+
+	Option	Stork,			false			; try saving power by calling Portable_Idle
+
+	Option	PlotSpritesFromPalette, false			; Use palette entries, not translation table
+                                            			; (this means funny paletted sprites plot
+                                            			; better in 16bpp+ modes)
+	Option	UseAMBControl,		false			; delegate task memory management to OS_AMBControl
+	Option	StrongARM,		false
+
+	ASSERT	International_Help = 0
+
+        END

Options/s/RO360

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Wimp options for a RISC OS 3.60 build of the Window Manager
+;
+
+	Option	UseAMBControl,		false			; delegate task memory management to OS_AMBControl
+	Option	StrongARM,		false
+
+	ASSERT	International_Help <> 0
+
+        END

Options/s/RO370

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Wimp options for a RISC OS 3.7x build of the Window Manager
+;
+
+ 	ASSERT	International_Help <> 0
+
+        END

Options/s/Ursula

+; Copyright 1997 Acorn Computers Ltd
+;
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+;     http://www.apache.org/licenses/LICENSE-2.0
+;
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
+;
+; Wimp options for an Ursula build of the Window Manager
+;
+
+	Option	IconiseButton,		true			; Windows given iconise button
+	Option	ChocolateScreen,	true			; Clean cached screen after redraw loops
+
+ 	ASSERT	International_Help <> 0
+
+        END