Cleanup

include/editor/editor.h

@@ -1,11 +1,11 @@
 #ifndef EDITOR_H
 #define EDITOR_H
 
-#include "boxes/diagnostics.h"
-#include "boxes/hover.h"
+#include "ui/diagnostics.h"
+#include "ui/hover.h"
 #include "editor/spans.h"
 #include "io/knot.h"
-#include "io/ui.h"
+#include "io/sysio.h"
 #include "ts/decl.h"
 #include "utils/utils.h"
 

include/io/sysio.h

@@ -83,6 +83,10 @@ extern std::vector<ScreenCell> screen;
 extern std::vector<ScreenCell> old_screen;
 extern std::mutex screen_mutex;
 
+inline bool is_empty_cell(const ScreenCell &c) {
+  return c.utf8.empty() || c.utf8 == " " || c.utf8 == "\x1b";
+}
+
 Coord start_screen();
 void end_screen();
 void update(uint32_t row, uint32_t col, std::string utf8, uint32_t fg,

include/ui/bar.h

@@ -0,0 +1,6 @@
+#ifndef UI_BAR_H
+#define UI_BAR_H
+
+#include "utils/utils.h"
+
+#endif

include/ui/diagnostics.h

@@ -1,8 +1,8 @@
-#ifndef BOXES_DIAGNOSTICS_H
-#define BOXES_DIAGNOSTICS_H
+#ifndef UI_DIAGNOSTICS_H
+#define UI_DIAGNOSTICS_H
 
 #include "editor/decl.h"
-#include "io/ui.h"
+#include "io/sysio.h"
 #include "pch.h"
 #include "utils/utils.h"
 

include/ui/hover.h

@@ -1,8 +1,8 @@
-#ifndef BOXES_HOVER_H
-#define BOXES_HOVER_H
+#ifndef UI_HOVER_H
+#define UI_HOVER_H
 
 #include "editor/decl.h"
-#include "io/ui.h"
+#include "io/sysio.h"
 #include "pch.h"
 #include "ts/decl.h"
 #include "utils/utils.h"