[evince/1119-cannot-highlight-a-word-by-double-clicking-it-on-wayland: 10/10] ev-view: fix adding annotations from dbl/tpl click selections

[Germán Poo-Caamaño <gpoo src gnome org>]

commit 2487bc28ef017cebcd86a8b29d22fbdddab1200d
Author: Nelson Benítez León <nbenitezl gmail com>
Date:   Sat May 18 18:51:55 2019 -0400

    ev-view: fix adding annotations from dbl/tpl click selections
    
    Implement support for creating highlight annotations (i.e.
    "Highlight selected text" action from context menu) from selections
    of type EV_SELECTION_STYLE_WORD and EV_SELECTION_STYLE_LINE,
    which are created by double/triple clicking over text.
    
    These type of selections have the peculiarity that both
    the 'start' and 'end' points for the selection are set to be
    the same, i.e. both are initialized to the point coords where
    the dbl/tpl click happened. So in this case, we need to extract
    the real coordinates of the text selection by looking at the
    selection region returned by ev_pixbuf_cache_get_selection_region().
    
    Fixes issue #1119

 libview/ev-view.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 4 deletions(-)
---
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 8b46fcb3..6bb8de2d 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -3485,6 +3485,40 @@ ev_view_create_annotation (EvView *view)
        ev_view_create_annotation_real (view, annot_page, start, end);
 }
 
+static gboolean
+ev_view_get_doc_points_from_selection_region (EvView  *view,
+                                             gint     page,
+                                             EvPoint *begin,
+                                             EvPoint *end)
+{
+       cairo_rectangle_int_t extents;
+       GdkPoint start, stop;
+       cairo_region_t *region = NULL;
+
+       if (!view->pixbuf_cache)
+               return FALSE;
+
+       region = ev_pixbuf_cache_get_selection_region (view->pixbuf_cache, page, view->scale);
+
+       if (!region)
+               return FALSE;
+
+       cairo_region_get_extents (region, &extents);
+
+       if (!get_doc_point_from_offset (view, page, extents.x, extents.y + (extents.height / 2), &(start.x), 
&(start.y)))
+               return FALSE;
+
+       if (!get_doc_point_from_offset (view, page, extents.x + extents.width, extents.y + (extents.height / 
2), &(stop.x), &(stop.y)))
+               return FALSE;
+
+       begin->x = start.x;
+       begin->y = start.y;
+       end->x = stop.x;
+       end->y = stop.y;
+
+       return TRUE;
+}
+
 static void
 ev_view_create_annotation_from_selection (EvView          *view,
                                          EvViewSelection *selection)
@@ -3492,10 +3526,20 @@ ev_view_create_annotation_from_selection (EvView          *view,
        EvPoint doc_point_start;
        EvPoint doc_point_end;
 
-       doc_point_start.x = selection->rect.x1;
-       doc_point_start.y = selection->rect.y1;
-       doc_point_end.x = selection->rect.x2;
-       doc_point_end.y = selection->rect.y2;
+       /* Check if selection is of double/triple click type (STYLE_WORD and STYLE_LINE) and in that
+        * case get the start/end points from the selection region of pixbuf cache. Issue #1119 */
+       if (selection->rect.x1 == selection->rect.x2 && selection->rect.y1 == selection->rect.y2 &&
+            (selection->style == EV_SELECTION_STYLE_WORD || selection->style == EV_SELECTION_STYLE_LINE)) {
+
+               if (!ev_view_get_doc_points_from_selection_region (view, selection->page,
+                                                                  &doc_point_start, &doc_point_end))
+                       return;
+       } else {
+               doc_point_start.x = selection->rect.x1;
+               doc_point_start.y = selection->rect.y1;
+               doc_point_end.x = selection->rect.x2;
+               doc_point_end.y = selection->rect.y2;
+       }
 
        ev_view_create_annotation_real (view, selection->page, doc_point_start, doc_point_end);
 }