2 files changed, 43 insertions, 36 deletions
diff --git a/src/user/mkpopup/main.c b/src/user/mkpopup/main.c
deleted file mode 100644
index 05ea4e3..0000000
--- a/src/user/mkpopup/main.c
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <popups/info.h>
-
-#include <knob/heap.h>
-
-#include <stdbool.h>
-#include <stdint.h>
-
-void main(const char *text) {
-  uint32_t required_new_length = 0;
-  bool needs_new = false;
-  for (const char *c = text; c[0]; ++c) {
-    ++required_new_length;
-    if ((c[0] == '\\') && (c[1] == 'n')) {
-      ++c;
-      needs_new = true;
-    }
-  }
-
-  if (needs_new) {
-    char *new_text = get_block(required_new_length);
-    const char *ci;
-    char *co;
-    for (ci = text, co = new_text; *ci; ++ci, ++co)
-      if ((ci[0] == '\\') && (ci[1] == 'n')) {
-        *co = '\n';
-        ++ci;
-      }
-      else
-        *co = *ci;
-    text = new_text;
-  }
-
-  struct popup p;
-  info_popup(&p, text, (_pixel_t){.r = 0, .g = 0, .b = 0}, (_pixel_t){.r = 0xbf, .g = 0xbf, .b = 0xbf});
-  make_modal(&p);
-}
-\ No newline at end of file
diff --git a/src/user/mkpopup/main.cpp b/src/user/mkpopup/main.cpp
new file mode 100644
index 0000000..5e3310c
--- /dev/null
+++ b/src/user/mkpopup/main.cpp
@@ -0,0 +1,43 @@
+#include <raleigh/w/padding.h>
+#include <raleigh/w/label.h>
+#include <raleigh/w/vbox.h>
+#include <raleigh/window.h>
+#include <knob/block.h>
+
+using namespace raleigh;
+
+widget *make_line(const char *str) {
+  return new label(str);
+}
+
+void main(const char *text) {
+  dllist<widget &> box_widgets;
+
+  char *const data = strdup(text);
+
+  char *this_string = data;
+  while (*this_string) {
+    char *i = this_string;
+    while (1) {
+      if (!i[0]) {
+        box_widgets.add_back(*make_line(this_string));
+        this_string = i;
+        break;
+      }
+      if ((i[0] == '\\') && (i[1] == 'n')) {
+        i[0] = '\0';
+        box_widgets.add_back(*make_line(this_string));
+        this_string = i + 2;
+        break;
+      }
+      ++i;
+    }
+  }
+
+  vbox box(box_widgets);
+  padding p(box, 4);
+  window w(p);
+
+  w.show();
+  start_runtime();
+}
+\ No newline at end of file