Merge lp:~azzar1/nux/fix-849175 into lp:nux/2.0

[Andrea Azzarone]

Changes the cursor when the mouse pointer is over the text entry area.

[lp:~azzar1/nux/fix-849175]

537. By Andrea Azzarone on 2012-01-09

Add an extra check.

538. By Andrea Azzarone on 2012-01-10

Fix bug #737719.

539. By Andrea Azzarone on 2012-01-10

Fixes.

540. By Andrea Azzarone on 2012-01-10

Ops.

[Andrea Azzarone (azzar1)]

Ready for review, later we can add a test.

[Alex Launi (alexlauni)]

Please add at least a manual test. It shouldn't be too difficult to write unit tests for this code as well, so please do.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

> Please add at least a manual test. It shouldn't be too difficult to write unit
> tests for this code as well, so please do.

Manual test for the moment. nux::TextEntry doesn't provide the right interface to easly test it.

[lp:~azzar1/nux/fix-849175]

541. By Andrea Azzarone on 2012-01-11

Add a manual test.

[Jay Taoko (jaytaoko)]

review: Approve

[lp:~azzar1/nux/fix-849175]

542. By Andrea Azzarone on 2012-01-19

Merge trunk.

543. By Andrea Azzarone on 2012-01-19

Abi change.

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2012-01-04 00:10:39 +0000
+++ Nux/TextEntry.cpp	2012-01-19 19:43:25 +0000
@@ -1,5 +1,3 @@
-
-
 /*
   Copyright 2008 Google Inc.
 
@@ -30,6 +28,10 @@
 
 #include "TextEntry.h"
 
+#if defined(NUX_OS_LINUX)
+#include <X11/cursorfont.h>
+#endif
+
 namespace nux
 {
   static const int kInnerBorderX = 2;
@@ -147,9 +149,11 @@
     , font_dpi_(96.0)
     , _text_color(color::White)
     , align_(CairoGraphics::ALIGN_LEFT)
+#if defined(NUX_OS_LINUX)
+    , caret_cursor_(None)
+#endif
     , text_input_mode_(false)
     , key_nav_mode_(false)
-
   {
     cairo_font_options_set_antialias(font_options_, CAIRO_ANTIALIAS_SUBPIXEL);
     cairo_font_options_set_hint_style(font_options_, CAIRO_HINT_STYLE_FULL);
@@ -160,6 +164,8 @@
     mouse_drag.connect(sigc::mem_fun(this, &TextEntry::RecvMouseDrag));
     mouse_up.connect(sigc::mem_fun(this, &TextEntry::RecvMouseUp));
     mouse_double_click.connect(sigc::mem_fun(this, &TextEntry::RecvMouseDoubleClick));
+    mouse_enter.connect(sigc::mem_fun(this, &TextEntry::RecvMouseEnter));
+    mouse_leave.connect(sigc::mem_fun(this, &TextEntry::RecvMouseLeave));
 
     key_down.connect(sigc::mem_fun(this, &TextEntry::RecvKeyEvent));
 
@@ -212,7 +218,7 @@
 
   void TextEntry::ProcessMouseEvent(int event_type, int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
   {
-    if (GetEventButton(button_flags) != 1)
+    if (GetEventButton(button_flags) != 1 && event_type != NUX_MOUSE_MOVE)
       return;
 
     //ResetImContext();
@@ -444,6 +450,41 @@
   {
     ProcessMouseEvent(NUX_MOUSE_MOVE, x, y, dx, dy, button_flags, key_flags);
   }
+  
+  void TextEntry::RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags)
+  {
+#if defined(NUX_OS_LINUX)
+    if (caret_cursor_ == None)
+    {
+      Display* display = nux::GetGraphicsDisplay()->GetX11Display();
+      nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+    
+      if (display && window)
+      {
+        caret_cursor_ = XCreateFontCursor(display, XC_xterm);
+        XDefineCursor(display, window->GetInputWindowId(), caret_cursor_);
+      }
+    }
+#endif
+  }
+  
+  void TextEntry::RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags)
+  {
+#if defined(NUX_OS_LINUX)
+    if (caret_cursor_ != None)
+    {
+      Display* display = nux::GetGraphicsDisplay()->GetX11Display();
+      nux::BaseWindow* window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+      
+      if (display && window)
+      {
+        XUndefineCursor(display, window->GetInputWindowId());
+        XFreeCursor(display, caret_cursor_);
+        caret_cursor_ = None;
+      }
+    }
+#endif
+  }
 
   void TextEntry::RecvKeyEvent(
     unsigned long    eventType  ,   /*event type*/

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2012-01-04 00:10:39 +0000
+++ Nux/TextEntry.h	2012-01-19 19:43:25 +0000
@@ -94,6 +94,8 @@
     void RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags);
     void RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
     void RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags);
+    void RecvMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
+    void RecvMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
     void RecvKeyEvent(
       unsigned long    eventType  ,   /*event type*/
       unsigned long    keysym     ,   /*event keysym*/
@@ -380,6 +382,10 @@
     Color _text_color;
 
     CairoGraphics::Alignment align_;
+    
+#if defined(NUX_OS_LINUX)
+    Cursor caret_cursor_;
+#endif
 
     std::list<Rect> last_selection_region_;
     std::list<Rect> selection_region_;

=== modified file 'configure.ac'
--- configure.ac	2012-01-18 21:08:29 +0000
+++ configure.ac	2012-01-19 19:43:25 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # So far there is no provision for more than one break in a day.
-m4_define([nux_abi_version], [20120118.01])
+m4_define([nux_abi_version], [20120119.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])

=== added file 'tests/manual-tests/text-entry.txt'
--- tests/manual-tests/text-entry.txt	1970-01-01 00:00:00 +0000
+++ tests/manual-tests/text-entry.txt	2012-01-19 19:43:25 +0000
@@ -0,0 +1,24 @@
+Text Entry - Mouse cursor
+-----------
+This test makes sure that the mouse pointer changes when it is inside a 
+text entry area.
+
+#. Make sure you're running Unity 3d;
+#. Press Super
+#. Move the cursor on dash text entry.
+
+Outcome
+  The caret mouse cursor should be shown.
+  
+
+Text Entry - Drag
+-----------
+This test makes sure that the drag inside the dash works well.
+
+#. Make sure you're running Unity 3d;
+#. Press Super
+#. Type something inside dash search bar.
+#. Use mouse drag to select part of the test.
+
+Outcome
+  It should work.