Ticket #4123: patch

src/af/ev/gtk/ev_UnixMouse.cpp

@@ -164 +164 @@
                 invokeMouseMethod(pView,pEM,static_cast<UT_sint32>(pView->getGraphics()->tluD(e->x)),static_cast<UT_sint32>(pView->getGraphics()->tluD(e->y)));
                 signal(emc|mop|emb|state, static_cast<UT_sint32>(pView->getGraphics()->tluD(e->x)),static_cast<UT_sint32>(pView->getGraphics()->tluD(e->y)));
 
-                if (gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN) {
+                if (gdk_device_get_source (device) == GDK_SOURCE_TOUCHSCREEN || getenv ("ABI_TEST_TOUCH")) {
                         pView->setVisualSelectionEnabled(true);
                 } else {
                         pView->setVisualSelectionEnabled(false);

src/text/fmt/gtk/gtktexthandle.c

@@ -93 +93 @@
   priv = handle->priv;
   cairo_save (cr);
 
+  cairo_save (cr);
   cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
   cairo_set_source_rgba (cr, 0, 0, 0, 0);
   cairo_paint (cr);
+  cairo_restore (cr);
 
   gtk_style_context_save (priv->style_context);
   gtk_style_context_add_class (priv->style_context, "cursor-handle");
@@ -523 +525 @@
       priv->windows[FV_TEXT_HANDLE_POSITION_SELECTION_START].window =
         _fv_text_handle_create_window (handle, FV_TEXT_HANDLE_POSITION_SELECTION_START);
       priv->windows[FV_TEXT_HANDLE_POSITION_SELECTION_END].window =
-        _fv_text_handle_create_window (handle, FV_TEXT_HANDLE_POSITION_SELECTION_START);
+        _fv_text_handle_create_window (handle, FV_TEXT_HANDLE_POSITION_SELECTION_END);
       priv->realized = TRUE;
     }
   else
@@ -550 +552 @@
   if (priv->mode == mode)
     return;
 
+  priv->mode = mode;
+
+  if (mode != FV_TEXT_HANDLE_MODE_NONE)
+    _fv_text_handle_update_shape (handle,
+                                  priv->windows[FV_TEXT_HANDLE_POSITION_CURSOR].window,
+                                  FV_TEXT_HANDLE_POSITION_CURSOR);
   switch (mode)
     {
     case FV_TEXT_HANDLE_MODE_CURSOR:
@@ -568 +576 @@
       gdk_window_hide (priv->windows[FV_TEXT_HANDLE_POSITION_SELECTION_END].window);
       break;
     }
-
-  priv->mode = mode;
 }
 
 FvTextHandleMode
@@ -645 +651 @@
   if (!window)
     return;
 
+  if (priv->windows[pos].dragged)
+    return;
+
   if (!visible)
     gdk_window_hide (window);
   else

src/text/fmt/xp/fv_SelectionHandles.cpp

@@ -107 +107 @@
         pos = UT_MAX (pos, left + 1);
 
         m_pView->selectRange(left, pos);
+        m_pView->_fixInsertionPointCoords();
+        m_pView->ensureInsertionPointOnScreen();
 }
 
 void FV_SelectionHandles::updateCursor(UT_sint32 x, UT_sint32 y)

src/text/fmt/xp/fv_View.cpp

@@ -14426 +14426 @@
 void
 FV_View::selectRange( PT_DocPosition start, PT_DocPosition end )
 {
+        PT_DocPosition prev_start, prev_end;
+
+        prev_start = m_Selection.getSelectionLeftAnchor();
+        prev_end = m_Selection.getSelectionRightAnchor();
+
+        if (prev_start == start && prev_end == end)
+                return;
+
         _clearSelection(false);
         _setPoint(start);
         m_Selection.setSelectionLeftAnchor(start);
         _setSelectionAnchor();
         setPoint(end);
         m_Selection.setSelectionRightAnchor(end);
-        _drawSelection();
+
+        _drawBetweenPositions(MIN (prev_start, start), MAX (prev_end, end));
         _updateSelectionHandles();
 }