[vte/wip/egmont/bidi: 74/84] selection (copying in rectangle mode is still broken)

[Egmont Koblinger <egmontkob src gnome org>]

commit be4a8860b89af62db5ceab048d06edbea5c8febd
Author: Egmont Koblinger <egmont gmail com>
Date:   Wed Sep 19 12:16:57 2018 +0200

    selection (copying in rectangle mode is still broken)

 BIDI-STATUS        |  7 ++++--
 src/vte.cc         | 64 +++++++++++++++++++++++++++++++++++++++++++-----------
 src/vteinternal.hh |  6 ++---
 3 files changed, 59 insertions(+), 18 deletions(-)
---
diff --git a/BIDI-STATUS b/BIDI-STATUS
index 840ffd5c..8736754f 100644
--- a/BIDI-STATUS
+++ b/BIDI-STATUS
@@ -5,6 +5,8 @@ Done:
 - Possibility to make box drawing characters mirrorable (DECSET / DECRST 2500).
 - I-Beam cursor shows the character's resolved directionality when the
   paragraph has a foreign directionality character.
+- Mouse highlighting (logical in normal modes, visual in rectangle mode).
+- Copying text in logical modes.
 - VTE_DEBUG=bidi highlights characters with resolved RTL directionality.
 - Test file.
 - Configure flag.
@@ -15,9 +17,10 @@ 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.
+- Copying text in rectangle mode.
 
 Missing from first release:
-- Adjust mouse operations.
+- Adjust mouse reporting.
 - Adjust the preedit box.
 - The entire screen is always invalidated. Have some more fine grained
   solution (see also vte #26).
@@ -44,5 +47,5 @@ Planned future improvements:
 Not planned at all:
 - Operating on the presentation component (DCSM reset).
 - BiDi in explicit mode by transferring the embedding levels (SDS, SRS...).
-- Escape sequences that modify the emulation behavior (SIMD...)
+- Escape sequences that modify the emulation behavior (SIMD...).
 - Other silly escape sequences (SCP...).
diff --git a/src/vte.cc b/src/vte.cc
index 05c63894..df136031 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -1563,17 +1563,19 @@ Terminal::confine_grid_coords(vte::grid::coords const& rowcol) const
 
 /*
  * Track mouse click and drag positions (the "origin" and "last" coordinates) with half cell accuracy,
- * that is, know whether the event occurred over the left or right half of the cell.
+ * that is, know whether the event occurred over the left/start or right/end half of the cell.
  * This is required because some selection modes care about the cell over which the event occurred,
  * while some care about the closest boundary between cells.
  *
- * Misuse vte::grid::coords for storing the result. Column k's left side is stored as 2k, right side as 2k+1.
+ * Misuse vte::grid::coords for storing the result. Column k's left/start side is stored as 2k, right/end 
side as 2k+1.
  * FIXMEegmont Maybe should we have a separate type?
  *
- * Left margin or anything further to the left is denoted by half-column -1,
- * right margin or anything further to the right is denoted by half-column 2*m_column_count.
+ * Left/start margin or anything further to the left/start is denoted by half-column -1,
+ * right/end margin or anything further to the right/end is denoted by half-column 2*m_column_count.
  *
  * Storing the actual view coordinates would become problematic when the font size changes, see bug 756058.
+ *
+ * BiDi: returns logical (start/end) position for normal selection modes, visual (left/right) position for 
block mode.
  */
 vte::grid::coords
 Terminal::selection_grid_half_coords_from_view_coords(vte::view::coords const& pos) const
@@ -1589,6 +1591,12 @@ Terminal::selection_grid_half_coords_from_view_coords(vte::view::coords const& p
                 colhalf = pos.x * 2 / m_cell_width;
         }
 
+        if (!m_selection_block_mode) {
+                /* BiDi: convert to logical half column. */
+                vte::base::BidiRow const* bidirow = m_ringview.get_row_map(row);
+                colhalf = bidirow->vis2log(colhalf, 2);
+        }
+
         return vte::grid::coords(row, colhalf);
 }
 
@@ -1608,6 +1616,14 @@ Terminal::selection_maybe_swap_endpoints(vte::view::coords const& pos,
         if (m_selection_resolved.empty())
                 return;
 
+
+        // 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.update ();
+
+
         vte::grid::coords current_half = selection_grid_half_coords_from_view_coords (pos);
 
         if (block) {
@@ -5145,7 +5161,7 @@ Terminal::line_is_wrappable(vte::grid::row_t row) const
  * In block mode, similarly to char mode, we care about vertical character boundary. (This is somewhat 
debatable, as results in
  * asymmetrical behavior along the two axes: a rectangle can disappear by becoming zero wide, but not zero 
high.)
  * We cannot take care of CJKs at the endpoints now because CJKs can cross the boundary in any included row. 
Taking care of them
- * needs to go to cell_is_selected(). We don't care about used vs. unused cells either. The event coordinate 
is simply rounded
+ * needs to go to cell_is_selected_vis(). We don't care about used vs. unused cells either. The event 
coordinate is simply rounded
  * to the nearest vertical cell boundary.
  */
 vte::grid::coords
@@ -5412,6 +5428,14 @@ Terminal::modify_selection (vte::view::coords pos)
 {
         g_assert (m_selecting);
 
+
+        // 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.update ();
+
+
         vte::grid::coords current_half = selection_grid_half_coords_from_view_coords (pos);
 
         if (current_half == m_selection_last_half)
@@ -5425,10 +5449,10 @@ Terminal::modify_selection (vte::view::coords pos)
         resolve_selection();
 }
 
-/* Check if a cell is selected or not. */
+/* Check if a cell is selected or not. BiDi: the coordinate is visual. */
 bool
-Terminal::cell_is_selected(vte::grid::column_t col,
-                                     vte::grid::row_t row) const
+Terminal::cell_is_selected_vis(vte::grid::column_t col,
+                               vte::grid::row_t row) const
 {
         if (m_selection_block_mode) {
                 /* In block mode, make sure CJKs and TABs aren't cut in half. */
@@ -5440,7 +5464,10 @@ Terminal::cell_is_selected(vte::grid::column_t col,
                 }
                 return m_selection_resolved.box_contains (vte::grid::coords (row, col));
         } else {
-                /* In normal modes, resolve_selection() made sure to generate such boundaries for 
m_selection_resolved. */
+                /* BiDi: convert to logical column. */
+                vte::base::BidiRow const* bidirow = m_ringview.get_row_map(row);
+                col = bidirow->vis2log(col);
+                /* In normal modes, resolve_selection() made sure not to cat CJKs or TABs in half. */
                 return m_selection_resolved.contains (vte::grid::coords (row, col));
         }
 }
@@ -6089,6 +6116,9 @@ Terminal::rgb_from_index(guint index,
        }
 }
 
+// FIXMEegmont block mode doesn't work with BiDi, it won't be that easy.
+// We'll need to get the bidirow for areas not necessarily inside the current view.
+// Needs a bit of refactoring in bidi.cc.
 GString*
 Terminal::get_text(vte::grid::row_t start_row,
                              vte::grid::column_t start_col,
@@ -6605,6 +6635,14 @@ Terminal::start_selection (vte::view::coords pos,
        if (m_selection_block_mode)
                type = selection_type_char;
 
+
+        // 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.update ();
+
+
         m_selection_origin_half = m_selection_last_half = selection_grid_half_coords_from_view_coords(pos);
 
        /* Decide whether or not to restart on the next drag. FIXME this description is bad */
@@ -8839,7 +8877,7 @@ Terminal::draw_rows(VteScreen *screen_,
                         /* Get the first cell's contents. */
                         cell = row_data ? _vte_row_data_get_visual (row_data, bidirow, i) : nullptr;
                         /* Find the colors for this cell. */
-                        selected = cell_is_selected(i, row);
+                        selected = cell_is_selected_vis(i, row);
                         determine_colors(cell, selected, &fore, &back, &deco);
                         rtl = bidirow->vis_is_rtl(i);
 
@@ -8849,7 +8887,7 @@ Terminal::draw_rows(VteScreen *screen_,
                                 /* Resolve attributes to colors where possible and
                                  * compare visual attributes to the first character
                                  * in this chunk. */
-                                selected = cell_is_selected(j, row);
+                                selected = cell_is_selected_vis(j, row);
                                 determine_colors(cell, selected, &nfore, &nback, &ndeco);
                                 nrtl = bidirow->vis_is_rtl(j);
                                 if (nback != back || (_vte_debug_on (VTE_DEBUG_BIDI) && nrtl != rtl)) {
@@ -8923,7 +8961,7 @@ Terminal::draw_rows(VteScreen *screen_,
 
                         /* Find the colors for this cell. */
                         nattr = cell->attr.attr;
-                        selected = cell_is_selected(col, row);
+                        selected = cell_is_selected_vis(col, row);
                         determine_colors(cell, selected, &nfore, &nback, &ndeco);
 
                         nhilite = (nhyperlink && cell->attr.hyperlink_idx == m_hyperlink_hover_idx) ||
@@ -9120,7 +9158,7 @@ Terminal::paint_cursor()
                style = _vte_draw_get_style(cell->attr.bold(), cell->attr.italic());
        }
 
-       selected = cell_is_selected(col, drow);
+       selected = cell_is_selected_vis(viscol, drow);
         determine_cursor_colors(cell, selected, &fore, &back, &deco);
         rgb_from_index<8, 8, 8>(back, bg);
 
diff --git a/src/vteinternal.hh b/src/vteinternal.hh
index 2a2dd926..ce89123b 100644
--- a/src/vteinternal.hh
+++ b/src/vteinternal.hh
@@ -436,7 +436,7 @@ public:
         gboolean m_selecting_had_delta;
         gboolean m_selection_block_mode;  // FIXMEegmont move it into a 4th value in vte_selection_type?
         enum vte_selection_type m_selection_type;
-        vte::grid::coords m_selection_origin_half, m_selection_last_half;
+        vte::grid::coords m_selection_origin_half, m_selection_last_half;  /* BiDi: logical in normal modes, 
visual in m_selection_block_mode */
         vte::grid::span m_selection_resolved;
 
        /* Clipboard data information. */
@@ -969,8 +969,8 @@ public:
         vte::grid::coords resolve_selection_endpoint(vte::grid::coords rowcolhalf, bool after) const;
         void resolve_selection();
         void modify_selection(vte::view::coords pos);
-        bool cell_is_selected(vte::grid::column_t col,
-                              vte::grid::row_t) const;
+        bool cell_is_selected_vis(vte::grid::column_t col,
+                                  vte::grid::row_t) const;
 
         void reset_default_attributes(bool reset_hyperlink);