[vte] ring: Split cell and rowdata headers
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte] ring: Split cell and rowdata headers
- Date: Mon, 23 Apr 2018 18:52:44 +0000 (UTC)
commit 20c47ad8f28b7b25c4cc8f4839d0d7ce632bb45e
Author: Christian Persch <chpe src gnome org>
Date: Mon Apr 23 20:51:18 2018 +0200
ring: Split cell and rowdata headers
doc/reference/Makefile.am | 1 +
src/Makefile.am | 1 +
src/cell.hh | 187 +++++++++++++++++++++++++++++++++++++++++++++
src/vterowdata.hh | 159 +--------------------------------------
4 files changed, 190 insertions(+), 158 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 6a916d5..28a8538 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -79,6 +79,7 @@ IGNORE_HFILES = \
config.h \
buffer.h \
caps.hh \
+ cell.hh \
debug.h \
iso2022.h \
keymap.h \
diff --git a/src/Makefile.am b/src/Makefile.am
index 2a5afde..39ce8c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,6 +48,7 @@ libvte_@VTE_API_MAJOR_VERSION@_@VTE_API_MINOR_VERSION@_la_SOURCES = \
attr.hh \
buffer.h \
caps.hh \
+ cell.hh \
color-triple.hh \
debug.cc \
debug.h \
diff --git a/src/cell.hh b/src/cell.hh
new file mode 100644
index 0000000..261740c
--- /dev/null
+++ b/src/cell.hh
@@ -0,0 +1,187 @@
+/*
+ * Copyright (C) 2002 Red Hat, Inc.
+ * Copyright © 2018 Christian Persch
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/* The interfaces in this file are subject to change at any time. */
+
+#pragma once
+
+#include <string.h>
+
+#include "vteunistr.h"
+#include "vtemacros.h"
+#include "vtedefines.hh"
+
+#include "attr.hh"
+#include "color-triple.hh"
+
+#define VTE_TAB_WIDTH_MAX ((1 << VTE_ATTR_COLUMNS_BITS) - 1)
+
+#define VTE_CELL_ATTR_COMMON_BYTES 12 /* The number of common bytes in VteCellAttr and
VteStreamCellAttr */
+
+/*
+ * VteCellAttr: A single cell style attributes
+ *
+ * When adding new attributes, keep in sync with VteStreamCellAttr and
+ * update VTE_CELL_ATTR_COMMON_BYTES accordingly.
+ * Also don't forget to update basic_cell below!
+ */
+
+#define CELL_ATTR_BOOL(lname,uname) \
+ inline void set_##lname(bool value) \
+ { \
+ vte_attr_set_bool(&attr, VTE_ATTR_##uname##_MASK, value); \
+ } \
+ \
+ inline constexpr bool lname() const \
+ { \
+ return vte_attr_get_bool(attr, VTE_ATTR_##uname##_SHIFT); \
+ }
+
+#define CELL_ATTR_UINT(lname,uname) \
+ inline void set_##lname(unsigned int value) \
+ { \
+ vte_attr_set_value(&attr, VTE_ATTR_##uname##_MASK, VTE_ATTR_##uname##_SHIFT, value); \
+ } \
+ \
+ inline constexpr uint32_t lname() const \
+ { \
+ return vte_attr_get_value(attr, VTE_ATTR_##uname##_VALUE_MASK, VTE_ATTR_##uname##_SHIFT); \
+ }
+
+typedef struct _VTE_GNUC_PACKED VteCellAttr {
+ uint32_t attr;
+
+ /* 4-byte boundary (8-byte boundary in VteCell) */
+ uint64_t m_colors; /* fore, back and deco (underline) colour */
+
+ /* 12-byte boundary (16-byte boundary in VteCell) */
+ uint32_t hyperlink_idx; /* a unique hyperlink index at a time for the ring's cells,
+ 0 means not a hyperlink, VTE_HYPERLINK_IDX_TARGET_IN_STREAM
+ means the target is irrelevant/unknown at the moment.
+ If bitpacking, choose a size big enough to hold a different idx
+ for every cell in the ring but not yet in the stream
+ (currently the height rounded up to the next power of two, times width)
+ for supported VTE sizes, and update VTE_HYPERLINK_IDX_TARGET_IN_STREAM. */
+
+ /* Methods */
+
+ inline constexpr uint64_t colors() const { return m_colors; }
+
+ inline void copy_colors(VteCellAttr const& other)
+ {
+ m_colors = vte_color_triple_copy(other.colors());
+ }
+
+#define CELL_ATTR_COLOR(name) \
+ inline void set_##name(uint32_t value) \
+ { \
+ vte_color_triple_set_##name(&m_colors, value); \
+ } \
+ \
+ inline constexpr uint32_t name() const \
+ { \
+ return vte_color_triple_get_##name(m_colors); \
+ }
+
+ CELL_ATTR_COLOR(fore)
+ CELL_ATTR_COLOR(back)
+ CELL_ATTR_COLOR(deco)
+#undef CELL_ATTR_COLOR
+
+ inline constexpr bool has_any(uint32_t mask) const
+ {
+ return !!(attr & mask);
+ }
+
+ inline constexpr bool has_all(uint32_t mask) const
+ {
+ return (attr & mask) == mask;
+ }
+
+ inline constexpr bool has_none(uint32_t mask) const
+ {
+ return !(attr & mask);
+ }
+
+ inline void unset(uint32_t mask)
+ {
+ attr &= ~mask;
+ }
+
+ CELL_ATTR_UINT(columns, COLUMNS)
+ CELL_ATTR_BOOL(fragment, FRAGMENT)
+ CELL_ATTR_BOOL(bold, BOLD)
+ CELL_ATTR_BOOL(italic, ITALIC)
+ CELL_ATTR_UINT(underline, UNDERLINE)
+ CELL_ATTR_BOOL(strikethrough, STRIKETHROUGH)
+ CELL_ATTR_BOOL(overline, OVERLINE)
+ CELL_ATTR_BOOL(reverse, REVERSE)
+ CELL_ATTR_BOOL(blink, BLINK)
+ CELL_ATTR_BOOL(dim, DIM)
+ CELL_ATTR_BOOL(invisible, INVISIBLE)
+ /* ATTR_BOOL(boxed, BOXED) */
+} VteCellAttr;
+G_STATIC_ASSERT (sizeof (VteCellAttr) == 16);
+G_STATIC_ASSERT (offsetof (VteCellAttr, hyperlink_idx) == VTE_CELL_ATTR_COMMON_BYTES);
+
+/*
+ * VteStreamCellAttr: Variant of VteCellAttr to be stored in attr_stream.
+ *
+ * When adding new attributes, keep in sync with VteCellAttr and
+ * update VTE_CELL_ATTR_COMMON_BYTES accordingly.
+ */
+
+typedef struct _VTE_GNUC_PACKED _VteStreamCellAttr {
+ uint32_t attr; /* Same as VteCellAttr. We only access columns
+ * and fragment, however.
+ */
+ /* 4-byte boundary */
+ uint64_t colors;
+ /* 12-byte boundary */
+ guint16 hyperlink_length; /* make sure it fits VTE_HYPERLINK_TOTAL_LENGTH_MAX */
+
+ /* Methods */
+ CELL_ATTR_UINT(columns, COLUMNS)
+ CELL_ATTR_BOOL(fragment, FRAGMENT)
+} VteStreamCellAttr;
+G_STATIC_ASSERT (sizeof (VteStreamCellAttr) == 14);
+G_STATIC_ASSERT (offsetof (VteStreamCellAttr, hyperlink_length) == VTE_CELL_ATTR_COMMON_BYTES);
+
+#undef CELL_ATTR_BOOL
+#undef CELL_ATTR_UINT
+
+/*
+ * VteCell: A single cell's data
+ */
+
+typedef struct _VTE_GNUC_PACKED _VteCell {
+ vteunistr c;
+ VteCellAttr attr;
+} VteCell;
+
+static_assert(sizeof (VteCell) == 20, "VteCell has wrong size");
+
+static const VteCell basic_cell = {
+ 0,
+ {
+ VTE_ATTR_DEFAULT, /* attr */
+ VTE_COLOR_TRIPLE_INIT_DEFAULT, /* colors */
+ 0, /* hyperlink_idx */
+ }
+};
diff --git a/src/vterowdata.hh b/src/vterowdata.hh
index 2d66b60..a55269d 100644
--- a/src/vterowdata.hh
+++ b/src/vterowdata.hh
@@ -27,166 +27,10 @@
#include "vtedefines.hh"
#include "attr.hh"
-#include "color-triple.hh"
+#include "cell.hh"
G_BEGIN_DECLS
-#define VTE_TAB_WIDTH_MAX ((1 << VTE_ATTR_COLUMNS_BITS) - 1)
-
-#define VTE_CELL_ATTR_COMMON_BYTES 12 /* The number of common bytes in VteCellAttr and
VteStreamCellAttr */
-
-/*
- * VteCellAttr: A single cell style attributes
- *
- * When adding new attributes, keep in sync with VteStreamCellAttr and
- * update VTE_CELL_ATTR_COMMON_BYTES accordingly.
- * Also don't forget to update basic_cell below!
- */
-
-#define CELL_ATTR_BOOL(lname,uname) \
- inline void set_##lname(bool value) \
- { \
- vte_attr_set_bool(&attr, VTE_ATTR_##uname##_MASK, value); \
- } \
- \
- inline constexpr bool lname() const \
- { \
- return vte_attr_get_bool(attr, VTE_ATTR_##uname##_SHIFT); \
- }
-
-#define CELL_ATTR_UINT(lname,uname) \
- inline void set_##lname(unsigned int value) \
- { \
- vte_attr_set_value(&attr, VTE_ATTR_##uname##_MASK, VTE_ATTR_##uname##_SHIFT, value); \
- } \
- \
- inline constexpr uint32_t lname() const \
- { \
- return vte_attr_get_value(attr, VTE_ATTR_##uname##_VALUE_MASK, VTE_ATTR_##uname##_SHIFT); \
- }
-
-typedef struct _VTE_GNUC_PACKED VteCellAttr {
- uint32_t attr;
-
- /* 4-byte boundary (8-byte boundary in VteCell) */
- uint64_t m_colors; /* fore, back and deco (underline) colour */
-
- /* 12-byte boundary (16-byte boundary in VteCell) */
- uint32_t hyperlink_idx; /* a unique hyperlink index at a time for the ring's cells,
- 0 means not a hyperlink, VTE_HYPERLINK_IDX_TARGET_IN_STREAM
- means the target is irrelevant/unknown at the moment.
- If bitpacking, choose a size big enough to hold a different idx
- for every cell in the ring but not yet in the stream
- (currently the height rounded up to the next power of two, times width)
- for supported VTE sizes, and update VTE_HYPERLINK_IDX_TARGET_IN_STREAM. */
-
- /* Methods */
-
- inline constexpr uint64_t colors() const { return m_colors; }
-
- inline void copy_colors(VteCellAttr const& other)
- {
- m_colors = vte_color_triple_copy(other.colors());
- }
-
-#define CELL_ATTR_COLOR(name) \
- inline void set_##name(uint32_t value) \
- { \
- vte_color_triple_set_##name(&m_colors, value); \
- } \
- \
- inline constexpr uint32_t name() const \
- { \
- return vte_color_triple_get_##name(m_colors); \
- }
-
- CELL_ATTR_COLOR(fore)
- CELL_ATTR_COLOR(back)
- CELL_ATTR_COLOR(deco)
-#undef CELL_ATTR_COLOR
-
- inline constexpr bool has_any(uint32_t mask) const
- {
- return !!(attr & mask);
- }
-
- inline constexpr bool has_all(uint32_t mask) const
- {
- return (attr & mask) == mask;
- }
-
- inline constexpr bool has_none(uint32_t mask) const
- {
- return !(attr & mask);
- }
-
- inline void unset(uint32_t mask)
- {
- attr &= ~mask;
- }
-
- CELL_ATTR_UINT(columns, COLUMNS)
- CELL_ATTR_BOOL(fragment, FRAGMENT)
- CELL_ATTR_BOOL(bold, BOLD)
- CELL_ATTR_BOOL(italic, ITALIC)
- CELL_ATTR_UINT(underline, UNDERLINE)
- CELL_ATTR_BOOL(strikethrough, STRIKETHROUGH)
- CELL_ATTR_BOOL(overline, OVERLINE)
- CELL_ATTR_BOOL(reverse, REVERSE)
- CELL_ATTR_BOOL(blink, BLINK)
- CELL_ATTR_BOOL(dim, DIM)
- CELL_ATTR_BOOL(invisible, INVISIBLE)
- /* ATTR_BOOL(boxed, BOXED) */
-} VteCellAttr;
-G_STATIC_ASSERT (sizeof (VteCellAttr) == 16);
-G_STATIC_ASSERT (offsetof (VteCellAttr, hyperlink_idx) == VTE_CELL_ATTR_COMMON_BYTES);
-
-/*
- * VteStreamCellAttr: Variant of VteCellAttr to be stored in attr_stream.
- *
- * When adding new attributes, keep in sync with VteCellAttr and
- * update VTE_CELL_ATTR_COMMON_BYTES accordingly.
- */
-
-typedef struct _VTE_GNUC_PACKED _VteStreamCellAttr {
- uint32_t attr; /* Same as VteCellAttr. We only access columns
- * and fragment, however.
- */
- /* 4-byte boundary */
- uint64_t colors;
- /* 12-byte boundary */
- guint16 hyperlink_length; /* make sure it fits VTE_HYPERLINK_TOTAL_LENGTH_MAX */
-
- /* Methods */
- CELL_ATTR_UINT(columns, COLUMNS)
- CELL_ATTR_BOOL(fragment, FRAGMENT)
-} VteStreamCellAttr;
-G_STATIC_ASSERT (sizeof (VteStreamCellAttr) == 14);
-G_STATIC_ASSERT (offsetof (VteStreamCellAttr, hyperlink_length) == VTE_CELL_ATTR_COMMON_BYTES);
-
-#undef CELL_ATTR_BOOL
-#undef CELL_ATTR_UINT
-
-/*
- * VteCell: A single cell's data
- */
-
-typedef struct _VTE_GNUC_PACKED _VteCell {
- vteunistr c;
- VteCellAttr attr;
-} VteCell;
-G_STATIC_ASSERT (sizeof (VteCell) == 20);
-
-static const VteCell basic_cell = {
- 0,
- {
- VTE_ATTR_DEFAULT, /* attr */
- VTE_COLOR_TRIPLE_INIT_DEFAULT, /* colors */
- 0, /* hyperlink_idx */
- }
-};
-
-
/*
* VteRowAttr: A single row's attributes
*/
@@ -236,5 +80,4 @@ void _vte_row_data_remove (VteRowData *row, gulong col);
void _vte_row_data_fill (VteRowData *row, const VteCell *cell, gulong len);
void _vte_row_data_shrink (VteRowData *row, gulong max_len);
-
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
