/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ * Copyright (C) 2004-2006 Christian Hammond
+ * Copyright (C) 2008 Cody Russell
+ * Copyright (C) 2008 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "config.h"
-#include <string.h>
-#include <pango/pango.h>
+#include <math.h>
+#include <string.h>
#include "gdk/gdkkeysyms.h"
+#include "gtkalignment.h"
#include "gtkbindings.h"
#include "gtkcelleditable.h"
#include "gtkclipboard.h"
#include "gtkdnd.h"
#include "gtkentry.h"
+#include "gtkentrybuffer.h"
#include "gtkimagemenuitem.h"
#include "gtkimcontextsimple.h"
#include "gtkimmulticontext.h"
#include "gtkintl.h"
+#include "gtklabel.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkmenu.h"
#include "gtkprivate.h"
#include "gtkentryprivate.h"
#include "gtkcelllayout.h"
+#include "gtktooltip.h"
+#include "gtkiconfactory.h"
+#include "gtkicontheme.h"
#include "gtkalias.h"
#define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key"
#define COMPLETION_TIMEOUT 300
#define PASSWORD_HINT_MAX 8
-/* Initial size of buffer, in bytes */
-#define MIN_SIZE 16
+#define MAX_ICONS 2
-/* Maximum size of text buffer, in bytes */
-#define MAX_SIZE G_MAXUSHORT
+#define IS_VALID_ICON_POSITION(pos) \
+ ((pos) == GTK_ENTRY_ICON_PRIMARY || \
+ (pos) == GTK_ENTRY_ICON_SECONDARY)
static const GtkBorder default_inner_border = { 2, 2, 2, 2 };
static GQuark quark_inner_border = 0;
static GQuark quark_password_hint = 0;
static GQuark quark_cursor_hadjustment = 0;
+static GQuark quark_capslock_feedback = 0;
typedef struct _GtkEntryPrivate GtkEntryPrivate;
#define GTK_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ENTRY, GtkEntryPrivate))
+typedef struct
+{
+ GdkWindow *window;
+ gchar *tooltip;
+ guint insensitive : 1;
+ guint nonactivatable : 1;
+ guint prelight : 1;
+ guint in_drag : 1;
+ guint pressed : 1;
+
+ GtkImageType storage_type;
+ GdkPixbuf *pixbuf;
+ gchar *stock_id;
+ gchar *icon_name;
+ GIcon *gicon;
+
+ GtkTargetList *target_list;
+ GdkDragAction actions;
+} EntryIconInfo;
+
struct _GtkEntryPrivate
{
+ GtkEntryBuffer* buffer;
+
gfloat xalign;
gint insert_pos;
guint blink_time; /* time in msec the cursor has blinked since last user event */
- guint interior_focus : 1;
- guint real_changed : 1;
- guint change_count : 8;
+ guint interior_focus : 1;
+ guint real_changed : 1;
+ guint invisible_char_set : 1;
+ guint caps_lock_warning : 1;
+ guint caps_lock_warning_shown : 1;
+ guint change_count : 8;
+ guint progress_pulse_mode : 1;
+ guint progress_pulse_way_back : 1;
gint focus_width;
GtkShadowType shadow_type;
+
+ gdouble progress_fraction;
+ gdouble progress_pulse_fraction;
+ gdouble progress_pulse_current;
+
+ EntryIconInfo *icons[MAX_ICONS];
+ gint icon_margin;
+ gint start_x;
+ gint start_y;
+
+ gchar *im_module;
};
typedef struct _GtkEntryPasswordHint GtkEntryPasswordHint;
struct _GtkEntryPasswordHint
{
- gchar password_hint[PASSWORD_HINT_MAX];
- guint password_hint_timeout_id;
- gint password_hint_length;
- gint password_hint_position;
+ gint position; /* Position (in text) of the last password hint */
+ guint source_id; /* Timeout source id */
+};
+
+typedef struct _GtkEntryCapslockFeedback GtkEntryCapslockFeedback;
+
+struct _GtkEntryCapslockFeedback
+{
+ GtkWidget *entry;
+ GtkWidget *window;
+ GtkWidget *label;
};
enum {
COPY_CLIPBOARD,
PASTE_CLIPBOARD,
TOGGLE_OVERWRITE,
+ ICON_PRESS,
+ ICON_RELEASE,
LAST_SIGNAL
};
enum {
PROP_0,
+ PROP_BUFFER,
PROP_CURSOR_POSITION,
PROP_SELECTION_BOUND,
PROP_EDITABLE,
PROP_TRUNCATE_MULTILINE,
PROP_SHADOW_TYPE,
PROP_OVERWRITE_MODE,
- PROP_TEXT_LENGTH
+ PROP_TEXT_LENGTH,
+ PROP_INVISIBLE_CHAR_SET,
+ PROP_CAPS_LOCK_WARNING,
+ PROP_PROGRESS_FRACTION,
+ PROP_PROGRESS_PULSE_STEP,
+ PROP_PIXBUF_PRIMARY,
+ PROP_PIXBUF_SECONDARY,
+ PROP_STOCK_PRIMARY,
+ PROP_STOCK_SECONDARY,
+ PROP_ICON_NAME_PRIMARY,
+ PROP_ICON_NAME_SECONDARY,
+ PROP_GICON_PRIMARY,
+ PROP_GICON_SECONDARY,
+ PROP_STORAGE_TYPE_PRIMARY,
+ PROP_STORAGE_TYPE_SECONDARY,
+ PROP_ACTIVATABLE_PRIMARY,
+ PROP_ACTIVATABLE_SECONDARY,
+ PROP_SENSITIVE_PRIMARY,
+ PROP_SENSITIVE_SECONDARY,
+ PROP_TOOLTIP_TEXT_PRIMARY,
+ PROP_TOOLTIP_TEXT_SECONDARY,
+ PROP_TOOLTIP_MARKUP_PRIMARY,
+ PROP_TOOLTIP_MARKUP_SECONDARY,
+ PROP_IM_MODULE,
+ PROP_EDITING_CANCELED
};
static guint signals[LAST_SIGNAL] = { 0 };
CURSOR_DND
} CursorType;
+typedef enum
+{
+ DISPLAY_NORMAL, /* The entry text is being shown */
+ DISPLAY_INVISIBLE, /* In invisible mode, text replaced by (eg) bullets */
+ DISPLAY_BLANK /* In invisible mode, nothing shown at all */
+} DisplayMode;
+
/* GObject, GtkObject methods
*/
static void gtk_entry_editable_init (GtkEditableClass *iface);
GParamSpec *pspec);
static void gtk_entry_finalize (GObject *object);
static void gtk_entry_destroy (GtkObject *object);
+static void gtk_entry_dispose (GObject *object);
/* GtkWidget methods
*/
static void gtk_entry_realize (GtkWidget *widget);
static void gtk_entry_unrealize (GtkWidget *widget);
+static void gtk_entry_map (GtkWidget *widget);
+static void gtk_entry_unmap (GtkWidget *widget);
static void gtk_entry_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_entry_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_entry_draw_frame (GtkWidget *widget,
- GdkRectangle *area);
+ GdkEventExpose *event);
+static void gtk_entry_draw_progress (GtkWidget *widget,
+ GdkEventExpose *event);
static gint gtk_entry_expose (GtkWidget *widget,
GdkEventExpose *event);
static gint gtk_entry_button_press (GtkWidget *widget,
GdkEventButton *event);
static gint gtk_entry_button_release (GtkWidget *widget,
GdkEventButton *event);
+static gint gtk_entry_enter_notify (GtkWidget *widget,
+ GdkEventCrossing *event);
+static gint gtk_entry_leave_notify (GtkWidget *widget,
+ GdkEventCrossing *event);
static gint gtk_entry_motion_notify (GtkWidget *widget,
GdkEventMotion *event);
static gint gtk_entry_key_press (GtkWidget *widget,
static void gtk_entry_grab_focus (GtkWidget *widget);
static void gtk_entry_style_set (GtkWidget *widget,
GtkStyle *previous_style);
+static gboolean gtk_entry_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip);
static void gtk_entry_direction_changed (GtkWidget *widget,
GtkTextDirection previous_dir);
static void gtk_entry_state_changed (GtkWidget *widget,
guint time);
static void gtk_entry_drag_data_delete (GtkWidget *widget,
GdkDragContext *context);
+static void gtk_entry_drag_begin (GtkWidget *widget,
+ GdkDragContext *context);
+static void gtk_entry_drag_end (GtkWidget *widget,
+ GdkDragContext *context);
+
/* GtkEditable method implementations
*/
static void gtk_entry_toggle_overwrite (GtkEntry *entry);
static void gtk_entry_select_all (GtkEntry *entry);
static void gtk_entry_real_activate (GtkEntry *entry);
-static gboolean gtk_entry_popup_menu (GtkWidget *widget);
+static gboolean gtk_entry_popup_menu (GtkWidget *widget);
+
+static void keymap_direction_changed (GdkKeymap *keymap,
+ GtkEntry *entry);
+static void keymap_state_changed (GdkKeymap *keymap,
+ GtkEntry *entry);
+static void remove_capslock_feedback (GtkEntry *entry);
-static void gtk_entry_keymap_direction_changed (GdkKeymap *keymap,
- GtkEntry *entry);
/* IM Context Callbacks
*/
static void gtk_entry_commit_cb (GtkIMContext *context,
static void gtk_entry_delete_whitespace (GtkEntry *entry);
static void gtk_entry_select_word (GtkEntry *entry);
static void gtk_entry_select_line (GtkEntry *entry);
-static char * gtk_entry_get_public_chars (GtkEntry *entry,
- gint start,
- gint end);
static void gtk_entry_paste (GtkEntry *entry,
GdkAtom selection);
static void gtk_entry_update_primary_selection (GtkEntry *entry);
GdkEventButton *event);
static gboolean gtk_entry_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling);
-static void gtk_entry_state_changed (GtkWidget *widget,
- GtkStateType previous_state);
static void gtk_entry_check_cursor_blink (GtkEntry *entry);
static void gtk_entry_pend_cursor_blink (GtkEntry *entry);
static void gtk_entry_reset_blink_time (GtkEntry *entry);
-static void get_text_area_size (GtkEntry *entry,
+static void gtk_entry_get_text_area_size (GtkEntry *entry,
gint *x,
gint *y,
gint *width,
gint *height);
-static void gtk_entry_get_text_area_size (GtkEntry *entry,
+static void get_text_area_size (GtkEntry *entry,
gint *x,
gint *y,
gint *width,
gint *y,
gint *width,
gint *height);
-static void gtk_entry_move_adjustments (GtkEntry *entry);
+static void gtk_entry_move_adjustments (GtkEntry *entry);
+static void gtk_entry_ensure_pixbuf (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos);
+
/* Completion */
static gint gtk_entry_completion_timeout (gpointer data);
static void end_change (GtkEntry *entry);
static void emit_changed (GtkEntry *entry);
+
+static void buffer_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars,
+ GtkEntry *entry);
+static void buffer_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars,
+ GtkEntry *entry);
+static void buffer_notify_text (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_notify_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_notify_max_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry);
+static void buffer_connect_signals (GtkEntry *entry);
+static void buffer_disconnect_signals (GtkEntry *entry);
+static GtkEntryBuffer *get_buffer (GtkEntry *entry);
+
+
G_DEFINE_TYPE_WITH_CODE (GtkEntry, gtk_entry, GTK_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (GTK_TYPE_EDITABLE,
gtk_entry_editable_init)
widget_class = (GtkWidgetClass*) class;
gtk_object_class = (GtkObjectClass *)class;
+ gobject_class->dispose = gtk_entry_dispose;
gobject_class->finalize = gtk_entry_finalize;
gobject_class->set_property = gtk_entry_set_property;
gobject_class->get_property = gtk_entry_get_property;
+ widget_class->map = gtk_entry_map;
+ widget_class->unmap = gtk_entry_unmap;
widget_class->realize = gtk_entry_realize;
widget_class->unrealize = gtk_entry_unrealize;
widget_class->size_request = gtk_entry_size_request;
widget_class->size_allocate = gtk_entry_size_allocate;
widget_class->expose_event = gtk_entry_expose;
+ widget_class->enter_notify_event = gtk_entry_enter_notify;
+ widget_class->leave_notify_event = gtk_entry_leave_notify;
widget_class->button_press_event = gtk_entry_button_press;
widget_class->button_release_event = gtk_entry_button_release;
widget_class->motion_notify_event = gtk_entry_motion_notify;
widget_class->focus_out_event = gtk_entry_focus_out;
widget_class->grab_focus = gtk_entry_grab_focus;
widget_class->style_set = gtk_entry_style_set;
+ widget_class->query_tooltip = gtk_entry_query_tooltip;
+ widget_class->drag_begin = gtk_entry_drag_begin;
+ widget_class->drag_end = gtk_entry_drag_end;
widget_class->direction_changed = gtk_entry_direction_changed;
widget_class->state_changed = gtk_entry_state_changed;
widget_class->screen_changed = gtk_entry_screen_changed;
quark_inner_border = g_quark_from_static_string ("gtk-entry-inner-border");
quark_password_hint = g_quark_from_static_string ("gtk-entry-password-hint");
quark_cursor_hadjustment = g_quark_from_static_string ("gtk-hadjustment");
+ quark_capslock_feedback = g_quark_from_static_string ("gtk-entry-capslock-feedback");
+
+ g_object_class_override_property (gobject_class,
+ PROP_EDITING_CANCELED,
+ "editing-canceled");
+
+ g_object_class_install_property (gobject_class,
+ PROP_BUFFER,
+ g_param_spec_object ("buffer",
+ P_("Text Buffer"),
+ P_("Text buffer object which actually stores entry text"),
+ GTK_TYPE_ENTRY_BUFFER,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (gobject_class,
PROP_CURSOR_POSITION,
P_("Cursor Position"),
P_("The current position of the insertion cursor in chars"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READABLE));
P_("Selection Bound"),
P_("The position of the opposite end of the selection from the cursor in chars"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READABLE));
P_("Maximum length"),
P_("Maximum number of characters for this entry. Zero if no maximum"),
0,
- MAX_SIZE,
+ GTK_ENTRY_BUFFER_MAX_SIZE,
0,
GTK_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
P_("Whether new text overwrites existing text"),
FALSE,
GTK_PARAM_READWRITE));
+
/**
* GtkEntry:text-length:
*
G_MAXUINT16,
0,
GTK_PARAM_READABLE));
+ /**
+ * GtkEntry:invisible-char-set:
+ *
+ * Whether the invisible char has been set for the #GtkEntry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_INVISIBLE_CHAR_SET,
+ g_param_spec_boolean ("invisible-char-set",
+ P_("Invisible char set"),
+ P_("Whether the invisible char has been set"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:caps-lock-warning
+ *
+ * Whether password entries will show a warning when Caps Lock is on.
+ *
+ * Note that the warning is shown using a secondary icon, and thus
+ * does not work if you are using the secondary icon position for some
+ * other purpose.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CAPS_LOCK_WARNING,
+ g_param_spec_boolean ("caps-lock-warning",
+ P_("Caps Lock warning"),
+ P_("Whether password entries will show a warning when Caps Lock is on"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:progress-fraction:
+ *
+ * The current fraction of the task that's been completed.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_PROGRESS_FRACTION,
+ g_param_spec_double ("progress-fraction",
+ P_("Progress Fraction"),
+ P_("The current fraction of the task that's been completed"),
+ 0.0,
+ 1.0,
+ 0.0,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:progress-pulse-step:
+ *
+ * The fraction of total entry width to move the progress
+ * bouncing block for each call to gtk_entry_progress_pulse().
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_PROGRESS_PULSE_STEP,
+ g_param_spec_double ("progress-pulse-step",
+ P_("Progress Pulse Step"),
+ P_("The fraction of total entry width to move the progress bouncing block for each call to gtk_entry_progress_pulse()"),
+ 0.0,
+ 1.0,
+ 0.1,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-pixbuf:
+ *
+ * A pixbuf to use as the primary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_PIXBUF_PRIMARY,
+ g_param_spec_object ("primary-icon-pixbuf",
+ P_("Primary pixbuf"),
+ P_("Primary pixbuf for the entry"),
+ GDK_TYPE_PIXBUF,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-pixbuf:
+ *
+ * An pixbuf to use as the secondary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_PIXBUF_SECONDARY,
+ g_param_spec_object ("secondary-icon-pixbuf",
+ P_("Secondary pixbuf"),
+ P_("Secondary pixbuf for the entry"),
+ GDK_TYPE_PIXBUF,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-stock:
+ *
+ * The stock id to use for the primary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_STOCK_PRIMARY,
+ g_param_spec_string ("primary-icon-stock",
+ P_("Primary stock ID"),
+ P_("Stock ID for primary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-stock:
+ *
+ * The stock id to use for the secondary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_STOCK_SECONDARY,
+ g_param_spec_string ("secondary-icon-stock",
+ P_("Secondary stock ID"),
+ P_("Stock ID for secondary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-name:
+ *
+ * The icon name to use for the primary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ICON_NAME_PRIMARY,
+ g_param_spec_string ("primary-icon-name",
+ P_("Primary icon name"),
+ P_("Icon name for primary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-name:
+ *
+ * The icon name to use for the secondary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ICON_NAME_SECONDARY,
+ g_param_spec_string ("secondary-icon-name",
+ P_("Secondary icon name"),
+ P_("Icon name for secondary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-gicon:
+ *
+ * The #GIcon to use for the primary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_GICON_PRIMARY,
+ g_param_spec_object ("primary-icon-gicon",
+ P_("Primary GIcon"),
+ P_("GIcon for primary icon"),
+ G_TYPE_ICON,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-gicon:
+ *
+ * The #GIcon to use for the secondary icon for the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_GICON_SECONDARY,
+ g_param_spec_object ("secondary-icon-gicon",
+ P_("Secondary GIcon"),
+ P_("GIcon for secondary icon"),
+ G_TYPE_ICON,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-storage-type:
+ *
+ * The representation which is used for the primary icon of the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_STORAGE_TYPE_PRIMARY,
+ g_param_spec_enum ("primary-icon-storage-type",
+ P_("Primary storage type"),
+ P_("The representation being used for primary icon"),
+ GTK_TYPE_IMAGE_TYPE,
+ GTK_IMAGE_EMPTY,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkEntry:secondary-icon-storage-type:
+ *
+ * The representation which is used for the secondary icon of the entry.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_STORAGE_TYPE_SECONDARY,
+ g_param_spec_enum ("secondary-icon-storage-type",
+ P_("Secondary storage type"),
+ P_("The representation being used for secondary icon"),
+ GTK_TYPE_IMAGE_TYPE,
+ GTK_IMAGE_EMPTY,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkEntry:primary-icon-activatable:
+ *
+ * Whether the primary icon is activatable.
+ *
+ * GTK+ emits the #GtkEntry::icon-press and #GtkEntry::icon-release
+ * signals only on sensitive, activatable icons.
+ *
+ * Sensitive, but non-activatable icons can be used for purely
+ * informational purposes.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ACTIVATABLE_PRIMARY,
+ g_param_spec_boolean ("primary-icon-activatable",
+ P_("Primary icon activatable"),
+ P_("Whether the primary icon is activatable"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-activatable:
+ *
+ * Whether the secondary icon is activatable.
+ *
+ * GTK+ emits the #GtkEntry::icon-press and #GtkEntry::icon-release
+ * signals only on sensitive, activatable icons.
+ *
+ * Sensitive, but non-activatable icons can be used for purely
+ * informational purposes.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_ACTIVATABLE_SECONDARY,
+ g_param_spec_boolean ("secondary-icon-activatable",
+ P_("Secondary icon activatable"),
+ P_("Whether the secondary icon is activatable"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+
+ /**
+ * GtkEntry:primary-icon-sensitive:
+ *
+ * Whether the primary icon is sensitive.
+ *
+ * An insensitive icon appears grayed out. GTK+ does not emit the
+ * #GtkEntry::icon-press and #GtkEntry::icon-release signals and
+ * does not allow DND from insensitive icons.
+ *
+ * An icon should be set insensitive if the action that would trigger
+ * when clicked is currently not available.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SENSITIVE_PRIMARY,
+ g_param_spec_boolean ("primary-icon-sensitive",
+ P_("Primary icon sensitive"),
+ P_("Whether the primary icon is sensitive"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-sensitive:
+ *
+ * Whether the secondary icon is sensitive.
+ *
+ * An insensitive icon appears grayed out. GTK+ does not emit the
+ * #GtkEntry::icon-press and #GtkEntry::icon-release signals and
+ * does not allow DND from insensitive icons.
+ *
+ * An icon should be set insensitive if the action that would trigger
+ * when clicked is currently not available.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_SENSITIVE_SECONDARY,
+ g_param_spec_boolean ("secondary-icon-sensitive",
+ P_("Secondary icon sensitive"),
+ P_("Whether the secondary icon is sensitive"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-tooltip-text:
+ *
+ * The contents of the tooltip on the primary icon.
+ *
+ * Also see gtk_entry_set_icon_tooltip_text().
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLTIP_TEXT_PRIMARY,
+ g_param_spec_string ("primary-icon-tooltip-text",
+ P_("Primary icon tooltip text"),
+ P_("The contents of the tooltip on the primary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-tooltip-text:
+ *
+ * The contents of the tooltip on the secondary icon.
+ *
+ * Also see gtk_entry_set_icon_tooltip_text().
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLTIP_TEXT_SECONDARY,
+ g_param_spec_string ("secondary-icon-tooltip-text",
+ P_("Secondary icon tooltip text"),
+ P_("The contents of the tooltip on the secondary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:primary-icon-tooltip-markup:
+ *
+ * The contents of the tooltip on the primary icon, which is marked up
+ * with the <link linkend="PangoMarkupFormat">Pango text markup
+ * language</link>.
+ *
+ * Also see gtk_entry_set_icon_tooltip_markup().
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLTIP_MARKUP_PRIMARY,
+ g_param_spec_string ("primary-icon-tooltip-markup",
+ P_("Primary icon tooltip markup"),
+ P_("The contents of the tooltip on the primary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:secondary-icon-tooltip-markup:
+ *
+ * The contents of the tooltip on the secondary icon, which is marked up
+ * with the <link linkend="PangoMarkupFormat">Pango text markup
+ * language</link>.
+ *
+ * Also see gtk_entry_set_icon_tooltip_markup().
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_TOOLTIP_MARKUP_SECONDARY,
+ g_param_spec_string ("secondary-icon-tooltip-markup",
+ P_("Secondary icon tooltip markup"),
+ P_("The contents of the tooltip on the secondary icon"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:im-module:
+ *
+ * Which IM (input method) module should be used for this entry.
+ * See #GtkIMContext.
+ *
+ * Setting this to a non-%NULL value overrides the
+ * system-wide IM module setting. See the GtkSettings
+ * #GtkSettings:gtk-im-module property.
+ *
+ * Since: 2.16
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_IM_MODULE,
+ g_param_spec_string ("im-module",
+ P_("IM module"),
+ P_("Which IM module should be used"),
+ NULL,
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkEntry:icon-prelight:
+ *
+ * The prelight style property determines whether activatable
+ * icons prelight on mouseover.
+ *
+ * Since: 2.16
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boolean ("icon-prelight",
+ P_("Icon Prelight"),
+ P_("Whether activatable icons should prelight when hovered"),
+ TRUE,
+ GTK_PARAM_READABLE));
+ /**
+ * GtkEntry:progress-border:
+ *
+ * The border around the progress bar in the entry.
+ *
+ * Since: 2.16
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boxed ("progress-border",
+ P_("Progress Border"),
+ P_("Border around the progress bar"),
+ GTK_TYPE_BORDER,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkEntry:invisible-char:
+ *
+ * The invisible character is used when masking entry contents (in
+ * \"password mode\")"). When it is not explicitly set with the
+ * #GtkEntry::invisible-char property, GTK+ determines the character
+ * to use from a list of possible candidates, depending on availability
+ * in the current font.
+ *
+ * This style property allows the theme to prepend a character
+ * to the list of candidates.
+ *
+ * Since: 2.18
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_unichar ("invisible-char",
+ P_("Invisible character"),
+ P_("The character to use when masking entry contents (in \"password mode\")"),
+ 0,
+ GTK_PARAM_READABLE));
+
+ /**
+ * GtkEntry::populate-popup:
+ * @entry: The entry on which the signal is emitted
+ * @menu: the menu that is being populated
+ *
+ * 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.
+ */
signals[POPULATE_POPUP] =
g_signal_new (I_("populate-popup"),
G_OBJECT_CLASS_TYPE (gobject_class),
/* Action signals */
+ /**
+ * GtkEntry::activate:
+ * @entry: The entry on which the signal is emitted
+ *
+ * A <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user activates the entry.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control activation
+ * programmatically.
+ *
+ * The default bindings for this signal are all forms of the Enter key.
+ */
signals[ACTIVATE] =
g_signal_new (I_("activate"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_TYPE_NONE, 0);
widget_class->activate_signal = signals[ACTIVATE];
+ /**
+ * GtkEntry::move-cursor:
+ * @entry: the object which received the signal
+ * @step: the granularity of the move, as a #GtkMovementStep
+ * @count: the number of @step units to move
+ * @extend_selection: %TRUE if the move should extend the selection
+ *
+ * The ::move-cursor signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user initiates a cursor movement.
+ * If the cursor is not visible in @entry, this signal causes
+ * the viewport to be moved instead.
+ *
+ * Applications should not connect to it, but may emit it with
+ * g_signal_emit_by_name() if they need to control the cursor
+ * programmatically.
+ *
+ * The default bindings for this signal come in two variants,
+ * the variant with the Shift modifier extends the selection,
+ * the variant without the Shift modifer does not.
+ * There are too many key combinations to list them all here.
+ * <itemizedlist>
+ * <listitem>Arrow keys move by individual characters/lines</listitem>
+ * <listitem>Ctrl-arrow key combinations move by words/paragraphs</listitem>
+ * <listitem>Home/End keys move to the ends of the buffer</listitem>
+ * </itemizedlist>
+ */
signals[MOVE_CURSOR] =
g_signal_new (I_("move-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_TYPE_INT,
G_TYPE_BOOLEAN);
+ /**
+ * GtkEntry::insert-at-cursor:
+ * @entry: the object which received the signal
+ * @string: the string to insert
+ *
+ * The ::insert-at-cursor signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user initiates the insertion of a
+ * fixed string at the cursor.
+ *
+ * This signal has no default bindings.
+ */
signals[INSERT_AT_CURSOR] =
g_signal_new (I_("insert-at-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_TYPE_NONE, 1,
G_TYPE_STRING);
+ /**
+ * GtkEntry::delete-from-cursor:
+ * @entry: the object which received the signal
+ * @type: the granularity of the deletion, as a #GtkDeleteType
+ * @count: the number of @type units to delete
+ *
+ * The ::delete-from-cursor signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user initiates a text deletion.
+ *
+ * If the @type is %GTK_DELETE_CHARS, GTK+ deletes the selection
+ * if there is one, otherwise it deletes the requested number
+ * of characters.
+ *
+ * The default bindings for this signal are
+ * Delete for deleting a character and Ctrl-Delete for
+ * deleting a word.
+ */
signals[DELETE_FROM_CURSOR] =
g_signal_new (I_("delete-from-cursor"),
G_OBJECT_CLASS_TYPE (gobject_class),
GTK_TYPE_DELETE_TYPE,
G_TYPE_INT);
+ /**
+ * GtkEntry::backspace:
+ * @entry: the object which received the signal
+ *
+ * The ::backspace signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted when the user asks for it.
+ *
+ * The default bindings for this signal are
+ * Backspace and Shift-Backspace.
+ */
signals[BACKSPACE] =
g_signal_new (I_("backspace"),
G_OBJECT_CLASS_TYPE (gobject_class),
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkEntry::cut-clipboard:
+ * @entry: the object which received the signal
+ *
+ * The ::cut-clipboard signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to cut the selection to the clipboard.
+ *
+ * The default bindings for this signal are
+ * Ctrl-x and Shift-Delete.
+ */
signals[CUT_CLIPBOARD] =
g_signal_new (I_("cut-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkEntry::copy-clipboard:
+ * @entry: the object which received the signal
+ *
+ * The ::copy-clipboard signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to copy the selection to the clipboard.
+ *
+ * The default bindings for this signal are
+ * Ctrl-c and Ctrl-Insert.
+ */
signals[COPY_CLIPBOARD] =
g_signal_new (I_("copy-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
- signals[PASTE_CLIPBOARD] =
+ /**
+ * GtkEntry::paste-clipboard:
+ * @entry: the object which received the signal
+ *
+ * The ::paste-clipboard signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to paste the contents of the clipboard
+ * into the text view.
+ *
+ * The default bindings for this signal are
+ * Ctrl-v and Shift-Insert.
+ */
+ signals[PASTE_CLIPBOARD] =
g_signal_new (I_("paste-clipboard"),
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkEntry::toggle-overwrite:
+ * @entry: the object which received the signal
+ *
+ * The ::toggle-overwrite signal is a
+ * <link linkend="keybinding-signals">keybinding signal</link>
+ * which gets emitted to toggle the overwrite mode of the entry.
+ *
+ * The default bindings for this signal is Insert.
+ */
signals[TOGGLE_OVERWRITE] =
g_signal_new (I_("toggle-overwrite"),
G_OBJECT_CLASS_TYPE (gobject_class),
_gtk_marshal_VOID__VOID,
G_TYPE_NONE, 0);
+ /**
+ * GtkEntry::icon-press:
+ * @entry: The entry on which the signal is emitted
+ * @icon_pos: The position of the clicked icon
+ * @event: the button press event
+ *
+ * The ::icon-press signal is emitted when an activatable icon
+ * is clicked.
+ *
+ * Since: 2.16
+ */
+ signals[ICON_PRESS] =
+ g_signal_new (I_("icon-press"),
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM_BOXED,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_ENTRY_ICON_POSITION,
+ GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+ /**
+ * GtkEntry::icon-release:
+ * @entry: The entry on which the signal is emitted
+ * @icon_pos: The position of the clicked icon
+ * @event: the button release event
+ *
+ * The ::icon-release signal is emitted on the button release from a
+ * mouse click over an activatable icon.
+ *
+ * Since: 2.16
+ */
+ signals[ICON_RELEASE] =
+ g_signal_new (I_("icon-release"),
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ 0,
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM_BOXED,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_ENTRY_ICON_POSITION,
+ GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
+
+
/*
* Key bindings
*/
GTK_TYPE_BORDER,
GTK_PARAM_READABLE));
+ /**
+ * GtkEntry:state-hint:
+ *
+ * Indicates whether to pass a proper widget state when
+ * drawing the shadow and the widget background.
+ *
+ * Since: 2.16
+ */
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boolean ("state-hint",
+ P_("State Hint"),
+ P_("Whether to pass a proper state when drawing shadow or background"),
+ FALSE,
+ GTK_PARAM_READABLE));
+
gtk_settings_install_property (g_param_spec_boolean ("gtk-entry-select-on-focus",
P_("Select on focus"),
P_("Whether to select the contents of an entry when it is focused"),
switch (prop_id)
{
+ case PROP_BUFFER:
+ gtk_entry_set_buffer (entry, g_value_get_object (value));
+ break;
+
case PROP_EDITABLE:
{
gboolean new_value = g_value_get_boolean (value);
gtk_entry_set_overwrite_mode (entry, g_value_get_boolean (value));
break;
+ case PROP_INVISIBLE_CHAR_SET:
+ if (g_value_get_boolean (value))
+ priv->invisible_char_set = TRUE;
+ else
+ gtk_entry_unset_invisible_char (entry);
+ break;
+
+ case PROP_CAPS_LOCK_WARNING:
+ priv->caps_lock_warning = g_value_get_boolean (value);
+ break;
+
+ case PROP_PROGRESS_FRACTION:
+ gtk_entry_set_progress_fraction (entry, g_value_get_double (value));
+ break;
+
+ case PROP_PROGRESS_PULSE_STEP:
+ gtk_entry_set_progress_pulse_step (entry, g_value_get_double (value));
+ break;
+
+ case PROP_PIXBUF_PRIMARY:
+ gtk_entry_set_icon_from_pixbuf (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_object (value));
+ break;
+
+ case PROP_PIXBUF_SECONDARY:
+ gtk_entry_set_icon_from_pixbuf (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_object (value));
+ break;
+
+ case PROP_STOCK_PRIMARY:
+ gtk_entry_set_icon_from_stock (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_STOCK_SECONDARY:
+ gtk_entry_set_icon_from_stock (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_ICON_NAME_PRIMARY:
+ gtk_entry_set_icon_from_icon_name (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_ICON_NAME_SECONDARY:
+ gtk_entry_set_icon_from_icon_name (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_GICON_PRIMARY:
+ gtk_entry_set_icon_from_gicon (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_object (value));
+ break;
+
+ case PROP_GICON_SECONDARY:
+ gtk_entry_set_icon_from_gicon (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_object (value));
+ break;
+
+ case PROP_ACTIVATABLE_PRIMARY:
+ gtk_entry_set_icon_activatable (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_ACTIVATABLE_SECONDARY:
+ gtk_entry_set_icon_activatable (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_SENSITIVE_PRIMARY:
+ gtk_entry_set_icon_sensitive (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_SENSITIVE_SECONDARY:
+ gtk_entry_set_icon_sensitive (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_boolean (value));
+ break;
+
+ case PROP_TOOLTIP_TEXT_PRIMARY:
+ gtk_entry_set_icon_tooltip_text (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_TOOLTIP_TEXT_SECONDARY:
+ gtk_entry_set_icon_tooltip_text (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_TOOLTIP_MARKUP_PRIMARY:
+ gtk_entry_set_icon_tooltip_markup (entry,
+ GTK_ENTRY_ICON_PRIMARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_TOOLTIP_MARKUP_SECONDARY:
+ gtk_entry_set_icon_tooltip_markup (entry,
+ GTK_ENTRY_ICON_SECONDARY,
+ g_value_get_string (value));
+ break;
+
+ case PROP_IM_MODULE:
+ g_free (priv->im_module);
+ priv->im_module = g_strdup (g_value_get_string (value));
+ if (GTK_IS_IM_MULTICONTEXT (entry->im_context))
+ gtk_im_multicontext_set_context_id (GTK_IM_MULTICONTEXT (entry->im_context), priv->im_module);
+ break;
+
case PROP_SCROLL_OFFSET:
case PROP_CURSOR_POSITION:
default:
switch (prop_id)
{
+ case PROP_BUFFER:
+ g_value_set_object (value, gtk_entry_get_buffer (entry));
+ break;
+
case PROP_CURSOR_POSITION:
g_value_set_int (value, entry->current_pos);
break;
+
case PROP_SELECTION_BOUND:
g_value_set_int (value, entry->selection_bound);
break;
+
case PROP_EDITABLE:
g_value_set_boolean (value, entry->editable);
break;
+
case PROP_MAX_LENGTH:
- g_value_set_int (value, entry->text_max_length);
+ g_value_set_int (value, gtk_entry_buffer_get_max_length (get_buffer (entry)));
break;
+
case PROP_VISIBILITY:
g_value_set_boolean (value, entry->visible);
break;
+
case PROP_HAS_FRAME:
g_value_set_boolean (value, entry->has_frame);
break;
+
case PROP_INNER_BORDER:
g_value_set_boxed (value, gtk_entry_get_inner_border (entry));
break;
+
case PROP_INVISIBLE_CHAR:
g_value_set_uint (value, entry->invisible_char);
break;
+
case PROP_ACTIVATES_DEFAULT:
g_value_set_boolean (value, entry->activates_default);
break;
+
case PROP_WIDTH_CHARS:
g_value_set_int (value, entry->width_chars);
break;
+
case PROP_SCROLL_OFFSET:
g_value_set_int (value, entry->scroll_offset);
break;
+
case PROP_TEXT:
g_value_set_string (value, gtk_entry_get_text (entry));
break;
+
case PROP_XALIGN:
g_value_set_float (value, gtk_entry_get_alignment (entry));
break;
+
case PROP_TRUNCATE_MULTILINE:
g_value_set_boolean (value, entry->truncate_multiline);
break;
+
case PROP_SHADOW_TYPE:
g_value_set_enum (value, priv->shadow_type);
break;
+
case PROP_OVERWRITE_MODE:
g_value_set_boolean (value, entry->overwrite_mode);
break;
+
case PROP_TEXT_LENGTH:
- g_value_set_uint (value, entry->text_length);
+ g_value_set_uint (value, gtk_entry_buffer_get_length (get_buffer (entry)));
+ break;
+
+ case PROP_INVISIBLE_CHAR_SET:
+ g_value_set_boolean (value, priv->invisible_char_set);
+ break;
+
+ case PROP_IM_MODULE:
+ g_value_set_string (value, priv->im_module);
+ break;
+
+ case PROP_CAPS_LOCK_WARNING:
+ g_value_set_boolean (value, priv->caps_lock_warning);
+ break;
+
+ case PROP_PROGRESS_FRACTION:
+ g_value_set_double (value, priv->progress_fraction);
+ break;
+
+ case PROP_PROGRESS_PULSE_STEP:
+ g_value_set_double (value, priv->progress_pulse_fraction);
+ break;
+
+ case PROP_PIXBUF_PRIMARY:
+ g_value_set_object (value,
+ gtk_entry_get_icon_pixbuf (entry,
+ GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_PIXBUF_SECONDARY:
+ g_value_set_object (value,
+ gtk_entry_get_icon_pixbuf (entry,
+ GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_STOCK_PRIMARY:
+ g_value_set_string (value,
+ gtk_entry_get_icon_stock (entry,
+ GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_STOCK_SECONDARY:
+ g_value_set_string (value,
+ gtk_entry_get_icon_stock (entry,
+ GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_ICON_NAME_PRIMARY:
+ g_value_set_string (value,
+ gtk_entry_get_icon_name (entry,
+ GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_ICON_NAME_SECONDARY:
+ g_value_set_string (value,
+ gtk_entry_get_icon_name (entry,
+ GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_GICON_PRIMARY:
+ g_value_set_object (value,
+ gtk_entry_get_icon_gicon (entry,
+ GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_GICON_SECONDARY:
+ g_value_set_object (value,
+ gtk_entry_get_icon_gicon (entry,
+ GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_STORAGE_TYPE_PRIMARY:
+ g_value_set_enum (value,
+ gtk_entry_get_icon_storage_type (entry,
+ GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_STORAGE_TYPE_SECONDARY:
+ g_value_set_enum (value,
+ gtk_entry_get_icon_storage_type (entry,
+ GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_ACTIVATABLE_PRIMARY:
+ g_value_set_boolean (value,
+ gtk_entry_get_icon_activatable (entry, GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_ACTIVATABLE_SECONDARY:
+ g_value_set_boolean (value,
+ gtk_entry_get_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_SENSITIVE_PRIMARY:
+ g_value_set_boolean (value,
+ gtk_entry_get_icon_sensitive (entry, GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_SENSITIVE_SECONDARY:
+ g_value_set_boolean (value,
+ gtk_entry_get_icon_sensitive (entry, GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_TOOLTIP_TEXT_PRIMARY:
+ g_value_take_string (value,
+ gtk_entry_get_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_TOOLTIP_TEXT_SECONDARY:
+ g_value_take_string (value,
+ gtk_entry_get_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_TOOLTIP_MARKUP_PRIMARY:
+ g_value_take_string (value,
+ gtk_entry_get_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY));
+ break;
+
+ case PROP_TOOLTIP_MARKUP_SECONDARY:
+ g_value_take_string (value,
+ gtk_entry_get_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY));
+ break;
+
+ case PROP_EDITING_CANCELED:
+ g_value_set_boolean (value,
+ entry->editing_canceled);
break;
default:
}
}
+static gunichar
+find_invisible_char (GtkWidget *widget)
+{
+ PangoLayout *layout;
+ PangoAttrList *attr_list;
+ gint i;
+ gunichar invisible_chars [] = {
+ 0,
+ 0x25cf, /* BLACK CIRCLE */
+ 0x2022, /* BULLET */
+ 0x2731, /* HEAVY ASTERISK */
+ 0x273a /* SIXTEEN POINTED ASTERISK */
+ };
+
+ if (widget->style)
+ gtk_widget_style_get (widget,
+ "invisible-char", &invisible_chars[0],
+ NULL);
+
+ layout = gtk_widget_create_pango_layout (widget, NULL);
+
+ attr_list = pango_attr_list_new ();
+ pango_attr_list_insert (attr_list, pango_attr_fallback_new (FALSE));
+
+ pango_layout_set_attributes (layout, attr_list);
+ pango_attr_list_unref (attr_list);
+
+ for (i = (invisible_chars[0] != 0 ? 0 : 1); i < G_N_ELEMENTS (invisible_chars); i++)
+ {
+ gchar text[7] = { 0, };
+ gint len, count;
+
+ len = g_unichar_to_utf8 (invisible_chars[i], text);
+ pango_layout_set_text (layout, text, len);
+
+ count = pango_layout_get_unknown_glyphs_count (layout);
+
+ if (count == 0)
+ {
+ g_object_unref (layout);
+ return invisible_chars[i];
+ }
+ }
+
+ g_object_unref (layout);
+
+ return '*';
+}
+
static void
gtk_entry_init (GtkEntry *entry)
{
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
-
- GTK_WIDGET_SET_FLAGS (entry, GTK_CAN_FOCUS);
- entry->text_size = MIN_SIZE;
- entry->text = g_malloc (entry->text_size);
- entry->text[0] = '\0';
+ GTK_WIDGET_SET_FLAGS (entry, GTK_CAN_FOCUS);
entry->editable = TRUE;
entry->visible = TRUE;
- entry->invisible_char = '*';
+ entry->invisible_char = find_invisible_char (GTK_WIDGET (entry));
entry->dnd_position = -1;
entry->width_chars = -1;
entry->is_cell_renderer = FALSE;
entry->truncate_multiline = FALSE;
priv->shadow_type = GTK_SHADOW_IN;
priv->xalign = 0.0;
+ priv->caps_lock_warning = TRUE;
+ priv->caps_lock_warning_shown = FALSE;
+ priv->progress_fraction = 0.0;
+ priv->progress_pulse_fraction = 0.1;
gtk_drag_dest_set (GTK_WIDGET (entry),
GTK_DEST_DEFAULT_HIGHLIGHT,
G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
g_signal_connect (entry->im_context, "delete-surrounding",
G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
+
+}
+
+static gint
+get_icon_width (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
+ GdkScreen *screen;
+ GtkSettings *settings;
+ gint menu_icon_width;
+
+ if (!icon_info || icon_info->pixbuf == NULL)
+ return 0;
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (entry));
+ settings = gtk_settings_get_for_screen (screen);
+
+ gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
+ &menu_icon_width, NULL);
+
+ return MAX (gdk_pixbuf_get_width (icon_info->pixbuf), menu_icon_width);
+}
+
+static void
+get_icon_allocations (GtkEntry *entry,
+ GtkAllocation *primary,
+ GtkAllocation *secondary)
+
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ gint x, y, width, height;
+
+ get_text_area_size (entry, &x, &y, &width, &height);
+
+ if (GTK_WIDGET_HAS_FOCUS (entry) && !priv->interior_focus)
+ y += priv->focus_width;
+
+ primary->y = y;
+ primary->height = height;
+ primary->width = get_icon_width (entry, GTK_ENTRY_ICON_PRIMARY);
+ if (primary->width > 0)
+ primary->width += 2 * priv->icon_margin;
+
+ secondary->y = y;
+ secondary->height = height;
+ secondary->width = get_icon_width (entry, GTK_ENTRY_ICON_SECONDARY);
+ if (secondary->width > 0)
+ secondary->width += 2 * priv->icon_margin;
+
+ if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
+ {
+ primary->x = x + width - primary->width;
+ secondary->x = x;
+ }
+ else
+ {
+ primary->x = x;
+ secondary->x = x + width - secondary->width;
+ }
}
+
static void
begin_change (GtkEntry *entry)
{
priv->real_changed = TRUE;
}
-/*
- * Overwrite a memory that might contain sensitive information.
- */
-static void
-trash_area (gchar *area, gsize len)
-{
- volatile gchar *varea = (volatile gchar *)area;
- while (len-- > 0)
- *varea++ = 0;
-}
-
static void
gtk_entry_destroy (GtkObject *object)
{
GtkEntry *entry = GTK_ENTRY (object);
- entry->n_bytes = 0;
- entry->current_pos = entry->selection_bound = entry->text_length = 0;
+ entry->current_pos = entry->selection_bound = 0;
_gtk_entry_reset_im_context (entry);
gtk_entry_reset_layout (entry);
entry->recompute_idle = 0;
}
- if (!entry->visible)
- {
- /* We want to trash the text here because the entry might be leaked. */
- trash_area (entry->text, strlen (entry->text));
- }
-
GTK_OBJECT_CLASS (gtk_entry_parent_class)->destroy (object);
}
+static void
+gtk_entry_dispose (GObject *object)
+{
+ GtkEntry *entry = GTK_ENTRY (object);
+
+ gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+ gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
+ gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+ gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+
+ G_OBJECT_CLASS (gtk_entry_parent_class)->dispose (object);
+}
+
static void
gtk_entry_finalize (GObject *object)
{
GtkEntry *entry = GTK_ENTRY (object);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = NULL;
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->target_list != NULL)
+ {
+ gtk_target_list_unref (icon_info->target_list);
+ icon_info->target_list = NULL;
+ }
+
+ g_slice_free (EntryIconInfo, icon_info);
+ priv->icons[i] = NULL;
+ }
+ }
gtk_entry_set_completion (entry, NULL);
if (entry->recompute_idle)
g_source_remove (entry->recompute_idle);
- entry->text_size = 0;
+ g_free (priv->im_module);
- if (entry->text)
- {
- if (!entry->visible)
- trash_area (entry->text, strlen (entry->text));
- g_free (entry->text);
- entry->text = NULL;
- }
+ /* COMPAT: entry->text is a deprecated field, and the allocation
+ is owned by the buffer. */
+
+ gtk_entry_set_buffer (entry, NULL);
G_OBJECT_CLASS (gtk_entry_parent_class)->finalize (object);
}
-static void
-gtk_entry_realize (GtkWidget *widget)
+static DisplayMode
+gtk_entry_get_display_mode (GtkEntry *entry)
{
- GtkEntry *entry;
- GdkWindowAttr attributes;
- gint attributes_mask;
-
- GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
- entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv;
+ if (entry->visible)
+ return DISPLAY_NORMAL;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ if (entry->invisible_char == 0 && priv->invisible_char_set)
+ return DISPLAY_BLANK;
+ return DISPLAY_INVISIBLE;
+}
- attributes.window_type = GDK_WINDOW_CHILD;
-
- get_widget_window_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
+static gchar*
+gtk_entry_get_display_text (GtkEntry *entry,
+ gint start_pos,
+ gint end_pos)
+{
+ GtkEntryPasswordHint *password_hint;
+ GtkEntryPrivate *priv;
+ gunichar invisible_char;
+ const gchar *start;
+ const gchar *end;
+ const gchar *text;
+ gchar char_str[7];
+ gint char_len;
+ GString *str;
+ guint length;
+ gint i;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.visual = gtk_widget_get_visual (widget);
- attributes.colormap = gtk_widget_get_colormap (widget);
- attributes.event_mask = gtk_widget_get_events (widget);
- attributes.event_mask |= (GDK_EXPOSURE_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON1_MOTION_MASK |
- GDK_BUTTON3_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_ENTER_NOTIFY_MASK |
- GDK_LEAVE_NOTIFY_MASK);
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ text = gtk_entry_buffer_get_text (get_buffer (entry));
+ length = gtk_entry_buffer_get_length (get_buffer (entry));
- widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
- gdk_window_set_user_data (widget->window, entry);
+ if (end_pos < 0)
+ end_pos = length;
+ if (start_pos > length)
+ start_pos = length;
- get_text_area_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
-
- if (GTK_WIDGET_IS_SENSITIVE (widget))
+ if (end_pos <= start_pos)
+ return g_strdup ("");
+ else if (entry->visible)
{
- attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
+ start = g_utf8_offset_to_pointer (text, start_pos);
+ end = g_utf8_offset_to_pointer (start, end_pos - start_pos);
+ return g_strndup (start, end - start);
+ }
+ else
+ {
+ str = g_string_sized_new (length * 2);
+
+ /* Figure out what our invisible char is and encode it */
+ if (!entry->invisible_char)
+ invisible_char = priv->invisible_char_set ? ' ' : '*';
+ else
+ invisible_char = entry->invisible_char;
+ char_len = g_unichar_to_utf8 (invisible_char, char_str);
+
+ /*
+ * Add hidden characters for each character in the text
+ * buffer. If there is a password hint, then keep that
+ * character visible.
+ */
+
+ password_hint = g_object_get_qdata (G_OBJECT (entry), quark_password_hint);
+ for (i = start_pos; i < end_pos; ++i)
+ {
+ if (password_hint && i == password_hint->position)
+ {
+ start = g_utf8_offset_to_pointer (text, i);
+ g_string_append_len (str, start, g_utf8_next_char (start) - start);
+ }
+ else
+ {
+ g_string_append_len (str, char_str, char_len);
+ }
+ }
+
+ return g_string_free (str, FALSE);
+ }
+
+}
+
+static void
+update_cursors (GtkWidget *widget)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info = NULL;
+ GdkDisplay *display;
+ GdkCursor *cursor;
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
+ gdk_window_show_unraised (icon_info->window);
+
+ /* The icon windows are not children of the visible entry window,
+ * thus we can't just inherit the xterm cursor. Slight complication
+ * here is that for the entry, insensitive => arrow cursor, but for
+ * an icon in a sensitive entry, insensitive => xterm cursor.
+ */
+ if (GTK_WIDGET_IS_SENSITIVE (widget) &&
+ (icon_info->insensitive ||
+ (icon_info->nonactivatable && icon_info->target_list == NULL)))
+ {
+ display = gtk_widget_get_display (widget);
+ cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
+ gdk_window_set_cursor (icon_info->window, cursor);
+ gdk_cursor_unref (cursor);
+ }
+ else
+ {
+ gdk_window_set_cursor (icon_info->window, NULL);
+ }
+ }
+ }
+}
+
+static void
+realize_icon_info (GtkWidget *widget,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+
+ g_return_if_fail (icon_info != NULL);
+
+ attributes.x = 0;
+ attributes.y = 0;
+ attributes.width = 1;
+ attributes.height = 1;
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= (GDK_EXPOSURE_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_BUTTON1_MOTION_MASK |
+ GDK_BUTTON3_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK);
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ icon_info->window = gdk_window_new (widget->window,
+ &attributes,
+ attributes_mask);
+ gdk_window_set_user_data (icon_info->window, widget);
+ gdk_window_set_background (icon_info->window,
+ &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+ gtk_widget_queue_resize (widget);
+}
+
+static EntryIconInfo*
+construct_icon_info (GtkWidget *widget,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (priv->icons[icon_pos] == NULL, NULL);
+
+ icon_info = g_slice_new0 (EntryIconInfo);
+ priv->icons[icon_pos] = icon_info;
+
+ if (GTK_WIDGET_REALIZED (widget))
+ realize_icon_info (widget, icon_pos);
+
+ return icon_info;
+}
+
+static void
+gtk_entry_map (GtkWidget *widget)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info = NULL;
+ gint i;
+
+ if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget))
+ {
+ GTK_WIDGET_CLASS (gtk_entry_parent_class)->map (widget);
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
+ gdk_window_show (icon_info->window);
+ }
+ }
+
+ update_cursors (widget);
+ }
+}
+
+static void
+gtk_entry_unmap (GtkWidget *widget)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info = NULL;
+ gint i;
+
+ if (GTK_WIDGET_MAPPED (widget))
+ {
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
+ gdk_window_hide (icon_info->window);
+ }
+ }
+
+ GTK_WIDGET_CLASS (gtk_entry_parent_class)->unmap (widget);
+ }
+}
+
+static void
+gtk_entry_realize (GtkWidget *widget)
+{
+ GtkEntry *entry;
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+ GdkWindowAttr attributes;
+ gint attributes_mask;
+ int i;
+
+ GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+ entry = GTK_ENTRY (widget);
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ attributes.window_type = GDK_WINDOW_CHILD;
+
+ get_widget_window_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
+
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.visual = gtk_widget_get_visual (widget);
+ attributes.colormap = gtk_widget_get_colormap (widget);
+ attributes.event_mask = gtk_widget_get_events (widget);
+ attributes.event_mask |= (GDK_EXPOSURE_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_BUTTON1_MOTION_MASK |
+ GDK_BUTTON3_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_ENTER_NOTIFY_MASK |
+ GDK_LEAVE_NOTIFY_MASK);
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
+
+ widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
+ gdk_window_set_user_data (widget->window, entry);
+
+ get_text_area_size (entry, &attributes.x, &attributes.y, &attributes.width, &attributes.height);
+
+ if (GTK_WIDGET_IS_SENSITIVE (widget))
+ {
+ attributes.cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
attributes_mask |= GDK_WA_CURSOR;
}
gtk_entry_adjust_scroll (entry);
gtk_entry_update_primary_selection (entry);
+
+
+ /* If the icon positions are already setup, create their windows.
+ * Otherwise if they don't exist yet, then construct_icon_info()
+ * will create the windows once the widget is already realized.
+ */
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->window == NULL)
+ realize_icon_info (widget, i);
+ }
+ }
}
static void
gtk_entry_unrealize (GtkWidget *widget)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
GtkClipboard *clipboard;
+ EntryIconInfo *icon_info;
+ gint i;
gtk_entry_reset_layout (entry);
entry->popup_menu = NULL;
}
- if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize) (widget);
+ GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize (widget);
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->window != NULL)
+ {
+ gdk_window_destroy (icon_info->window);
+ icon_info->window = NULL;
+ }
+ }
+ }
}
void
GtkRequisition *requisition)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
PangoFontMetrics *metrics;
gint xborder, yborder;
GtkBorder inner_border;
PangoContext *context;
+ int icon_widths = 0;
+ int icon_width, i;
gtk_widget_ensure_style (widget);
context = gtk_widget_get_pango_context (widget);
requisition->height = PANGO_PIXELS (entry->ascent + entry->descent) + yborder * 2 + inner_border.top + inner_border.bottom;
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ icon_width = get_icon_width (entry, i);
+ if (icon_width > 0)
+ icon_widths += icon_width + 2 * priv->icon_margin;
+ }
+
+ if (icon_widths > requisition->width)
+ requisition->width += icon_widths;
+
pango_font_metrics_unref (metrics);
}
static void
-get_text_area_size (GtkEntry *entry,
- gint *x,
- gint *y,
- gint *width,
- gint *height)
+place_windows (GtkEntry *entry)
{
- GtkEntryClass *class;
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ gint x, y, width, height;
+ GtkAllocation primary;
+ GtkAllocation secondary;
+ EntryIconInfo *icon_info = NULL;
- g_return_if_fail (GTK_IS_ENTRY (entry));
+ get_text_area_size (entry, &x, &y, &width, &height);
+ get_icon_allocations (entry, &primary, &secondary);
- class = GTK_ENTRY_GET_CLASS (entry);
+ if (GTK_WIDGET_HAS_FOCUS (entry) && !priv->interior_focus)
+ y += priv->focus_width;
- if (class->get_text_area_size)
- class->get_text_area_size (entry, x, y, width, height);
+ if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
+ x += secondary.width;
+ else
+ x += primary.width;
+ width -= primary.width + secondary.width;
+
+ if ((icon_info = priv->icons[GTK_ENTRY_ICON_PRIMARY]) != NULL)
+ gdk_window_move_resize (icon_info->window,
+ primary.x, primary.y,
+ primary.width, primary.height);
+
+ if ((icon_info = priv->icons[GTK_ENTRY_ICON_SECONDARY]) != NULL)
+ gdk_window_move_resize (icon_info->window,
+ secondary.x, secondary.y,
+ secondary.width, secondary.height);
+
+ gdk_window_move_resize (GTK_ENTRY (entry)->text_area, x, y, width, height);
}
static void
gint *width,
gint *height)
{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
gint frame_height;
gint xborder, yborder;
GtkRequisition requisition;
- GtkWidget *widget = GTK_WIDGET (entry);
- GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
gtk_widget_get_child_requisition (widget, &requisition);
_gtk_entry_get_borders (entry, &xborder, &yborder);
frame_height = requisition.height;
if (GTK_WIDGET_HAS_FOCUS (widget) && !priv->interior_focus)
- frame_height -= 2 * priv->focus_width;
+ frame_height -= 2 * priv->focus_width;
if (x)
*x = xborder;
*height = requisition.height - yborder * 2;
}
+static void
+get_text_area_size (GtkEntry *entry,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height)
+{
+ GtkEntryClass *class;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ class = GTK_ENTRY_GET_CLASS (entry);
+
+ if (class->get_text_area_size)
+ class->get_text_area_size (entry, x, y, width, height);
+}
+
+
static void
get_widget_window_size (GtkEntry *entry,
gint *x,
* be affected by the usize of the entry, if set
*/
gint x, y, width, height;
+ GtkEntryCompletion* completion;
get_widget_window_size (entry, &x, &y, &width, &height);
-
- gdk_window_move_resize (widget->window,
- x, y, width, height);
-
- get_text_area_size (entry, &x, &y, &width, &height);
-
- gdk_window_move_resize (entry->text_area,
- x, y, width, height);
+ gdk_window_move_resize (widget->window, x, y, width, height);
+ place_windows (entry);
gtk_entry_recompute (entry);
+
+ completion = gtk_entry_get_completion (entry);
+ if (completion && GTK_WIDGET_MAPPED (completion->priv->popup_window))
+ _gtk_entry_completion_resize_popup (completion);
+ }
+}
+
+/* Kudos to the gnome-panel guys. */
+static void
+colorshift_pixbuf (GdkPixbuf *dest,
+ GdkPixbuf *src,
+ gint shift)
+{
+ gint i, j;
+ gint width, height, has_alpha, src_rowstride, dest_rowstride;
+ guchar *target_pixels;
+ guchar *original_pixels;
+ guchar *pix_src;
+ guchar *pix_dest;
+ int val;
+ guchar r, g, b;
+
+ has_alpha = gdk_pixbuf_get_has_alpha (src);
+ width = gdk_pixbuf_get_width (src);
+ height = gdk_pixbuf_get_height (src);
+ src_rowstride = gdk_pixbuf_get_rowstride (src);
+ dest_rowstride = gdk_pixbuf_get_rowstride (dest);
+ original_pixels = gdk_pixbuf_get_pixels (src);
+ target_pixels = gdk_pixbuf_get_pixels (dest);
+
+ for (i = 0; i < height; i++)
+ {
+ pix_dest = target_pixels + i * dest_rowstride;
+ pix_src = original_pixels + i * src_rowstride;
+
+ for (j = 0; j < width; j++)
+ {
+ r = *(pix_src++);
+ g = *(pix_src++);
+ b = *(pix_src++);
+
+ val = r + shift;
+ *(pix_dest++) = CLAMP (val, 0, 255);
+
+ val = g + shift;
+ *(pix_dest++) = CLAMP (val, 0, 255);
+
+ val = b + shift;
+ *(pix_dest++) = CLAMP (val, 0, 255);
+
+ if (has_alpha)
+ *(pix_dest++) = *(pix_src++);
+ }
+ }
+}
+
+static gboolean
+should_prelight (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
+ gboolean prelight;
+
+ if (!icon_info)
+ return FALSE;
+
+ if (icon_info->nonactivatable && icon_info->target_list == NULL)
+ return FALSE;
+
+ if (icon_info->pressed)
+ return FALSE;
+
+ gtk_widget_style_get (GTK_WIDGET (entry),
+ "icon-prelight", &prelight,
+ NULL);
+
+ return prelight;
+}
+
+static void
+draw_icon (GtkWidget *widget,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
+ GdkPixbuf *pixbuf;
+ gint x, y, width, height;
+
+ if (!icon_info)
+ return;
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ if (icon_info->pixbuf == NULL)
+ return;
+
+ gdk_drawable_get_size (icon_info->window, &width, &height);
+
+ /* size_allocate hasn't been called yet. These are the default values.
+ */
+ if (width == 1 || height == 1)
+ return;
+
+ pixbuf = icon_info->pixbuf;
+ g_object_ref (pixbuf);
+
+ if (gdk_pixbuf_get_height (pixbuf) > height)
+ {
+ GdkPixbuf *temp_pixbuf;
+ gint scale;
+
+ scale = height - 2 * priv->icon_margin;
+ temp_pixbuf = gdk_pixbuf_scale_simple (pixbuf, scale, scale,
+ GDK_INTERP_BILINEAR);
+ g_object_unref (pixbuf);
+ pixbuf = temp_pixbuf;
+ }
+
+ x = (width - gdk_pixbuf_get_width (pixbuf)) / 2;
+ y = (height - gdk_pixbuf_get_height (pixbuf)) / 2;
+
+ if (!GTK_WIDGET_IS_SENSITIVE (widget) ||
+ icon_info->insensitive)
+ {
+ GdkPixbuf *temp_pixbuf;
+
+ temp_pixbuf = gdk_pixbuf_copy (pixbuf);
+ gdk_pixbuf_saturate_and_pixelate (pixbuf,
+ temp_pixbuf,
+ 0.8f,
+ TRUE);
+ g_object_unref (pixbuf);
+ pixbuf = temp_pixbuf;
+ }
+ else if (icon_info->prelight)
+ {
+ GdkPixbuf *temp_pixbuf;
+
+ temp_pixbuf = gdk_pixbuf_copy (pixbuf);
+ colorshift_pixbuf (temp_pixbuf, pixbuf, 30);
+ g_object_unref (pixbuf);
+ pixbuf = temp_pixbuf;
}
+
+ gdk_draw_pixbuf (icon_info->window, widget->style->black_gc, pixbuf,
+ 0, 0, x, y, -1, -1,
+ GDK_RGB_DITHER_NORMAL, 0, 0);
+
+ g_object_unref (pixbuf);
}
+
static void
-gtk_entry_draw_frame (GtkWidget *widget,
- GdkRectangle *area)
+gtk_entry_draw_frame (GtkWidget *widget,
+ GdkEventExpose *event)
{
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
gint x = 0, y = 0, width, height;
+ gboolean state_hint;
+ GtkStateType state;
gdk_drawable_get_size (widget->window, &width, &height);
{
gint xborder, yborder;
- get_text_area_size (GTK_ENTRY (widget), &x, NULL, &width, NULL);
+ gtk_entry_get_text_area_size (GTK_ENTRY (widget), &x, NULL, &width, NULL);
_gtk_entry_get_borders (GTK_ENTRY (widget), &xborder, &yborder);
x -= xborder;
height -= 2 * priv->focus_width;
}
+ gtk_widget_style_get (widget, "state-hint", &state_hint, NULL);
+ if (state_hint)
+ state = GTK_WIDGET_HAS_FOCUS (widget) ?
+ GTK_STATE_ACTIVE : GTK_WIDGET_STATE (widget);
+ else
+ state = GTK_STATE_NORMAL;
+
gtk_paint_shadow (widget->style, widget->window,
- GTK_STATE_NORMAL, priv->shadow_type,
- area, widget, "entry", x, y, width, height);
+ state, priv->shadow_type,
+ &event->area, widget, "entry", x, y, width, height);
- if (GTK_WIDGET_HAS_FOCUS (widget) && !priv->interior_focus)
+
+ gtk_entry_draw_progress (widget, event);
+
+ if (GTK_WIDGET_HAS_FOCUS (widget) && !priv->interior_focus)
{
x -= priv->focus_width;
y -= priv->focus_width;
height += 2 * priv->focus_width;
gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
- area, widget, "entry",
+ &event->area, widget, "entry",
0, 0, width, height);
}
}
+static void
+gtk_entry_get_progress_border (GtkWidget *widget,
+ GtkBorder *progress_border)
+{
+ GtkBorder *tmp_border;
+
+ gtk_widget_style_get (widget, "progress-border", &tmp_border, NULL);
+ if (tmp_border)
+ {
+ *progress_border = *tmp_border;
+ gtk_border_free (tmp_border);
+ }
+ else
+ {
+ progress_border->left = widget->style->xthickness;
+ progress_border->right = widget->style->xthickness;
+ progress_border->top = widget->style->ythickness;
+ progress_border->bottom = widget->style->ythickness;
+ }
+}
+
+static void
+get_progress_area (GtkWidget *widget,
+ gint *x,
+ gint *y,
+ gint *width,
+ gint *height)
+{
+ GtkEntryPrivate *private = GTK_ENTRY_GET_PRIVATE (widget);
+ GtkEntry *entry = GTK_ENTRY (widget);
+ GtkBorder progress_border;
+
+ gtk_entry_get_progress_border (widget, &progress_border);
+
+ *x = progress_border.left;
+ *y = progress_border.top;
+
+ gdk_drawable_get_size (widget->window, width, height);
+
+ *width -= progress_border.left + progress_border.right;
+ *height -= progress_border.top + progress_border.bottom;
+
+ if (GTK_WIDGET_HAS_FOCUS (widget) && !private->interior_focus)
+ {
+ *x += private->focus_width;
+ *y += private->focus_width;
+ *width -= 2 * private->focus_width;
+ *height -= 2 * private->focus_width;
+ }
+
+ if (private->progress_pulse_mode)
+ {
+ gdouble value = private->progress_pulse_current;
+
+ *x += (gint) floor(value * (*width));
+ *width = (gint) ceil(private->progress_pulse_fraction * (*width));
+ }
+ else if (private->progress_fraction > 0)
+ {
+ gdouble value = private->progress_fraction;
+
+ if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_RTL)
+ {
+ gint bar_width;
+
+ bar_width = floor(value * (*width) + 0.5);
+ *x += *width - bar_width;
+ *width = bar_width;
+ }
+ else
+ {
+ *width = (gint) floor(value * (*width) + 0.5);
+ }
+ }
+ else
+ {
+ *width = 0;
+ *height = 0;
+ }
+}
+
+static void
+gtk_entry_draw_progress (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ gint x, y, width, height;
+ GtkStateType state;
+
+ get_progress_area (widget, &x, &y, &width, &height);
+
+ if ((width <= 0) || (height <= 0))
+ return;
+
+ if (event->window != widget->window)
+ {
+ gint pos_x, pos_y;
+
+ gdk_window_get_position (event->window, &pos_x, &pos_y);
+
+ x -= pos_x;
+ y -= pos_y;
+ }
+
+ state = GTK_STATE_SELECTED;
+ if (!GTK_WIDGET_SENSITIVE (widget))
+ state = GTK_STATE_INSENSITIVE;
+
+ gtk_paint_box (widget->style, event->window,
+ state, GTK_SHADOW_OUT,
+ &event->area, widget, "entry-progress",
+ x, y,
+ width, height);
+}
+
static gint
gtk_entry_expose (GtkWidget *widget,
GdkEventExpose *event)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ gboolean state_hint;
+ GtkStateType state;
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ gtk_widget_style_get (widget, "state-hint", &state_hint, NULL);
+ if (state_hint)
+ state = GTK_WIDGET_HAS_FOCUS (widget) ?
+ GTK_STATE_ACTIVE : GTK_WIDGET_STATE (widget);
+ else
+ state = GTK_WIDGET_STATE(widget);
if (widget->window == event->window)
- gtk_entry_draw_frame (widget, &event->area);
+ {
+ gtk_entry_draw_frame (widget, event);
+ }
else if (entry->text_area == event->window)
{
- gint area_width, area_height;
- gdk_drawable_get_size (entry->text_area, &area_width, &area_height);
+ gint width, height;
+
+ gdk_drawable_get_size (entry->text_area, &width, &height);
gtk_paint_flat_box (widget->style, entry->text_area,
- GTK_WIDGET_STATE(widget), GTK_SHADOW_NONE,
+ state, GTK_SHADOW_NONE,
&event->area, widget, "entry_bg",
- 0, 0, area_width, area_height);
+ 0, 0, width, height);
+
+ gtk_entry_draw_progress (widget, event);
if (entry->dnd_position != -1)
gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_DND);
gtk_entry_draw_text (GTK_ENTRY (widget));
- if ((entry->visible || entry->invisible_char != 0) &&
+ /* When no text is being displayed at all, don't show the cursor */
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_BLANK &&
GTK_WIDGET_HAS_FOCUS (widget) &&
- entry->selection_bound == entry->current_pos && entry->cursor_visible)
- gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_STANDARD);
+ entry->selection_bound == entry->current_pos && entry->cursor_visible)
+ gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_STANDARD);
+ }
+ else
+ {
+ int i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL && event->window == icon_info->window)
+ {
+ gint width, height;
+
+ gdk_drawable_get_size (icon_info->window, &width, &height);
+
+ gtk_paint_flat_box (widget->style, icon_info->window,
+ GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
+ NULL, widget, "entry_bg",
+ 0, 0, width, height);
+
+ gtk_entry_draw_progress (widget, event);
+ draw_icon (widget, i);
+
+ break;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
+static gint
+gtk_entry_enter_notify (GtkWidget *widget,
+ GdkEventCrossing *event)
+{
+ GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL && event->window == icon_info->window)
+ {
+ if (should_prelight (entry, i))
+ {
+ icon_info->prelight = TRUE;
+ gtk_widget_queue_draw (widget);
+ }
+
+ break;
+ }
+ }
+
+ return FALSE;
+}
+
+static gint
+gtk_entry_leave_notify (GtkWidget *widget,
+ GdkEventCrossing *event)
+{
+ GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL && event->window == icon_info->window)
+ {
+ /* a grab means that we may never see the button release */
+ if (event->mode == GDK_CROSSING_GRAB || event->mode == GDK_CROSSING_GTK_GRAB)
+ icon_info->pressed = FALSE;
+
+ if (should_prelight (entry, i))
+ {
+ icon_info->prelight = FALSE;
+ gtk_widget_queue_draw (widget);
+ }
+
+ break;
+ }
}
return FALSE;
GtkEntry *entry = GTK_ENTRY (widget);
GtkEditable *editable = GTK_EDITABLE (widget);
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = NULL;
gint tmp_pos;
gint sel_start, sel_end;
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ icon_info = priv->icons[i];
+
+ if (!icon_info || icon_info->insensitive)
+ continue;
+
+ if (event->window == icon_info->window)
+ {
+ if (should_prelight (entry, i))
+ {
+ icon_info->prelight = FALSE;
+ gtk_widget_queue_draw (widget);
+ }
+
+ priv->start_x = event->x;
+ priv->start_y = event->y;
+ icon_info->pressed = TRUE;
+
+ if (!icon_info->nonactivatable)
+ g_signal_emit (entry, signals[ICON_PRESS], 0, i, event);
+
+ return TRUE;
+ }
+ }
if (event->window != entry->text_area ||
(entry->button && event->button != entry->button))
GdkEventButton *event)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ EntryIconInfo *icon_info = NULL;
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ icon_info = priv->icons[i];
+
+ if (!icon_info || icon_info->insensitive)
+ continue;
+
+ if (event->window == icon_info->window)
+ {
+ gint width, height;
+
+ gdk_drawable_get_size (icon_info->window, &width, &height);
+
+ icon_info->pressed = FALSE;
+
+ if (should_prelight (entry, i) &&
+ event->x >= 0 && event->y >= 0 &&
+ event->x < width && event->y < height)
+ {
+ icon_info->prelight = TRUE;
+ gtk_widget_queue_draw (widget);
+ }
+
+ if (!icon_info->nonactivatable)
+ g_signal_emit (entry, signals[ICON_RELEASE], 0, i, event);
+
+ return TRUE;
+ }
+ }
if (event->window != entry->text_area || entry->button != event->button)
return FALSE;
GdkEventMotion *event)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = NULL;
+ GdkDragContext *context;
gint tmp_pos;
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ icon_info = priv->icons[i];
+
+ if (!icon_info || icon_info->insensitive)
+ continue;
+
+ if (event->window == icon_info->window)
+ {
+ if (icon_info->pressed &&
+ icon_info->target_list != NULL &&
+ gtk_drag_check_threshold (widget,
+ priv->start_x,
+ priv->start_y,
+ event->x,
+ event->y))
+ {
+ icon_info->in_drag = TRUE;
+ icon_info->pressed = FALSE;
+ context = gtk_drag_begin (widget,
+ icon_info->target_list,
+ icon_info->actions,
+ 1,
+ (GdkEvent*)event);
+ }
+
+ return TRUE;
+ }
+ }
if (entry->mouse_cursor_obscured)
{
if (entry->in_drag)
{
- if (gtk_drag_check_threshold (widget,
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_NORMAL &&
+ gtk_drag_check_threshold (widget,
entry->drag_start_x, entry->drag_start_y,
event->x + entry->scroll_offset, event->y))
{
gtk_target_list_add_text_targets (target_list, 0);
- if (entry->visible)
- {
- text = _gtk_entry_get_selected_text (entry);
- pixmap = _gtk_text_util_create_drag_icon (widget, text, -1);
- }
+ text = _gtk_entry_get_selected_text (entry);
+ pixmap = _gtk_text_util_create_drag_icon (widget, text, -1);
context = gtk_drag_begin (widget, target_list, actions,
entry->button, (GdkEvent *)event);
if (event->y < 0)
tmp_pos = 0;
else if (event->y >= height)
- tmp_pos = entry->text_length;
+ tmp_pos = gtk_entry_buffer_get_length (get_buffer (entry));
else
tmp_pos = gtk_entry_find_position (entry, event->x + entry->scroll_offset);
gtk_entry_set_positions (entry, pos, bound);
}
else
- gtk_entry_set_positions (entry, tmp_pos, -1);
+ gtk_entry_set_positions (entry, tmp_pos, -1);
}
return TRUE;
static void
set_invisible_cursor (GdkWindow *window)
{
- GdkBitmap *empty_bitmap;
+ GdkDisplay *display;
GdkCursor *cursor;
- GdkColor useless;
- char invisible_cursor_bits[] = { 0x0 };
-
- useless.red = useless.green = useless.blue = 0;
- useless.pixel = 0;
-
- empty_bitmap = gdk_bitmap_create_from_data (window,
- invisible_cursor_bits,
- 1, 1);
-
- cursor = gdk_cursor_new_from_pixmap (empty_bitmap,
- empty_bitmap,
- &useless,
- &useless, 0, 0);
-
+
+ display = gdk_drawable_get_display (window);
+ cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
+
gdk_window_set_cursor (window, cursor);
-
+
gdk_cursor_unref (cursor);
-
- g_object_unref (empty_bitmap);
}
static void
GdkEventFocus *event)
{
GtkEntry *entry = GTK_ENTRY (widget);
-
+ GdkKeymap *keymap;
+
gtk_widget_queue_draw (widget);
-
+
+ keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
+
if (entry->editable)
{
entry->need_im_reset = TRUE;
gtk_im_context_focus_in (entry->im_context);
+ keymap_state_changed (keymap, entry);
+ g_signal_connect (keymap, "state-changed",
+ G_CALLBACK (keymap_state_changed), entry);
}
- g_signal_connect (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
- "direction-changed",
- G_CALLBACK (gtk_entry_keymap_direction_changed), entry);
+ g_signal_connect (keymap, "direction-changed",
+ G_CALLBACK (keymap_direction_changed), entry);
gtk_entry_reset_blink_time (entry);
gtk_entry_check_cursor_blink (entry);
{
GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryCompletion *completion;
-
+ GdkKeymap *keymap;
+
gtk_widget_queue_draw (widget);
+ keymap = gdk_keymap_get_for_display (gtk_widget_get_display (widget));
+
if (entry->editable)
{
entry->need_im_reset = TRUE;
gtk_im_context_focus_out (entry->im_context);
+ remove_capslock_feedback (entry);
}
gtk_entry_check_cursor_blink (entry);
- g_signal_handlers_disconnect_by_func (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
- gtk_entry_keymap_direction_changed,
- entry);
+ g_signal_handlers_disconnect_by_func (keymap, keymap_state_changed, entry);
+ g_signal_handlers_disconnect_by_func (keymap, keymap_direction_changed, entry);
completion = gtk_entry_get_completion (entry);
if (completion)
GtkStateType previous_state)
{
GtkEntry *entry = GTK_ENTRY (widget);
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
GdkCursor *cursor;
+ gint i;
if (GTK_WIDGET_REALIZED (widget))
{
gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
gdk_window_set_background (entry->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+ if (icon_info && icon_info->window)
+ gdk_window_set_background (icon_info->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ }
if (GTK_WIDGET_IS_SENSITIVE (widget))
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_XTERM);
gdk_cursor_unref (cursor);
entry->mouse_cursor_obscured = FALSE;
+
+ update_cursors (widget);
}
if (!GTK_WIDGET_IS_SENSITIVE (widget))
gint new_text_length,
gint *position)
{
- GtkEntry *entry = GTK_ENTRY (editable);
- gchar buf[64];
- gchar *text;
-
- if (*position < 0 || *position > entry->text_length)
- *position = entry->text_length;
-
g_object_ref (editable);
-
- if (new_text_length <= 63)
- text = buf;
- else
- text = g_new (gchar, new_text_length + 1);
-
- text[new_text_length] = '\0';
- strncpy (text, new_text, new_text_length);
- g_signal_emit_by_name (editable, "insert_text", text, new_text_length, position);
-
- if (!entry->visible)
- trash_area (text, new_text_length);
+ /*
+ * The incoming text may a password or other secret. We make sure
+ * not to copy it into temporary buffers.
+ */
- if (new_text_length > 63)
- g_free (text);
+ g_signal_emit_by_name (editable, "insert-text", new_text, new_text_length, position);
g_object_unref (editable);
}
gint start_pos,
gint end_pos)
{
- GtkEntry *entry = GTK_ENTRY (editable);
-
- if (end_pos < 0 || end_pos > entry->text_length)
- end_pos = entry->text_length;
- if (start_pos < 0)
- start_pos = 0;
- if (start_pos > end_pos)
- start_pos = end_pos;
-
g_object_ref (editable);
- g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos);
+ g_signal_emit_by_name (editable, "delete-text", start_pos, end_pos);
g_object_unref (editable);
}
gint end_pos)
{
GtkEntry *entry = GTK_ENTRY (editable);
+ const gchar *text;
+ gint text_length;
gint start_index, end_index;
-
+
+ text = gtk_entry_buffer_get_text (get_buffer (entry));
+ text_length = gtk_entry_buffer_get_length (get_buffer (entry));
+
if (end_pos < 0)
- end_pos = entry->text_length;
+ end_pos = text_length;
- start_pos = MIN (entry->text_length, start_pos);
- end_pos = MIN (entry->text_length, end_pos);
+ start_pos = MIN (text_length, start_pos);
+ end_pos = MIN (text_length, end_pos);
- start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
- end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
+ start_index = g_utf8_offset_to_pointer (text, start_pos) - entry->text;
+ end_index = g_utf8_offset_to_pointer (text, end_pos) - entry->text;
- return g_strndup (entry->text + start_index, end_index - start_index);
+ return g_strndup (text + start_index, end_index - start_index);
}
static void
{
GtkEntry *entry = GTK_ENTRY (editable);
- if (position < 0 || position > entry->text_length)
- position = entry->text_length;
+ guint length;
+
+ length = gtk_entry_buffer_get_length (get_buffer (entry));
+ if (position < 0 || position > length)
+ position = length;
if (position != entry->current_pos ||
position != entry->selection_bound)
gint end)
{
GtkEntry *entry = GTK_ENTRY (editable);
+ guint length;
+ length = gtk_entry_buffer_get_length (get_buffer (entry));
if (start < 0)
- start = entry->text_length;
+ start = length;
if (end < 0)
- end = entry->text_length;
+ end = length;
_gtk_entry_reset_im_context (entry);
gtk_entry_set_positions (entry,
- MIN (end, entry->text_length),
- MIN (start, entry->text_length));
+ MIN (end, length),
+ MIN (start, length));
gtk_entry_update_primary_selection (entry);
}
return (entry->selection_bound != entry->current_pos);
}
+static void
+icon_theme_changed (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+ if (icon_info != NULL)
+ {
+ if (icon_info->storage_type == GTK_IMAGE_ICON_NAME)
+ gtk_entry_set_icon_from_icon_name (entry, i, icon_info->icon_name);
+ else if (icon_info->storage_type == GTK_IMAGE_STOCK)
+ gtk_entry_set_icon_from_stock (entry, i, icon_info->stock_id);
+ else if (icon_info->storage_type == GTK_IMAGE_GICON)
+ gtk_entry_set_icon_from_gicon (entry, i, icon_info->gicon);
+ }
+ }
+
+ gtk_widget_queue_draw (GTK_WIDGET (entry));
+}
+
+static void
+icon_margin_changed (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ GtkBorder border;
+
+ _gtk_entry_effective_inner_border (GTK_ENTRY (entry), &border);
+
+ priv->icon_margin = border.left;
+}
+
static void
-gtk_entry_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_entry_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
{
GtkEntry *entry = GTK_ENTRY (widget);
GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
gint focus_width;
gboolean interior_focus;
+ gint i;
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
priv->focus_width = focus_width;
priv->interior_focus = interior_focus;
-
+
+ if (!priv->invisible_char_set)
+ entry->invisible_char = find_invisible_char (GTK_WIDGET (entry));
+
gtk_entry_recompute (entry);
if (previous_style && GTK_WIDGET_REALIZED (widget))
{
gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
gdk_window_set_background (entry->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+ if (icon_info && icon_info->window)
+ gdk_window_set_background (icon_info->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ }
}
+
+ icon_theme_changed (entry);
+ icon_margin_changed (entry);
}
/* GtkCellEditable method implementations
static void
gtk_entry_password_hint_free (GtkEntryPasswordHint *password_hint)
{
- if (password_hint->password_hint_timeout_id)
- g_source_remove (password_hint->password_hint_timeout_id);
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
g_slice_free (GtkEntryPasswordHint, password_hint);
}
+
+static gboolean
+gtk_entry_remove_password_hint (gpointer data)
+{
+ GtkEntryPasswordHint *password_hint = g_object_get_qdata (data, quark_password_hint);
+ password_hint->position = -1;
+
+ /* Force the string to be redrawn, but now without a visible character */
+ gtk_entry_recompute (GTK_ENTRY (data));
+ return FALSE;
+}
+
/* Default signal handlers
*/
static void
gint new_text_length,
gint *position)
{
- GtkEntry *entry = GTK_ENTRY (editable);
- gint index;
+ guint n_inserted;
gint n_chars;
- if (new_text_length < 0)
- new_text_length = strlen (new_text);
-
n_chars = g_utf8_strlen (new_text, new_text_length);
- if (entry->text_max_length > 0 && n_chars + entry->text_length > entry->text_max_length)
- {
- gtk_widget_error_bell (GTK_WIDGET (entry));
- n_chars = entry->text_max_length - entry->text_length;
- new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
- }
- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
- {
- gsize prev_size = entry->text_size;
+ /*
+ * The actual insertion into the buffer. This will end up firing the
+ * following signal handlers: buffer_inserted_text(), buffer_notify_display_text(),
+ * buffer_notify_text(), buffer_notify_length()
+ */
+ n_inserted = gtk_entry_buffer_insert_text (GTK_ENTRY_GET_PRIVATE (editable)->buffer, *position, new_text, n_chars);
- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
- {
- if (entry->text_size == 0)
- entry->text_size = MIN_SIZE;
- else
- {
- if (2 * (guint)entry->text_size < MAX_SIZE &&
- 2 * (guint)entry->text_size > entry->text_size)
- entry->text_size *= 2;
- else
- {
- entry->text_size = MAX_SIZE;
- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
- {
- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
- new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
- n_chars = g_utf8_strlen (new_text, new_text_length);
- }
- break;
- }
- }
- }
+ if (n_inserted != n_chars)
+ gtk_widget_error_bell (GTK_WIDGET (editable));
- if (entry->visible)
- entry->text = g_realloc (entry->text, entry->text_size);
- else
- {
- /* Same thing, just slower and without leaving stuff in memory. */
- gchar *et_new = g_malloc (entry->text_size);
- memcpy (et_new, entry->text, MIN (prev_size, entry->text_size));
- trash_area (entry->text, prev_size);
- g_free (entry->text);
- entry->text = et_new;
- }
- }
+ *position += n_inserted;
+}
- index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
+static void
+gtk_entry_real_delete_text (GtkEditable *editable,
+ gint start_pos,
+ gint end_pos)
+{
+ /*
+ * The actual deletion from the buffer. This will end up firing the
+ * following signal handlers: buffer_deleted_text(), buffer_notify_display_text(),
+ * buffer_notify_text(), buffer_notify_length()
+ */
- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
- memcpy (entry->text + index, new_text, new_text_length);
+ gtk_entry_buffer_delete_text (get_buffer (GTK_ENTRY (editable)), start_pos, end_pos - start_pos);
+}
- entry->n_bytes += new_text_length;
- entry->text_length += n_chars;
+/* GtkEntryBuffer signal handlers
+ */
+static void
+buffer_inserted_text (GtkEntryBuffer *buffer,
+ guint position,
+ const gchar *chars,
+ guint n_chars,
+ GtkEntry *entry)
+{
+ guint password_hint_timeout;
- /* NUL terminate for safety and convenience */
- entry->text[entry->n_bytes] = '\0';
-
- if (entry->current_pos > *position)
+ if (entry->current_pos > position)
entry->current_pos += n_chars;
-
- if (entry->selection_bound > *position)
+
+ if (entry->selection_bound > position)
entry->selection_bound += n_chars;
- if (n_chars == 1 && !entry->visible && (new_text_length < PASSWORD_HINT_MAX))
+ /* Calculate the password hint if it needs to be displayed. */
+ if (n_chars == 1 && !entry->visible)
{
- guint password_hint_timeout;
-
g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)),
"gtk-entry-password-hint-timeout", &password_hint_timeout,
NULL);
{
GtkEntryPasswordHint *password_hint = g_object_get_qdata (G_OBJECT (entry),
quark_password_hint);
-
if (!password_hint)
{
password_hint = g_slice_new0 (GtkEntryPasswordHint);
- g_object_set_qdata_full (G_OBJECT (entry), quark_password_hint,
- password_hint,
- (GDestroyNotify) gtk_entry_password_hint_free);
+ g_object_set_qdata_full (G_OBJECT (entry), quark_password_hint, password_hint,
+ (GDestroyNotify)gtk_entry_password_hint_free);
}
- memset (&password_hint->password_hint, 0x0, PASSWORD_HINT_MAX);
- password_hint->password_hint_length = new_text_length;
- memcpy (&password_hint->password_hint, new_text, new_text_length);
- password_hint->password_hint_position = *position + n_chars;
- }
+ password_hint->position = position;
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
+ password_hint->source_id = gdk_threads_add_timeout (password_hint_timeout,
+ (GSourceFunc)gtk_entry_remove_password_hint, entry);
+ }
}
- else
+}
+
+static void
+buffer_deleted_text (GtkEntryBuffer *buffer,
+ guint position,
+ guint n_chars,
+ GtkEntry *entry)
+{
+ guint end_pos = position + n_chars;
+ gint selection_bound;
+ guint current_pos;
+
+ current_pos = entry->current_pos;
+ if (current_pos > position)
+ current_pos -= MIN (current_pos, end_pos) - position;
+
+ selection_bound = entry->selection_bound;
+ if (selection_bound > position)
+ selection_bound -= MIN (selection_bound, end_pos) - position;
+
+ gtk_entry_set_positions (entry, current_pos, selection_bound);
+
+ /* We might have deleted the selection */
+ gtk_entry_update_primary_selection (entry);
+
+ /* Disable the password hint if one exists. */
+ if (!entry->visible)
{
- g_object_set_qdata (G_OBJECT (entry), quark_password_hint, NULL);
+ GtkEntryPasswordHint *password_hint = g_object_get_qdata (G_OBJECT (entry),
+ quark_password_hint);
+ if (password_hint)
+ {
+ if (password_hint->source_id)
+ g_source_remove (password_hint->source_id);
+ password_hint->source_id = 0;
+ password_hint->position = -1;
+ }
}
+}
- *position += n_chars;
+static void
+buffer_notify_text (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
+{
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text = (gchar*)gtk_entry_buffer_get_text (buffer);
gtk_entry_recompute (entry);
-
emit_changed (entry);
- g_object_notify (G_OBJECT (editable), "text");
+ g_object_notify (G_OBJECT (entry), "text");
}
static void
-gtk_entry_real_delete_text (GtkEditable *editable,
- gint start_pos,
- gint end_pos)
+buffer_notify_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
{
- GtkEntry *entry = GTK_ENTRY (editable);
-
- if (start_pos < 0)
- start_pos = 0;
- if (end_pos < 0 || end_pos > entry->text_length)
- end_pos = entry->text_length;
-
- if (start_pos < end_pos)
- {
- gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
- gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- gint current_pos;
- gint selection_bound;
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text_length = gtk_entry_buffer_get_length (buffer);
- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
- entry->text_length -= (end_pos - start_pos);
- entry->n_bytes -= (end_index - start_index);
-
- /* In password-mode, make sure we don't leave anything sensitive after
- * the terminating zero. Note, that the terminating zero already trashed
- * one byte.
- */
- if (!entry->visible)
- trash_area (entry->text + entry->n_bytes + 1, end_index - start_index - 1);
-
- current_pos = entry->current_pos;
- if (current_pos > start_pos)
- current_pos -= MIN (current_pos, end_pos) - start_pos;
+ g_object_notify (G_OBJECT (entry), "text-length");
+}
- selection_bound = entry->selection_bound;
- if (selection_bound > start_pos)
- selection_bound -= MIN (selection_bound, end_pos) - start_pos;
+static void
+buffer_notify_max_length (GtkEntryBuffer *buffer,
+ GParamSpec *spec,
+ GtkEntry *entry)
+{
+ /* COMPAT: Deprecated, not used. This struct field will be removed in GTK+ 3.x */
+ entry->text_max_length = gtk_entry_buffer_get_max_length (buffer);
- gtk_entry_set_positions (entry, current_pos, selection_bound);
+ g_object_notify (G_OBJECT (entry), "max-length");
+}
- /* We might have deleted the selection
- */
- gtk_entry_update_primary_selection (entry);
-
- gtk_entry_recompute (entry);
+static void
+buffer_connect_signals (GtkEntry *entry)
+{
+ g_signal_connect (get_buffer (entry), "inserted-text", G_CALLBACK (buffer_inserted_text), entry);
+ g_signal_connect (get_buffer (entry), "deleted-text", G_CALLBACK (buffer_deleted_text), entry);
+ g_signal_connect (get_buffer (entry), "notify::text", G_CALLBACK (buffer_notify_text), entry);
+ g_signal_connect (get_buffer (entry), "notify::length", G_CALLBACK (buffer_notify_length), entry);
+ g_signal_connect (get_buffer (entry), "notify::max-length", G_CALLBACK (buffer_notify_max_length), entry);
+}
- emit_changed (entry);
- g_object_notify (G_OBJECT (editable), "text");
- }
+static void
+buffer_disconnect_signals (GtkEntry *entry)
+{
+ g_signal_handlers_disconnect_by_func (get_buffer (entry), buffer_inserted_text, entry);
+ g_signal_handlers_disconnect_by_func (get_buffer (entry), buffer_deleted_text, entry);
+ g_signal_handlers_disconnect_by_func (get_buffer (entry), buffer_notify_text, entry);
+ g_signal_handlers_disconnect_by_func (get_buffer (entry), buffer_notify_length, entry);
+ g_signal_handlers_disconnect_by_func (get_buffer (entry), buffer_notify_max_length, entry);
}
/* Compute the X position for an offset that corresponds to the "more important
gboolean extend_selection)
{
gint new_pos = entry->current_pos;
+ GtkEntryPrivate *priv;
_gtk_entry_reset_im_context (entry);
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
- new_pos = count < 0 ? 0 : entry->text_length;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ new_pos = count < 0 ? 0 : gtk_entry_buffer_get_length (get_buffer (entry));
break;
case GTK_MOVEMENT_DISPLAY_LINES:
case GTK_MOVEMENT_PARAGRAPHS:
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
- new_pos = count < 0 ? 0 : entry->text_length;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ new_pos = count < 0 ? 0 : gtk_entry_buffer_get_length (get_buffer (entry));
if (entry->current_pos == new_pos)
gtk_widget_error_bell (GTK_WIDGET (entry));
break;
GtkEditable *editable = GTK_EDITABLE (entry);
gint start_pos = entry->current_pos;
gint end_pos = entry->current_pos;
- gint old_n_bytes = entry->n_bytes;
+ gint old_n_bytes = gtk_entry_buffer_get_bytes (get_buffer (entry));
_gtk_entry_reset_im_context (entry);
break;
}
- if (entry->n_bytes == old_n_bytes)
+ if (gtk_entry_buffer_get_bytes (get_buffer (entry)) == old_n_bytes)
gtk_widget_error_bell (GTK_WIDGET (entry));
gtk_entry_pend_cursor_blink (entry);
_gtk_entry_reset_im_context (entry);
- if (!entry->editable || !entry->text)
+ if (!entry->editable)
{
gtk_widget_error_bell (GTK_WIDGET (entry));
return;
return;
}
- prev_pos = gtk_entry_move_logically(entry, entry->current_pos, -1);
+ prev_pos = gtk_entry_move_logically (entry, entry->current_pos, -1);
if (prev_pos < entry->current_pos)
{
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
+ /* Deleting parts of characters */
if (log_attrs[entry->current_pos].backspace_deletes_character)
{
gchar *cluster_text;
gchar *normalized_text;
glong len;
- cluster_text = gtk_editable_get_chars (editable,
- prev_pos,
- entry->current_pos);
+ cluster_text = gtk_entry_get_display_text (entry, prev_pos,
+ entry->current_pos);
normalized_text = g_utf8_normalize (cluster_text,
strlen (cluster_text),
G_NORMALIZE_NFD);
{
GtkEditable *editable = GTK_EDITABLE (entry);
gint start, end;
+ gchar *str;
if (gtk_editable_get_selection_bounds (editable, &start, &end))
{
- gchar *str = gtk_entry_get_public_chars (entry, start, end);
+ if (!entry->visible)
+ {
+ gtk_widget_error_bell (GTK_WIDGET (entry));
+ return;
+ }
+
+ str = gtk_entry_get_display_text (entry, start, end);
gtk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (entry),
GDK_SELECTION_CLIPBOARD),
str, -1);
GtkEditable *editable = GTK_EDITABLE (entry);
gint start, end;
+ if (!entry->visible)
+ {
+ gtk_widget_error_bell (GTK_WIDGET (entry));
+ return;
+ }
+
gtk_entry_copy_clipboard (entry);
if (entry->editable)
}
static void
-gtk_entry_keymap_direction_changed (GdkKeymap *keymap,
- GtkEntry *entry)
+keymap_direction_changed (GdkKeymap *keymap,
+ GtkEntry *entry)
{
gtk_entry_recompute (entry);
}
static gboolean
gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
- GtkEntry *entry)
+ GtkEntry *entry)
{
- gtk_im_context_set_surrounding (context,
- entry->text,
- entry->n_bytes,
- g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
+ gchar *text;
+
+ /* XXXX ??? does this even make sense when text is not visible? Should we return FALSE? */
+ text = gtk_entry_get_display_text (entry, 0, -1);
+ gtk_im_context_set_surrounding (context, text, strlen (text), /* Length in bytes */
+ g_utf8_offset_to_pointer (text, entry->current_pos) - text);
+ g_free (text);
return TRUE;
}
gint strong_xoffset;
gint area_width, area_height;
- gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, NULL)
-;
- get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
+ gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, NULL);
+ gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
strong_xoffset = strong_x - entry->scroll_offset;
if (strong_xoffset < 0)
}
}
-static void
-append_char (GString *str,
- gunichar ch,
- gint count)
-{
- gint i;
- gint char_len;
- gchar buf[7];
-
- char_len = g_unichar_to_utf8 (ch, buf);
-
- i = 0;
- while (i < count)
- {
- g_string_append_len (str, buf, char_len);
- ++i;
- }
-}
-
-static gboolean
-gtk_entry_remove_password_hint (gpointer data)
-{
- /* Force the string to be redrawn, but now without a visible character */
- gtk_entry_recompute (GTK_ENTRY (data));
-
- return FALSE;
-}
-
static PangoLayout *
gtk_entry_create_layout (GtkEntry *entry,
gboolean include_preedit)
GtkWidget *widget = GTK_WIDGET (entry);
PangoLayout *layout = gtk_widget_create_pango_layout (widget, NULL);
PangoAttrList *tmp_attrs = pango_attr_list_new ();
-
+
gchar *preedit_string = NULL;
gint preedit_length = 0;
PangoAttrList *preedit_attrs = NULL;
+ gchar *display;
+ guint n_bytes;
+
pango_layout_set_single_paragraph_mode (layout, TRUE);
+ display = gtk_entry_get_display_text (entry, 0, -1);
+ n_bytes = strlen (display);
+
if (include_preedit)
{
gtk_im_context_get_preedit_string (entry->im_context,
if (preedit_length)
{
- GString *tmp_string = g_string_new (NULL);
-
- gint cursor_index = g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text;
+ GString *tmp_string = g_string_new (display);
+ gint cursor_index = g_utf8_offset_to_pointer (display, entry->current_pos) - display;
- if (entry->visible)
- {
- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
- g_string_insert (tmp_string, cursor_index, preedit_string);
- }
- else
- {
- gint ch_len;
- gint preedit_len_chars;
- gunichar invisible_char;
-
- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
- preedit_len_chars = g_utf8_strlen (preedit_string, -1);
- ch_len += preedit_len_chars;
-
- if (entry->invisible_char != 0)
- invisible_char = entry->invisible_char;
- else
- invisible_char = ' '; /* just pick a char */
-
- append_char (tmp_string, invisible_char, ch_len);
-
- /* Fix cursor index to point to invisible char corresponding
- * to the preedit, fix preedit_length to be the length of
- * the invisible chars representing the preedit
- */
- cursor_index =
- g_utf8_offset_to_pointer (tmp_string->str, entry->current_pos) -
- tmp_string->str;
- preedit_length =
- preedit_len_chars *
- g_unichar_to_utf8 (invisible_char, NULL);
- }
+ g_string_insert (tmp_string, cursor_index, preedit_string);
pango_layout_set_text (layout, tmp_string->str, tmp_string->len);
{
PangoDirection pango_dir;
- if (entry->visible)
- pango_dir = pango_find_base_dir (entry->text, entry->n_bytes);
-
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_NORMAL)
+ pango_dir = pango_find_base_dir (display, n_bytes);
else
pango_dir = PANGO_DIRECTION_NEUTRAL;
pango_context_set_base_dir (gtk_widget_get_pango_context (widget),
pango_dir);
- pango_layout_set_alignment (layout, pango_dir);
-
entry->resolved_dir = pango_dir;
-
- if (entry->visible)
- {
- pango_layout_set_text (layout, entry->text, entry->n_bytes);
- }
- else
- {
- GString *str = g_string_new (NULL);
- gunichar invisible_char;
- guint password_hint_timeout;
- GtkEntryPasswordHint *password_hint;
-
- g_object_get (gtk_widget_get_settings (widget),
- "gtk-entry-password-hint-timeout", &password_hint_timeout,
- NULL);
-
- if (entry->invisible_char != 0)
- invisible_char = entry->invisible_char;
- else
- invisible_char = ' '; /* just pick a char */
-
- password_hint = g_object_get_qdata (G_OBJECT (entry),
- quark_password_hint);
-
- if (password_hint && password_hint->password_hint_timeout_id)
- {
- g_source_remove (password_hint->password_hint_timeout_id);
- password_hint->password_hint_timeout_id = 0;
- }
-
- if (password_hint_timeout == 0 || password_hint == NULL ||
- (password_hint && password_hint->password_hint_length == 0))
- {
- append_char (str, invisible_char, entry->text_length);
- }
- else if (password_hint)
- {
- /* Draw hidden characters upto the inserted position,
- * then the real thing, pad up to full length
- */
- if (password_hint->password_hint_position > 1)
- append_char (str, invisible_char,
- password_hint->password_hint_position - 1);
-
- g_string_append_len (str, password_hint->password_hint,
- password_hint->password_hint_length);
-
- if (password_hint->password_hint_position < entry->text_length)
- append_char (str, invisible_char,
- entry->text_length -
- password_hint->password_hint_position);
-
- /* Now remove this last input character, don't need
- * it anymore
- */
- memset (password_hint->password_hint, 0, PASSWORD_HINT_MAX);
- password_hint->password_hint_length = 0;
-
- password_hint->password_hint_timeout_id =
- gdk_threads_add_timeout (password_hint_timeout,
- (GSourceFunc) gtk_entry_remove_password_hint,
- entry);
- }
- pango_layout_set_text (layout, str->str, str->len);
- g_string_free (str, TRUE);
- }
+ pango_layout_set_text (layout, display, n_bytes);
}
pango_layout_set_attributes (layout, tmp_attrs);
g_free (preedit_string);
+ g_free (display);
+
if (preedit_attrs)
pango_attr_list_unref (preedit_attrs);
layout = gtk_entry_ensure_layout (entry, TRUE);
- get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
+ gtk_entry_get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
_gtk_entry_effective_inner_border (entry, &inner_border);
area_height = PANGO_SCALE * (area_height - inner_border.top - inner_border.bottom);
}
static void
-gtk_entry_draw_text (GtkEntry *entry)
+draw_text_with_color (GtkEntry *entry, cairo_t *cr, GdkColor *default_color)
{
+ PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
GtkWidget *widget;
+ gint x, y;
+ gint start_pos, end_pos;
+
+ widget = GTK_WIDGET (entry);
+
+ cairo_save (cr);
+
+ get_layout_position (entry, &x, &y);
+
+ cairo_move_to (cr, x, y);
+ gdk_cairo_set_source_color (cr, default_color);
+ pango_cairo_show_layout (cr, layout);
+
+ if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
+ {
+ gint *ranges;
+ gint n_ranges, i;
+ PangoRectangle logical_rect;
+ GdkColor *selection_color, *text_color;
+ GtkBorder inner_border;
+
+ pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
+ gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
+
+ if (GTK_WIDGET_HAS_FOCUS (entry))
+ {
+ selection_color = &widget->style->base [GTK_STATE_SELECTED];
+ text_color = &widget->style->text [GTK_STATE_SELECTED];
+ }
+ else
+ {
+ selection_color = &widget->style->base [GTK_STATE_ACTIVE];
+ text_color = &widget->style->text [GTK_STATE_ACTIVE];
+ }
+
+ _gtk_entry_effective_inner_border (entry, &inner_border);
+
+ for (i = 0; i < n_ranges; ++i)
+ cairo_rectangle (cr,
+ inner_border.left - entry->scroll_offset + ranges[2 * i],
+ y,
+ ranges[2 * i + 1],
+ logical_rect.height);
+
+ cairo_clip (cr);
+
+ gdk_cairo_set_source_color (cr, selection_color);
+ cairo_paint (cr);
+
+ cairo_move_to (cr, x, y);
+ gdk_cairo_set_source_color (cr, text_color);
+ pango_cairo_show_layout (cr, layout);
- if (!entry->visible && entry->invisible_char == 0)
+ g_free (ranges);
+ }
+ cairo_restore (cr);
+}
+
+static void
+gtk_entry_draw_text (GtkEntry *entry)
+{
+ GtkWidget *widget = GTK_WIDGET (entry);
+ cairo_t *cr;
+
+ /* Nothing to display at all */
+ if (gtk_entry_get_display_mode (entry) == DISPLAY_BLANK)
return;
if (GTK_WIDGET_DRAWABLE (entry))
{
- PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
- cairo_t *cr;
- gint x, y;
- gint start_pos, end_pos;
-
- widget = GTK_WIDGET (entry);
-
- get_layout_position (entry, &x, &y);
+ GdkColor text_color, bar_text_color;
+ gint pos_x, pos_y;
+ gint width, height;
+ gint progress_x, progress_y, progress_width, progress_height;
+ GtkStateType state;
- cr = gdk_cairo_create (entry->text_area);
+ state = GTK_STATE_SELECTED;
+ if (!GTK_WIDGET_SENSITIVE (widget))
+ state = GTK_STATE_INSENSITIVE;
+ text_color = widget->style->text[widget->state];
+ bar_text_color = widget->style->fg[state];
- cairo_move_to (cr, x, y);
- gdk_cairo_set_source_color (cr, &widget->style->text [widget->state]);
- pango_cairo_show_layout (cr, layout);
+ get_progress_area (widget,
+ &progress_x, &progress_y,
+ &progress_width, &progress_height);
- if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos))
- {
- gint *ranges;
- gint n_ranges, i;
- PangoRectangle logical_rect;
- GdkColor *selection_color, *text_color;
- GtkBorder inner_border;
+ cr = gdk_cairo_create (entry->text_area);
- pango_layout_get_pixel_extents (layout, NULL, &logical_rect);
- gtk_entry_get_pixel_ranges (entry, &ranges, &n_ranges);
+ /* If the color is the same, or the progress area has a zero
+ * size, then we only need to draw once. */
+ if ((text_color.pixel == bar_text_color.pixel) ||
+ ((progress_width == 0) || (progress_height == 0)))
+ {
+ draw_text_with_color (entry, cr, &text_color);
+ }
+ else
+ {
+ gdk_drawable_get_size (entry->text_area, &width, &height);
- if (GTK_WIDGET_HAS_FOCUS (entry))
- {
- selection_color = &widget->style->base [GTK_STATE_SELECTED];
- text_color = &widget->style->text [GTK_STATE_SELECTED];
- }
- else
- {
- selection_color = &widget->style->base [GTK_STATE_ACTIVE];
- text_color = &widget->style->text [GTK_STATE_ACTIVE];
- }
+ cairo_rectangle (cr, 0, 0, width, height);
+ cairo_clip (cr);
+ cairo_save (cr);
- _gtk_entry_effective_inner_border (entry, &inner_border);
+ cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+ cairo_rectangle (cr, 0, 0, width, height);
- for (i = 0; i < n_ranges; ++i)
- cairo_rectangle (cr,
- inner_border.left - entry->scroll_offset + ranges[2 * i],
- y,
- ranges[2 * i + 1],
- logical_rect.height);
+ gdk_window_get_position (entry->text_area, &pos_x, &pos_y);
+ progress_x -= pos_x;
+ progress_y -= pos_y;
- cairo_clip (cr);
-
- gdk_cairo_set_source_color (cr, selection_color);
- cairo_paint (cr);
+ cairo_rectangle (cr, progress_x, progress_y,
+ progress_width, progress_height);
+ cairo_clip (cr);
+ cairo_set_fill_rule (cr, CAIRO_FILL_RULE_WINDING);
+
+ draw_text_with_color (entry, cr, &text_color);
+ cairo_restore (cr);
- cairo_move_to (cr, x, y);
- gdk_cairo_set_source_color (cr, text_color);
- pango_cairo_show_layout (cr, layout);
-
- g_free (ranges);
- }
+ cairo_rectangle (cr, progress_x, progress_y,
+ progress_width, progress_height);
+ cairo_clip (cr);
+
+ draw_text_with_color (entry, cr, &bar_text_color);
+ }
cairo_destroy (cr);
}
gint cursor_index;
gboolean block;
gboolean block_at_line_end;
+ PangoLayout *layout;
+ const char *text;
_gtk_entry_effective_inner_border (entry, &inner_border);
gdk_drawable_get_size (entry->text_area, NULL, &text_area_height);
- cursor_index = g_utf8_offset_to_pointer (entry->text, entry->current_pos + entry->preedit_cursor) - entry->text;
+ layout = gtk_entry_ensure_layout (entry, TRUE);
+ text = pango_layout_get_text (layout);
+ cursor_index = g_utf8_offset_to_pointer (text, entry->current_pos + entry->preedit_cursor) - text;
if (!entry->overwrite_mode)
block = FALSE;
else
- block = _gtk_text_util_get_block_cursor_location (gtk_entry_ensure_layout (entry, TRUE),
+ block = _gtk_text_util_get_block_cursor_location (layout,
cursor_index, &cursor_rect, &block_at_line_end);
if (!block)
}
else /* overwrite_mode */
{
- PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE);
GdkColor cursor_color;
GdkRectangle rect;
cairo_t *cr;
gint *strong_x,
gint *weak_x)
{
- if (!entry->visible && !entry->invisible_char)
+ DisplayMode mode = gtk_entry_get_display_mode (entry);
+
+ /* Nothing to display at all, so no cursor is relevant */
+ if (mode == DISPLAY_BLANK)
{
if (strong_x)
*strong_x = 0;
if (entry->dnd_position > entry->current_pos)
{
- if (entry->visible)
+ if (mode == DISPLAY_NORMAL)
index += entry->preedit_length;
else
{
- gint preedit_len_chars = g_utf8_strlen (text, -1) - entry->text_length;
+ gint preedit_len_chars = g_utf8_strlen (text, -1) - gtk_entry_buffer_get_length (get_buffer (entry));
index += preedit_len_chars * g_unichar_to_utf8 (entry->invisible_char, NULL);
}
}
gint count)
{
gint new_pos = start;
+ guint length;
+
+ length = gtk_entry_buffer_get_length (get_buffer (entry));
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
- new_pos = CLAMP (start + count, 0, entry->text_length);
+ new_pos = CLAMP (start + count, 0, length);
}
- else if (entry->text)
+ else
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs);
- while (count > 0 && new_pos < entry->text_length)
+ while (count > 0 && new_pos < length)
{
do
new_pos++;
- while (new_pos < entry->text_length && !log_attrs[new_pos].is_cursor_position);
+ while (new_pos < length && !log_attrs[new_pos].is_cursor_position);
count--;
}
gboolean allow_whitespace)
{
gint new_pos = start;
+ guint length;
+
+ length = gtk_entry_buffer_get_length (get_buffer (entry));
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
- new_pos = entry->text_length;
+ new_pos = length;
}
- else if (entry->text && (new_pos < entry->text_length))
+ else if (new_pos < length)
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
gint new_pos = start;
/* Prevent any leak of information */
- if (!entry->visible)
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL)
{
new_pos = 0;
}
- else if (entry->text && start > 0)
+ else if (start > 0)
{
PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE);
PangoLogAttr *log_attrs;
gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
}
-/*
- * Like gtk_editable_get_chars, but handle not-visible entries
- * correctly.
- */
-static char *
-gtk_entry_get_public_chars (GtkEntry *entry,
- gint start,
- gint end)
-{
- if (end < 0)
- end = entry->text_length;
-
- if (entry->visible)
- return gtk_editable_get_chars (GTK_EDITABLE (entry), start, end);
- else if (!entry->invisible_char)
- return g_strdup ("");
- else
- {
- GString *str = g_string_new (NULL);
- append_char (str, entry->invisible_char, end - start);
- return g_string_free (str, FALSE);
- }
-}
-
static gint
truncate_multiline (const gchar *text)
{
length = truncate_multiline (text);
/* only complete if the selection is at the end */
- popup_completion = (entry->text_length == MAX (entry->current_pos, entry->selection_bound));
+ popup_completion = (gtk_entry_buffer_get_length (get_buffer (entry)) ==
+ MAX (entry->current_pos, entry->selection_bound));
if (completion)
{
if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end))
{
- gchar *str = gtk_entry_get_public_chars (entry, start, end);
+ gchar *str = gtk_entry_get_display_text (entry, start, end);
gtk_selection_data_set_text (selection_data, str, -1);
g_free (str);
}
gtk_target_list_unref (list);
}
-/* Public API
- */
-
-/**
- * gtk_entry_new:
- *
- * Creates a new entry.
- *
- * Return value: a new #GtkEntry.
- */
-GtkWidget*
-gtk_entry_new (void)
+static void
+gtk_entry_clear (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
{
- return g_object_new (GTK_TYPE_ENTRY, NULL);
-}
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
-/**
- * gtk_entry_new_with_max_length:
- * @max: the maximum length of the entry, or 0 for no maximum.
- * (other than the maximum length of entries.) The value passed in will
- * be clamped to the range 0-65536.
- *
- * Creates a new #GtkEntry widget with the given maximum length.
- *
- * Note: the existence of this function is inconsistent
- * with the rest of the GTK+ API. The normal setup would
- * be to just require the user to make an extra call
- * to gtk_entry_set_max_length() instead. It is not
- * expected that this function will be removed, but
- * it would be better practice not to use it.
- *
- * Return value: a new #GtkEntry.
- **/
-GtkWidget*
-gtk_entry_new_with_max_length (gint max)
-{
- GtkEntry *entry;
+ if (!icon_info || icon_info->storage_type == GTK_IMAGE_EMPTY)
+ return;
- max = CLAMP (max, 0, MAX_SIZE);
+ g_object_freeze_notify (G_OBJECT (entry));
- entry = g_object_new (GTK_TYPE_ENTRY, NULL);
- entry->text_max_length = max;
+ /* Explicitly check, as the pointer may become invalidated
+ * during destruction.
+ */
+ if (GDK_IS_WINDOW (icon_info->window))
+ gdk_window_hide (icon_info->window);
- return GTK_WIDGET (entry);
-}
+ if (icon_info->pixbuf)
+ {
+ g_object_unref (icon_info->pixbuf);
+ icon_info->pixbuf = NULL;
+ }
-/**
- * gtk_entry_set_text:
- * @entry: a #GtkEntry
- * @text: the new text
- *
- * Sets the text in the widget to the given
+ switch (icon_info->storage_type)
+ {
+ case GTK_IMAGE_PIXBUF:
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-pixbuf" : "secondary-icon-pixbuf");
+ break;
+
+ case GTK_IMAGE_STOCK:
+ g_free (icon_info->stock_id);
+ icon_info->stock_id = NULL;
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-stock" : "secondary-icon-stock");
+ break;
+
+ case GTK_IMAGE_ICON_NAME:
+ g_free (icon_info->icon_name);
+ icon_info->icon_name = NULL;
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-name" : "secondary-icon-name");
+ break;
+
+ case GTK_IMAGE_GICON:
+ if (icon_info->gicon)
+ {
+ g_object_unref (icon_info->gicon);
+ icon_info->gicon = NULL;
+ }
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-gicon" : "secondary-icon-gicon");
+ break;
+
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+
+ icon_info->storage_type = GTK_IMAGE_EMPTY;
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-storage-type" : "secondary-icon-storage-type");
+
+ g_object_thaw_notify (G_OBJECT (entry));
+}
+
+static void
+gtk_entry_ensure_pixbuf (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ EntryIconInfo *icon_info = priv->icons[icon_pos];
+ GdkScreen *screen;
+ GtkIconTheme *icon_theme;
+ GtkSettings *settings;
+ gint width, height;
+ GtkIconInfo *info;
+ gint state;
+
+ if (!icon_info || icon_info->pixbuf)
+ return;
+
+ switch (icon_info->storage_type)
+ {
+ case GTK_IMAGE_EMPTY:
+ case GTK_IMAGE_PIXBUF:
+ break;
+ case GTK_IMAGE_STOCK:
+ state = GTK_WIDGET_STATE (entry);
+ GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
+ icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+ icon_info->stock_id,
+ GTK_ICON_SIZE_MENU,
+ NULL);
+ if (!icon_info->pixbuf)
+ icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+ GTK_STOCK_MISSING_IMAGE,
+ GTK_ICON_SIZE_MENU,
+ NULL);
+ GTK_WIDGET_STATE (entry) = state;
+ break;
+
+ case GTK_IMAGE_ICON_NAME:
+ screen = gtk_widget_get_screen (GTK_WIDGET (entry));
+ if (screen)
+ {
+ icon_theme = gtk_icon_theme_get_for_screen (screen);
+ settings = gtk_settings_get_for_screen (screen);
+
+ gtk_icon_size_lookup_for_settings (settings,
+ GTK_ICON_SIZE_MENU,
+ &width, &height);
+
+ icon_info->pixbuf = gtk_icon_theme_load_icon (icon_theme,
+ icon_info->icon_name,
+ MIN (width, height),
+ 0, NULL);
+
+ if (icon_info->pixbuf == NULL)
+ {
+ state = GTK_WIDGET_STATE (entry);
+ GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
+ icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+ GTK_STOCK_MISSING_IMAGE,
+ GTK_ICON_SIZE_MENU,
+ NULL);
+ GTK_WIDGET_STATE (entry) = state;
+ }
+ }
+ break;
+
+ case GTK_IMAGE_GICON:
+ screen = gtk_widget_get_screen (GTK_WIDGET (entry));
+ if (screen)
+ {
+ icon_theme = gtk_icon_theme_get_for_screen (screen);
+ settings = gtk_settings_get_for_screen (screen);
+
+ gtk_icon_size_lookup_for_settings (settings,
+ GTK_ICON_SIZE_MENU,
+ &width, &height);
+
+ info = gtk_icon_theme_lookup_by_gicon (icon_theme,
+ icon_info->gicon,
+ MIN (width, height),
+ GTK_ICON_LOOKUP_USE_BUILTIN);
+ if (info)
+ {
+ icon_info->pixbuf = gtk_icon_info_load_icon (info, NULL);
+ gtk_icon_info_free (info);
+ }
+
+ if (icon_info->pixbuf == NULL)
+ {
+ state = GTK_WIDGET_STATE (entry);
+ GTK_WIDGET_STATE (entry) = GTK_STATE_NORMAL;
+ icon_info->pixbuf = gtk_widget_render_icon (GTK_WIDGET (entry),
+ GTK_STOCK_MISSING_IMAGE,
+ GTK_ICON_SIZE_MENU,
+ NULL);
+ GTK_WIDGET_STATE (entry) = state;
+ }
+ }
+ break;
+
+ default:
+ g_assert_not_reached ();
+ break;
+ }
+
+ if (icon_info->pixbuf != NULL && icon_info->window != NULL)
+ gdk_window_show_unraised (icon_info->window);
+}
+
+
+/* Public API
+ */
+
+/**
+ * gtk_entry_new:
+ *
+ * Creates a new entry.
+ *
+ * Return value: a new #GtkEntry.
+ */
+GtkWidget*
+gtk_entry_new (void)
+{
+ return g_object_new (GTK_TYPE_ENTRY, NULL);
+}
+
+/**
+ * gtk_entry_new_with_buffer:
+ * @buffer: The buffer to use for the new #GtkEntry.
+ *
+ * Creates a new entry with the specified text buffer.
+ *
+ * Return value: a new #GtkEntry
+ *
+ * Since: 2.18
+ */
+GtkWidget*
+gtk_entry_new_with_buffer (GtkEntryBuffer *buffer)
+{
+ g_return_val_if_fail (GTK_IS_ENTRY_BUFFER (buffer), NULL);
+ return g_object_new (GTK_TYPE_ENTRY, "buffer", buffer, NULL);
+}
+
+/**
+ * gtk_entry_new_with_max_length:
+ * @max: the maximum length of the entry, or 0 for no maximum.
+ * (other than the maximum length of entries.) The value passed in will
+ * be clamped to the range 0-65536.
+ *
+ * Creates a new #GtkEntry widget with the given maximum length.
+ *
+ * Return value: a new #GtkEntry
+ *
+ * Deprecated: Use gtk_entry_set_max_length() instead.
+ **/
+GtkWidget*
+gtk_entry_new_with_max_length (gint max)
+{
+ GtkEntry *entry;
+
+ max = CLAMP (max, 0, GTK_ENTRY_BUFFER_MAX_SIZE);
+
+ entry = g_object_new (GTK_TYPE_ENTRY, NULL);
+ gtk_entry_buffer_set_max_length (get_buffer (entry), max);
+
+ return GTK_WIDGET (entry);
+}
+
+
+static GtkEntryBuffer*
+get_buffer (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (priv->buffer == NULL)
+ {
+ GtkEntryBuffer *buffer;
+ buffer = gtk_entry_buffer_new (NULL, 0);
+ gtk_entry_set_buffer (entry, buffer);
+ g_object_unref (buffer);
+ }
+
+ return priv->buffer;
+}
+
+/**
+ * gtk_entry_get_buffer:
+ * @entry: a #GtkEntry
+ *
+ * Get the #GtkEntryBuffer object which holds the text for
+ * this widget.
+ *
+ * Since: 2.18
+ *
+ * Returns: A #GtkEntryBuffer object.
+ */
+GtkEntryBuffer*
+gtk_entry_get_buffer (GtkEntry *entry)
+{
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+
+ return get_buffer (entry);
+}
+
+/**
+ * gtk_entry_set_buffer:
+ * @entry: a #GtkEntry
+ * @buffer: a #GtkEntryBuffer
+ *
+ * Set the #GtkEntryBuffer object which holds the text for
+ * this widget.
+ *
+ * Since: 2.18
+ */
+void
+gtk_entry_set_buffer (GtkEntry *entry,
+ GtkEntryBuffer *buffer)
+{
+ GtkEntryPrivate *priv;
+ GObject *obj;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (buffer)
+ {
+ g_return_if_fail (GTK_IS_ENTRY_BUFFER (buffer));
+ g_object_ref (buffer);
+ }
+
+ if (priv->buffer)
+ {
+ buffer_disconnect_signals (entry);
+ g_object_unref (priv->buffer);
+
+ /* COMPAT: Deprecated. Not used. Setting these fields no longer necessary in GTK 3.x */
+ entry->text = NULL;
+ entry->text_length = 0;
+ entry->text_max_length = 0;
+ }
+
+ priv->buffer = buffer;
+
+ if (priv->buffer)
+ {
+ buffer_connect_signals (entry);
+
+ /* COMPAT: Deprecated. Not used. Setting these fields no longer necessary in GTK 3.x */
+ entry->text = (char*)gtk_entry_buffer_get_text (priv->buffer);
+ entry->text_length = gtk_entry_buffer_get_length (priv->buffer);
+ entry->text_max_length = gtk_entry_buffer_get_max_length (priv->buffer);
+ }
+
+ obj = G_OBJECT (entry);
+ g_object_freeze_notify (obj);
+ g_object_notify (obj, "buffer");
+ g_object_notify (obj, "text");
+ g_object_notify (obj, "text-length");
+ g_object_notify (obj, "max-length");
+ g_object_notify (obj, "visibility");
+ g_object_notify (obj, "invisible-char");
+ g_object_notify (obj, "invisible-char-set");
+ g_object_thaw_notify (obj);
+}
+
+
+/**
+ * gtk_entry_set_text:
+ * @entry: a #GtkEntry
+ * @text: the new text
+ *
+ * Sets the text in the widget to the given
* value, replacing the current contents.
+ *
+ * See gtk_entry_buffer_set_text().
*/
void
gtk_entry_set_text (GtkEntry *entry,
{
gint tmp_pos;
GtkEntryCompletion *completion;
+ GtkEntryPrivate *priv;
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
/* Actually setting the text will affect the cursor and selection;
* if the contents don't actually change, this will look odd to the user.
*/
- if (strcmp (entry->text, text) == 0)
+ if (strcmp (gtk_entry_buffer_get_text (get_buffer (entry)), text) == 0)
return;
completion = gtk_entry_get_completion (entry);
begin_change (entry);
g_object_freeze_notify (G_OBJECT (entry));
gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
-
tmp_pos = 0;
gtk_editable_insert_text (GTK_EDITABLE (entry), text, strlen (text), &tmp_pos);
g_object_thaw_notify (G_OBJECT (entry));
gtk_entry_append_text (GtkEntry *entry,
const gchar *text)
{
+ GtkEntryPrivate *priv;
gint tmp_pos;
g_return_if_fail (GTK_IS_ENTRY (entry));
g_return_if_fail (text != NULL);
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
- tmp_pos = entry->text_length;
+ tmp_pos = gtk_entry_buffer_get_length (get_buffer (entry));
gtk_editable_insert_text (GTK_EDITABLE (entry), text, -1, &tmp_pos);
}
/**
* gtk_entry_set_position:
* @entry: a #GtkEntry
- * @position: the position of the cursor. The cursor is displayed
+ * @position: the position of the cursor. The cursor is displayed
* before the character with the given (base 0) index in the widget.
* The value must be less than or equal to the number of characters
* in the widget. A value of -1 indicates that the position should
*/
void
gtk_entry_set_position (GtkEntry *entry,
- gint position)
+ gint position)
{
g_return_if_fail (GTK_IS_ENTRY (entry));
* as the invisible char, and will also appear that way when
* the text in the entry widget is copied elsewhere.
*
- * The default invisible char is the asterisk '*', but it can
- * be changed with gtk_entry_set_invisible_char().
+ * By default, GTK+ picks the best invisible character available
+ * in the current font, but it can be changed with
+ * gtk_entry_set_invisible_char().
*/
void
gtk_entry_set_visibility (GtkEntry *entry,
if (entry->visible != visible)
{
- if (GTK_WIDGET_HAS_FOCUS (entry) && !visible)
- gtk_im_context_focus_out (entry->im_context);
-
- g_object_unref (entry->im_context);
-
- if (visible)
- entry->im_context = gtk_im_multicontext_new ();
- else
- entry->im_context = gtk_im_context_simple_new ();
-
- g_signal_connect (entry->im_context, "commit",
- G_CALLBACK (gtk_entry_commit_cb), entry);
- g_signal_connect (entry->im_context, "preedit-changed",
- G_CALLBACK (gtk_entry_preedit_changed_cb), entry);
- g_signal_connect (entry->im_context, "retrieve-surrounding",
- G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry);
- g_signal_connect (entry->im_context, "delete-surrounding",
- G_CALLBACK (gtk_entry_delete_surrounding_cb), entry);
-
- if (GTK_WIDGET_HAS_FOCUS (entry) && visible)
- gtk_im_context_focus_in (entry->im_context);
-
entry->visible = visible;
g_object_notify (G_OBJECT (entry), "visibility");
* Sets the character to use in place of the actual text when
* gtk_entry_set_visibility() has been called to set text visibility
* to %FALSE. i.e. this is the character used in "password mode" to
- * show the user how many characters have been typed. The default
- * invisible char is an asterisk ('*'). If you set the invisible char
- * to 0, then the user will get no feedback at all; there will be
- * no text on the screen as they type.
+ * show the user how many characters have been typed. By default, GTK+
+ * picks the best invisible char available in the current font. If you
+ * set the invisible char to 0, then the user will get no feedback
+ * at all; there will be no text on the screen as they type.
**/
void
gtk_entry_set_invisible_char (GtkEntry *entry,
gunichar ch)
{
+ GtkEntryPrivate *priv;
+
g_return_if_fail (GTK_IS_ENTRY (entry));
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (!priv->invisible_char_set)
+ {
+ priv->invisible_char_set = TRUE;
+ g_object_notify (G_OBJECT (entry), "invisible-char-set");
+ }
+
if (ch == entry->invisible_char)
return;
return entry->invisible_char;
}
+/**
+ * gtk_entry_unset_invisible_char:
+ * @entry: a #GtkEntry
+ *
+ * Unsets the invisible char previously set with
+ * gtk_entry_set_invisible_char(). So that the
+ * default invisible char is used again.
+ *
+ * Since: 2.16
+ **/
+void
+gtk_entry_unset_invisible_char (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+ gunichar ch;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (!priv->invisible_char_set)
+ return;
+
+ priv->invisible_char_set = FALSE;
+ ch = find_invisible_char (GTK_WIDGET (entry));
+
+ if (entry->invisible_char != ch)
+ {
+ entry->invisible_char = ch;
+ g_object_notify (G_OBJECT (entry), "invisible-char");
+ }
+
+ g_object_notify (G_OBJECT (entry), "invisible-char-set");
+ gtk_entry_recompute (entry);
+}
+
/**
* gtk_entry_set_editable:
* @entry: a #GtkEntry
* Retrieves the contents of the entry widget.
* See also gtk_editable_get_chars().
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_text (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: a pointer to the contents of the widget as a
* string. This string points to internally allocated
* storage in the widget and must not be freed, modified or
gtk_entry_get_text (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
-
- return entry->text;
+ return gtk_entry_buffer_get_text (get_buffer (entry));
}
/**
* Sets the maximum allowed length of the contents of the widget. If
* the current contents are longer than the given length, then they
* will be truncated to fit.
+ *
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_set_max_length (gtk_entry_get_buffer (entry), max);
+ * </programlisting></informalexample>
**/
void
gtk_entry_set_max_length (GtkEntry *entry,
gint max)
{
g_return_if_fail (GTK_IS_ENTRY (entry));
-
- max = CLAMP (max, 0, MAX_SIZE);
-
- if (max > 0 && entry->text_length > max)
- gtk_editable_delete_text (GTK_EDITABLE (entry), max, -1);
-
- entry->text_max_length = max;
- g_object_notify (G_OBJECT (entry), "max-length");
+ gtk_entry_buffer_set_max_length (get_buffer (entry), max);
}
/**
* Retrieves the maximum allowed length of the text in
* @entry. See gtk_entry_set_max_length().
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_max_length (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: the maximum allowed number of characters
* in #GtkEntry, or 0 if there is no maximum.
**/
gtk_entry_get_max_length (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), 0);
-
- return entry->text_max_length;
+ return gtk_entry_buffer_get_max_length (get_buffer (entry));
}
/**
* Retrieves the current length of the text in
* @entry.
*
+ * This is equivalent to:
+ *
+ * <informalexample><programlisting>
+ * gtk_entry_buffer_get_length (gtk_entry_get_buffer (entry));
+ * </programlisting></informalexample>
+ *
* Return value: the current number of characters
* in #GtkEntry, or 0 if there are none.
*
gtk_entry_get_text_length (GtkEntry *entry)
{
g_return_val_if_fail (GTK_IS_ENTRY (entry), 0);
-
- return entry->text_length;
+ return gtk_entry_buffer_get_length (get_buffer (entry));
}
/**
g_return_if_fail (GTK_IS_ENTRY (entry));
- /* this gets coords relative to text area */
- get_layout_position (entry, x, y);
+ /* this gets coords relative to text area */
+ get_layout_position (entry, x, y);
+
+ /* convert to widget coords */
+ gtk_entry_get_text_area_size (entry, &text_area_x, &text_area_y, NULL, NULL);
+
+ if (x)
+ *x += text_area_x;
+
+ if (y)
+ *y += text_area_y;
+}
+
+
+/**
+ * gtk_entry_set_alignment:
+ * @entry: a #GtkEntry
+ * @xalign: The horizontal alignment, from 0 (left) to 1 (right).
+ * Reversed for RTL layouts
+ *
+ * Sets the alignment for the contents of the entry. This controls
+ * the horizontal positioning of the contents when the displayed
+ * text is shorter than the width of the entry.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_entry_set_alignment (GtkEntry *entry, gfloat xalign)
+{
+ GtkEntryPrivate *priv;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (xalign < 0.0)
+ xalign = 0.0;
+ else if (xalign > 1.0)
+ xalign = 1.0;
+
+ if (xalign != priv->xalign)
+ {
+ priv->xalign = xalign;
+
+ gtk_entry_recompute (entry);
+
+ g_object_notify (G_OBJECT (entry), "xalign");
+ }
+}
+
+/**
+ * gtk_entry_get_alignment:
+ * @entry: a #GtkEntry
+ *
+ * Gets the value set by gtk_entry_set_alignment().
+ *
+ * Return value: the alignment
+ *
+ * Since: 2.4
+ **/
+gfloat
+gtk_entry_get_alignment (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), 0.0);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ return priv->xalign;
+}
+
+/**
+ * gtk_entry_set_icon_from_pixbuf:
+ * @entry: a #GtkEntry
+ * @icon_pos: Icon position
+ * @pixbuf: A #GdkPixbuf, or %NULL
+ *
+ * Sets the icon shown in the specified position using a pixbuf.
+ *
+ * If @pixbuf is %NULL, no icon will be shown in the specified position.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_from_pixbuf (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ GdkPixbuf *pixbuf)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ g_object_freeze_notify (G_OBJECT (entry));
+
+ if (pixbuf)
+ g_object_ref (pixbuf);
+
+ gtk_entry_clear (entry, icon_pos);
+
+ if (pixbuf)
+ {
+ icon_info->storage_type = GTK_IMAGE_PIXBUF;
+ icon_info->pixbuf = pixbuf;
+
+ if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
+ {
+ g_object_notify (G_OBJECT (entry), "primary-icon-pixbuf");
+ g_object_notify (G_OBJECT (entry), "primary-icon-storage-type");
+ }
+ else
+ {
+ g_object_notify (G_OBJECT (entry), "secondary-icon-pixbuf");
+ g_object_notify (G_OBJECT (entry), "secondary-icon-storage-type");
+ }
+
+ if (GTK_WIDGET_MAPPED (entry))
+ gdk_window_show_unraised (icon_info->window);
+ }
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ if (GTK_WIDGET_VISIBLE (entry))
+ gtk_widget_queue_resize (GTK_WIDGET (entry));
+
+ g_object_thaw_notify (G_OBJECT (entry));
+}
+
+/**
+ * gtk_entry_set_icon_from_stock:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ * @stock_id: The name of the stock item, or %NULL
+ *
+ * Sets the icon shown in the entry at the specified position from
+ * a stock image.
+ *
+ * If @stock_id is %NULL, no icon will be shown in the specified position.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_from_stock (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *stock_id)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+ gchar *new_id;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ g_object_freeze_notify (G_OBJECT (entry));
+
+ gtk_widget_ensure_style (GTK_WIDGET (entry));
+
+ /* need to dup before clearing */
+ new_id = g_strdup (stock_id);
+
+ gtk_entry_clear (entry, icon_pos);
+
+ if (new_id != NULL)
+ {
+ icon_info->storage_type = GTK_IMAGE_STOCK;
+ icon_info->stock_id = new_id;
+
+ if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
+ {
+ g_object_notify (G_OBJECT (entry), "primary-icon-stock");
+ g_object_notify (G_OBJECT (entry), "primary-icon-storage-type");
+ }
+ else
+ {
+ g_object_notify (G_OBJECT (entry), "secondary-icon-stock");
+ g_object_notify (G_OBJECT (entry), "secondary-icon-storage-type");
+ }
+
+ if (GTK_WIDGET_MAPPED (entry))
+ gdk_window_show_unraised (icon_info->window);
+ }
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ if (GTK_WIDGET_VISIBLE (entry))
+ gtk_widget_queue_resize (GTK_WIDGET (entry));
+
+ g_object_thaw_notify (G_OBJECT (entry));
+}
+
+/**
+ * gtk_entry_set_icon_from_icon_name:
+ * @entry: A #GtkEntry
+ * @icon_pos: The position at which to set the icon
+ * @icon_name: An icon name, or %NULL
+ *
+ * Sets the icon shown in the entry at the specified position
+ * from the current icon theme.
+ *
+ * If the icon name isn't known, a "broken image" icon will be displayed
+ * instead.
+ *
+ * If @icon_name is %NULL, no icon will be shown in the specified position.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_from_icon_name (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *icon_name)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+ gchar *new_name;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ g_object_freeze_notify (G_OBJECT (entry));
+
+ gtk_widget_ensure_style (GTK_WIDGET (entry));
+
+ /* need to dup before clearing */
+ new_name = g_strdup (icon_name);
+
+ gtk_entry_clear (entry, icon_pos);
+
+ if (new_name != NULL)
+ {
+ icon_info->storage_type = GTK_IMAGE_ICON_NAME;
+ icon_info->icon_name = new_name;
+
+ if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
+ {
+ g_object_notify (G_OBJECT (entry), "primary-icon-name");
+ g_object_notify (G_OBJECT (entry), "primary-icon-storage-type");
+ }
+ else
+ {
+ g_object_notify (G_OBJECT (entry), "secondary-icon-name");
+ g_object_notify (G_OBJECT (entry), "secondary-icon-storage-type");
+ }
+
+ if (GTK_WIDGET_MAPPED (entry))
+ gdk_window_show_unraised (icon_info->window);
+ }
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ if (GTK_WIDGET_VISIBLE (entry))
+ gtk_widget_queue_resize (GTK_WIDGET (entry));
+
+ g_object_thaw_notify (G_OBJECT (entry));
+}
+
+/**
+ * gtk_entry_set_icon_from_gicon:
+ * @entry: A #GtkEntry
+ * @icon_pos: The position at which to set the icon
+ * @icon: The icon to set, or %NULL
+ *
+ * Sets the icon shown in the entry at the specified position
+ * from the current icon theme.
+ * If the icon isn't known, a "broken image" icon will be displayed
+ * instead.
+ *
+ * If @icon is %NULL, no icon will be shown in the specified position.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_from_gicon (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ GIcon *icon)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ g_object_freeze_notify (G_OBJECT (entry));
+
+ /* need to ref before clearing */
+ if (icon)
+ g_object_ref (icon);
+
+ gtk_entry_clear (entry, icon_pos);
+
+ if (icon)
+ {
+ icon_info->storage_type = GTK_IMAGE_GICON;
+ icon_info->gicon = icon;
+
+ if (icon_pos == GTK_ENTRY_ICON_PRIMARY)
+ {
+ g_object_notify (G_OBJECT (entry), "primary-icon-gicon");
+ g_object_notify (G_OBJECT (entry), "primary-icon-storage-type");
+ }
+ else
+ {
+ g_object_notify (G_OBJECT (entry), "secondary-icon-gicon");
+ g_object_notify (G_OBJECT (entry), "secondary-icon-storage-type");
+ }
+
+ if (GTK_WIDGET_MAPPED (entry))
+ gdk_window_show_unraised (icon_info->window);
+ }
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ if (GTK_WIDGET_VISIBLE (entry))
+ gtk_widget_queue_resize (GTK_WIDGET (entry));
+
+ g_object_thaw_notify (G_OBJECT (entry));
+}
+
+/**
+ * gtk_entry_set_icon_activatable:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ * @activatable: %TRUE if the icon should be activatable
+ *
+ * Sets whether the icon is activatable.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_activatable (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ gboolean activatable)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ activatable = activatable != FALSE;
+
+ if (icon_info->nonactivatable != !activatable)
+ {
+ icon_info->nonactivatable = !activatable;
+
+ if (GTK_WIDGET_REALIZED (GTK_WIDGET (entry)))
+ update_cursors (GTK_WIDGET (entry));
+
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-activatable" : "secondary-icon-activatable");
+ }
+}
+
+/**
+ * gtk_entry_get_icon_activatable:
+ * @entry: a #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Returns whether the icon is activatable.
+ *
+ * Returns: %TRUE if the icon is activatable.
+ *
+ * Since: 2.16
+ */
+gboolean
+gtk_entry_get_icon_activatable (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), FALSE);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), FALSE);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ return (icon_info != NULL && !icon_info->nonactivatable);
+}
+
+/**
+ * gtk_entry_get_icon_pixbuf:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Retrieves the image used for the icon.
+ *
+ * Unlike the other methods of setting and getting icon data, this
+ * method will work regardless of whether the icon was set using a
+ * #GdkPixbuf, a #GIcon, a stock item, or an icon name.
+ *
+ * Returns: A #GdkPixbuf, or %NULL if no icon is set for this position.
+ *
+ * Since: 2.16
+ */
+GdkPixbuf *
+gtk_entry_get_icon_pixbuf (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return NULL;
+
+ gtk_entry_ensure_pixbuf (entry, icon_pos);
+
+ return icon_info->pixbuf;
+}
+
+/**
+ * gtk_entry_get_icon_gicon:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Retrieves the #GIcon used for the icon, or %NULL if there is
+ * no icon or if the icon was set by some other method (e.g., by
+ * stock, pixbuf, or icon name).
+ *
+ * Returns: A #GIcon, or %NULL if no icon is set or if the icon
+ * is not a #GIcon
+ *
+ * Since: 2.16
+ */
+GIcon *
+gtk_entry_get_icon_gicon (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return NULL;
+
+ return icon_info->storage_type == GTK_IMAGE_GICON ? icon_info->gicon : NULL;
+}
+
+/**
+ * gtk_entry_get_icon_stock:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Retrieves the stock id used for the icon, or %NULL if there is
+ * no icon or if the icon was set by some other method (e.g., by
+ * pixbuf, icon name or gicon).
+ *
+ * Returns: A stock id, or %NULL if no icon is set or if the icon
+ * wasn't set from a stock id
+ *
+ * Since: 2.16
+ */
+const gchar *
+gtk_entry_get_icon_stock (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return NULL;
+
+ return icon_info->storage_type == GTK_IMAGE_STOCK ? icon_info->stock_id : NULL;
+}
+
+/**
+ * gtk_entry_get_icon_name:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Retrieves the icon name used for the icon, or %NULL if there is
+ * no icon or if the icon was set by some other method (e.g., by
+ * pixbuf, stock or gicon).
+ *
+ * Returns: An icon name, or %NULL if no icon is set or if the icon
+ * wasn't set from an icon name
+ *
+ * Since: 2.16
+ */
+const gchar *
+gtk_entry_get_icon_name (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return NULL;
+
+ return icon_info->storage_type == GTK_IMAGE_ICON_NAME ? icon_info->icon_name : NULL;
+}
+
+/**
+ * gtk_entry_set_icon_sensitive:
+ * @entry: A #GtkEntry
+ * @icon_pos: Icon position
+ * @sensitive: Specifies whether the icon should appear
+ * sensitive or insensitive
+ *
+ * Sets the sensitivity for the specified icon.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_sensitive (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ gboolean sensitive)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ if (icon_info->insensitive != !sensitive)
+ {
+ icon_info->insensitive = !sensitive;
+
+ icon_info->pressed = FALSE;
+ icon_info->prelight = FALSE;
+
+ if (GTK_WIDGET_REALIZED (GTK_WIDGET (entry)))
+ update_cursors (GTK_WIDGET (entry));
+
+ gtk_widget_queue_draw (GTK_WIDGET (entry));
+
+ g_object_notify (G_OBJECT (entry),
+ icon_pos == GTK_ENTRY_ICON_PRIMARY ? "primary-icon-sensitive" : "secondary-icon-sensitive");
+ }
+}
+
+/**
+ * gtk_entry_get_icon_sensitive:
+ * @entry: a #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Returns whether the icon appears sensitive or insensitive.
+ *
+ * Returns: %TRUE if the icon is sensitive.
+ *
+ * Since: 2.16
+ */
+gboolean
+gtk_entry_get_icon_sensitive (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), TRUE);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), TRUE);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ return (!icon_info || !icon_info->insensitive);
+
+}
+
+/**
+ * gtk_entry_get_icon_storage_type:
+ * @entry: a #GtkEntry
+ * @icon_pos: Icon position
+ *
+ * Gets the type of representation being used by the icon
+ * to store image data. If the icon has no image data,
+ * the return value will be %GTK_IMAGE_EMPTY.
+ *
+ * Return value: image representation being used
+ *
+ * Since: 2.16
+ **/
+GtkImageType
+gtk_entry_get_icon_storage_type (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), GTK_IMAGE_EMPTY);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), GTK_IMAGE_EMPTY);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return GTK_IMAGE_EMPTY;
+
+ return icon_info->storage_type;
+}
+
+/**
+ * gtk_entry_get_icon_at_pos:
+ * @entry: a #GtkEntry
+ * @x: the x coordinate of the position to find
+ * @y: the y coordinate of the position to find
+ *
+ * Finds the icon at the given position and return its index.
+ * If @x, @y doesn't lie inside an icon, -1 is returned.
+ * This function is intended for use in a #GtkWidget::query-tooltip
+ * signal handler.
+ *
+ * Returns: the index of the icon at the given position, or -1
+ *
+ * Since: 2.16
+ */
+gint
+gtk_entry_get_icon_at_pos (GtkEntry *entry,
+ gint x,
+ gint y)
+{
+ GtkAllocation primary;
+ GtkAllocation secondary;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), -1);
+
+ get_icon_allocations (entry, &primary, &secondary);
+
+ if (primary.x <= x && x < primary.x + primary.width &&
+ primary.y <= y && y < primary.y + primary.height)
+ return GTK_ENTRY_ICON_PRIMARY;
+
+ if (secondary.x <= x && x < secondary.x + secondary.width &&
+ secondary.y <= y && y < secondary.y + secondary.height)
+ return GTK_ENTRY_ICON_SECONDARY;
+
+ return -1;
+}
+
+/**
+ * gtk_entry_set_icon_drag_source:
+ * @entry: a #GtkIconEntry
+ * @icon_pos: icon position
+ * @target_list: the targets (data formats) in which the data can be provided
+ * @actions: a bitmask of the allowed drag actions
+ *
+ * Sets up the icon at the given position so that GTK+ will start a drag
+ * operation when the user clicks and drags the icon.
+ *
+ * To handle the drag operation, you need to connect to the usual
+ * #GtkWidget::drag-data-get (or possibly #GtkWidget::drag-data-delete)
+ * signal, and use gtk_entry_get_current_icon_drag_source() in
+ * your signal handler to find out if the drag was started from
+ * an icon.
+ *
+ * By default, GTK+ uses the icon as the drag icon. You can use the
+ * #GtkWidget::drag-begin signal to set a different icon. Note that you
+ * have to use g_signal_connect_after() to ensure that your signal handler
+ * gets executed after the default handler.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_drag_source (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ GtkTargetList *target_list,
+ GdkDragAction actions)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if ((icon_info = priv->icons[icon_pos]) == NULL)
+ icon_info = construct_icon_info (GTK_WIDGET (entry), icon_pos);
+
+ if (icon_info->target_list)
+ gtk_target_list_unref (icon_info->target_list);
+ icon_info->target_list = target_list;
+ if (icon_info->target_list)
+ gtk_target_list_ref (icon_info->target_list);
+
+ icon_info->actions = actions;
+}
+
+/**
+ * gtk_entry_get_current_icon_drag_source:
+ * @entry: a #GtkIconEntry
+ *
+ * Returns the index of the icon which is the source of the current
+ * DND operation, or -1.
+ *
+ * This function is meant to be used in a #GtkWidget::drag-data-get
+ * callback.
+ *
+ * Returns: index of the icon which is the source of the current
+ * DND operation, or -1.
+ *
+ * Since: 2.16
+ */
+gint
+gtk_entry_get_current_icon_drag_source (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info = NULL;
+ gint i;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), -1);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]))
+ {
+ if (icon_info->in_drag)
+ return i;
+ }
+ }
+
+ return -1;
+}
+
+static void
+ensure_has_tooltip (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+ int i;
+ gboolean has_tooltip = FALSE;
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ if ((icon_info = priv->icons[i]) != NULL)
+ {
+ if (icon_info->tooltip != NULL)
+ {
+ has_tooltip = TRUE;
+ break;
+ }
+ }
+ }
+
+ gtk_widget_set_has_tooltip (GTK_WIDGET (entry), has_tooltip);
+}
+
+/**
+ * gtk_entry_get_icon_tooltip_text:
+ * @entry: a #GtkEntry
+ * @icon_pos: the icon position
+ *
+ * Gets the contents of the tooltip on the icon at the specified
+ * position in @entry.
+ *
+ * Returns: the tooltip text, or %NULL. Free the returned string
+ * with g_free() when done.
+ *
+ * Since: 2.16
+ */
+gchar *
+gtk_entry_get_icon_tooltip_text (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+ gchar *text = NULL;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
+
+ if (!icon_info)
+ return NULL;
+
+ if (icon_info->tooltip &&
+ !pango_parse_markup (icon_info->tooltip, -1, 0, NULL, &text, NULL, NULL))
+ g_assert (NULL == text); /* text should still be NULL in case of markup errors */
+
+ return text;
+}
+
+/**
+ * gtk_entry_set_icon_tooltip_text:
+ * @entry: a #GtkEntry
+ * @icon_pos: the icon position
+ * @tooltip: the contents of the tooltip for the icon, or %NULL
+ *
+ * Sets @tooltip as the contents of the tooltip for the icon
+ * at the specified position.
+ *
+ * Use %NULL for @tooltip to remove an existing tooltip.
+ *
+ * See also gtk_widget_set_tooltip_text() and
+ * gtk_entry_set_icon_tooltip_markup().
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_icon_tooltip_text (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *tooltip)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
+
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (!(icon_info = priv->icons[icon_pos]))
+ icon_info = priv->icons[icon_pos];
+
+ if (icon_info->tooltip)
+ g_free (icon_info->tooltip);
+
+ /* Treat an empty string as a NULL string,
+ * because an empty string would be useless for a tooltip:
+ */
+ if (tooltip && tooltip[0] == '\0')
+ tooltip = NULL;
+
+ icon_info->tooltip = tooltip ? g_markup_escape_text (tooltip, -1) : NULL;
+
+ ensure_has_tooltip (entry);
+}
+
+/**
+ * gtk_entry_get_icon_tooltip_markup:
+ * @entry: a #GtkEntry
+ * @icon_pos: the icon position
+ *
+ * Gets the contents of the tooltip on the icon at the specified
+ * position in @entry.
+ *
+ * Returns: the tooltip text, or %NULL. Free the returned string
+ * with g_free() when done.
+ *
+ * Since: 2.16
+ */
+gchar *
+gtk_entry_get_icon_tooltip_markup (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos)
+{
+ GtkEntryPrivate *priv;
+ EntryIconInfo *icon_info;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), NULL);
+ g_return_val_if_fail (IS_VALID_ICON_POSITION (icon_pos), NULL);
- /* convert to widget coords */
- get_text_area_size (entry, &text_area_x, &text_area_y, NULL, NULL);
-
- if (x)
- *x += text_area_x;
+ priv = GTK_ENTRY_GET_PRIVATE (entry);
+ icon_info = priv->icons[icon_pos];
- if (y)
- *y += text_area_y;
+ if (!icon_info)
+ return NULL;
+
+ return g_strdup (icon_info->tooltip);
}
-
/**
- * gtk_entry_set_alignment:
+ * gtk_entry_set_icon_tooltip_markup:
* @entry: a #GtkEntry
- * @xalign: The horizontal alignment, from 0 (left) to 1 (right).
- * Reversed for RTL layouts
- *
- * Sets the alignment for the contents of the entry. This controls
- * the horizontal positioning of the contents when the displayed
- * text is shorter than the width of the entry.
+ * @icon_pos: the icon position
+ * @tooltip: the contents of the tooltip for the icon, or %NULL
*
- * Since: 2.4
- **/
+ * Sets @tooltip as the contents of the tooltip for the icon at
+ * the specified position. @tooltip is assumed to be marked up with
+ * the <link linkend="PangoMarkupFormat">Pango text markup language</link>.
+ *
+ * Use %NULL for @tooltip to remove an existing tooltip.
+ *
+ * See also gtk_widget_set_tooltip_markup() and
+ * gtk_enty_set_icon_tooltip_text().
+ *
+ * Since: 2.16
+ */
void
-gtk_entry_set_alignment (GtkEntry *entry, gfloat xalign)
+gtk_entry_set_icon_tooltip_markup (GtkEntry *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *tooltip)
{
GtkEntryPrivate *priv;
-
+ EntryIconInfo *icon_info;
+
g_return_if_fail (GTK_IS_ENTRY (entry));
+ g_return_if_fail (IS_VALID_ICON_POSITION (icon_pos));
priv = GTK_ENTRY_GET_PRIVATE (entry);
- if (xalign < 0.0)
- xalign = 0.0;
- else if (xalign > 1.0)
- xalign = 1.0;
+ if (!(icon_info = priv->icons[icon_pos]))
+ icon_info = priv->icons[icon_pos];
- if (xalign != priv->xalign)
- {
- priv->xalign = xalign;
+ if (icon_info->tooltip)
+ g_free (icon_info->tooltip);
- gtk_entry_recompute (entry);
+ /* Treat an empty string as a NULL string,
+ * because an empty string would be useless for a tooltip:
+ */
+ if (tooltip && tooltip[0] == '\0')
+ tooltip = NULL;
- g_object_notify (G_OBJECT (entry), "xalign");
- }
+ icon_info->tooltip = g_strdup (tooltip);
+
+ ensure_has_tooltip (entry);
}
-/**
- * gtk_entry_get_alignment:
- * @entry: a #GtkEntry
- *
- * Gets the value set by gtk_entry_set_alignment().
- *
- * Return value: the alignment
- *
- * Since: 2.4
- **/
-gfloat
-gtk_entry_get_alignment (GtkEntry *entry)
+static gboolean
+gtk_entry_query_tooltip (GtkWidget *widget,
+ gint x,
+ gint y,
+ gboolean keyboard_tip,
+ GtkTooltip *tooltip)
{
+ GtkEntry *entry;
GtkEntryPrivate *priv;
-
- g_return_val_if_fail (GTK_IS_ENTRY (entry), 0.0);
+ EntryIconInfo *icon_info;
+ gint icon_pos;
+ entry = GTK_ENTRY (widget);
priv = GTK_ENTRY_GET_PRIVATE (entry);
- return priv->xalign;
+ if (!keyboard_tip)
+ {
+ icon_pos = gtk_entry_get_icon_at_pos (entry, x, y);
+ if (icon_pos != -1)
+ {
+ if ((icon_info = priv->icons[icon_pos]) != NULL)
+ {
+ if (icon_info->tooltip)
+ {
+ gtk_tooltip_set_markup (tooltip, icon_info->tooltip);
+ return TRUE;
+ }
+
+ return FALSE;
+ }
+ }
+ }
+
+ return GTK_WIDGET_CLASS (gtk_entry_parent_class)->query_tooltip (widget,
+ x, y,
+ keyboard_tip,
+ tooltip);
}
+
/* Quick hack of a popup menu
*/
static void
if (GTK_WIDGET_REALIZED (entry))
{
+ DisplayMode mode;
gboolean clipboard_contains_text;
GtkWidget *menuitem;
GtkWidget *submenu;
GTK_WIDGET (entry),
popup_menu_detach);
- append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
- entry->editable && entry->current_pos != entry->selection_bound);
- append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+ mode = gtk_entry_get_display_mode (entry);
+ append_action_signal (entry, entry->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
+ entry->editable && mode == DISPLAY_NORMAL &&
entry->current_pos != entry->selection_bound);
- append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+
+ append_action_signal (entry, entry->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
+ mode == DISPLAY_NORMAL &&
+ entry->current_pos != entry->selection_bound);
+
+ append_action_signal (entry, entry->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
entry->editable && clipboard_contains_text);
-
+
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_DELETE, NULL);
gtk_widget_set_sensitive (menuitem, entry->editable && entry->current_pos != entry->selection_bound);
g_signal_connect_swapped (menuitem, "activate",
"gtk-show-unicode-menu", &show_unicode_menu,
NULL);
- if (!entry->visible)
- show_input_method_menu = FALSE;
-
if (show_input_method_menu || show_unicode_menu)
{
menuitem = gtk_separator_menu_item_new ();
return TRUE;
}
+static void
+gtk_entry_drag_begin (GtkWidget *widget,
+ GdkDragContext *context)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL)
+ {
+ if (icon_info->in_drag)
+ {
+ switch (icon_info->storage_type)
+ {
+ case GTK_IMAGE_STOCK:
+ gtk_drag_set_icon_stock (context, icon_info->stock_id, -2, -2);
+ break;
+
+ case GTK_IMAGE_ICON_NAME:
+ gtk_drag_set_icon_name (context, icon_info->icon_name, -2, -2);
+ break;
+
+ /* FIXME: No GIcon support for dnd icons */
+ case GTK_IMAGE_GICON:
+ case GTK_IMAGE_PIXBUF:
+ gtk_drag_set_icon_pixbuf (context, icon_info->pixbuf, -2, -2);
+ break;
+ default:
+ g_assert_not_reached ();
+ }
+ }
+ }
+ }
+}
+
+static void
+gtk_entry_drag_end (GtkWidget *widget,
+ GdkDragContext *context)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
+ gint i;
+
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL)
+ icon_info->in_drag = 0;
+ }
+}
+
static void
gtk_entry_drag_leave (GtkWidget *widget,
GdkDragContext *context,
guint time)
{
gint sel_start, sel_end;
+ gint i;
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
GtkEditable *editable = GTK_EDITABLE (widget);
-
+
+ /* If there is an icon drag going on, exit early. */
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL)
+ {
+ if (icon_info->in_drag)
+ return;
+ }
+ }
+
if (gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end))
{
- gchar *str = gtk_entry_get_public_chars (GTK_ENTRY (widget), sel_start, sel_end);
+ gchar *str = gtk_entry_get_display_text (GTK_ENTRY (widget), sel_start, sel_end);
gtk_selection_data_set_text (selection_data, str, -1);
GdkDragContext *context)
{
gint sel_start, sel_end;
+ gint i;
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (widget);
GtkEditable *editable = GTK_EDITABLE (widget);
+
+ /* If there is an icon drag going on, exit early. */
+ for (i = 0; i < MAX_ICONS; i++)
+ {
+ EntryIconInfo *icon_info = priv->icons[i];
+
+ if (icon_info != NULL)
+ {
+ if (icon_info->in_drag)
+ return;
+ }
+ }
if (GTK_ENTRY (widget)->editable &&
gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end))
event->keyval == GDK_KP_Enter ||
event->keyval == GDK_Return)
{
+ GtkTreeIter iter;
+ GtkTreeModel *model = NULL;
+ GtkTreeSelection *sel;
gboolean retval = TRUE;
_gtk_entry_reset_im_context (GTK_ENTRY (widget));
if (completion->priv->current_selected < matches)
{
- GtkTreeIter iter;
- GtkTreeModel *model = NULL;
- GtkTreeSelection *sel;
gboolean entry_set;
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->tree_view));
}
else if (completion->priv->current_selected - matches >= 0)
{
- GtkTreePath *path;
-
- _gtk_entry_reset_im_context (GTK_ENTRY (widget));
-
- path = gtk_tree_path_new_from_indices (completion->priv->current_selected - matches, -1);
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->action_view));
+ if (gtk_tree_selection_get_selected (sel, &model, &iter))
+ {
+ GtkTreePath *path;
- g_signal_emit_by_name (completion, "action-activated",
- gtk_tree_path_get_indices (path)[0]);
- gtk_tree_path_free (path);
+ path = gtk_tree_path_new_from_indices (completion->priv->current_selected - matches, -1);
+ g_signal_emit_by_name (completion, "action-activated",
+ gtk_tree_path_get_indices (path)[0]);
+ gtk_tree_path_free (path);
+ }
+ else
+ retval = FALSE;
}
g_free (completion->priv->completion_prefix);
if (completion->priv->has_completion)
gtk_editable_set_position (GTK_EDITABLE (entry),
- entry->text_length);
+ gtk_entry_buffer_get_length (get_buffer (entry)));
return FALSE;
}
return g_object_get_qdata (G_OBJECT (entry), quark_cursor_hadjustment);
}
+/**
+ * gtk_entry_set_progress_fraction:
+ * @entry: a #GtkEntry
+ * @fraction: fraction of the task that's been completed
+ *
+ * Causes the entry's progress indicator to "fill in" the given
+ * fraction of the bar. The fraction should be between 0.0 and 1.0,
+ * inclusive.
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_progress_fraction (GtkEntry *entry,
+ gdouble fraction)
+{
+ GtkEntryPrivate *private;
+ gdouble old_fraction;
+ gint x, y, width, height;
+ gint old_x, old_y, old_width, old_height;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ private = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (private->progress_pulse_mode)
+ old_fraction = -1;
+ else
+ old_fraction = private->progress_fraction;
+
+ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (entry)))
+ get_progress_area (GTK_WIDGET(entry), &old_x, &old_y, &old_width, &old_height);
+
+ fraction = CLAMP (fraction, 0.0, 1.0);
+
+ private->progress_fraction = fraction;
+ private->progress_pulse_mode = FALSE;
+ private->progress_pulse_current = 0.0;
+
+ if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (entry)))
+ {
+ get_progress_area (GTK_WIDGET(entry), &x, &y, &width, &height);
+
+ if ((x != old_x) || (y != old_y) || (width != old_width) || (height != old_height))
+ gtk_widget_queue_draw (GTK_WIDGET (entry));
+ }
+
+ if (fraction != old_fraction)
+ g_object_notify (G_OBJECT (entry), "progress-fraction");
+}
+
+/**
+ * gtk_entry_get_progress_fraction:
+ * @entry: a #GtkEntry
+ *
+ * Returns the current fraction of the task that's been completed.
+ * See gtk_entry_set_progress_fraction().
+ *
+ * Return value: a fraction from 0.0 to 1.0
+ *
+ * Since: 2.16
+ */
+gdouble
+gtk_entry_get_progress_fraction (GtkEntry *entry)
+{
+ GtkEntryPrivate *private;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), 0.0);
+
+ private = GTK_ENTRY_GET_PRIVATE (entry);
+
+ return private->progress_fraction;
+}
+
+/**
+ * gtk_entry_set_progress_pulse_step:
+ * @entry: a #GtkEntry
+ * @fraction: fraction between 0.0 and 1.0
+ *
+ * Sets the fraction of total entry width to move the progress
+ * bouncing block for each call to gtk_entry_progress_pulse().
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_set_progress_pulse_step (GtkEntry *entry,
+ gdouble fraction)
+{
+ GtkEntryPrivate *private;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ private = GTK_ENTRY_GET_PRIVATE (entry);
+
+ fraction = CLAMP (fraction, 0.0, 1.0);
+
+ if (fraction != private->progress_pulse_fraction)
+ {
+ private->progress_pulse_fraction = fraction;
+
+ gtk_widget_queue_draw (GTK_WIDGET (entry));
+
+ g_object_notify (G_OBJECT (entry), "progress-pulse-step");
+ }
+}
+
+/**
+ * gtk_entry_get_progress_pulse_step:
+ * @entry: a #GtkEntry
+ *
+ * Retrieves the pulse step set with gtk_entry_set_progress_pulse_step().
+ *
+ * Return value: a fraction from 0.0 to 1.0
+ *
+ * Since: 2.16
+ */
+gdouble
+gtk_entry_get_progress_pulse_step (GtkEntry *entry)
+{
+ GtkEntryPrivate *private;
+
+ g_return_val_if_fail (GTK_IS_ENTRY (entry), 0.0);
+
+ private = GTK_ENTRY_GET_PRIVATE (entry);
+
+ return private->progress_pulse_fraction;
+}
+
+/**
+ * gtk_entry_progress_pulse:
+ * @entry: a #GtkEntry
+ *
+ * Indicates that some progress is made, but you don't know how much.
+ * Causes the entry's progress indicator to enter "activity mode,"
+ * where a block bounces back and forth. Each call to
+ * gtk_entry_progress_pulse() causes the block to move by a little bit
+ * (the amount of movement per pulse is determined by
+ * gtk_entry_set_progress_pulse_step()).
+ *
+ * Since: 2.16
+ */
+void
+gtk_entry_progress_pulse (GtkEntry *entry)
+{
+ GtkEntryPrivate *private;
+
+ g_return_if_fail (GTK_IS_ENTRY (entry));
+
+ private = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (private->progress_pulse_mode)
+ {
+ if (private->progress_pulse_way_back)
+ {
+ private->progress_pulse_current -= private->progress_pulse_fraction;
+
+ if (private->progress_pulse_current < 0.0)
+ {
+ private->progress_pulse_current = 0.0;
+ private->progress_pulse_way_back = FALSE;
+ }
+ }
+ else
+ {
+ private->progress_pulse_current += private->progress_pulse_fraction;
+
+ if (private->progress_pulse_current > 1.0 - private->progress_pulse_fraction)
+ {
+ private->progress_pulse_current = 1.0 - private->progress_pulse_fraction;
+ private->progress_pulse_way_back = TRUE;
+ }
+ }
+ }
+ else
+ {
+ private->progress_fraction = 0.0;
+ private->progress_pulse_mode = TRUE;
+ private->progress_pulse_way_back = FALSE;
+ private->progress_pulse_current = 0.0;
+ }
+
+ gtk_widget_queue_draw (GTK_WIDGET (entry));
+}
+
+/* Caps Lock warning for password entries */
+
+static void
+show_capslock_feedback (GtkEntry *entry,
+ const gchar *text)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (gtk_entry_get_icon_storage_type (entry, GTK_ENTRY_ICON_SECONDARY) == GTK_IMAGE_EMPTY)
+ {
+ gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CAPS_LOCK_WARNING);
+ gtk_entry_set_icon_activatable (entry, GTK_ENTRY_ICON_SECONDARY, FALSE);
+ priv->caps_lock_warning_shown = TRUE;
+ }
+
+ if (priv->caps_lock_warning_shown)
+ gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_SECONDARY, text);
+ else
+ g_warning ("Can't show Caps Lock warning, since secondary icon is set");
+}
+
+static void
+remove_capslock_feedback (GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+
+ if (priv->caps_lock_warning_shown)
+ {
+ gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
+ priv->caps_lock_warning_shown = FALSE;
+ }
+}
+
+static void
+keymap_state_changed (GdkKeymap *keymap,
+ GtkEntry *entry)
+{
+ GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
+ char *text = NULL;
+
+ if (gtk_entry_get_display_mode (entry) != DISPLAY_NORMAL && priv->caps_lock_warning)
+ {
+ if (gdk_keymap_get_caps_lock_state (keymap))
+ text = _("Caps Lock is on");
+ }
+
+ if (text)
+ show_capslock_feedback (entry, text);
+ else
+ remove_capslock_feedback (entry);
+}
+
#define __GTK_ENTRY_C__
#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff