Rather than having two grids for each pane, one for ASCII and one for

UTF-8, collapse the two together. Simplifies the code at the expense of
more memory (which can probably be reduced again later).

1 files changed, 55 insertions, 0 deletions

diff --git a/usr.bin/tmux/grid-cell.c b/usr.bin/tmux/grid-cell.c
new file mode 100644
index 00000000000..4b71d2ba3c1
--- /dev/null
+++ b/usr.bin/tmux/grid-cell.c
@@ -0,0 +1,55 @@
+/* $OpenBSD: grid-cell.c,v 1.1 2013/01/18 02:16:21 nicm Exp $ */
+
+/*
+ * Copyright (c) 2012 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include <string.h>
+
+#include "tmux.h"
+
+/* Get cell width. */
+u_int
+grid_cell_width(const struct grid_cell *gc)
+{
+	return (gc->xstate >> 4);
+}
+
+/* Get cell data. */
+void
+grid_cell_get(const struct grid_cell *gc, struct utf8_data *ud)
+{
+	ud->size = gc->xstate & 0xf;
+	ud->width = gc->xstate >> 4;
+	memcpy(ud->data, gc->xdata, ud->size);
+}
+
+/* Set cell data. */
+void
+grid_cell_set(struct grid_cell *gc, const struct utf8_data *ud)
+{
+	memcpy(gc->xdata, ud->data, ud->size);
+	gc->xstate = (ud->width << 4) | ud->size;
+}
+
+/* Set a single character as cell data. */
+void
+grid_cell_one(struct grid_cell *gc, u_char ch)
+{
+	*gc->xdata = ch;
+	gc->xstate = (1 << 4) | 1;
+}