From a95fcb445bbc9299eb1d974ce34db8cf24622c10 Mon Sep 17 00:00:00 2001
From: Julian Hurst <julian.hurst92@gmail.com>
Date: Wed, 15 Jun 2022 10:46:03 +0200
Subject: Externalize modules and add .gitignore

---
 main.ha | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'main.ha')

diff --git a/main.ha b/main.ha
index a7396cb..fa1850b 100644
--- a/main.ha
+++ b/main.ha
@@ -1,7 +1,7 @@
-use libui;
-use libui::widget;
-use libui::widget::list;
-use libui::layout;
+use libtui;
+use libtui::widget;
+use libtui::widget::list;
+use libtui::layout;
 use encoding::utf8;
 use io;
 use fmt;
@@ -24,7 +24,7 @@ type mainUI = struct {
 fn sighandler(sig: int, info: *signal::siginfo, ucontext: *void) void = {
 	switch (sig) {
 	case signal::SIGWINCH =>
-		let sz = libui::getwinsize(u.list.widget.ui)!;
+		let sz = libtui::getwinsize(u.list.widget.ui)!;
 		let rows: (u16 | size) = if (sz.rows - 2 < len(u.list.items)) {
 			yield sz.rows - 2;
 		} else {
@@ -37,7 +37,7 @@ fn sighandler(sig: int, info: *signal::siginfo, ucontext: *void) void = {
 		u.list.sz.rows = rows: u16;
 		u.list.sz.cols = sz.columns;
 		list::resize(u.list, oldsz);
-		libui::clear(u.list.widget.ui);
+		libtui::clear(u.list.widget.ui);
 		list::print(u.list)!;
 	case =>
 		yield;
@@ -45,7 +45,7 @@ fn sighandler(sig: int, info: *signal::siginfo, ucontext: *void) void = {
 };
 
 fn resize(list: *list::listwidget) void = {
-	let sz = libui::getwinsize(list.widget.ui)!;
+	let sz = libtui::getwinsize(list.widget.ui)!;
 	let rows: (u16 | size) = if (sz.rows - 2 < len(list.items)) {
 		yield sz.rows - 2;
 	} else {
@@ -58,7 +58,7 @@ fn resize(list: *list::listwidget) void = {
 	list.sz.rows = rows: u16;
 	list.sz.cols = sz.columns;
 	list::resize(list, oldsz);
-	libui::clear(list.widget.ui);
+	libtui::clear(list.widget.ui);
 	list::print(list)!;
 };
 
@@ -73,20 +73,20 @@ export fn main() void = {
 	let sin = strings::fromutf8(in);
 	sin = strings::trim(sin, '\n');
 	let items = strings::split(sin, "\n"); // freed by list::finish
-	itemscopy = strings::dupall(items);
-	defer strings::freeall(itemscopy);
+	//itemscopy = strings::dupall(items);
+	//defer strings::freeall(itemscopy);
 
-	let ui = libui::init();
-	defer libui::finish(&ui);
+	let ui = libtui::init();
+	defer libtui::finish(&ui);
 	let l = list::newlist(ui, items...);
-	libui::addlistener(&ui, &globalrunehandler);
+	libtui::addlistener(&ui, &globalrunehandler);
 	widget::addlistener(&l, &runehandler);
 
 	let layout = layout::newlayout(&l);
 	defer layout::finishall(&layout);
 
 	//defer free(searchterm);
-	libui::clear(l.widget.ui);
+	libtui::clear(l.widget.ui);
 
 	match (layout::print(layout)) {
 	case void =>
@@ -137,7 +137,7 @@ export fn main() void = {
 			};
 		};
 		if (readin) {
-			let r = match (libui::scan(ui)) {
+			let r = match (libtui::scan(ui)) {
 			case let r: rune =>
 				yield r;
 			case utf8::invalid =>
@@ -150,7 +150,7 @@ export fn main() void = {
 				fmt::fprintln(os::stderr, io::strerror(e))!;
 				break;
 			};
-			if (libui::notify(&ui, r)) {
+			if (libtui::notify(&ui, r)) {
 				break;
 			};
 			if (list::notify(&l, r)) {
-- 
cgit v1.2.3