#include "gtkwidgetprivate.h"
#include "gtkstylecontextprivate.h"
#include "gtktexthandleprivate.h"
-#include "gtkselectionwindow.h"
+#include "gtkbubblewindowprivate.h"
+#include "gtktoolbar.h"
#include "a11y/gtkentryaccessible.h"
guint truncate_multiline : 1;
guint cursor_handle_dragged : 1;
guint selection_handle_dragged : 1;
+ guint populate_all : 1;
};
struct _EntryIconInfo
PROP_COMPLETION,
PROP_INPUT_PURPOSE,
PROP_INPUT_HINTS,
- PROP_ATTRIBUTES
+ PROP_ATTRIBUTES,
+ PROP_POPULATE_ALL
};
static guint signals[LAST_SIGNAL] = { 0 };
PANGO_TYPE_ATTR_LIST,
GTK_PARAM_READWRITE));
+ /** GtkEntry:populate-all:
+ *
+ * If ::populate-all is %TRUE, the #GtkEntry::populate-popup
+ * signal is also emitted for touch popups.
+ *
+ * Since: 3.8
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_POPULATE_ALL,
+ g_param_spec_boolean ("populate-all",
+ P_("Populate all"),
+ P_("Whether to emit ::populate-popup for touch popups"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
/**
* GtkEntry:icon-prelight:
*
/**
* GtkEntry::populate-popup:
* @entry: The entry on which the signal is emitted
- * @menu: the menu that is being populated
+ * @popup: the container that is being populated
*
- * The ::populate-popup signal gets emitted before showing the
- * context menu of the entry.
+ * The ::populate-popup signal gets emitted before showing the
+ * context menu of the entry.
*
* If you need to add items to the context menu, connect
- * to this signal and append your menuitems to the @menu.
+ * to this signal and append your items to the @widget, which
+ * will be a #GtkMenu in this case.
+ *
+ * If #GtkEntry::populate-all is %TRUE, this signal will
+ * also be emitted to populate touch popups. In this case,
+ * @widget will be a different container, e.g. a #GtkToolbar.
+ * The signal handler should not make assumptions about the
+ * type of @widget.
*/
signals[POPULATE_POPUP] =
g_signal_new (I_("populate-popup"),
NULL, NULL,
_gtk_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
- GTK_TYPE_MENU);
+ GTK_TYPE_WIDGET);
/* Action signals */
gtk_entry_set_attributes (entry, g_value_get_boxed (value));
break;
+ case PROP_POPULATE_ALL:
+ entry->priv->populate_all = g_value_get_boolean (value);
+ break;
+
case PROP_SCROLL_OFFSET:
case PROP_CURSOR_POSITION:
default:
g_value_set_boxed (value, priv->attrs);
break;
+ case PROP_POPULATE_ALL:
+ g_value_set_boolean (value, priv->populate_all);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
text = gtk_entry_buffer_get_text (get_buffer (entry));
length = gtk_entry_buffer_get_length (get_buffer (entry));
- if (end_pos < 0)
+ if (end_pos < 0 || end_pos > length)
end_pos = length;
if (start_pos > length)
start_pos = length;
return TRUE;
}
-static gboolean
-gtk_entry_selection_bubble_popup_cb (gpointer user_data)
+static void
+activate_bubble_cb (GtkWidget *item,
+ GtkEntry *entry)
+{
+ const gchar *signal = g_object_get_data (G_OBJECT (item), "gtk-signal");
+ g_signal_emit_by_name (entry, signal);
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (entry->priv->selection_bubble));
+}
+
+static void
+append_bubble_action (GtkEntry *entry,
+ GtkWidget *toolbar,
+ const gchar *stock_id,
+ const gchar *signal,
+ gboolean sensitive)
+{
+ GtkToolItem *item = gtk_tool_button_new_from_stock (stock_id);
+ g_object_set_data (G_OBJECT (item), I_("gtk-signal"), (char *)signal);
+ g_signal_connect (item, "clicked", G_CALLBACK (activate_bubble_cb), entry);
+ gtk_widget_set_sensitive (GTK_WIDGET (item), sensitive);
+ gtk_widget_show (GTK_WIDGET (item));
+ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
+}
+
+static void
+bubble_targets_received (GtkClipboard *clipboard,
+ GtkSelectionData *data,
+ gpointer user_data)
{
GtkEntry *entry = user_data;
GtkEntryPrivate *priv = entry->priv;
GtkAllocation allocation;
gint start_x, end_x;
gboolean has_selection;
+ gboolean has_clipboard;
+ DisplayMode mode;
+ GtkWidget *toolbar;
has_selection = gtk_editable_get_selection_bounds (GTK_EDITABLE (entry),
NULL, NULL);
if (!has_selection && !priv->editable)
{
priv->selection_bubble_timeout_id = 0;
- return FALSE;
+ return;
}
if (priv->selection_bubble)
gtk_widget_destroy (priv->selection_bubble);
- priv->selection_bubble = gtk_selection_window_new ();
- g_signal_connect_swapped (priv->selection_bubble, "cut",
- G_CALLBACK (gtk_entry_cut_clipboard),
- entry);
- g_signal_connect_swapped (priv->selection_bubble, "copy",
- G_CALLBACK (gtk_entry_copy_clipboard),
- entry);
- g_signal_connect_swapped (priv->selection_bubble, "paste",
- G_CALLBACK (gtk_entry_paste_clipboard),
- entry);
-
- gtk_selection_window_set_editable (GTK_SELECTION_WINDOW (priv->selection_bubble),
- priv->editable);
- gtk_selection_window_set_has_selection (GTK_SELECTION_WINDOW (priv->selection_bubble),
- has_selection);
+ priv->selection_bubble = _gtk_bubble_window_new ();
+ toolbar = GTK_WIDGET (gtk_toolbar_new ());
+ gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
+ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
+ gtk_widget_show (toolbar);
+ gtk_container_add (GTK_CONTAINER (priv->selection_bubble), toolbar);
+
+ has_clipboard = gtk_selection_data_targets_include_text (data);
+ mode = gtk_entry_get_display_mode (entry);
+
+ append_bubble_action (entry, toolbar, GTK_STOCK_CUT, "cut-clipboard",
+ priv->editable && has_selection && mode == DISPLAY_NORMAL);
+
+ append_bubble_action (entry, toolbar, GTK_STOCK_COPY, "copy-clipboard",
+ has_selection && mode == DISPLAY_NORMAL);
+
+ append_bubble_action (entry, toolbar, GTK_STOCK_PASTE, "paste-clipboard",
+ priv->editable && has_clipboard);
+
+ if (priv->populate_all)
+ g_signal_emit (entry, signals[POPULATE_POPUP], 0, toolbar);
gtk_widget_get_allocation (GTK_WIDGET (entry), &allocation);
rect.width = 0;
}
- gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
- priv->text_area, &rect, GTK_POS_TOP);
+ _gtk_bubble_window_popup (GTK_BUBBLE_WINDOW (priv->selection_bubble),
+ priv->text_area, &rect, GTK_POS_TOP);
priv->selection_bubble_timeout_id = 0;
- return FALSE;
+}
+
+static gboolean
+gtk_entry_selection_bubble_popup_cb (gpointer user_data)
+{
+ GtkEntry *entry = user_data;
+
+ gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (entry), GDK_SELECTION_CLIPBOARD),
+ gdk_atom_intern_static_string ("TARGETS"),
+ bubble_targets_received,
+ entry);
+ return G_SOURCE_REMOVE;
}
static void
priv = entry->priv;
if (priv->selection_bubble)
- gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
+ _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
if (priv->selection_bubble_timeout_id)
{
projects / ~andy / gtk / blobdiff