Refactor damage tracking types

1 files changed, 10 insertions, 12 deletions

diff --git a/tui/widget/widget.ha b/tui/widget/widget.ha
index 6697935..8422932 100644
--- a/tui/widget/widget.ha
+++ b/tui/widget/widget.ha
@@ -15,15 +15,15 @@ export type finishfn = fn(w: *widget) void;
 
 export type widgetsize = (tty::ttysize | void);
 
-export type none = void;
-export type all = void;
-export type row = uint;
-export type col = uint;
+export type damagenone = void;
+export type damageall = void;
+export type damagerow = uint;
+export type damagecol = uint;
 
 //export type damageitem = (row | col | coords);
-export type damageitem = row;
+export type damageitem = damagerow;
 
-export type damage = (none | all | []damageitem);
+export type damage = (damagenone | damageall | []damageitem);
 
 export type widget = struct {
 	state: *tui::tui,
@@ -132,9 +132,9 @@ export fn print(w: *widget) void = {
 	//defer tui::raw(w.state)!;
 
 	const clear = match (w.damage) {
-	case all =>
+	case damageall =>
 		yield strings::dup(CLEAR);
-	case none =>
+	case damagenone =>
 		yield strings::dup("");
 	case let dam: []damageitem =>
 		let st = memio::dynamic();
@@ -250,15 +250,13 @@ export fn finish(w: *widget) void = {
 	match (w.damage) {
 	case let dam: []damageitem =>
 		free(dam);
-	case all =>
-		return;
-	case all =>
+	case damageall =>
 		return;
 	};
 };
 
 export fn cleardamage(w: *widget) void = {
-	let dam = if (w.damage is all) {
+	let dam = if (w.damage is damageall) {
 		return;
 	} else {
 		yield w.damage as []damageitem;