[vte/wip/egmont/bidi: 75/76] Arabic shaping PoC, using fribidi + Unicode presentation form characters
- From: Egmont Koblinger <egmontkob src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/wip/egmont/bidi: 75/76] Arabic shaping PoC, using fribidi + Unicode presentation form characters
- Date: Sun, 7 Oct 2018 13:09:19 +0000 (UTC)
commit a43f9151bdf7840ae51158f78daf685d96e3a5dd
Author: Egmont Koblinger <egmont gmail com>
Date: Mon Oct 1 11:42:55 2018 +0200
Arabic shaping PoC, using fribidi + Unicode presentation form characters
BIDI-STATUS | 4 +++-
src/bidi.cc | 38 ++++++++++++++++++++++++++++++++------
src/bidi.hh | 2 ++
src/vte.cc | 12 +++++++++---
4 files changed, 46 insertions(+), 10 deletions(-)
---
diff --git a/BIDI-STATUS b/BIDI-STATUS
index ff78efb6..2fe65d92 100644
--- a/BIDI-STATUS
+++ b/BIDI-STATUS
@@ -10,6 +10,7 @@ Done:
- Mouse reporting.
- Regex match and explicit hyperlink underlining on hover.
- VTE_DEBUG=bidi highlights characters with resolved RTL directionality.
+- Arabic shaping using Unicode presentation forms.
- Test file.
- Configure flag.
@@ -18,6 +19,7 @@ Bugs:
- The way the modes apply to paragraphs, and what happens when a paragraph
is split or two paragraphs are joined is just a first hack, needs to be
reviewed, adjusted, fixed properly.
+- Arabic shaping vs. extras (linewrap, cursor, combining accents).
Missing from first release:
- The entire screen is always invalidated. Have some more fine grained
@@ -30,7 +32,7 @@ Missing from first release:
- Code cleanup and review, of course.
Planned future improvements:
-- Shaping.
+- Real shaping (harfbuzz?).
- Right-align RTL glyphs.
- Implicit mode level 2 (handling BiDi control characters).
- Mirror the glyphs that don't have mirrored counterpart.
diff --git a/src/bidi.cc b/src/bidi.cc
index 4a54383c..8c02a31f 100644
--- a/src/bidi.cc
+++ b/src/bidi.cc
@@ -39,6 +39,7 @@ BidiRow::BidiRow()
m_log2vis = nullptr;
m_vis2log = nullptr;
m_vis_rtl = nullptr;
+ m_vis_shaped_char = nullptr;
}
BidiRow::~BidiRow()
@@ -46,6 +47,7 @@ BidiRow::~BidiRow()
g_free (m_log2vis);
g_free (m_vis2log);
g_free (m_vis_rtl);
+ g_free (m_vis_shaped_char);
}
void BidiRow::set_width(vte::grid::column_t width)
@@ -60,6 +62,7 @@ void BidiRow::set_width(vte::grid::column_t width)
m_log2vis = (vte::grid::column_t *) g_realloc (m_log2vis, sizeof (vte::grid::column_t) *
m_width_alloc);
m_vis2log = (vte::grid::column_t *) g_realloc (m_vis2log, sizeof (vte::grid::column_t) *
m_width_alloc);
m_vis_rtl = (guint8 *) g_realloc (m_vis_rtl, sizeof (guint8) * m_width_alloc);
+ m_vis_shaped_char = (gunichar *) g_realloc (m_vis_shaped_char, sizeof (gunichar) *
m_width_alloc);
}
m_width = width;
@@ -137,6 +140,18 @@ bool BidiRow::vis_is_rtl(vte::grid::column_t col, int factor) const
}
}
+/* Get the shaped character for the given visual position.
+ *
+ * A return value of 0 means that the caller needs to use the original codepoint.
+ */
+gunichar
+BidiRow::vis_get_shaped_char(vte::grid::column_t col) const
+{
+ if (col >= m_width)
+ return 0;
+ return m_vis_shaped_char[col];
+}
+
/* Whether the line's base direction is RTL. */
bool BidiRow::base_is_rtl() const
{
@@ -246,6 +261,7 @@ void RingView::explicit_line(vte::grid::row_t row, bool rtl)
for (i = 0; i < m_width; i++) {
bidirow->m_log2vis[i] = bidirow->m_vis2log[i] = m_width - 1 - i;
bidirow->m_vis_rtl[i] = true;
+ bidirow->m_vis_shaped_char[i] = 0;
}
} else {
/* Shortcut: bidirow->m_width == 0 might denote a fully LTR line,
@@ -370,6 +386,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
// FIXME VLA is a gcc extension, use g_newa() instead
FriBidiCharType fribidi_chartypes[count];
FriBidiBracketType fribidi_brackettypes[count];
+ FriBidiJoiningType fribidi_joiningtypes[count];
FriBidiLevel fribidi_levels[count];
FriBidiStrIndex fribidi_map[count];
@@ -378,6 +395,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
fribidi_get_bidi_types (fribidi_chars, count, fribidi_chartypes);
fribidi_get_bracket_types (fribidi_chars, count, fribidi_chartypes, fribidi_brackettypes);
+ fribidi_get_joining_types (fribidi_chars, count, fribidi_joiningtypes);
level = fribidi_get_par_embedding_levels_ex (fribidi_chartypes, fribidi_brackettypes, count,
&pbase_dir, fribidi_levels);
if (level == 0) {
@@ -385,13 +403,17 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
return explicit_paragraph (row_orig, rtl);
}
+ // FIXME make these per-row?
+ fribidi_join_arabic (fribidi_chartypes, count, fribidi_levels, fribidi_joiningtypes);
+ fribidi_shape_arabic (FRIBIDI_FLAGS_ARABIC, fribidi_levels, count, fribidi_joiningtypes,
fribidi_chars);
+
g_assert_cmpint (pbase_dir, !=, FRIBIDI_PAR_ON);
/* For convenience, from now on this variable contains the resolved (i.e. possibly autodetected)
value. */
rtl = (pbase_dir == FRIBIDI_PAR_RTL || pbase_dir == FRIBIDI_PAR_WRTL);
- if (level == 1 || (rtl && level == 2)) {
- /* Fast shortcut for LTR-only and RTL-only paragraphs. */
- return explicit_paragraph (row_orig, rtl);
+ if (level == 1) {
+ /* Fast shortcut for LTR-only paragraphs. */
+ return explicit_paragraph (row_orig, false);
}
/* Silly FriBidi API of fribidi_reorder_line()... It reorders whatever values we give to it,
@@ -453,9 +475,9 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
goto next_line;
}
- if (level == 1 || (rtl && level == 2)) {
- /* Fast shortcut for LTR-only and RTL-only lines. */
- explicit_line (row, rtl);
+ if (level == 1) {
+ /* Fast shortcut for LTR-only lines. */
+ explicit_line (row, false);
bidirow->m_has_foreign = true;
goto next_line;
}
@@ -468,6 +490,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
for (; tv < unused; tv++) {
bidirow->m_vis2log[tv] = m_width - 1 - tv;
bidirow->m_vis_rtl[tv] = true;
+ bidirow->m_vis_shaped_char[tv] = 0;
}
}
for (fv = lines[line]; fv < lines[line + 1]; fv++) {
@@ -482,6 +505,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
for (col = 0; col < cell->attr.columns(); col++) {
bidirow->m_vis2log[tv + col] = tl + cell->attr.columns() - 1 - col;
bidirow->m_vis_rtl[tv + col] = true;
+ bidirow->m_vis_shaped_char[tv + col] = fribidi_chars[fl];
}
tv += cell->attr.columns();
tl += cell->attr.columns();
@@ -490,6 +514,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
for (col = 0; col < cell->attr.columns(); col++) {
bidirow->m_vis2log[tv] = tl;
bidirow->m_vis_rtl[tv] = false;
+ bidirow->m_vis_shaped_char[tv] = fribidi_chars[fl];
tv++;
tl++;
}
@@ -501,6 +526,7 @@ vte::grid::row_t RingView::paragraph(vte::grid::row_t row)
for (; tv < m_width; tv++) {
bidirow->m_vis2log[tv] = tv;
bidirow->m_vis_rtl[tv] = false;
+ bidirow->m_vis_shaped_char[tv] = 0;
}
}
g_assert_cmpint (tv, ==, m_width);
diff --git a/src/bidi.hh b/src/bidi.hh
index 093c35f6..cf3c9eca 100644
--- a/src/bidi.hh
+++ b/src/bidi.hh
@@ -48,6 +48,7 @@ public:
vte::grid::column_t vis2log(vte::grid::column_t col, int factor = 1) const;
bool log_is_rtl(vte::grid::column_t col, int factor = 1) const;
bool vis_is_rtl(vte::grid::column_t col, int factor = 1) const;
+ gunichar vis_get_shaped_char(vte::grid::column_t col) const;
bool base_is_rtl() const;
bool has_foreign() const;
@@ -60,6 +61,7 @@ private:
vte::grid::column_t *m_log2vis;
vte::grid::column_t *m_vis2log;
guint8 *m_vis_rtl;
+ gunichar *m_vis_shaped_char;
guint8 m_base_rtl: 1;
guint8 m_has_foreign: 1;
diff --git a/src/vte.cc b/src/vte.cc
index 2367a9c2..ada2ca0a 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -8927,7 +8927,7 @@ Terminal::draw_rows(VteScreen *screen_,
// FIXME find a nicer place for these
m_ringview.set_ring (m_screen->row_data);
m_ringview.set_rows ((long) m_screen->scroll_delta, m_row_count + 3);
- m_ringview.set_width (m_column_count);
+ m_ringview.set_width (column_count);
m_ringview.update ();
@@ -9069,7 +9069,13 @@ Terminal::draw_rows(VteScreen *screen_,
hilite = nhilite;
g_assert_cmpint (item_count, <, column_count);
- items[item_count].c = cell->c;
+
+ // FIXME apply combining accents on top of the shaped character
+ gunichar shaped_char = bidirow->vis_get_shaped_char(col);
+ if (shaped_char == 0)
+ shaped_char = cell->c;
+
+ items[item_count].c = shaped_char;
items[item_count].columns = cell->attr.columns();
items[item_count].x = (col - (bidirow->vis_is_rtl(col) ? cell->attr.columns() - 1 :
0)) * column_width;
items[item_count].y = y;
@@ -9219,7 +9225,7 @@ Terminal::paint_cursor()
/* Draw the cursor. */
viscol = bidirow->log2vis(col);
- item.c = (cell && cell->c) ? cell->c : ' ';
+ item.c = (cell && cell->c) ? cell->c : ' '; // FIXME replace with shaped character
item.columns = item.c == '\t' ? 1 : cell ? cell->attr.columns() : 1;
item.x = (viscol - ((cell && bidirow->vis_is_rtl(viscol)) ? cell->attr.columns() - 1 : 0)) * width;
item.y = row_to_pixel(drow);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
