[gtk/shortcuts-rebased-again: 119/129] text: Add more actions
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/shortcuts-rebased-again: 119/129] text: Add more actions
- Date: Sat, 22 Jun 2019 14:01:18 +0000 (UTC)
commit b44ae5c99c6ffa165a65b5bb87e7f00fad1babee
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jun 21 20:24:13 2019 +0000
text: Add more actions
These will let us port more bindings to actions.
gtk/gtktext.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 139 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index b2f59a9c2f..54c876b85b 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -544,6 +544,9 @@ static void emit_changed (GtkText *self);
static void gtk_text_update_clipboard_actions (GtkText *self);
static void gtk_text_update_emoji_action (GtkText *self);
+static void gtk_text_activate_default_activate (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
static void gtk_text_activate_clipboard_cut (GtkWidget *widget,
const char *action_name,
GVariant *parameter);
@@ -559,6 +562,18 @@ static void gtk_text_activate_selection_delete (GtkWidget *widget,
static void gtk_text_activate_selection_select_all (GtkWidget *widget,
const char *action_name,
GVariant *parameter);
+static void gtk_text_activate_edit_move_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
+static void gtk_text_activate_edit_insert_at_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
+static void gtk_text_activate_edit_delete_from_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
+static void gtk_text_activate_edit_backspace (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
static void gtk_text_activate_misc_insert_emoji (GtkWidget *widget,
const char *action_name,
GVariant *parameter);
@@ -572,6 +587,16 @@ static void gtk_text_set_misc_toggle_visibility (GtkWidget *widget,
static GVariant *gtk_text_get_misc_toggle_visibility (GtkWidget *widget,
const char *action_name);
+static void gtk_text_activate_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter);
+
+static void gtk_text_set_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name,
+ GVariant *state);
+static GVariant *gtk_text_get_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name);
+
/* GtkTextContent implementation
*/
#define GTK_TYPE_TEXT_CONTENT (gtk_text_content_get_type ())
@@ -1184,6 +1209,8 @@ gtk_text_class_init (GtkTextClass *class)
/* Actions */
+ gtk_widget_class_install_action (widget_class, "default.activate",
+ gtk_text_activate_default_activate);
gtk_widget_class_install_action (widget_class, "clipboard.cut",
gtk_text_activate_clipboard_cut);
gtk_widget_class_install_action (widget_class, "clipboard.copy",
@@ -1194,6 +1221,7 @@ gtk_text_class_init (GtkTextClass *class)
gtk_text_activate_selection_delete);
gtk_widget_class_install_action (widget_class, "selection.select-all",
gtk_text_activate_selection_select_all);
+
gtk_widget_class_install_action (widget_class, "misc.insert-emoji",
gtk_text_activate_misc_insert_emoji);
gtk_widget_class_install_stateful_action (widget_class, "misc.toggle-visibility",
@@ -1201,6 +1229,25 @@ gtk_text_class_init (GtkTextClass *class)
NULL, "b",
gtk_text_set_misc_toggle_visibility,
gtk_text_get_misc_toggle_visibility);
+ gtk_widget_class_install_stateful_action (widget_class, "misc.toggle-overwrite",
+ gtk_text_activate_misc_toggle_overwrite,
+ NULL, "b",
+ gtk_text_set_misc_toggle_overwrite,
+ gtk_text_get_misc_toggle_overwrite);
+ gtk_widget_class_install_stateful_action (widget_class, "edit.move-cursor",
+ gtk_text_activate_edit_move_cursor,
+ "(iib)", NULL,
+ NULL, NULL);
+ gtk_widget_class_install_stateful_action (widget_class, "edit.insert-at-cursor",
+ gtk_text_activate_edit_insert_at_cursor,
+ "s", NULL,
+ NULL, NULL);
+ gtk_widget_class_install_stateful_action (widget_class, "edit.delete-from-cursor",
+ gtk_text_activate_edit_delete_from_cursor,
+ "(ii)", NULL,
+ NULL, NULL);
+ gtk_widget_class_install_action (widget_class, "edit.backspace",
+ gtk_text_activate_edit_backspace);
/* Key bindings */
@@ -1263,7 +1310,7 @@ gtk_text_class_init (GtkTextClass *class)
"selection.select-all",
NULL);
- /* Unselect all
+ /* Unselect all
*/
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_backslash, GDK_CONTROL_MASK,
@@ -1296,7 +1343,7 @@ gtk_text_class_init (GtkTextClass *class)
GDK_KEY_KP_Delete, 0,
"delete-from-cursor",
"(ii)", GTK_DELETE_CHARS, 1);
-
+
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_BackSpace, 0,
"backspace",
@@ -5669,6 +5716,18 @@ hide_selection_bubble (GtkText *self)
gtk_widget_hide (priv->selection_bubble);
}
+static void
+gtk_text_activate_default_activate (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ GtkText *self = GTK_TEXT (widget);
+ GtkTextPrivate *priv = gtk_text_get_instance_private (self);
+
+ if (priv->activates_default)
+ gtk_widget_activate_default (gtk_widget_get_parent (widget));
+}
+
static void
gtk_text_activate_clipboard_cut (GtkWidget *widget,
const char *action_name,
@@ -5714,8 +5773,59 @@ gtk_text_activate_selection_select_all (GtkWidget *widget,
const char *action_name,
GVariant *parameter)
{
- GtkText *self = GTK_TEXT (widget);
- gtk_text_select_all (self);
+ gtk_text_select_all (GTK_TEXT (widget));
+}
+
+static void
+gtk_text_activate_edit_move_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ GtkMovementStep step;
+ int count;
+ gboolean extend;
+
+ g_variant_get (parameter, "(iib)", &step, &count, &extend);
+
+ step = CLAMP (step, GTK_MOVEMENT_LOGICAL_POSITIONS,
+ GTK_MOVEMENT_HORIZONTAL_PAGES);
+
+ gtk_text_move_cursor (GTK_TEXT (widget), step, count, extend);
+}
+
+static void
+gtk_text_activate_edit_insert_at_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ const char *str;
+
+ g_variant_get (parameter, "(&s)", &str);
+ gtk_text_insert_at_cursor (GTK_TEXT (widget), str);
+}
+
+static void
+gtk_text_activate_edit_delete_from_cursor (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ GtkDeleteType type;
+ int count;
+
+ g_variant_get (parameter, "(ii)", &type, &count);
+
+ type = CLAMP (type, GTK_DELETE_CHARS,
+ GTK_DELETE_WHITESPACE);
+
+ gtk_text_delete_from_cursor (GTK_TEXT (widget), type, count);
+}
+
+static void
+gtk_text_activate_edit_backspace (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ gtk_text_backspace (GTK_TEXT (widget));
}
static void
@@ -5757,6 +5867,31 @@ gtk_text_set_misc_toggle_visibility (GtkWidget *widget,
gtk_text_set_visibility (self, visible);
}
+static void
+gtk_text_activate_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name,
+ GVariant *parameter)
+{
+ gtk_text_toggle_overwrite (GTK_TEXT (widget));
+}
+
+static GVariant *
+gtk_text_get_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name)
+{
+ GtkText *self = GTK_TEXT (widget);
+ return g_variant_new_boolean (gtk_text_get_overwrite_mode (self));
+}
+
+static void
+gtk_text_set_misc_toggle_overwrite (GtkWidget *widget,
+ const char *action_name,
+ GVariant *state)
+{
+ GtkText *self = GTK_TEXT (widget);
+ gtk_text_set_overwrite_mode (self, g_variant_get_boolean (state));
+}
+
static void
gtk_text_update_clipboard_actions (GtkText *self)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
