st-entry.c: Remove unused blink code.

In b7639f1, cursor blink was disable. This commit removes
the remaining code.

Author: mtwebster

src/st/st-entry.c

@@ -94,10 +94,6 @@ enum
 
 #define ST_ENTRY_PRIV(x) ((StEntry *) x)->priv
 
-static void         st_entry_check_cursor_blink       (StEntry       *entry);
-static void         st_entry_pend_cursor_blink        (StEntry       *entry);
-static void         st_entry_reset_blink_time         (StEntry       *entry);
-
 struct _StEntryPrivate
 {
   ClutterActor *entry;
@@ -112,9 +108,6 @@ struct _StEntryPrivate
 
   gboolean      hint_visible;
   gboolean      capslock_warning_shown;
-  guint         blink_time;
-  guint         blink_timeout;
-  gboolean      cursor_visible;
 
   CoglPipeline *text_shadow_material;
   gfloat        shadow_width;
@@ -238,12 +231,6 @@ st_entry_dispose (GObject *object)
 
   cogl_clear_object (&priv->text_shadow_material);
 
-  if (priv->blink_timeout)
-    {
-      g_source_remove (priv->blink_timeout);
-      priv->blink_timeout = 0;
-    }
-
   seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
   keymap = clutter_seat_get_keymap (seat);
   g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
@@ -523,183 +510,6 @@ st_entry_allocate (ClutterActor          *actor,
   clutter_actor_allocate (priv->entry, &child_box, flags);
 }
 
-#define CURSOR_ON_MULTIPLIER 2
-#define CURSOR_OFF_MULTIPLIER 1
-#define CURSOR_PEND_MULTIPLIER 3
-#define CURSOR_DIVIDER 3
-
-static gboolean
-cursor_blinks (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  return FALSE;
-
-  if (clutter_actor_has_key_focus (CLUTTER_ACTOR (priv->entry)) &&
-      clutter_text_get_editable (CLUTTER_TEXT (priv->entry)) &&
-      clutter_text_get_selection_bound (CLUTTER_TEXT (priv->entry)) == clutter_text_get_cursor_position (CLUTTER_TEXT (priv->entry)))
-    {
-      gboolean blink;
-      g_object_get (gtk_settings_get_default (), "gtk-cursor-blink", &blink, NULL);
-
-      return blink;
-    }
-  else
-    return FALSE;
-}
-
-static gint
-get_cursor_time (StEntry *entry)
-{
-  gint time;
-  g_object_get (gtk_settings_get_default (), "gtk-cursor-blink-time", &time, NULL);
-
-  return time;
-}
-
-static gint
-get_cursor_blink_timeout (StEntry *entry)
-{
-  gint timeout;
-  g_object_get (gtk_settings_get_default (), "gtk-cursor-blink-timeout", &timeout, NULL);
-
-  return timeout;
-}
-
-static void
-show_cursor (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  if (!priv->cursor_visible)
-    {
-      priv->cursor_visible = TRUE;
-      clutter_text_set_cursor_visible (CLUTTER_TEXT (priv->entry), TRUE);
-    }
-}
-
-static void
-hide_cursor (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  if (priv->cursor_visible)
-    {
-      priv->cursor_visible = FALSE;
-      clutter_text_set_cursor_visible (CLUTTER_TEXT (priv->entry), FALSE);
-    }
-}
-
-/*
- * Blink!
- */
-static gint
-blink_cb (gpointer data)
-{
-  StEntry *entry;
-  StEntryPrivate *priv;
-  guint blink_timeout;
-
-  entry = ST_ENTRY (data);
-  priv = entry->priv;
-
-  if (!clutter_actor_has_key_focus (priv->entry))
-    {
-      g_warning ("StEntry - did not receive key-focus-out event. If you\n"
-         "connect a handler to this signal, it must return\n"
-         "FALSE so the StEntry gets the event as well");
-
-      st_entry_check_cursor_blink (entry);
-
-      return FALSE;
-    }
-
-  if (clutter_text_get_selection_bound (CLUTTER_TEXT (priv->entry)) != clutter_text_get_cursor_position (CLUTTER_TEXT (priv->entry)))
-    {
-      st_entry_check_cursor_blink (entry);
-      return FALSE;
-    }
-
-  blink_timeout = get_cursor_blink_timeout (entry);
-  if (priv->blink_time > 1000 * blink_timeout &&
-      blink_timeout < G_MAXINT/1000)
-    {
-      /* we've blinked enough without the user doing anything, stop blinking */
-      show_cursor (entry);
-      priv->blink_timeout = 0;
-    }
-  else if (priv->cursor_visible)
-    {
-      hide_cursor (entry);
-      priv->blink_timeout = clutter_threads_add_timeout (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER / CURSOR_DIVIDER,
-                        blink_cb,
-                        entry);
-    }
-  else
-    {
-      show_cursor (entry);
-      priv->blink_time += get_cursor_time (entry);
-      priv->blink_timeout = clutter_threads_add_timeout (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER,
-                        blink_cb,
-                        entry);
-    }
-
-  /* Remove ourselves */
-  return FALSE;
-}
-
-static void
-st_entry_check_cursor_blink (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  if (cursor_blinks (entry))
-    {
-      if (!priv->blink_timeout)
-    {
-      show_cursor (entry);
-      priv->blink_timeout = clutter_threads_add_timeout (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER / CURSOR_DIVIDER,
-                        blink_cb,
-                        entry);
-    }
-    }
-  else
-    {
-      if (priv->blink_timeout)
-        {
-          g_source_remove (priv->blink_timeout);
-          priv->blink_timeout = 0;
-        }
-
-      show_cursor (entry);
-    }
-}
-
-static void
-st_entry_pend_cursor_blink (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  if (cursor_blinks (entry))
-    {
-      if (priv->blink_timeout != 0)
-    g_source_remove (priv->blink_timeout);
-
-      priv->blink_timeout = clutter_threads_add_timeout (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER / CURSOR_DIVIDER,
-                                                     blink_cb,
-                                                     entry);
-      show_cursor (entry);
-    }
-}
-
-static void
-st_entry_reset_blink_time (StEntry *entry)
-{
-  StEntryPrivate *priv = entry->priv;
-
-  priv->blink_time = 0;
-}
-
 static void
 clutter_text_focus_in_cb (ClutterText  *text,
                           ClutterActor *actor)
@@ -716,9 +526,7 @@ clutter_text_focus_in_cb (ClutterText  *text,
                     G_CALLBACK (keymap_state_changed), entry);
 
   st_widget_add_style_pseudo_class (ST_WIDGET (actor), "focus");
-
-  st_entry_reset_blink_time (entry);
-  st_entry_check_cursor_blink (entry);
+  clutter_text_set_cursor_visible (text, TRUE);
 }
 
 static void
@@ -730,8 +538,8 @@ clutter_text_focus_out_cb (ClutterText  *text,
   ClutterSeat *seat;
 
   st_widget_remove_style_pseudo_class (ST_WIDGET (actor), "focus");
+  clutter_text_set_cursor_visible (text, FALSE);
 
-  st_entry_check_cursor_blink (entry);
   remove_capslock_feedback (entry);
 
   seat = clutter_backend_get_default_seat (clutter_get_default_backend ());
@@ -750,24 +558,6 @@ clutter_text_password_char_cb (GObject    *object,
     remove_capslock_feedback (entry);
 }
 
-static void
-clutter_text_selection_bound_cb (GObject    *object,
-                                 GParamSpec *pspec,
-                                 gpointer    user_data)
-{
-  StEntry *entry = ST_ENTRY (user_data);
-
-  st_entry_reset_blink_time (entry);
-  st_entry_pend_cursor_blink (entry);
-}
-
-static void
-clutter_text_cursor_changed (ClutterText *text, ClutterActor *actor)
-{
-  st_entry_reset_blink_time (ST_ENTRY (actor));
-  st_entry_pend_cursor_blink (ST_ENTRY (actor));
-}
-
 static void
 clutter_text_changed_cb (GObject    *object,
                          GParamSpec *pspec,
@@ -846,9 +636,6 @@ st_entry_key_press_event (ClutterActor    *actor,
 {
   StEntryPrivate *priv = ST_ENTRY_PRIV (actor);
 
-  st_entry_reset_blink_time (ST_ENTRY (actor));
-  st_entry_pend_cursor_blink (ST_ENTRY (actor));
-
   /* This is expected to handle events that were emitted for the inner
      ClutterText. They only reach this function if the ClutterText
      didn't handle them */
@@ -1111,12 +898,6 @@ st_entry_init (StEntry *entry)
   g_signal_connect (priv->entry, "button-press-event",
                     G_CALLBACK (clutter_text_button_press_event), entry);
 
-  g_signal_connect (priv->entry, "notify::selection-bound",
-                    G_CALLBACK (clutter_text_selection_bound_cb), entry);
-
-  g_signal_connect (priv->entry, "cursor-changed",
-                    G_CALLBACK (clutter_text_cursor_changed), entry);
-
   g_signal_connect (priv->entry, "notify::text",
                     G_CALLBACK (clutter_text_changed_cb), entry);
 
@@ -1130,9 +911,6 @@ st_entry_init (StEntry *entry)
   clutter_actor_set_reactive ((ClutterActor *) entry, TRUE);
 
   /* set cursor hidden until we receive focus */
-  priv->blink_timeout = 0;
-  priv->blink_time = 0;
-  priv->cursor_visible = FALSE;
   clutter_text_set_cursor_visible ((ClutterText *) priv->entry, FALSE);
 }