chore: added .dir-locals.el

.clang-format

@@ -0,0 +1,204 @@
+---
+BasedOnStyle: Microsoft
+AccessModifierOffset: -4
+AlignAfterOpenBracket: DontAlign
+AlignArrayOfStructures: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignConsecutiveMacros: None
+AlignEscapedNewlines: Right
+AlignOperands: DontAlign
+AlignTrailingComments:
+  Kind: Always
+  OverEmptyLines: 0
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+AttributeMacros:
+  - __capability
+BinPackArguments: true
+BinPackParameters: true
+BitFieldColonSpacing: Both
+BreakAfterAttributes: Never
+BreakAfterJavaFieldAnnotations: false
+BreakArrays: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  BeforeLambdaBody: false
+  BeforeWhile: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeConceptDeclarations: Always
+BreakBeforeInlineASMColon: OnlyMultiline
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit: 0
+CommentPragmas: "^ IWYU pragma:"
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat: false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: ^"(llvm|llvm-c|clang|clang-c)/
+    Priority: 2
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: ^(<|"(gtest|gmock|isl|json)/)
+    Priority: 3
+    SortPriority: 0
+    CaseSensitive: false
+  - Regex: .*
+    Priority: 1
+    SortPriority: 0
+    CaseSensitive: false
+IncludeIsMainRegex: (Test)?$
+IncludeIsMainSourceRegex: ""
+IndentAccessModifiers: false
+IndentCaseBlocks: false
+IndentCaseLabels: false
+IndentExternBlock: AfterExternBlock
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentRequiresClause: true
+IndentWidth: 4
+IndentWrappedFunctionNames: false
+InsertBraces: true
+InsertNewlineAtEOF: true
+InsertTrailingCommas: None
+IntegerLiteralSeparator:
+  Binary: 0
+  BinaryMinDigits: 0
+  Decimal: 0
+  DecimalMinDigits: 0
+  Hex: 0
+  HexMinDigits: 0
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+LambdaBodyIndentation: Signature
+Language: Cpp
+LineEnding: DeriveLF
+MacroBlockBegin: ""
+MacroBlockEnd: ""
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PPIndentWidth: -1
+PackConstructorInitializers: BinPack
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyIndentedWhitespace: 0
+PenaltyReturnTypeOnItsOwnLine: 1000
+PointerAlignment: Right
+QualifierAlignment: Leave
+ReferenceAlignment: Pointer
+ReflowComments: true
+RemoveBracesLLVM: false
+RemoveSemicolon: false
+RequiresClausePosition: OwnLine
+RequiresExpressionIndentation: OuterScope
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes: CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: LexicographicNumeric
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: Never
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: true
+  AfterFunctionDeclarationName: false
+  AfterFunctionDefinitionName: false
+  AfterIfMacros: false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceBeforeSquareBrackets: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: Never
+SpacesInCStyleCastParentheses: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInLineCommentPrefix:
+  Minimum: 1
+  Maximum: -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Latest
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth: 4
+UseTab: Always
+WhitespaceSensitiveMacros:
+  - BOOST_PP_STRINGIZE
+  - CF_SWIFT_NAME
+  - NS_SWIFT_NAME
+  - PP_STRINGIZE
+  - STRINGIZE
+UseCRLF: false

.clangd

@@ -1,2 +1,2 @@
 CompileFlags:
-  Add: [ -Wall, --std=c23, -xc, -Ivendor/ ]
+  Add: [ -Wall, --std=c++23, -xc++, -Ivendor/ ]

.dir-locals.el

@@ -0,0 +1,4 @@
+((nil
+  (indent-tabs-mode . t)
+  (tab-width . 4)
+  (lsp-enable-on-type-formatting nil)))

justfile

@@ -1,6 +1,6 @@
 build:
 	# BUILDING
-	make
+	bear -- make
 
 run:
 	bin/DiceGui

premake5.lua

@@ -4,15 +4,18 @@ workspace "DiceGui"
 
 project "Dice"
   kind "ConsoleApp"
-  language "C"
-  cdialect "c23"
+  language "C++"
+  cppdialect "c++23"
   location "build/"
-  files { "src/**.c" }
+  files { "src/**.cpp", "src/**.c" }
   includedirs { "include/" }
   links { "m", "stdc++", "SDL3", "SDL3_ttf", "SDL3_image" }
   buildoptions { "-Wall" }
   targetdir "bin/"
-  postbuildcommands { "{RMDIR} %{cfg.targetdir}/assets", "{COPYDIR} %{wks.location}/assets/ %{cfg.targetdir}/assets/" }
+  postbuildcommands {
+    "{RMDIR} %{cfg.targetdir}/assets",
+    "{COPYDIR} %{wks.location}/assets/ %{cfg.targetdir}/assets/"
+  }
   filter "configurations:debug"
     defines { "DEBUG" }
     symbols "On"

src/application.c

@@ -1,47 +0,0 @@
-#include "application.h"
-#include "dice_container.h"
-#include "style.h"
-#include <SDL3/SDL.h>
-#include <clay/clay.h>
-
-static inline
-void DiceLogContainer() {
-	CLAY(CLAY_ID("LogContainer"), {
-		.layout = {
-			.sizing = layoutExpand,
-			.padding = CLAY_PADDING_ALL(16),
-		},
-		.PANEL(0),
-	}) {}
-}
-
-static inline
-void InitiativeListContainer() {
-	CLAY(CLAY_ID("InitiativeListContainer"), {
-		.layout = {
-			.sizing = layoutExpand,
-			.padding = CLAY_PADDING_ALL(16),
-		},
-		.PANEL(0)
-	}) {}
-}
-
-Clay_RenderCommandArray RenderApplication() {
-	Clay_BeginLayout();
-	CLAY(CLAY_ID("OuterContainer"), WindowStyle()) {
-		DiceContainer();
-		CLAY(CLAY_ID("LowerSplitContainer"), {
-			.layout = {
-				.sizing = layoutExpand,
-				.childGap = containerGap
-			},
-		}) {
-			DiceLogContainer();
-			InitiativeListContainer();
-		}
-	}
-	return Clay_EndLayout();
-}
-
-void HandleEvent(SDL_Event event) {
-}

src/application.cpp

@@ -0,0 +1,16 @@
+#include "application.h"
+#include "dice_container.h"
+#include "style.h"
+#include <SDL3/SDL.h>
+#include <clay/clay.h>
+
+Clay_RenderCommandArray RenderApplication() {
+	Clay_BeginLayout();
+	CLAY(CLAY_ID("OuterContainer"), WindowStyle()) {
+		DiceContainer();
+	}
+	return Clay_EndLayout();
+}
+
+void HandleEvent(SDL_Event event) {
+}

src/dice.cpp

@@ -1,14 +1,10 @@
 #include "dice.h"
 #include <memory.h>
 
-static int activeDiceCount = 0;
+static size_t activeDiceCount = 0;
 static enum Dice_Die activeDice[MAX_ACTIVE_DICE];
 
 static struct Dice_ResultType rollResult[MAX_ACTIVE_DICE];
-static struct Dice_ResultType rollTotal = {
-	.string = "0",
-	.roll = 0, .string_len = 1,
-};
 
 int Dice_Roll(enum Dice_Die die) {
 	if (die == COIN) {
@@ -23,16 +19,7 @@ static
 struct Dice_ResultType Dice_RollToResultType(int roll, enum Dice_Die die) {
 	struct Dice_ResultType result = { };
 	result.roll = roll;
-	if (die == COIN) {
-		result.string_len = SDL_snprintf(result.string, MAX_ROLL_STR_LEN, roll == 1 ? "H" : "T");
-	} else {
-		result.string_len = SDL_snprintf(result.string, MAX_ROLL_STR_LEN, "%d", roll);
-	}
-	result.clay_string = (Clay_String) {
-		.chars = result.string,
-		.length = result.string_len,
-		.isStaticallyAllocated = false
-	};
+	result.die = die;
 	return result;
 }
 
@@ -49,34 +36,26 @@ size_t Dice_AddToActiveSet(enum Dice_Die die) {
 	}
 	activeDice[activeDiceCount] = die;
 	rollResult[activeDiceCount] = Dice_RollToResultType(die, die);
-	rollTotal.roll += die;
-	rollTotal = Dice_RollToResultType(rollTotal.roll, 0);
 	return activeDiceCount++;
 }
 
 void Dice_RemoveFromActiveSet(size_t index) {
 	if (index >= MAX_ACTIVE_DICE) {
 		return;
+	} else for (size_t i = index; i < activeDiceCount; ++i) {
+		rollResult[i] = rollResult[i+1];
 	}
-	rollTotal.roll -= rollResult[index].roll;
-	rollTotal = Dice_RollToResultType(rollTotal.roll, 0);
-	memcpy(activeDice + index, activeDice + index + 1, MAX_ACTIVE_DICE - index - 1);
 	--activeDiceCount;
 }
 
 void Dice_ClearActiveSet() {
-	rollTotal.roll = 0;
-	rollTotal = Dice_RollToResultType(rollTotal.roll, 0);
 	activeDiceCount = 0;
 }
 
 void Dice_RollActiveSet() {
-	int total = 0;
 	for (size_t i = 0; i < activeDiceCount; ++i) {
 		rollResult[i] = Dice_RollToResultType(Dice_Roll(activeDice[i]), activeDice[i]);
-		total += rollResult[i].roll;
 	}
-	rollTotal = Dice_RollToResultType(total, 0);
 }
 
 struct Dice_ResultType *Dice_GetLastResult(size_t *out_length) {
@@ -86,17 +65,17 @@ struct Dice_ResultType *Dice_GetLastResult(size_t *out_length) {
 	return rollResult;
 }
 
-struct Dice_ResultType *Dice_GetLastResultTotal() {
-	rollTotal.clay_string = (Clay_String) {
-		.chars = rollTotal.string,
-		.length = rollTotal.string_len,
-		.isStaticallyAllocated = false
-	};
-	return &rollTotal;
+int Dice_GetLastResultTotal() {
+	int result = 0;
+	for (size_t i = 0; i < activeDiceCount; ++i) {
+		result += rollResult[i].roll;
+	}
+	return result;
 }
 
 Clay_String Dice_ToString(enum Dice_Die die) {
 	switch (die) {
+		case NONE: return CLAY_STRING("N/A");
 		case COIN: return CLAY_STRING("C");
 		case D4: return CLAY_STRING("4");
 		case D6: return CLAY_STRING("6");
@@ -106,4 +85,19 @@ Clay_String Dice_ToString(enum Dice_Die die) {
 		case D20: return CLAY_STRING("20");
 		case D100: return CLAY_STRING("100");
 	}
+	return CLAY_STRING("INVALID");
+}
+
+Clay_String Dice_ResultToString(Dice_ResultType const &result) {
+	static char chars[MAX_ROLL_STR_LEN];
+	Clay_String string = {
+		false, 0, chars,
+	};
+	if (result.die == COIN) {
+		string.length = SDL_snprintf(chars, MAX_ROLL_STR_LEN, result.roll == 1 ? "H" : "T");
+	} else {
+		string.length = SDL_snprintf(chars, MAX_ROLL_STR_LEN, "%d", result.roll);
+	}
+	string.chars = chars;
+	return string;
 }

src/dice.h

@@ -5,6 +5,7 @@
 #include <stdlib.h>
 
 enum Dice_Die {
+	NONE,
 	COIN = 1,
 	D4 = 4,
 	D6 = 6,
@@ -20,9 +21,7 @@ enum Dice_Die {
 #endif
 struct Dice_ResultType {
 	int roll;
-	size_t string_len;
-	char string[MAX_ROLL_STR_LEN];
-	Clay_String clay_string;
+	enum Dice_Die die;
 };
 
 #ifndef MAX_ACTIVE_DICE
@@ -32,15 +31,17 @@ struct Dice_ResultType {
 extern int Dice_Roll(enum Dice_Die die);
 
 extern enum Dice_Die const *Dice_GetActiveSet(size_t *out_length);
-extern size_t Dice_AddToActiveSet(enum Dice_Die die);
+extern size_t Dice_AddToActiveSet(Dice_Die die);
 extern void Dice_RemoveFromActiveSet(size_t index);
 extern void Dice_ClearActiveSet();
+extern Clay_String Dice_RollToString(Dice_ResultType &type);
 
 extern struct Dice_ResultType *Dice_GetLastResult(size_t *out_length);
-extern struct Dice_ResultType *Dice_GetLastResultTotal();
+extern int Dice_GetLastResultTotal();
 
 extern void Dice_RollActiveSet();
 
 extern Clay_String Dice_ToString(enum Dice_Die die);
+extern Clay_String Dice_ResultToString(Dice_ResultType const &result);
 
 #endif // !DICE_H

src/dice_container.c

@@ -1,174 +0,0 @@
-#include "dice_container.h"
-#include <SDL3/SDL_mouse.h>
-#include <SDL3_image/SDL_image.h>
-#include <clay/clay.h>
-#include <stdint.h>
-#include "elements.h"
-#include "style.h"
-#include "dice.h"
-
-static
-void HandleRollSetButtonInteraction(Clay_ElementId element, Clay_PointerData pointer, intptr_t data) {
-	if (pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
-		Dice_RollActiveSet();
-	}
-}
-
-static
-void HandleClearSetButtonInteraction(Clay_ElementId element, Clay_PointerData pointer, intptr_t data) {
-	if (pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
-		Dice_ClearActiveSet();
-	}
-}
-
-static
-void HandleAddDieButtonInteraction(Clay_ElementId element, Clay_PointerData pointer, intptr_t die) {
-	if (pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
-		Dice_AddToActiveSet((enum Dice_Die)die);
-	}
-}
-
-static inline
-void AddDieButton(enum Dice_Die die) {
-	CLAY(CLAY_IDI("AddDieButton", die), {
-		.layout = {
-			.sizing = { CLAY_SIZING_FIXED(100), CLAY_SIZING_FIXED(100) },
-			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-		},
-		.image = { GetDiceImage(die, Clay_Hovered()) },
-		.border = {
-			PanelBorder(0),
-			CLAY_BORDER_ALL(1),
-		}
-	}) {
-		Clay_OnHover(&HandleAddDieButtonInteraction, die);
-		CLAY_TEXT(Dice_ToString(die), CLAY_TEXT_CONFIG({
-			.H(2),
-			.textColor = TextColors(0),
-			.textAlignment = CLAY_TEXT_ALIGN_CENTER,
-		}));
-	}
-}
-
-static inline
-void DiceSelectorContainer() {
-	CLAY(CLAY_ID("DiceSelector"), {
-		.PANEL(0),
-		.layout = {
-			.sizing = { CLAY_SIZING_FIT(), CLAY_SIZING_GROW() },
-			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-		},
-	}) {
-		CLAY(CLAY_ID("DiceSelectorInner"), {
-			.layout = {
-				.layoutDirection = CLAY_TOP_TO_BOTTOM,
-				.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-				.sizing = { CLAY_SIZING_FIT(), CLAY_SIZING_FIT() },
-				.padding = { 2, 2, 5, 5 },
-			},
-			.clip = {
-				true, true, Clay_GetScrollOffset(),
-			},
-		}) {
-			AddDieButton(D4);
-			AddDieButton(D6);
-			AddDieButton(D8);
-			AddDieButton(D10);
-			AddDieButton(D12);
-			AddDieButton(D20);
-			AddDieButton(D100);
-			AddDieButton(COIN);
-		}
-	}
-}
-
-static
-void HandleRemoveDieButtonInteraction(Clay_ElementId element, Clay_PointerData pointer, intptr_t index) {
-	if (pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
-		Dice_RemoveFromActiveSet(index);
-	}
-}
-
-static inline
-void RemoveDieButton(enum Dice_Die die, int index) {
-	CLAY(CLAY_IDI("RemoveDieButton", index), {
-		.layout = {
-			.sizing = { CLAY_SIZING_FIXED(200), CLAY_SIZING_FIXED(200) },
-			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-		},
-		.image = { GetDiceImage(die, Clay_Hovered()) },
-	}) {
-		size_t result_length;
-		struct Dice_ResultType const *result = Dice_GetLastResult(&result_length);
-		Clay_String string = {
-			.chars = result[index].string,
-			.length = result[index].string_len,
-			.isStaticallyAllocated = true
-		};
-		Clay_OnHover(&HandleRemoveDieButtonInteraction, index);
-		CLAY_TEXT(string, CLAY_TEXT_CONFIG({
-			.H(1),
-			.textColor = TextColors(0),
-			.textAlignment = CLAY_TEXT_ALIGN_CENTER,
-		}));
-	}
-}
-
-static inline
-void ActiveDiceContainer() {
-	CLAY(CLAY_ID("ActiveDice"), {
-		.layout = {
-			.layoutDirection = CLAY_TOP_TO_BOTTOM,
-			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-			.sizing = { CLAY_SIZING_GROW(), CLAY_SIZING_GROW() },
-		},
-		.PANEL(0),
-	}) {
-		CLAY(CLAY_ID("ActiveDiceInner"), {
-			.layout = {
-				.sizing = { CLAY_SIZING_FIT(), CLAY_SIZING_GROW() },
-				.layoutDirection = CLAY_LEFT_TO_RIGHT,
-				.childAlignment = { CLAY_ALIGN_X_LEFT, CLAY_ALIGN_Y_CENTER },
-				.childGap = 16,
-				.padding = { 100, 100, 0, 0 },
-			},
-			.clip = {
-				true, true, { Clay_GetScrollOffset().x, 0 }
-			}
-		}) {
-			size_t dice_count = 0;
-			enum Dice_Die const *dice = Dice_GetActiveSet(&dice_count);
-			for (size_t i = 0; i < dice_count; ++i) {
-				RemoveDieButton(dice[i], i);
-			}
-		}
-		CLAY(CLAY_ID("ActiveDiceControls"), {
-			.layout = {
-				.layoutDirection = CLAY_LEFT_TO_RIGHT,
-				.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
-				.childGap = 20,
-				.padding = { 0, 0, 0, 10 },
-			},
-		}) {
-			TextButton(CLAY_STRING("Roll"), proceedButton, &HandleRollSetButtonInteraction, 0);
-			CLAY_TEXT(Dice_GetLastResultTotal()->clay_string, CLAY_TEXT_CONFIG({
-				.H(3),
-				.textColor = TextColors(0),
-			}));
-			TextButton(CLAY_STRING("Clear"), warningButton, &HandleClearSetButtonInteraction, 0);
-		}
-	}
-}
-
-void DiceContainer() {
-	CLAY(CLAY_ID("DiceContainer"), {
-		.layout = {
-			.layoutDirection = CLAY_LEFT_TO_RIGHT,
-			.sizing = { CLAY_SIZING_GROW(), CLAY_SIZING_PERCENT(0.4) },
-			.childGap = containerGap
-		},
-	}) {
-		DiceSelectorContainer();
-		ActiveDiceContainer();
-	}
-}

src/dice_container.cpp

@@ -0,0 +1,161 @@
+#include "dice_container.h"
+#include "dice.h"
+#include "elements.h"
+#include "style.h"
+#include "ui_data.h"
+#include <SDL3/SDL_mouse.h>
+#include <SDL3_image/SDL_image.h>
+#include <clay/clay.h>
+#include <stdint.h>
+
+static void HandleRollSetButtonInteraction(Clay_ElementId element,
+	Clay_PointerData pointer,
+	intptr_t data) {
+	if(pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
+		Dice_RollActiveSet();
+	}
+}
+
+static void HandleClearSetButtonInteraction(Clay_ElementId element,
+	Clay_PointerData pointer,
+	intptr_t data) {
+	if(pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
+		Dice_ClearActiveSet();
+	}
+}
+
+static void HandleAddDieButtonInteraction(Clay_ElementId element,
+	Clay_PointerData pointer,
+	intptr_t die) {
+	if(pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
+		Dice_AddToActiveSet((enum Dice_Die)die);
+	}
+}
+
+static inline void AddDieButton(enum Dice_Die die) {
+	CLAY(CLAY_IDI("AddDieButton", die), {
+		.layout = {
+			.sizing = {CLAY_SIZING_FIXED(100), CLAY_SIZING_FIXED(100)},
+			.childAlignment = {CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER},
+		},
+		.image = {GetDiceImage(die, Clay_Hovered())},
+	}) {
+		Clay_OnHover(&HandleAddDieButtonInteraction, die);
+		CLAY_TEXT(Dice_ToString(die), CLAY_TEXT_CONFIG(Header(2, {.textColor = TextColors(0), .textAlignment = CLAY_TEXT_ALIGN_CENTER})));
+	}
+}
+
+static inline void DiceSelectorContainer() {
+	CLAY(CLAY_ID("DiceSelector"),
+		PanelContainer(0, (Clay_ElementDeclaration){
+			.layout = {
+				.sizing = {CLAY_SIZING_FIT(), CLAY_SIZING_GROW()}
+			}}
+		)) {
+		CLAY_AUTO_ID(ListContainer(0, {
+			.layout = {
+					.sizing = {CLAY_SIZING_GROW(), CLAY_SIZING_GROW()},
+					.padding = {2, 2, 5, 5},
+					.childAlignment = {CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_TOP},
+					.layoutDirection = CLAY_TOP_TO_BOTTOM,
+			},
+			.clip = {
+					false,
+					true,
+					Clay_GetScrollOffset(),
+				},
+		})) {
+			AddDieButton(D4);
+			AddDieButton(D6);
+			AddDieButton(D8);
+			AddDieButton(D10);
+			AddDieButton(D12);
+			AddDieButton(D20);
+			AddDieButton(D100);
+			AddDieButton(COIN);
+		}
+	}
+}
+
+static void HandleRemoveDieButtonInteraction(Clay_ElementId element,
+	Clay_PointerData pointer,
+	intptr_t index) {
+	if(pointer.state == CLAY_POINTER_DATA_PRESSED_THIS_FRAME) {
+		Dice_RemoveFromActiveSet((size_t)index);
+	}
+}
+
+static inline void RemoveDieButton(enum Dice_Die die, size_t index) {
+	CLAY(CLAY_IDI("RemoveDieButton", index), {
+		.layout = {
+				.sizing = {CLAY_SIZING_FIXED(200), CLAY_SIZING_FIXED(200)},
+				.childAlignment = {CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER},
+		},
+		.image = {GetDiceImage(die, Clay_Hovered())},
+	}) {
+		Clay_OnHover(&HandleRemoveDieButtonInteraction, (intptr_t)index);
+		size_t result_length;
+		struct Dice_ResultType const *result = Dice_GetLastResult(&result_length);
+		CLAY_TEXT(
+			UiData_StoreClayStr(Dice_ResultToString(result[index])),
+			CLAY_TEXT_CONFIG(Header(1, {
+				.textColor = TextColors(0),
+				.textAlignment = CLAY_TEXT_ALIGN_CENTER,
+			})));
+	}
+}
+
+static inline void ActiveDiceContainer() {
+	CLAY(CLAY_ID("ActiveDice"), PanelContainer(0, {
+		.layout = {
+			.sizing = {CLAY_SIZING_GROW(), CLAY_SIZING_GROW()},
+			.childAlignment = {CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER},
+			.layoutDirection = CLAY_TOP_TO_BOTTOM,
+		},
+	})) {
+		CLAY(CLAY_ID("ActiveDiceInner"), {
+			.layout = {
+				.sizing = {CLAY_SIZING_FIT(), CLAY_SIZING_GROW()},
+				.padding = {100, 100, 0, 0},
+				.childGap = 16,
+				.childAlignment = {CLAY_ALIGN_X_LEFT, CLAY_ALIGN_Y_CENTER},
+				.layoutDirection = CLAY_LEFT_TO_RIGHT,
+			},
+			.clip = { true, true, {Clay_GetScrollOffset().x, 0}}}
+		) {
+			size_t dice_count = 0;
+			enum Dice_Die const *dice = Dice_GetActiveSet(&dice_count);
+			for(size_t i = 0; i < dice_count; ++i) {
+				RemoveDieButton(dice[i], i);
+			}
+		}
+		CLAY(CLAY_ID("ActiveDiceControls"), {
+			.layout = {
+				.padding = {0, 0, 0, 10},
+				.childGap = 20,
+				.childAlignment = {CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER},
+				.layoutDirection = CLAY_LEFT_TO_RIGHT,
+			},
+		}) {
+			TextButton(CLAY_STRING("Roll"), proceedButton, &HandleRollSetButtonInteraction, 0);
+			int result = Dice_GetLastResultTotal();
+			CLAY_TEXT(UiData_StoreClayStr(Dice_ResultToString({result, NONE})), CLAY_TEXT_CONFIG(Header(1, {
+				.textColor = TextColors(0)
+			})));
+			TextButton(CLAY_STRING("Clear"), warningButton, &HandleClearSetButtonInteraction, 0);
+		}
+	}
+}
+
+void DiceContainer() {
+	CLAY(CLAY_ID("DiceContainer"), {
+		.layout = {
+			.sizing = {CLAY_SIZING_GROW(), CLAY_SIZING_GROW()},
+			.childGap = containerGap,
+			.layoutDirection = CLAY_LEFT_TO_RIGHT,
+		}
+	}) {
+		DiceSelectorContainer();
+		ActiveDiceContainer();
+	}
+}

src/elements.cpp

@@ -5,18 +5,17 @@ void TextButton(Clay_String text, Clay_Color color, OnHoveredFn onHovered, intpt
 	Clay_Color hovered = ToHoveredColor(color);
 	CLAY_AUTO_ID({
 		.layout = {
-			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
 			.padding = buttonPadding,
+			.childAlignment = { CLAY_ALIGN_X_CENTER, CLAY_ALIGN_Y_CENTER },
 		},
-		.cornerRadius = buttonRadii,
 		.backgroundColor = Clay_Hovered() ? hovered : color,
-		.border = { ToHoveredColor(Clay_Hovered() ? hovered : color), CLAY_BORDER_ALL(1) }
+		.cornerRadius = buttonRadii,
+		.border = { ToHoveredColor(Clay_Hovered() ? hovered : color), CLAY_BORDER_ALL(1) },
 	}) {
-		CLAY_TEXT(text, CLAY_TEXT_CONFIG({
-			.BODY(),
+		CLAY_TEXT(text, CLAY_TEXT_CONFIG(BodyText({
 			.textColor = TextColors(0),
 			.textAlignment = CLAY_TEXT_ALIGN_CENTER,
-		}));
+		})));
 		Clay_OnHover(onHovered, onHoveredData);
 	}
 }

src/main.cpp

@@ -1,13 +1,13 @@
+#include "renderer/clay_renderer_SDL3.h"
 #include <SDL3/SDL_hints.h>
 #include <SDL3/SDL_keycode.h>
 #include <SDL3/SDL_oldnames.h>
 #include <clay/clay.h>
-#include "renderer/clay_renderer_SDL3.h"
 
 #include "application.h"
 #include "defs.h"
-#include "style.h"
 #include "resources.h"
+#include "ui_data.h"
 
 #define SDL_MAIN_HANDLED
 #include <SDL3/SDL.h>
@@ -20,86 +20,84 @@
 #include <SDL3/SDL_video.h>
 #include <SDL3_ttf/SDL_ttf.h>
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <stdbool.h>
 #include <stdlib.h>
 
 constexpr SDL_InitFlags sdlInitFlags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIGH_PIXEL_DENSITY;
 
 SDL_Window *window = nullptr;
 SDL_Renderer *renderer = nullptr;
-int screenWidth = 1920, screenHeight = 1080;
 bool running = true;
 uint64_t clayMemorySize = 0;
 
 Clay_Arena clayPrimaryArena;
 
-Clay_SDL3RendererData backendData = {
-	.renderer = nullptr,
-	.fonts = nullptr,
-	.textEngine = nullptr
-};
+Clay_SDL3RendererData backendData = {nullptr, nullptr, nullptr};
 
-static inline
-void LogOutputResolution() {
+static inline void LogOutputResolution() {
 	int w, h;
 	SDL_GetCurrentRenderOutputSize(renderer, &w, &h);
 	SDL_Log("output size: %i, %d", w, h);
 }
 
-static
-Clay_Dimensions MeasureText(Clay_StringSlice text, Clay_TextElementConfig *config, void *userData) {
-	TTF_Font **fonts = userData;
+static Clay_Dimensions MeasureText(Clay_StringSlice text, Clay_TextElementConfig *config, void *userData) {
+	TTF_Font **fonts = (TTF_Font **)userData;
 	TTF_Font *font = fonts[config->fontId];
 	int width, height;
 	TTF_SetFontSize(font, config->fontSize);
-	if (!TTF_GetStringSize(font, text.chars, text.length, &width, &height)) {
+	if(!TTF_GetStringSize(font, text.chars, text.length, &width, &height)) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "MeasureText failed to measure text %s", SDL_GetError());
 	}
-	return (Clay_Dimensions) { width, height };
+	return (Clay_Dimensions){(float)width, (float)height};
 }
 
-static
-void HandleClayErrors(Clay_ErrorData data) {
+static void HandleClayErrors(Clay_ErrorData data) {
 	SDL_LogError(SDL_LOG_CATEGORY_ERROR, "%s", data.errorText.chars);
 }
 
-static inline
-void InitSDL() {
+static inline void InitSDL() {
 	SDL_SetHint(SDL_HINT_RENDER_LINE_METHOD, "3");
-	if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS)) {
+	if(!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS)) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "SDL_Init failed: %s", SDL_GetError());
 		exit(1);
 	}
-	if ((window = SDL_CreateWindow("Window", screenWidth, screenHeight, sdlInitFlags)) == nullptr) {
+	int screenWidth{1920}, screenHeight{1080};
+	if(SDL_DisplayMode const *mode{SDL_GetDesktopDisplayMode(0)}) {
+		screenWidth = mode->w;
+		screenHeight = mode->h;
+	}
+
+	if((window = SDL_CreateWindow("Window", screenWidth, screenHeight, sdlInitFlags)) == nullptr) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "SDL_CreateWindow failed: %s", SDL_GetError());
 		exit(2);
 	}
-	if ((renderer = SDL_CreateRenderer(window, NULL)) == nullptr) {
+	if((renderer = SDL_CreateRenderer(window, NULL)) == nullptr) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "SDL_CreateRenderer failed: %s", SDL_GetError());
 		exit(3);
 	}
-	if (!TTF_Init()) {
+	if(!TTF_Init()) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "TTF_Init failed: %s", SDL_GetError());
 		exit(4);
 	}
-	if ((textEngine = TTF_CreateRendererTextEngine(renderer)) == nullptr) {
+	if((textEngine = TTF_CreateRendererTextEngine(renderer)) == nullptr) {
 		SDL_LogError(SDL_LOG_CATEGORY_ERROR, "TTF_CreateRendererTextEngine failed: %s", SDL_GetError());
 		exit(5);
 	}
 }
 
-static
-void InitClay() {
+static void InitClay() {
 	clayMemorySize = Clay_MinMemorySize();
 	clayPrimaryArena = Clay_CreateArenaWithCapacityAndMemory(clayMemorySize, SDL_malloc(clayMemorySize));
-	Clay_Initialize(clayPrimaryArena, (Clay_Dimensions) { screenWidth, screenHeight }, (Clay_ErrorHandler) { HandleClayErrors });
+	int screenWidth{}, screenHeight{};
+	SDL_GetCurrentRenderOutputSize(renderer, &screenWidth, &screenHeight);
+	Clay_Initialize(clayPrimaryArena, {(float)screenWidth, (float)screenHeight}, {HandleClayErrors});
 	Clay_SetMeasureTextFunction(MeasureText, fonts);
-	Clay_SetLayoutDimensions((Clay_Dimensions) { screenWidth, screenHeight });
+	Clay_SetLayoutDimensions({(float)screenWidth, (float)screenHeight});
 	float x, y;
 	SDL_GetMouseState(&x, &y);
-	Clay_SetPointerState((Clay_Vector2) { x, y }, false);
+	Clay_SetPointerState((Clay_Vector2){x, y}, false);
 }
 
 extern Clay_RenderCommandArray RenderApplication();
@@ -110,57 +108,52 @@ int main(int argc, char *argv[]) {
 	LoadResources();
 	LogOutputResolution();
 	InitClay();
-	backendData = (Clay_SDL3RendererData) {
-		.renderer = renderer,
-		.fonts = fonts,
-		.textEngine = textEngine,
-	};
+	backendData = (Clay_SDL3RendererData){renderer, textEngine, fonts};
 	SDL_Event event;
 	uint64_t startFrameTime = SDL_GetTicksNS();
 	double deltaTime = 0.0;
 	bool mouseButtonDown = false;
 	bool shiftDown = false;
-	while (running) {
+	while(running) {
 		deltaTime = SDL_GetTicksNS() - startFrameTime;
 		startFrameTime = SDL_GetTicksNS();
-		Clay_Vector2 scrollMotion = { 0, 0 };
-		while (SDL_PollEvent(&event)) {
+		Clay_Vector2 scrollMotion = {0, 0};
+		UiData_Clear();
+		while(SDL_PollEvent(&event)) {
 			HandleEvent(event);
-			switch (event.type) {
-				case SDL_EVENT_QUIT:
-					running = false;
-					break;
-				case SDL_EVENT_WINDOW_RESIZED:
-					Clay_SetLayoutDimensions((Clay_Dimensions){
-						event.window.data1,
-						event.window.data2
-					});
-					LogOutputResolution();
-					break;
-				case SDL_EVENT_MOUSE_WHEEL:
-					if (shiftDown) {
-						scrollMotion = (Clay_Vector2) { event.wheel.y * 2.f, -event.wheel.x * 5.f };
-					} else {
-						scrollMotion = (Clay_Vector2) { -event.wheel.x * 2.f, event.wheel.y * 5.f };
-					}
-					break;
-				case SDL_EVENT_MOUSE_MOTION:
-					Clay_SetPointerState((Clay_Vector2) { event.motion.x, event.motion.y }, mouseButtonDown);
-					break;
-				case SDL_EVENT_MOUSE_BUTTON_DOWN:
-				case SDL_EVENT_MOUSE_BUTTON_UP:
-					if (event.button.button == SDL_BUTTON_LEFT) {
-						mouseButtonDown = event.button.down;
-						Clay_SetPointerState((Clay_Vector2) { event.button.x, event.button.y }, mouseButtonDown);
-					}
-					break;
-				case SDL_EVENT_KEY_DOWN:
-				case SDL_EVENT_KEY_UP:
-					if (event.key.key == SDLK_LSHIFT || event.key.key == SDLK_RSHIFT) {
-						shiftDown = event.key.down;
-					}
-					break;
-				default: break;
+			switch(event.type) {
+			case SDL_EVENT_QUIT:
+				running = false;
+				break;
+			case SDL_EVENT_WINDOW_RESIZED:
+				Clay_SetLayoutDimensions({(float)event.window.data1, (float)event.window.data2});
+				LogOutputResolution();
+				break;
+			case SDL_EVENT_MOUSE_WHEEL:
+				if(shiftDown) {
+					scrollMotion = (Clay_Vector2){event.wheel.y * 2.f, -event.wheel.x * 5.f};
+				} else {
+					scrollMotion = (Clay_Vector2){-event.wheel.x * 2.f, event.wheel.y * 5.f};
+				}
+				break;
+			case SDL_EVENT_MOUSE_MOTION:
+				Clay_SetPointerState((Clay_Vector2){event.motion.x, event.motion.y}, mouseButtonDown);
+				break;
+			case SDL_EVENT_MOUSE_BUTTON_DOWN:
+			case SDL_EVENT_MOUSE_BUTTON_UP:
+				if(event.button.button == SDL_BUTTON_LEFT) {
+					mouseButtonDown = event.button.down;
+					Clay_SetPointerState((Clay_Vector2){event.button.x, event.button.y}, mouseButtonDown);
+				}
+				break;
+			case SDL_EVENT_KEY_DOWN:
+			case SDL_EVENT_KEY_UP:
+				if(event.key.key == SDLK_LSHIFT || event.key.key == SDLK_RSHIFT) {
+					shiftDown = event.key.down;
+				}
+				break;
+			default:
+				break;
 			}
 		}
 		Clay_UpdateScrollContainers(true, scrollMotion, deltaTime);

src/renderer/clay_renderer_SDL3.h

@@ -1,6 +1,9 @@
 #ifndef CLAY_RENDERER_SDL3_H
 #define CLAY_RENDERER_SDL3_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 #include <clay/clay.h>
 #include <SDL3_ttf/SDL_ttf.h>
 #include <SDL3/SDL_render.h>
@@ -12,5 +15,8 @@ typedef struct {
 } Clay_SDL3RendererData;
 
 extern void SDL_Clay_RenderClayCommands(Clay_SDL3RendererData *rendererData, Clay_RenderCommandArray *rcommands);
+#ifdef __cplusplus
+}
+#endif
 
 #endif // !CLAY_RENDERER_SDL3_H

src/resources.cpp

@@ -79,6 +79,7 @@ void LoadResources() {
 
 SDL_Texture *GetDiceImage(enum Dice_Die die, bool selected) {
 	switch (die) {
+		default:
 		case COIN:
 			return selected ? diceImagesSelected[COIN_IMAGE] : diceImages[COIN_IMAGE];
 		case D4:

src/style.cpp

@@ -1,6 +1,26 @@
 #include "style.h"
 #include "defs.h"
 #include "dice.h"
+#include <clay/clay.h>
+
+Clay_ElementDeclaration ListContainer(size_t depth, Clay_ElementDeclaration source) {
+	source.border = (Clay_BorderElementConfig) {
+		PanelBorder(depth),
+		CLAY_BORDER_ALL(2)
+	};
+	source.cornerRadius = defaultRadiusAll;
+	return source;
+}
+
+Clay_ElementDeclaration PanelContainer(size_t depth, Clay_ElementDeclaration source) {
+	source.backgroundColor = PanelBackground(depth);
+	source.border = (Clay_BorderElementConfig) {
+		PanelBorder(depth),
+		CLAY_BORDER_OUTSIDE(2)
+	};
+	source.cornerRadius = defaultRadiusAll;
+	return source;
+}
 
 Clay_Color PanelBackground(size_t idx) {
 	return (Clay_Color) {
@@ -11,6 +31,18 @@ Clay_Color PanelBackground(size_t idx) {
 	};
 }
 
+Clay_TextElementConfig BodyText(Clay_TextElementConfig base) {
+	base.fontId = FONT_DEFAULT;
+	base.fontSize = baseFontSize;
+	return base;
+}
+
+Clay_TextElementConfig Header(size_t header, Clay_TextElementConfig base) {
+	base.fontId = FONT_BOLD;
+	base.fontSize = headerSizes[(header)-1];
+	return base;
+}
+
 Clay_Color PanelBorder(size_t idx) {
 	return (Clay_Color) {
 		255*panelBorder[idx],
@@ -41,10 +73,10 @@ Clay_Color WindowBackground() {
 Clay_ElementDeclaration WindowStyle() {
 	return (Clay_ElementDeclaration) {
 		.layout = {
-			.layoutDirection = CLAY_TOP_TO_BOTTOM,
 			.sizing = layoutExpand,
 			.padding = CLAY_PADDING_ALL(windowPadding),
 			.childGap = containerGap,
+			.layoutDirection = CLAY_TOP_TO_BOTTOM,
 		},
 		.backgroundColor = WindowBackground()
 	};

src/style.h

@@ -36,10 +36,8 @@ constexpr Clay_Padding panelPadding = {
 	24, 24,
 };
 
-#define PANEL(depth_)\
-backgroundColor = PanelBackground(depth_),\
-.border = { PanelBackground(depth_), CLAY_BORDER_ALL(2) },\
-.cornerRadius = defaultRadiusAll
+extern Clay_ElementDeclaration ListContainer(size_t depth, Clay_ElementDeclaration source);
+extern Clay_ElementDeclaration PanelContainer(size_t depth, Clay_ElementDeclaration source);
 
 ////////////////////////////////////
 // TEXT STYLE
@@ -58,13 +56,8 @@ constexpr uint16_t headerSizes[] = {
 	28, 16
 };
 
-#define BODY()\
-	fontId = FONT_DEFAULT,\
-	.fontSize = baseFontSize
-
-#define H(level_)\
-fontId = FONT_BOLD,\
-.fontSize = headerSizes[(level_)-1]
+extern Clay_TextElementConfig BodyText(Clay_TextElementConfig base);
+extern Clay_TextElementConfig Header(size_t header, Clay_TextElementConfig base);
 
 ////////////////////////////////////
 // BUTTONS

src/ui_data.c

@@ -0,0 +1,30 @@
+#include "ui_data.h"
+#include <stdint.h>
+#include <string.h>
+
+constexpr size_t uiDataLength = UI_DATA_SIZE;
+
+static size_t utilized = 9;
+static char uiDataArena[uiDataLength];
+static char *uiDataWriter = uiDataArena;
+
+Clay_String UiData_StoreString(char const *data, size_t amount) {
+	if (utilized + amount > uiDataLength) {
+		return CLAY_STRING("out of arena memory");
+	}
+	memcpy(uiDataWriter, data, amount);
+	Clay_String result = {
+		false, (int32_t)amount, uiDataWriter
+	};
+	uiDataWriter += amount;
+	utilized += amount;
+	return result;
+}
+Clay_String UiData_StoreClayStr(Clay_String string) {
+	return UiData_StoreString(string.chars, string.length);
+}
+
+void UiData_Clear() {
+	utilized = 0;
+	uiDataWriter = uiDataArena;
+}

src/ui_data.h

@@ -0,0 +1,23 @@
+#ifndef UI_DATA_H
+#define UI_DATA_H
+
+#include <clay/clay.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef UI_DATA_SIZE
+#define UI_DATA_SIZE 1024*1024
+#endif
+
+extern Clay_String UiData_StoreString(char const *data, size_t amount);
+extern Clay_String UiData_StoreClayStr(Clay_String str);
+extern void UiData_Clear();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // !UI_DATA_