Merge branch 'wt/rename' into api-hardening

# Conflicts:
#	README.md

1 files changed, 18 insertions, 18 deletions

diff --git a/src/cell.h b/src/cell.h
index 615879e..3138dca 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -1,33 +1,33 @@
-#ifndef TERM_CELL_H
-#define TERM_CELL_H
+#ifndef WSAP_VTCORE_CELL_H
+#define WSAP_VTCORE_CELL_H
 
 /*
  * The cell layout that the terminal stores. Only src/term uses it. A
- * snapshot converts these cells to the public struct term_cell.
+ * snapshot converts these cells to the public struct wsap_vtcore_cell.
  */
 
-#include "term.h"
+#include "wsap_vtcore.h"
 
 enum cell_flags {
-    CELL_BOLD      = TERM_ATTR_BOLD,
-    CELL_ITALIC    = TERM_ATTR_ITALIC,
-    CELL_UNDERLINE = TERM_ATTR_UNDERLINE,
-    CELL_STRIKE    = TERM_ATTR_STRIKE,
-    CELL_OVERLINE  = TERM_ATTR_OVERLINE,
-    CELL_EMOJI     = TERM_ATTR_EMOJI,
-    CELL_TEXT      = TERM_ATTR_TEXT,
+    CELL_BOLD      = WSAP_VTCORE_ATTR_BOLD,
+    CELL_ITALIC    = WSAP_VTCORE_ATTR_ITALIC,
+    CELL_UNDERLINE = WSAP_VTCORE_ATTR_UNDERLINE,
+    CELL_STRIKE    = WSAP_VTCORE_ATTR_STRIKE,
+    CELL_OVERLINE  = WSAP_VTCORE_ATTR_OVERLINE,
+    CELL_EMOJI     = WSAP_VTCORE_ATTR_EMOJI,
+    CELL_TEXT      = WSAP_VTCORE_ATTR_TEXT,
     CELL_WIDE      = 1 << 7,
     CELL_TRAIL     = 1 << 8,
     CELL_WRAP_PAD  = 1 << 9,
-    CELL_FAINT     = TERM_ATTR_FAINT,
-    CELL_DOUBLE_UNDERLINE = TERM_ATTR_DOUBLE_UNDERLINE,
-    CELL_CURLY_UNDERLINE  = TERM_ATTR_CURLY_UNDERLINE,
-    CELL_DOTTED_UNDERLINE = TERM_ATTR_DOTTED_UNDERLINE,
-    CELL_DASHED_UNDERLINE = TERM_ATTR_DASHED_UNDERLINE,
-    CELL_LINK      = TERM_ATTR_LINK,
+    CELL_FAINT     = WSAP_VTCORE_ATTR_FAINT,
+    CELL_DOUBLE_UNDERLINE = WSAP_VTCORE_ATTR_DOUBLE_UNDERLINE,
+    CELL_CURLY_UNDERLINE  = WSAP_VTCORE_ATTR_CURLY_UNDERLINE,
+    CELL_DOTTED_UNDERLINE = WSAP_VTCORE_ATTR_DOTTED_UNDERLINE,
+    CELL_DASHED_UNDERLINE = WSAP_VTCORE_ATTR_DASHED_UNDERLINE,
+    CELL_LINK      = WSAP_VTCORE_ATTR_LINK,
 };
 
-#define CELL_ANY_UNDERLINE TERM_ATTR_UNDERLINE_MASK
+#define CELL_ANY_UNDERLINE WSAP_VTCORE_ATTR_UNDERLINE_MASK
 
 /* c is a code point or a grapheme handle. pad holds the OSC 8 link id. */
 struct cell {