Merge lp:~brandontschaefer/nux/lp.834465-fix-ABI-BREAK into lp:nux

[Brandon Schaefer]

Allow setting the cursor blink speed

Allow setting the cursor blink speed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:859
http://jenkins.qa.ubuntu.com/job/nux-ci/118/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/118/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Looks good, and one minor thing if you want.
Also check this comment https://code.launchpad.net/~brandontschaefer/unity/lp.834465-fix-ABI-BREAK-FIX/+merge/258323/comments/645079 in order to adapt the API to support no-blinking.

By the way I'd like to follow this ABI break branch with another change for having consistent double clicks settings as well (so we can just break things once).

[Stephen M. Webb (bregma)]

Could you please break the ABI bump into a separate MP so we can batch multiple ABI-breaking changes together (but still be able to back one out if necessary)?

review: Needs Fixing

[lp:~brandontschaefer/nux/lp.834465-fix-ABI-BREAK]

860. By Brandon Schaefer on 2015-05-26

* Remove the ABI bump, THIS BRANCH STILL BREAKS ABI. Just need to bump the ABI
  in a different branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:860
http://jenkins.qa.ubuntu.com/job/nux-ci/120/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-wily-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/120/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:860
http://jenkins.qa.ubuntu.com/job/nux-ci/121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-wily-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-wily-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/nux-ci/121/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

860. By Brandon Schaefer on 2015-05-26

* Remove the ABI bump, THIS BRANCH STILL BREAKS ABI. Just need to bump the ABI
  in a different branch

859. By Brandon Schaefer on 2015-05-05

* Allows setting the cursor blink speed

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2014-03-05 03:42:22 +0000
+++ Nux/TextEntry.cpp	2015-05-26 19:19:24 +0000
@@ -145,6 +145,7 @@
     , scroll_offset_y_(0)
     , cursor_blink_timer_(0)
     , cursor_blink_status_(0)
+    , cursor_blink_speed_(kCursorBlinkTimeout)
     , visible_(true)
     , focused_(false)
     , need_im_reset_(false)
@@ -1156,7 +1157,7 @@
       return;
 
     if (!cursor_blink_timer_)
-      cursor_blink_timer_ = g_timeout_add(kCursorBlinkTimeout,
+      cursor_blink_timer_ = g_timeout_add(cursor_blink_speed_,
                                           (GSourceFunc)&CursorBlinkCallback,
                                           this);
   }
@@ -2386,6 +2387,18 @@
     QueueRefresh(true, true);
   }
 
+  void TextEntry::SetCursorBlinkSpeed(int blink_speed)
+  {
+    if (cursor_blink_timer_)
+    {
+      g_source_remove(cursor_blink_timer_);
+      cursor_blink_timer_ = 0;
+    }
+
+    cursor_blink_speed_ = blink_speed;
+    QueueCursorBlink();
+  }
+
   bool TextEntry::InspectKeyEvent(unsigned int /* eventType */, unsigned int /* key_sym */, const char* /* character */)
   {
     nux::Event const& cur_event = GetGraphicsDisplay()->GetCurrentEvent();

=== modified file 'Nux/TextEntry.h'
--- Nux/TextEntry.h	2014-03-05 03:42:22 +0000
+++ Nux/TextEntry.h	2015-05-26 19:19:24 +0000
@@ -159,6 +159,8 @@
     void SetFontSize(double font_size);
     void SetFontOptions(const cairo_font_options_t* options);
 
+    void SetCursorBlinkSpeed(int blink_speed);
+
     /** Select text between start and end. */
     void Select(int start, int end);
     /** Select all text */
@@ -434,6 +436,9 @@
      */
     int cursor_blink_status_;
 
+    /** The blink speed of the cursor **/
+    int cursor_blink_speed_;
+
     /*! Whether the text is visible, or its characters are masked by a default char (password mode). */
     bool visible_;
     /** Whether the edit control is focused */