brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

text: implement del_word_next/del_word_prev()

Browse Source 
Bind ctrl-backspace and ctrl-del to functions that delete a word before
or after the cursor, respectively.

Selection does not affect the deletion, but current selection is
preserved. This mimicks GTK+ functionality in GtkTextView and GtkEntry.

http://bugzilla.openedhand.com/show_bug.cgi?id=1767

Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Jussi Kukkonen 2010-02-03 17:04:38 +00:00 committed by Emmanuele Bassi
parent d8d728a8d7
commit cd3c5155d8
1 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
clutter/clutter-text.c
View File

@ -2166,6 +2166,42 @@ clutter_text_real_del_next (ClutterText *self,
return TRUE;
}
static gboolean
clutter_text_real_del_word_next (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
pos = priv->position;
len = priv->n_chars;
if (len && pos != -1 && pos < len)
{
gint end;
end = clutter_text_move_word_forward (self, pos);
clutter_text_delete_text (self, pos, end);
if (priv->selection_bound >= end)
{
gint new_bound;
new_bound = priv->selection_bound - (end - pos);
clutter_text_set_selection_bound (self, new_bound);
}
else if (priv->selection_bound > pos)
{
clutter_text_set_selection_bound (self, pos);
}
}
return TRUE;
}
static gboolean
clutter_text_real_del_prev (ClutterText *self,
const gchar *action,
@ -2201,6 +2237,53 @@ clutter_text_real_del_prev (ClutterText *self,
return TRUE;
}
static gboolean
clutter_text_real_del_word_prev (ClutterText *self,
const gchar *action,
guint keyval,
ClutterModifierType modifiers)
{
ClutterTextPrivate *priv = self->priv;
gint pos;
gint len;
pos = priv->position;
len = priv->n_chars;
if (pos != 0 && len != 0)
{
gint new_pos;
if (pos == -1)
{
new_pos = clutter_text_move_word_backward (self, len);
clutter_text_delete_text (self, new_pos, len);
clutter_text_set_positions (self, -1, -1);
}
else
{
new_pos = clutter_text_move_word_backward (self, pos);
clutter_text_delete_text (self, new_pos, pos);
clutter_text_set_cursor_position (self, new_pos);
if (priv->selection_bound >= pos)
{
gint new_bound;
new_bound = priv->selection_bound - (pos - new_pos);
clutter_text_set_selection_bound (self, new_bound);
}
else if (priv->selection_bound >= new_pos)
{
clutter_text_set_selection_bound (self, new_pos);
}
}
}
return TRUE;
}
static gboolean
clutter_text_real_activate (ClutterText *self,
const gchar *action,
@ -2814,14 +2897,26 @@ clutter_text_class_init (ClutterTextClass *klass)
CLUTTER_Delete, 0,
G_CALLBACK (clutter_text_real_del_next),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "delete-next",
CLUTTER_Delete, CLUTTER_CONTROL_MASK,
G_CALLBACK (clutter_text_real_del_word_next),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "delete-next",
CLUTTER_KP_Delete, 0,
G_CALLBACK (clutter_text_real_del_next),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "delete-next",
CLUTTER_KP_Delete, CLUTTER_CONTROL_MASK,
G_CALLBACK (clutter_text_real_del_word_next),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "delete-prev",
CLUTTER_BackSpace, 0,
G_CALLBACK (clutter_text_real_del_prev),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "delete-prev",
CLUTTER_BackSpace, CLUTTER_CONTROL_MASK,
G_CALLBACK (clutter_text_real_del_word_prev),
NULL, NULL);
clutter_binding_pool_install_action (binding_pool, "activate",
CLUTTER_Return, 0,