Move Pixmap functionality into its own module

core.d

@@ -181,6 +181,17 @@ version(Posix) {
 	=========================
 +/
 
+/++
+	Casts value `v` to type `T`.
+
+	$(TIP
+		This is a helper function for readability purposes.
+	)
+ +/
+auto ref T typeCast(T, S)(auto ref S v) {
+	return cast(T) v;
+}
+
 // enum stringz : const(char)* { init = null }
 
 /++

dub.json

@@ -681,13 +681,27 @@
 				"arsd-official:color_base":"*"
 			}
 		},
+		{
+			"name": "pixmappaint",
+			"description": "2D drawing companion library of Pixmap Presenter.",
+			"targetType": "library",
+			"sourceFiles": ["pixmappaint.d"],
+			"dependencies": {
+				"arsd-official:color_base":"*",
+				"arsd-official:core":"*"
+			},
+			"dflags-dmd": ["-mv=arsd.pixmappaint=$PACKAGE_DIR/pixmappaint.d"],
+			"dflags-ldc": ["--mv=arsd.pixmappaint=$PACKAGE_DIR/pixmappaint.d"],
+			"dflags-gdc": ["-fmodule-file=arsd.pixmappaint=$PACKAGE_DIR/pixmappaint.d"]
+		},
 		{
 			"name": "pixmappresenter",
 			"description": "High-level display library. Designed to blit fully-rendered frames to the screen.",
 			"targetType": "library",
 			"sourceFiles": ["pixmappresenter.d"],
 			"dependencies": {
-				"arsd-official:color_base":"*",
+				"arsd-official:core":"*",
+				"arsd-official:pixmappaint":"*",
 				"arsd-official:simpledisplay":"*"
 			},
 			"dflags-dmd": ["-mv=arsd.pixmappresenter=$PACKAGE_DIR/pixmappresenter.d"],

pixmappaint.d

@@ -0,0 +1,122 @@
+/+
+	== pixmappaint ==
+	Copyright Elias Batek (0xEAB) 2024.
+	Distributed under the Boost Software License, Version 1.0.
+ +/
+module arsd.pixmappaint;
+
+import arsd.color;
+import arsd.core;
+
+///
+alias Pixel = Color;
+
+///
+alias ColorF = arsd.color.ColorF;
+
+///
+alias Size = arsd.color.Size;
+
+///
+alias Point = arsd.color.Point;
+
+// verify assumption(s)
+static assert(Pixel.sizeof == uint.sizeof);
+
+@safe pure nothrow @nogc {
+	///
+	Pixel rgba(ubyte r, ubyte g, ubyte b, ubyte a = 0xFF) {
+		return Pixel(r, g, b, a);
+	}
+
+	///
+	Pixel rgb(ubyte r, ubyte g, ubyte b) {
+		return rgba(r, g, b, 0xFF);
+	}
+}
+
+/++
+	Pixel data container
+ +/
+struct Pixmap {
+
+	/// Pixel data
+	Pixel[] data;
+
+	/// Pixel per row
+	int width;
+
+@safe pure nothrow:
+
+	///
+	this(Size size) {
+		this.size = size;
+	}
+
+	///
+	this(Pixel[] data, int width) @nogc
+	in (data.length % width == 0) {
+		this.data = data;
+		this.width = width;
+	}
+
+	// undocumented: really shouldn’t be used.
+	// carries the risks of `length` and `width` getting out of sync accidentally.
+	deprecated("Use `size` instead.")
+	void length(int value) {
+		data.length = value;
+	}
+
+	/++
+		Changes the size of the buffer
+
+		Reallocates the underlying pixel array.
+	 +/
+	void size(Size value) {
+		data.length = value.area;
+		width = value.width;
+	}
+
+	/// ditto
+	void size(int totalPixels, int width)
+	in (totalPixels % width == 0) {
+		data.length = totalPixels;
+		this.width = width;
+	}
+
+@safe pure nothrow @nogc:
+
+	/// Height of the buffer, i.e. the number of lines
+	int height() inout {
+		if (width == 0) {
+			return 0;
+		}
+
+		return typeCast!int(data.length / width);
+	}
+
+	/// Rectangular size of the buffer
+	Size size() inout {
+		return Size(width, height);
+	}
+
+	/// Length of the buffer, i.e. the number of pixels
+	int length() inout {
+		return typeCast!int(data.length);
+	}
+
+	/++
+		Number of bytes per line
+
+		Returns:
+			width × Pixel.sizeof
+	 +/
+	int pitch() inout {
+		return (width * int(Pixel.sizeof));
+	}
+
+	/// Clears the buffer’s contents (by setting each pixel to the same color)
+	void clear(Pixel value) {
+		data[] = value;
+	}
+}

pixmappresenter.d

@@ -157,9 +157,12 @@
  +/
 module arsd.pixmappresenter;
 
-import arsd.color;
+import arsd.core;
 import arsd.simpledisplay;
 
+///
+public import arsd.pixmappaint;
+
 /*
 	## TODO
 
@@ -176,129 +179,14 @@ import arsd.simpledisplay;
  */
 
 ///
-alias Pixel = Color;
+alias Pixmap = arsd.pixmappaint.Pixmap;
-
-///
-alias ColorF = arsd.color.ColorF;
-
-///
-alias Size = arsd.color.Size;
-
-///
-alias Point = arsd.color.Point;
 
 ///
 alias WindowResizedCallback = void delegate(Size);
 
-// verify assumption(s)
-static assert(Pixel.sizeof == uint.sizeof);
-
 // is the Timer class available on this platform?
 private enum hasTimer = is(Timer == class);
 
-/// casts value `v` to type `T`
-auto ref T typeCast(T, S)(auto ref S v) {
-	return cast(T) v;
-}
-
-@safe pure nothrow @nogc {
-	///
-	Pixel rgba(ubyte r, ubyte g, ubyte b, ubyte a = 0xFF) {
-		return Pixel(r, g, b, a);
-	}
-
-	///
-	Pixel rgb(ubyte r, ubyte g, ubyte b) {
-		return rgba(r, g, b, 0xFF);
-	}
-}
-
-/++
-	Pixel data container
- +/
-struct Pixmap {
-
-	/// Pixel data
-	Pixel[] data;
-
-	/// Pixel per row
-	int width;
-
-@safe pure nothrow:
-
-	///
-	this(Size size) {
-		this.size = size;
-	}
-
-	///
-	this(Pixel[] data, int width) @nogc
-	in (data.length % width == 0) {
-		this.data = data;
-		this.width = width;
-	}
-
-	// undocumented: really shouldn’t be used.
-	// carries the risks of `length` and `width` getting out of sync accidentally.
-	deprecated("Use `size` instead.")
-	void length(int value) {
-		data.length = value;
-	}
-
-	/++
-		Changes the size of the buffer
-
-		Reallocates the underlying pixel array.
-	 +/
-	void size(Size value) {
-		data.length = value.area;
-		width = value.width;
-	}
-
-	/// ditto
-	void size(int totalPixels, int width)
-	in (totalPixels % width == 0) {
-		data.length = totalPixels;
-		this.width = width;
-	}
-
-@safe pure nothrow @nogc:
-
-	/// Height of the buffer, i.e. the number of lines
-	int height() inout {
-		if (width == 0) {
-			return 0;
-		}
-
-		return typeCast!int(data.length / width);
-	}
-
-	/// Rectangular size of the buffer
-	Size size() inout {
-		return Size(width, height);
-	}
-
-	/// Length of the buffer, i.e. the number of pixels
-	int length() inout {
-		return typeCast!int(data.length);
-	}
-
-	/++
-		Number of bytes per line
-
-		Returns:
-			width × Pixel.sizeof
-	 +/
-	int pitch() inout {
-		return (width * int(Pixel.sizeof));
-	}
-
-	/// Clears the buffer’s contents (by setting each pixel to the same color)
-	void clear(Pixel value) {
-		data[] = value;
-	}
-}
-
 // viewport math
 private @safe pure nothrow @nogc {