From c0bffbc81f6f7bf9e437391c1e5e13a6af188cb6 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Thu, 20 Nov 2008 08:29:55 +0900 Subject: [PATCH] Deleted gtkitementry Removed the (custom) widget gtkitementry and use a standard GtkEntry widget instead. --- lib/gtksheet/automake.mk | 2 - lib/gtksheet/gtkitementry.c | 2407 ----------------------------------- lib/gtksheet/gtkitementry.h | 76 -- lib/gtksheet/gtksheet.c | 159 +-- 4 files changed, 27 insertions(+), 2617 deletions(-) delete mode 100644 lib/gtksheet/gtkitementry.c delete mode 100644 lib/gtksheet/gtkitementry.h diff --git a/lib/gtksheet/automake.mk b/lib/gtksheet/automake.mk index ee523670..bba6becc 100644 --- a/lib/gtksheet/automake.mk +++ b/lib/gtksheet/automake.mk @@ -22,8 +22,6 @@ lib_gtksheet_libgtksheet_a_SOURCES = \ lib/gtksheet/gtkextra-marshal.c \ lib/gtksheet/gtkextra-marshal.h \ lib/gtksheet/gtkextra-sheet.h \ - lib/gtksheet/gtkitementry.h \ - lib/gtksheet/gtkitementry.c \ lib/gtksheet/gtkmarshalers.c \ lib/gtksheet/gtkmarshalers.h \ lib/gtksheet/gtksheet.c \ diff --git a/lib/gtksheet/gtkitementry.c b/lib/gtksheet/gtkitementry.c deleted file mode 100644 index 0ee90cc8..00000000 --- a/lib/gtksheet/gtkitementry.c +++ /dev/null @@ -1,2407 +0,0 @@ -#undef GDK_MULTIHEAD_SAFE -/* GTK - The GIMP Toolkit - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/* - * 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/. - */ - -#include - -#include - -#include - -#include -#include -#include "gtkitementry.h" - -#define MIN_ENTRY_WIDTH 150 -#define DRAW_TIMEOUT 20 -#define INNER_BORDER 0 - -/* Initial size of buffer, in bytes */ -#define MIN_SIZE 16 - -/* Maximum size of text buffer, in bytes */ -#define MAX_SIZE G_MAXUSHORT - -typedef enum { - CURSOR_STANDARD, - CURSOR_DND -} CursorType; - -/* GObject, GtkObject methods - */ -static void gtk_item_entry_class_init (GtkItemEntryClass *klass); -static void gtk_item_entry_init (GtkItemEntry *entry); -static void gtk_item_entry_editable_init (GtkEditableClass *iface); - -/* GtkWidget methods - */ -static void gtk_entry_realize (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); -static gint gtk_entry_expose (GtkWidget *widget, - GdkEventExpose *event); -static void gtk_entry_grab_focus (GtkWidget *widget); -static void gtk_entry_style_set (GtkWidget *widget, - GtkStyle *previous_style); -static void gtk_entry_direction_changed (GtkWidget *widget, - GtkTextDirection previous_dir); -static void gtk_entry_state_changed (GtkWidget *widget, - GtkStateType previous_state); - -/* GtkEditable method implementations - */ -static void gtk_entry_insert_text (GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position); -static void gtk_entry_delete_text (GtkEditable *editable, - gint start_pos, - gint end_pos); - -static void gtk_entry_real_set_position (GtkEditable *editable, - gint position); -static gint gtk_entry_get_position (GtkEditable *editable); - -/* Default signal handlers - */ -static void gtk_entry_real_insert_text (GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position); -static void gtk_entry_real_delete_text (GtkEditable *editable, - gint start_pos, - gint end_pos); -static void gtk_entry_move_cursor (GtkEntry *entry, - GtkMovementStep step, - gint count, - gboolean extend_selection); -static void gtk_entry_insert_at_cursor (GtkEntry *entry, - const gchar *str); -static void gtk_entry_delete_from_cursor (GtkEntry *entry, - GtkDeleteType type, - gint count); - -/* IM Context Callbacks - */ -static void gtk_entry_commit_cb (GtkIMContext *context, - const gchar *str, - GtkEntry *entry); -static void gtk_entry_preedit_changed_cb (GtkIMContext *context, - GtkEntry *entry); -static gboolean gtk_entry_retrieve_surrounding_cb (GtkIMContext *context, - GtkEntry *entry); -static gboolean gtk_entry_delete_surrounding_cb (GtkIMContext *context, - gint offset, - gint n_chars, - GtkEntry *entry); - -/* Internal routines - */ -static void gtk_entry_enter_text (GtkEntry *entry, - const gchar *str); -static void gtk_entry_set_positions (GtkEntry *entry, - gint current_pos, - gint selection_bound); -static void gtk_entry_draw_text (GtkEntry *entry); -static void gtk_entry_draw_cursor (GtkEntry *entry, - CursorType type); -static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, - gboolean include_preedit); -static void gtk_entry_queue_draw (GtkEntry *entry); -static void gtk_entry_reset_im_context (GtkEntry *entry); -static void gtk_entry_recompute (GtkEntry *entry); -static void gtk_entry_get_cursor_locations (GtkEntry *entry, - CursorType type, - gint *strong_x, - gint *weak_x); -static void gtk_entry_adjust_scroll (GtkEntry *entry); -static gint gtk_entry_move_visually (GtkEntry *editable, - gint start, - gint count); -static gint gtk_entry_move_logically (GtkEntry *entry, - gint start, - gint count); -static gint gtk_entry_move_forward_word (GtkEntry *entry, - gint start); -static gint gtk_entry_move_backward_word (GtkEntry *entry, - gint start); -static void gtk_entry_delete_whitespace (GtkEntry *entry); -static char * gtk_entry_get_public_chars (GtkEntry *entry, - gint start, - gint end); -static void gtk_entry_update_primary_selection (GtkEntry *entry); -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 get_text_area_size (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height); -static void get_widget_window_size (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height); - -static GtkEntryClass *parent_class = NULL; - -GtkType -gtk_item_entry_get_type (void) -{ - static GtkType item_entry_type = 0; - - if (!item_entry_type) - { - static const GtkTypeInfo item_entry_info = - { - "GtkItemEntry", - sizeof (GtkItemEntry), - sizeof (GtkItemEntryClass), - (GtkClassInitFunc) gtk_item_entry_class_init, - (GtkObjectInitFunc) gtk_item_entry_init, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, - }; - - static const GInterfaceInfo item_editable_info = - { - (GInterfaceInitFunc) gtk_item_entry_editable_init, /* interface_init */ - NULL, /* interface_finalize */ - NULL /* interface_data */ - }; - - - item_entry_type = gtk_type_unique (GTK_TYPE_ENTRY, &item_entry_info); - - g_type_add_interface_static (item_entry_type, - GTK_TYPE_EDITABLE, - &item_editable_info); - - } - - return item_entry_type; -} - -static void -gtk_item_entry_class_init (GtkItemEntryClass *class) -{ - GtkObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkEntryClass *entry_class; - - object_class = (GtkObjectClass*) class; - widget_class = (GtkWidgetClass*) class; - parent_class = gtk_type_class (GTK_TYPE_ENTRY); - entry_class = (GtkEntryClass *) class; - - widget_class->realize = gtk_entry_realize; - 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->grab_focus = gtk_entry_grab_focus; - widget_class->style_set = gtk_entry_style_set; - widget_class->direction_changed = gtk_entry_direction_changed; - widget_class->state_changed = gtk_entry_state_changed; - - entry_class->move_cursor = gtk_entry_move_cursor; - entry_class->insert_at_cursor = gtk_entry_insert_at_cursor; - entry_class->delete_from_cursor = gtk_entry_delete_from_cursor; - -} - -static void -gtk_item_entry_editable_init (GtkEditableClass *iface) -{ - iface->do_insert_text = gtk_entry_insert_text; - iface->do_delete_text = gtk_entry_delete_text; - iface->insert_text = gtk_entry_real_insert_text; - iface->delete_text = gtk_entry_real_delete_text; - iface->set_position = gtk_entry_real_set_position; - iface->get_position = gtk_entry_get_position; -} - -static void -gtk_item_entry_init (GtkItemEntry *entry) -{ - entry->justification = GTK_JUSTIFY_LEFT; - entry->text_max_size = 0; - GTK_ENTRY(entry)->has_frame = FALSE; - - g_object_unref(G_OBJECT(GTK_ENTRY(entry)->im_context)); - - GTK_ENTRY(entry)->im_context = gtk_im_multicontext_new (); - - g_signal_connect (G_OBJECT (GTK_ENTRY(entry)->im_context), "commit", - G_CALLBACK (gtk_entry_commit_cb), entry); - g_signal_connect (G_OBJECT (GTK_ENTRY(entry)->im_context), "preedit_changed", - G_CALLBACK (gtk_entry_preedit_changed_cb), entry); - g_signal_connect (G_OBJECT (GTK_ENTRY(entry)->im_context), "retrieve_surrounding", - G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry); - g_signal_connect (G_OBJECT (GTK_ENTRY(entry)->im_context), "delete_surrounding", - G_CALLBACK (gtk_entry_delete_surrounding_cb), entry); - -} - -static void -gtk_entry_realize (GtkWidget *widget) -{ - GtkEntry *entry; - GtkEditable *editable; - GdkWindowAttr attributes; - gint attributes_mask; - - GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED); - entry = GTK_ENTRY (widget); - editable = GTK_EDITABLE (widget); - - 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); - - attributes.cursor = gdk_cursor_new (GDK_XTERM); - attributes_mask |= GDK_WA_CURSOR; - - entry->text_area = gdk_window_new (widget->window, &attributes, attributes_mask); - gdk_window_set_user_data (entry->text_area, entry); - - gdk_cursor_unref (attributes.cursor); - - widget->style = gtk_style_attach (widget->style, widget->window); - - gdk_window_set_background (widget->window, &widget->style->bg[GTK_WIDGET_STATE(widget)]); - gdk_window_set_background (entry->text_area, &widget->style->bg[GTK_WIDGET_STATE (widget)]); - - gdk_window_show (entry->text_area); - - gtk_im_context_set_client_window (entry->im_context, entry->text_area); - - gtk_entry_adjust_scroll (entry); -} - -static void -get_borders (GtkEntry *entry, - gint *xborder, - gint *yborder) -{ - GtkWidget *widget = GTK_WIDGET (entry); - gint focus_width; - gboolean interior_focus; - - gtk_widget_style_get (widget, - "interior-focus", &interior_focus, - "focus-line-width", &focus_width, - NULL); - - if (entry->has_frame) - { - *xborder = widget->style->xthickness; - *yborder = widget->style->ythickness; - } - else - { - *xborder = 0; - *yborder = 0; - } - - if (!interior_focus) - { - *xborder += focus_width; - *yborder += focus_width; - } - -} - -static void -gtk_entry_size_request (GtkWidget *widget, - GtkRequisition *requisition) -{ - GtkEntry *entry = GTK_ENTRY (widget); - PangoFontMetrics *metrics; - gint xborder, yborder; - PangoContext *context; - - context = gtk_widget_get_pango_context (widget); - metrics = pango_context_get_metrics (context, - widget->style->font_desc, - pango_context_get_language (context)); - - entry->ascent = pango_font_metrics_get_ascent (metrics); - entry->descent = pango_font_metrics_get_descent (metrics); - - get_borders (entry, &xborder, &yborder); - - xborder += INNER_BORDER; - yborder += INNER_BORDER; - - if (entry->width_chars < 0) - requisition->width = MIN_ENTRY_WIDTH + xborder * 2; - else - { - gint char_width = pango_font_metrics_get_approximate_char_width (metrics); - requisition->width = PANGO_PIXELS (char_width) * entry->width_chars + xborder * 2; - } - - requisition->height = PANGO_PIXELS (entry->ascent + entry->descent) + yborder * 2; - - pango_font_metrics_unref (metrics); -} - -static void -get_text_area_size (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height) -{ - gint xborder, yborder; - GtkRequisition requisition; - GtkWidget *widget = GTK_WIDGET (entry); - - gtk_widget_get_child_requisition (widget, &requisition); - - get_borders (entry, &xborder, &yborder); - - if (x) - *x = xborder; - - if (y) - *y = yborder; - - if (width) - *width = GTK_WIDGET (entry)->allocation.width - xborder * 2; - - if (height) - *height = requisition.height - yborder * 2; -} - -static void -get_widget_window_size (GtkEntry *entry, - gint *x, - gint *y, - gint *width, - gint *height) -{ - GtkRequisition requisition; - GtkWidget *widget = GTK_WIDGET (entry); - - gtk_widget_get_child_requisition (widget, &requisition); - - if (x) - *x = widget->allocation.x; - - if (y) - { - if (entry->is_cell_renderer) - *y = widget->allocation.y; - else - *y = widget->allocation.y + (widget->allocation.height - requisition.height) / 2; - } - - if (width) - *width = widget->allocation.width; - - if (height) - { - if (entry->is_cell_renderer) - *height = widget->allocation.height; - else - *height = requisition.height; - } -} - -static void -gtk_entry_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GtkEntry *entry = GTK_ENTRY (widget); - GtkItemEntry *ientry = GTK_ITEM_ENTRY (widget); - - if(ientry->text_max_size > 0) - allocation->width = MIN(ientry->text_max_size, allocation->width); - - widget->allocation = *allocation; - - if (GTK_WIDGET_REALIZED (widget)) - { - /* We call gtk_widget_get_child_requisition, since we want (for - * backwards compatibility reasons) the realization here to - * be affected by the usize of the entry, if set - */ - gint x, y, width, height; - - get_widget_window_size (entry, &x, &y, &width, &height); - - gdk_window_move_resize (widget->window, - allocation->x, allocation->y, allocation->width, allocation->height); - - get_text_area_size (entry, &x, &y, &width, &height); - - gdk_window_move_resize (entry->text_area, - 0, allocation->height - height, allocation->width, height); - - gtk_entry_recompute (entry); - } -} - -static void -gtk_entry_draw_frame (GtkWidget *widget) -{ -} - -static gint -gtk_entry_expose (GtkWidget *widget, - GdkEventExpose *event) -{ - GtkEntry *entry = GTK_ENTRY (widget); - - if (widget->window == event->window) - gtk_entry_draw_frame (widget); - else if (entry->text_area == event->window) - { - gint area_width, area_height; - - get_text_area_size (entry, NULL, NULL, &area_width, &area_height); - - gdk_draw_rectangle (entry->text_area, - widget->style->bg_gc[GTK_WIDGET_STATE(widget)], - TRUE, - 0, 0, area_width, area_height); - - if ((entry->visible || entry->invisible_char != 0) && - GTK_WIDGET_HAS_FOCUS (widget) && - entry->selection_bound == entry->current_pos && entry->cursor_visible) - gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_STANDARD); - - if (entry->dnd_position != -1) - gtk_entry_draw_cursor (GTK_ENTRY (widget), CURSOR_DND); - - gtk_entry_draw_text (GTK_ENTRY (widget)); - } - - return FALSE; -} - -static void -gtk_entry_grab_focus (GtkWidget *widget) -{ - GtkEntry *entry = GTK_ENTRY (widget); - gboolean select_on_focus; - - GTK_WIDGET_CLASS (parent_class)->grab_focus (widget); - - g_object_get (G_OBJECT (gtk_settings_get_default ()), - "gtk-entry-select-on-focus", - &select_on_focus, - NULL); - - if (select_on_focus && entry->editable && !entry->in_click) - gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); -} - -static void -gtk_entry_direction_changed (GtkWidget *widget, - GtkTextDirection previous_dir) -{ - GtkEntry *entry = GTK_ENTRY (widget); - - gtk_entry_recompute (entry); - - GTK_WIDGET_CLASS (parent_class)->direction_changed (widget, previous_dir); -} - -static void -gtk_entry_state_changed (GtkWidget *widget, - GtkStateType previous_state) -{ - GtkEntry *entry = GTK_ENTRY (widget); - - if (GTK_WIDGET_REALIZED (widget)) - { - gdk_window_set_background (widget->window, &widget->style->bg[GTK_WIDGET_STATE (widget)]); - gdk_window_set_background (entry->text_area, &widget->style->bg[GTK_WIDGET_STATE (widget)]); - } - - if (!GTK_WIDGET_IS_SENSITIVE (widget)) - { - /* Clear any selection */ - gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos); - } - - gtk_widget_queue_clear (widget); -} - -/* GtkEditable method implementations - */ -static void -gtk_entry_insert_text (GtkEditable *editable, - const gchar *new_text, - 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 (G_OBJECT (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 (new_text_length > 63) - g_free (text); - - g_object_unref (G_OBJECT (editable)); -} - -static void -gtk_entry_delete_text (GtkEditable *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 (G_OBJECT (editable)); - - g_signal_emit_by_name (editable, "delete_text", start_pos, end_pos); - - g_object_unref (G_OBJECT (editable)); -} - -static void -gtk_entry_style_set (GtkWidget *widget, - GtkStyle *previous_style) -{ - GtkEntry *entry = GTK_ENTRY (widget); - - if (previous_style && GTK_WIDGET_REALIZED (widget)) - { - gtk_entry_recompute (entry); - - gdk_window_set_background (widget->window, &widget->style->bg[GTK_WIDGET_STATE(widget)]); - gdk_window_set_background (entry->text_area, &widget->style->bg[GTK_WIDGET_STATE (widget)]); - } -} - -static void -gtk_entry_real_set_position (GtkEditable *editable, - gint position) -{ - GtkEntry *entry = GTK_ENTRY (editable); - - if (position < 0 || position > entry->text_length) - position = entry->text_length; - - if (position != entry->current_pos || - position != entry->selection_bound) - { - gtk_entry_reset_im_context (entry); - gtk_entry_set_positions (entry, position, position); - } -} - -static gint -gtk_entry_get_position (GtkEditable *editable) -{ - return GTK_ENTRY (editable)->current_pos; -} - - -/* Default signal handlers - */ -static void -gtk_entry_real_insert_text (GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position) -{ - gint index; - gint n_chars; - - GtkEntry *entry = GTK_ENTRY (editable); - - 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) - { - gdk_beep (); - 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) - { - 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; - } - } - } - - entry->text = g_realloc (entry->text, entry->text_size); - } - - index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text; - - g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index); - memcpy (entry->text + index, new_text, new_text_length); - - entry->n_bytes += new_text_length; - entry->text_length += n_chars; - - /* NUL terminate for safety and convenience */ - entry->text[entry->n_bytes] = '\0'; - - if (entry->current_pos > *position) - entry->current_pos += n_chars; - - if (entry->selection_bound > *position) - entry->selection_bound += n_chars; - - *position += n_chars; - - gtk_entry_recompute (entry); - - g_signal_emit_by_name (editable, "changed"); - g_object_notify (G_OBJECT (editable), "text"); -} - -static void -gtk_entry_real_delete_text (GtkEditable *editable, - gint start_pos, - gint end_pos) -{ - 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; - - 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); - - if (entry->current_pos > start_pos) - entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos; - - if (entry->selection_bound > start_pos) - entry->selection_bound -= MIN (entry->selection_bound, end_pos) - start_pos; - /* We might have deleted the selection - */ - gtk_entry_update_primary_selection (entry); - - gtk_entry_recompute (entry); - - g_signal_emit_by_name (editable, "changed"); - g_object_notify (G_OBJECT (editable), "text"); - } -} - -/* Compute the X position for an offset that corresponds to the "more important - * cursor position for that offset. We use this when trying to guess to which - * end of the selection we should go to when the user hits the left or - * right arrow key. - */ -static gint -get_better_cursor_x (GtkEntry *entry, - gint offset) -{ - GtkTextDirection keymap_direction = - (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ? - GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL; - GtkTextDirection widget_direction = gtk_widget_get_direction (GTK_WIDGET (entry)); - gboolean split_cursor; - - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); - gint index = g_utf8_offset_to_pointer (entry->text, offset) - entry->text; - - PangoRectangle strong_pos, weak_pos; - - g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)), - "gtk-split-cursor", &split_cursor, - NULL); - - pango_layout_get_cursor_pos (layout, index, &strong_pos, &weak_pos); - - if (split_cursor) - return strong_pos.x / PANGO_SCALE; - else - return (keymap_direction == widget_direction) ? strong_pos.x / PANGO_SCALE : weak_pos.x / PANGO_SCALE; -} - -static void -gtk_entry_move_cursor (GtkEntry *entry, - GtkMovementStep step, - gint count, - gboolean extend_selection) -{ - gint new_pos = entry->current_pos; - - gtk_entry_reset_im_context (entry); - - if (entry->current_pos != entry->selection_bound && !extend_selection) - { - /* If we have a current selection and aren't extending it, move to the - * start/or end of the selection as appropriate - */ - switch (step) - { - case GTK_MOVEMENT_VISUAL_POSITIONS: - { - gint current_x = get_better_cursor_x (entry, entry->current_pos); - gint bound_x = get_better_cursor_x (entry, entry->selection_bound); - - if (count < 0) - new_pos = current_x < bound_x ? entry->current_pos : entry->selection_bound; - else - new_pos = current_x > bound_x ? entry->current_pos : entry->selection_bound; - - break; - } - case GTK_MOVEMENT_LOGICAL_POSITIONS: - case GTK_MOVEMENT_WORDS: - if (count < 0) - new_pos = MIN (entry->current_pos, entry->selection_bound); - else - new_pos = MAX (entry->current_pos, entry->selection_bound); - break; - case GTK_MOVEMENT_DISPLAY_LINE_ENDS: - case GTK_MOVEMENT_PARAGRAPH_ENDS: - case GTK_MOVEMENT_BUFFER_ENDS: - new_pos = count < 0 ? 0 : entry->text_length; - break; - case GTK_MOVEMENT_DISPLAY_LINES: - case GTK_MOVEMENT_PARAGRAPHS: - case GTK_MOVEMENT_PAGES: - break; - default: - break; - } - } - else - { - switch (step) - { - case GTK_MOVEMENT_LOGICAL_POSITIONS: - new_pos = gtk_entry_move_logically (entry, new_pos, count); - break; - case GTK_MOVEMENT_VISUAL_POSITIONS: - new_pos = gtk_entry_move_visually (entry, new_pos, count); - break; - case GTK_MOVEMENT_WORDS: - while (count > 0) - { - new_pos = gtk_entry_move_forward_word (entry, new_pos); - count--; - } - while (count < 0) - { - new_pos = gtk_entry_move_backward_word (entry, new_pos); - count++; - } - break; - case GTK_MOVEMENT_DISPLAY_LINE_ENDS: - case GTK_MOVEMENT_PARAGRAPH_ENDS: - case GTK_MOVEMENT_BUFFER_ENDS: - new_pos = count < 0 ? 0 : entry->text_length; - break; - case GTK_MOVEMENT_DISPLAY_LINES: - case GTK_MOVEMENT_PARAGRAPHS: - case GTK_MOVEMENT_PAGES: - break; - default: - break; - } - } - - if (extend_selection) - gtk_editable_select_region (GTK_EDITABLE (entry), entry->selection_bound, new_pos); - else - gtk_editable_set_position (GTK_EDITABLE (entry), new_pos); - - gtk_entry_pend_cursor_blink (entry); -} - -static void -gtk_entry_insert_at_cursor (GtkEntry *entry, - const gchar *str) -{ - GtkEditable *editable = GTK_EDITABLE (entry); - gint pos = entry->current_pos; - - if (entry->editable) - { - gtk_entry_reset_im_context (entry); - - gtk_editable_insert_text (editable, str, -1, &pos); - gtk_editable_set_position (editable, pos); - } -} - -static void -gtk_entry_delete_from_cursor (GtkEntry *entry, - GtkDeleteType type, - gint count) -{ - GtkEditable *editable = GTK_EDITABLE (entry); - gint start_pos = entry->current_pos; - gint end_pos = entry->current_pos; - - gtk_entry_reset_im_context (entry); - - if (!entry->editable) - return; - - if (entry->selection_bound != entry->current_pos) - { - gtk_editable_delete_selection (editable); - return; - } - - switch (type) - { - case GTK_DELETE_CHARS: - end_pos = gtk_entry_move_logically (entry, entry->current_pos, count); - gtk_editable_delete_text (editable, MIN (start_pos, end_pos), MAX (start_pos, end_pos)); - break; - case GTK_DELETE_WORDS: - if (count < 0) - { - /* Move to end of current word, or if not on a word, end of previous word */ - end_pos = gtk_entry_move_backward_word (entry, end_pos); - end_pos = gtk_entry_move_forward_word (entry, end_pos); - } - else if (count > 0) - { - /* Move to beginning of current word, or if not on a word, begining of next word */ - start_pos = gtk_entry_move_forward_word (entry, start_pos); - start_pos = gtk_entry_move_backward_word (entry, start_pos); - } - - /* Fall through */ - case GTK_DELETE_WORD_ENDS: - while (count < 0) - { - start_pos = gtk_entry_move_backward_word (entry, start_pos); - count++; - } - while (count > 0) - { - end_pos = gtk_entry_move_forward_word (entry, end_pos); - count--; - } - gtk_editable_delete_text (editable, start_pos, end_pos); - break; - case GTK_DELETE_DISPLAY_LINE_ENDS: - case GTK_DELETE_PARAGRAPH_ENDS: - if (count < 0) - gtk_editable_delete_text (editable, 0, entry->current_pos); - else - gtk_editable_delete_text (editable, entry->current_pos, -1); - break; - case GTK_DELETE_DISPLAY_LINES: - case GTK_DELETE_PARAGRAPHS: - gtk_editable_delete_text (editable, 0, -1); - break; - case GTK_DELETE_WHITESPACE: - gtk_entry_delete_whitespace (entry); - break; - } - - gtk_entry_pend_cursor_blink (entry); -} - -/* IM Context Callbacks - */ - -static void -gtk_entry_commit_cb (GtkIMContext *context, - const gchar *str, - GtkEntry *entry) -{ - gtk_entry_enter_text (entry, str); -} - -static void -gtk_entry_preedit_changed_cb (GtkIMContext *context, - GtkEntry *entry) -{ - gchar *preedit_string; - gint cursor_pos; - - gtk_im_context_get_preedit_string (entry->im_context, - &preedit_string, NULL, - &cursor_pos); - entry->preedit_length = strlen (preedit_string); - cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); - entry->preedit_cursor = cursor_pos; - g_free (preedit_string); - - gtk_entry_recompute (entry); -} - -static gboolean -gtk_entry_retrieve_surrounding_cb (GtkIMContext *context, - 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); - - return TRUE; -} - -static gboolean -gtk_entry_delete_surrounding_cb (GtkIMContext *slave, - gint offset, - gint n_chars, - GtkEntry *entry) -{ - gtk_editable_delete_text (GTK_EDITABLE (entry), - entry->current_pos + offset, - entry->current_pos + offset + n_chars); - - return TRUE; -} - - -/* Internal functions - */ - -/* Used for im_commit_cb and inserting Unicode chars */ -static void -gtk_entry_enter_text (GtkEntry *entry, - const gchar *str) -{ - GtkEditable *editable = GTK_EDITABLE (entry); - gint tmp_pos; - - if (gtk_editable_get_selection_bounds (editable, NULL, NULL)) - gtk_editable_delete_selection (editable); - else - { - if (entry->overwrite_mode) - gtk_entry_delete_from_cursor (entry, GTK_DELETE_CHARS, 1); - } - - tmp_pos = entry->current_pos; - gtk_editable_insert_text (editable, str, strlen (str), &tmp_pos); - gtk_editable_set_position (editable, tmp_pos); -} - -/* All changes to entry->current_pos and entry->selection_bound - * should go through this function. - */ -static void -gtk_entry_set_positions (GtkEntry *entry, - gint current_pos, - gint selection_bound) -{ - gboolean changed = FALSE; - - g_object_freeze_notify (G_OBJECT (entry)); - - if (current_pos != -1 && - entry->current_pos != current_pos) - { - entry->current_pos = current_pos; - changed = TRUE; - - g_object_notify (G_OBJECT (entry), "cursor_position"); - } - - if (selection_bound != -1 && - entry->selection_bound != selection_bound) - { - entry->selection_bound = selection_bound; - changed = TRUE; - - g_object_notify (G_OBJECT (entry), "selection_bound"); - } - - g_object_thaw_notify (G_OBJECT (entry)); - - if (changed) - gtk_entry_recompute (entry); -} - -static void -gtk_entry_reset_layout (GtkEntry *entry) -{ - if (entry->cached_layout) - { - g_object_unref (G_OBJECT (entry->cached_layout)); - entry->cached_layout = NULL; - } -} - -static void -update_im_cursor_location (GtkEntry *entry) -{ - GdkRectangle area; - gint strong_x; - gint strong_xoffset; - gint x, y, area_width, area_height; - - gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, NULL) -; - get_text_area_size (entry, &x, &y, &area_width, &area_height); - - strong_xoffset = strong_x - entry->scroll_offset; - if (strong_xoffset < 0) - { - strong_xoffset = 0; - } - else if (strong_xoffset > area_width) - { - strong_xoffset = area_width; - } - area.x = x + strong_xoffset; - area.y = y + area_height; - area.width = area_width; - area.height = area_height; - - gtk_im_context_set_cursor_location (entry->im_context, &area); -} - -static gboolean -recompute_idle_func (gpointer data) -{ - GtkEntry *entry; - - GDK_THREADS_ENTER (); - - entry = GTK_ENTRY (data); - - gtk_entry_adjust_scroll (entry); - gtk_entry_queue_draw (entry); - - entry->recompute_idle = FALSE; - - update_im_cursor_location (entry); - - GDK_THREADS_LEAVE (); - - return FALSE; -} - -static void -gtk_entry_recompute (GtkEntry *entry) -{ - gtk_entry_reset_layout (entry); - gtk_entry_check_cursor_blink (entry); - - - if (!entry->recompute_idle) - { - entry->recompute_idle = g_idle_add_full (G_PRIORITY_HIGH_IDLE + 15, /* between resize and redraw */ - recompute_idle_func, entry, NULL); - } -} - -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 PangoLayout * -gtk_entry_create_layout (GtkEntry *entry, - gboolean include_preedit) -{ - PangoLayout *layout = gtk_widget_create_pango_layout (GTK_WIDGET (entry), NULL); - PangoAttrList *tmp_attrs = pango_attr_list_new (); - - gchar *preedit_string = NULL; - gint preedit_length = 0; - PangoAttrList *preedit_attrs = NULL; - - pango_layout_set_single_paragraph_mode (layout, TRUE); - - if (include_preedit) - { - gtk_im_context_get_preedit_string (entry->im_context, - &preedit_string, &preedit_attrs, NULL); - preedit_length = entry->preedit_length; - } - - 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; - - 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); - } - - pango_layout_set_text (layout, tmp_string->str, tmp_string->len); - - pango_attr_list_splice (tmp_attrs, preedit_attrs, - cursor_index, preedit_length); - - g_string_free (tmp_string, TRUE); - } - else - { - if (entry->visible) - { - pango_layout_set_text (layout, entry->text, entry->n_bytes); - } - else - { - GString *str = g_string_new (NULL); - gunichar invisible_char; - - if (entry->invisible_char != 0) - invisible_char = entry->invisible_char; - else - invisible_char = ' '; /* just pick a char */ - - append_char (str, invisible_char, entry->text_length); - pango_layout_set_text (layout, str->str, str->len); - g_string_free (str, TRUE); - } - } - - pango_layout_set_attributes (layout, tmp_attrs); - - if (preedit_string) - g_free (preedit_string); - if (preedit_attrs) - pango_attr_list_unref (preedit_attrs); - - pango_attr_list_unref (tmp_attrs); - - return layout; -} - -static PangoLayout * -gtk_entry_ensure_layout (GtkEntry *entry, - gboolean include_preedit) -{ - if (entry->preedit_length > 0 && - !include_preedit != !entry->cache_includes_preedit) - gtk_entry_reset_layout (entry); - - if (!entry->cached_layout) - { - entry->cached_layout = gtk_entry_create_layout (entry, include_preedit); - entry->cache_includes_preedit = include_preedit; - } - - return entry->cached_layout; -} - -static void -get_layout_position (GtkEntry *entry, - gint *x, - gint *y) -{ - PangoLayout *layout; - PangoRectangle logical_rect; - gint area_width, area_height; - gint y_pos; - PangoLayoutLine *line; - - layout = gtk_entry_ensure_layout (entry, TRUE); - - get_text_area_size (entry, NULL, NULL, &area_width, &area_height); - - area_height = PANGO_SCALE * (area_height); - - line = pango_layout_get_lines (layout)->data; - pango_layout_line_get_extents (line, NULL, &logical_rect); - - /* Align primarily for locale's ascent/descent */ - - y_pos = ((area_height - entry->ascent - entry->descent) / 2 + - entry->ascent + logical_rect.y); - - - /* Now see if we need to adjust to fit in actual drawn string */ - - if (logical_rect.height > area_height) - y_pos = (area_height - logical_rect.height) / 2; - else if (y_pos < 0) - y_pos = 0; - else if (y_pos + logical_rect.height > area_height) - y_pos = area_height - logical_rect.height; - - y_pos = y_pos / PANGO_SCALE; - - if (x) - *x = - entry->scroll_offset; - - if (y) - *y = y_pos; -} - -static void -gtk_entry_draw_text (GtkEntry *entry) -{ - GtkWidget *widget; - PangoLayoutLine *line; - - if (!entry->visible && entry->invisible_char == 0) - return; - - if (GTK_WIDGET_DRAWABLE (entry)) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); - gint area_width, area_height; - - gint x, y; - gint start_pos, end_pos; - - widget = GTK_WIDGET (entry); - - get_layout_position (entry, &x, &y); - - get_text_area_size (entry, NULL, NULL, &area_width, &area_height); - - - gdk_draw_layout (entry->text_area, widget->style->text_gc [widget->state], - x, y, - layout); - - - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start_pos, &end_pos)) - { - gint *ranges; - gint n_ranges, i; - PangoRectangle logical_rect; - const gchar *text = pango_layout_get_text (layout); - gint start_index = g_utf8_offset_to_pointer (text, start_pos) - text; - gint end_index = g_utf8_offset_to_pointer (text, end_pos) - text; - GdkRegion *clip_region = gdk_region_new (); - GdkGC *text_gc; - GdkGC *selection_gc; - - line = pango_layout_get_lines (layout)->data; - - pango_layout_line_get_x_ranges (line, start_index, end_index, &ranges, &n_ranges); - - pango_layout_get_extents (layout, NULL, &logical_rect); - - if (GTK_WIDGET_HAS_FOCUS (entry)) - { - selection_gc = widget->style->base_gc [GTK_STATE_SELECTED]; - text_gc = widget->style->text_gc [GTK_STATE_SELECTED]; - } - else - { - selection_gc = widget->style->base_gc [GTK_STATE_ACTIVE]; - text_gc = widget->style->text_gc [GTK_STATE_ACTIVE]; - } - - for (i=0; i < n_ranges; i++) - { - GdkRectangle rect; - - rect.x = INNER_BORDER - entry->scroll_offset + ranges[2*i] / PANGO_SCALE; - rect.y = y; - rect.width = (ranges[2*i + 1] - ranges[2*i]) / PANGO_SCALE; - rect.height = logical_rect.height / PANGO_SCALE; - - gdk_draw_rectangle (entry->text_area, selection_gc, TRUE, - rect.x, rect.y, rect.width, rect.height); - - gdk_region_union_with_rect (clip_region, &rect); - } - - gdk_gc_set_clip_region (text_gc, clip_region); - gdk_draw_layout (entry->text_area, text_gc, - x, y, - layout); - gdk_gc_set_clip_region (text_gc, NULL); - - gdk_region_destroy (clip_region); - g_free (ranges); - } - } -} - -/* - * From _gtk_get_insertion_cursor_gc - */ - -typedef struct _CursorInfo CursorInfo; - -struct _CursorInfo -{ - GType for_type; - GdkGC *primary_gc; - GdkGC *secondary_gc; -}; - -static GdkGC * -make_cursor_gc (GtkWidget *widget, - const gchar *property_name, - GdkColor *fallback) -{ - GdkGCValues gc_values; - GdkGCValuesMask gc_values_mask; - GdkColor *cursor_color; - - gtk_widget_style_get (widget, property_name, &cursor_color, NULL); - - gc_values_mask = GDK_GC_FOREGROUND; - if (cursor_color) - { - gc_values.foreground = *cursor_color; - gdk_color_free (cursor_color); - } - else - gc_values.foreground = *fallback; - - gdk_rgb_find_color (widget->style->colormap, &gc_values.foreground); - return gtk_gc_get (widget->style->depth, widget->style->colormap, - &gc_values, gc_values_mask); -} - -static GdkGC * -_gtkextra_get_insertion_cursor_gc (GtkWidget *widget, - gboolean is_primary) -{ - CursorInfo *cursor_info; - - cursor_info = g_object_get_data (G_OBJECT (widget->style), "gtk-style-cursor-info"); - if (!cursor_info) - { - cursor_info = g_new (CursorInfo, 1); - g_object_set_data (G_OBJECT (widget->style), "gtk-style-cursor-info", cursor_info); - cursor_info->primary_gc = NULL; - cursor_info->secondary_gc = NULL; - cursor_info->for_type = G_TYPE_INVALID; - } - - /* We have to keep track of the type because gtk_widget_style_get() - * can return different results when called on the same property and - * same style but for different widgets. :-(. That is, - * GtkEntry::cursor-color = "red" in a style will modify the cursor - * color for entries but not for text view. - */ - if (cursor_info->for_type != G_OBJECT_TYPE (widget)) - { - cursor_info->for_type = G_OBJECT_TYPE (widget); - if (cursor_info->primary_gc) - { - gtk_gc_release (cursor_info->primary_gc); - cursor_info->primary_gc = NULL; - } - if (cursor_info->secondary_gc) - { - gtk_gc_release (cursor_info->secondary_gc); - cursor_info->secondary_gc = NULL; - } - } - - if (is_primary) - { - if (!cursor_info->primary_gc) - cursor_info->primary_gc = make_cursor_gc (widget, - "cursor-color", - &widget->style->black); - - return g_object_ref (cursor_info->primary_gc); - } - else - { - static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 }; - - if (!cursor_info->secondary_gc) - cursor_info->secondary_gc = make_cursor_gc (widget, - "secondary-cursor-color", - &gray); - - return g_object_ref (cursor_info->secondary_gc); - } -} - -/* - * From _gtk_draw_insertion_cursor - */ -static void -_gtkextra_draw_insertion_cursor (GtkWidget *widget, - GdkDrawable *drawable, - GdkGC *gc, - GdkRectangle *location, - GtkTextDirection direction, - gboolean draw_arrow) -{ - gint stem_width; - gint arrow_width; - gint x, y; - gint i; - gfloat cursor_aspect_ratio; - gint offset; - - g_return_if_fail (direction != GTK_TEXT_DIR_NONE); - - gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL); - - stem_width = location->height * cursor_aspect_ratio + 1; - arrow_width = stem_width + 1; - - /* put (stem_width % 2) on the proper side of the cursor */ - if (direction == GTK_TEXT_DIR_LTR) - offset = stem_width / 2; - else - offset = stem_width - stem_width / 2; - - for (i = 0; i < stem_width; i++) - gdk_draw_line (drawable, gc, - location->x + i - offset, location->y, - location->x + i - offset, location->y + location->height - 1); - - if (draw_arrow) - { - if (direction == GTK_TEXT_DIR_RTL) - { - x = location->x - offset - 1; - y = location->y + location->height - arrow_width * 2 - arrow_width + 1; - - for (i = 0; i < arrow_width; i++) - { - gdk_draw_line (drawable, gc, - x, y + i + 1, - x, y + 2 * arrow_width - i - 1); - x --; - } - } - else if (direction == GTK_TEXT_DIR_LTR) - { - x = location->x + stem_width - offset; - y = location->y + location->height - arrow_width * 2 - arrow_width + 1; - - for (i = 0; i < arrow_width; i++) - { - gdk_draw_line (drawable, gc, - x, y + i + 1, - x, y + 2 * arrow_width - i - 1); - x++; - } - } - } -} - -static void -gtk_entry_draw_cursor (GtkEntry *entry, - CursorType type) -{ - GtkTextDirection keymap_direction = - (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ? - GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL; - GtkTextDirection widget_direction = gtk_widget_get_direction (GTK_WIDGET (entry)); - - if (GTK_WIDGET_DRAWABLE (entry) && GTK_ENTRY(entry)->cursor_visible) - { - GtkWidget *widget = GTK_WIDGET (entry); - GdkRectangle cursor_location; - gboolean split_cursor; - - gint xoffset = INNER_BORDER - entry->scroll_offset; - gint strong_x, weak_x; - gint text_area_height; - GtkTextDirection dir1 = GTK_TEXT_DIR_NONE; - GtkTextDirection dir2 = GTK_TEXT_DIR_NONE; - gint x1 = 0; - gint x2 = 0; - GdkGC *gc; - - gdk_window_get_size (entry->text_area, NULL, &text_area_height); - - gtk_entry_get_cursor_locations (entry, type, &strong_x, &weak_x); - - g_object_get (gtk_widget_get_settings (widget), - "gtk-split-cursor", &split_cursor, - NULL); - - dir1 = widget_direction; - - if (split_cursor) - { - x1 = strong_x; - - if (weak_x != strong_x) - { - dir2 = (widget_direction == GTK_TEXT_DIR_LTR) ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR; - x2 = weak_x; - } - } - else - { - if (keymap_direction == widget_direction) - x1 = strong_x; - else - x1 = weak_x; - } - - cursor_location.x = xoffset + x1; - cursor_location.y = INNER_BORDER; - cursor_location.width = 0; - cursor_location.height = text_area_height - 2 * INNER_BORDER ; - - gc = _gtkextra_get_insertion_cursor_gc (widget, TRUE); - _gtkextra_draw_insertion_cursor (widget, entry->text_area, gc, - &cursor_location, dir1, - dir2 != GTK_TEXT_DIR_NONE); - g_object_unref (gc); - - if (dir2 != GTK_TEXT_DIR_NONE) - { - cursor_location.x = xoffset + x2; - gc = _gtkextra_get_insertion_cursor_gc (widget, FALSE); - _gtkextra_draw_insertion_cursor (widget, entry->text_area, gc, - &cursor_location, dir2, - TRUE); - g_object_unref (gc); - } - } -} - -static void -gtk_entry_queue_draw (GtkEntry *entry) -{ - if (GTK_WIDGET_REALIZED (entry)) - gdk_window_invalidate_rect (entry->text_area, NULL, FALSE); -} - -static void -gtk_entry_reset_im_context (GtkEntry *entry) -{ - if (entry->need_im_reset) - { - entry->need_im_reset = 0; - gtk_im_context_reset (entry->im_context); - } -} - -static void -gtk_entry_get_cursor_locations (GtkEntry *entry, - CursorType type, - gint *strong_x, - gint *weak_x) -{ - PangoLayout *layout = gtk_entry_ensure_layout (entry, TRUE); - const gchar *text; - PangoRectangle strong_pos, weak_pos; - gint index; - - if (type == CURSOR_STANDARD) - { - text = pango_layout_get_text (layout); - index = g_utf8_offset_to_pointer (text, entry->current_pos + entry->preedit_cursor) - text; - } - else /* type == CURSOR_DND */ - { - index = g_utf8_offset_to_pointer (entry->text, entry->dnd_position) - entry->text; - if (entry->dnd_position > entry->current_pos) - index += entry->preedit_length; - } - - pango_layout_get_cursor_pos (layout, index, &strong_pos, &weak_pos); - - if (strong_x) - *strong_x = strong_pos.x / PANGO_SCALE; - - if (weak_x) - *weak_x = weak_pos.x / PANGO_SCALE; -} - -static void -gtk_entry_adjust_scroll (GtkEntry *entry) -{ - gint min_offset, max_offset; - gint text_area_width; - gint strong_x, weak_x; - PangoLayout *layout; - PangoLayoutLine *line; - PangoRectangle logical_rect; - GtkItemEntry *item_entry; - gint text_width; - - if (!GTK_WIDGET_REALIZED (entry)) - return; - - item_entry = GTK_ITEM_ENTRY(entry); - - gdk_window_get_size (entry->text_area, &text_area_width, NULL); - text_area_width -= 2 * INNER_BORDER; - - layout = gtk_entry_ensure_layout (entry, TRUE); - line = pango_layout_get_lines (layout)->data; - - pango_layout_line_get_extents (line, NULL, &logical_rect); - text_width = logical_rect.width / PANGO_SCALE + 2; /* 2 for cursor */ - - gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, &weak_x); - - /* Display as much text as we can */ - - if (gtk_widget_get_direction (GTK_WIDGET (entry)) == GTK_TEXT_DIR_LTR) - { - entry->scroll_offset = 0; - switch(item_entry->justification){ - - case GTK_JUSTIFY_FILL: - case GTK_JUSTIFY_LEFT: - -/* LEFT JUSTIFICATION */ - - strong_x -= entry->scroll_offset; - if (strong_x < 0) - entry->scroll_offset += strong_x; - else if (strong_x > text_area_width){ - if(item_entry->text_max_size != 0 && - text_area_width + 2 <= item_entry->text_max_size){ - GtkAllocation allocation; - allocation = GTK_WIDGET(entry)->allocation; - allocation.width += text_width - text_area_width; - entry->scroll_offset = 0; - gtk_entry_size_allocate(GTK_WIDGET(entry), &allocation); - }else{ - entry->scroll_offset += (strong_x - text_area_width) + 1; - } - } - - break; - - case GTK_JUSTIFY_RIGHT: - - /* RIGHT JUSTIFICATION FOR NUMBERS */ - if(entry->text){ - - entry->scroll_offset= -(text_area_width - text_width) + 1; - if(entry->scroll_offset > 0){ - if(item_entry->text_max_size != 0 && - text_area_width + 2 <= item_entry->text_max_size){ - GtkAllocation allocation; - allocation = GTK_WIDGET(entry)->allocation; - allocation.x -= text_width - text_area_width; - allocation.width += text_width - text_area_width; - entry->scroll_offset = 0; - gtk_entry_size_allocate(GTK_WIDGET(entry), &allocation); - } - else - { - entry->scroll_offset= -(text_area_width - strong_x) + 1; - if(entry->scroll_offset < 0) entry->scroll_offset = 0; - } - } - } - else - entry->scroll_offset=0; - - break; - case GTK_JUSTIFY_CENTER: - - if(entry->text){ - - entry->scroll_offset= -(text_area_width - text_width)/2; - if(entry->scroll_offset > 0){ - if(item_entry->text_max_size != 0 && - text_area_width+1<=item_entry->text_max_size){ - GtkAllocation allocation; - allocation = GTK_WIDGET(entry)->allocation; - allocation.x += (text_area_width/2 - text_width/2); - allocation.width += text_width - text_area_width; - entry->scroll_offset = 0; - gtk_entry_size_allocate(GTK_WIDGET(entry), &allocation); - } - else - { - entry->scroll_offset= -(text_area_width - strong_x) + 1; - if(entry->scroll_offset < 0) entry->scroll_offset = 0; - } - } - } - else - entry->scroll_offset=0; - - break; - - } - - } - else - { - max_offset = text_width - text_area_width; - min_offset = MIN (0, max_offset); - entry->scroll_offset = CLAMP (entry->scroll_offset, min_offset, max_offset); - } - - g_object_notify (G_OBJECT (entry), "scroll_offset"); -} - -static gint -gtk_entry_move_visually (GtkEntry *entry, - gint start, - gint count) -{ - gint index; - PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE); - const gchar *text; - - text = pango_layout_get_text (layout); - - index = g_utf8_offset_to_pointer (text, start) - text; - - while (count != 0) - { - int new_index, new_trailing; - gboolean split_cursor; - gboolean strong; - - g_object_get (gtk_widget_get_settings (GTK_WIDGET (entry)), - "gtk-split-cursor", &split_cursor, - NULL); - - if (split_cursor) - strong = TRUE; - else - { - GtkTextDirection keymap_direction = - (gdk_keymap_get_direction (gdk_keymap_get_default ()) == PANGO_DIRECTION_LTR) ? - GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL; - - strong = keymap_direction == gtk_widget_get_direction (GTK_WIDGET (entry)); - } - - if (count > 0) - { - pango_layout_move_cursor_visually (layout, strong, index, 0, 1, &new_index, &new_trailing); - count--; - } - else - { - pango_layout_move_cursor_visually (layout, strong, index, 0, -1, &new_index, &new_trailing); - count++; - } - - if (new_index < 0 || new_index == G_MAXINT) - break; - - index = new_index; - - while (new_trailing--) - index = g_utf8_next_char (entry->text + new_index) - entry->text; - } - - return g_utf8_pointer_to_offset (text, text + index); -} - -static gint -gtk_entry_move_logically (GtkEntry *entry, - gint start, - gint count) -{ - gint new_pos = start; - - /* Prevent any leak of information */ - if (!entry->visible) - { - new_pos = CLAMP (start + count, 0, entry->text_length); - } - else if (entry->text) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE); - PangoLogAttr *log_attrs; - gint n_attrs; - - pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs); - - while (count > 0 && new_pos < entry->text_length) - { - do - new_pos++; - while (new_pos < entry->text_length && !log_attrs[new_pos].is_cursor_position); - - count--; - } - while (count < 0 && new_pos > 0) - { - do - new_pos--; - while (new_pos > 0 && !log_attrs[new_pos].is_cursor_position); - - count++; - } - - g_free (log_attrs); - } - - return new_pos; -} - -static gint -gtk_entry_move_forward_word (GtkEntry *entry, - gint start) -{ - gint new_pos = start; - - /* Prevent any leak of information */ - if (!entry->visible) - { - new_pos = entry->text_length; - } - else if (entry->text && (new_pos < entry->text_length)) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE); - PangoLogAttr *log_attrs; - gint n_attrs; - - pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs); - - /* Find the next word end */ - new_pos++; - while (new_pos < n_attrs && !log_attrs[new_pos].is_word_end) - new_pos++; - - g_free (log_attrs); - } - - return new_pos; -} - - -static gint -gtk_entry_move_backward_word (GtkEntry *entry, - gint start) -{ - gint new_pos = start; - - /* Prevent any leak of information */ - if (!entry->visible) - { - new_pos = 0; - } - else if (entry->text && start > 0) - { - PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE); - PangoLogAttr *log_attrs; - gint n_attrs; - - pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs); - - new_pos = start - 1; - - /* Find the previous word beginning */ - while (new_pos > 0 && !log_attrs[new_pos].is_word_start) - new_pos--; - - g_free (log_attrs); - } - - return new_pos; -} - -static void -gtk_entry_delete_whitespace (GtkEntry *entry) -{ - PangoLayout *layout = gtk_entry_ensure_layout (entry, FALSE); - PangoLogAttr *log_attrs; - gint n_attrs; - gint start, end; - - pango_layout_get_log_attrs (layout, &log_attrs, &n_attrs); - - start = end = entry->current_pos; - - while (start > 0 && log_attrs[start-1].is_white) - start--; - - while (end < n_attrs && log_attrs[end].is_white) - end++; - - g_free (log_attrs); - - if (start != end) - gtk_editable_delete_text (GTK_EDITABLE (entry), start, end); -} - - -/* - * Like gtk_editable_get_chars, but if the editable is not - * visible, return asterisks; also convert result to UTF-8. - */ -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 - { - gchar *str; - gint i; - gint n_chars = end - start; - - str = g_malloc (n_chars + 1); - for (i = 0; i < n_chars; i++) - str[i] = '*'; - str[i] = '\0'; - - return str; - } - -} - -static void -primary_get_cb (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - guint info, - gpointer data) -{ - GtkEntry *entry = GTK_ENTRY (data); - gint start, end; - - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end)) - { - gchar *str = gtk_entry_get_public_chars (entry, start, end); - gtk_selection_data_set_text (selection_data, str, -1); - g_free (str); - } -} - -static void -primary_clear_cb (GtkClipboard *clipboard, - gpointer data) -{ - GtkEntry *entry = GTK_ENTRY (data); - - gtk_editable_select_region (GTK_EDITABLE (entry), entry->current_pos, entry->current_pos); -} - -static void -gtk_entry_update_primary_selection (GtkEntry *entry) -{ - static const GtkTargetEntry targets[] = { - { "UTF8_STRING", 0, 0 }, - { "STRING", 0, 0 }, - { "TEXT", 0, 0 }, - { "COMPOUND_TEXT", 0, 0 } - }; - - GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); - gint start, end; - - if (gtk_editable_get_selection_bounds (GTK_EDITABLE (entry), &start, &end)) - { - if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets), - primary_get_cb, primary_clear_cb, G_OBJECT (entry))) - primary_clear_cb (clipboard, entry); - } - else - { - if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (entry)) - gtk_clipboard_clear (clipboard); - } -} - -/* Public API - */ - -GtkWidget* -gtk_item_entry_new (void) -{ - GtkWidget *widget; - - widget = GTK_WIDGET (gtk_type_new (GTK_TYPE_ITEM_ENTRY)); - return widget; -} - -GtkWidget* -gtk_item_entry_new_with_max_length (gint max) -{ - GtkItemEntry *entry; - - entry = gtk_type_new (GTK_TYPE_ITEM_ENTRY); - gtk_entry_set_max_length(GTK_ENTRY(entry), max); - - return GTK_WIDGET (entry); -} - -void -gtk_item_entry_set_text (GtkItemEntry *entry, - const gchar *text, - GtkJustification justification) -{ - gint tmp_pos; - - g_return_if_fail (GTK_IS_ITEM_ENTRY (entry)); - g_return_if_fail (text != NULL); - - entry->justification = justification; - - /* 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 (GTK_ENTRY(entry)->text, text) == 0) - return; - - if (GTK_ENTRY(entry)->recompute_idle){ - g_source_remove (GTK_ENTRY(entry)->recompute_idle); - GTK_ENTRY(entry)->recompute_idle = 0; - } - if (GTK_ENTRY(entry)->blink_timeout){ - g_source_remove (GTK_ENTRY(entry)->blink_timeout); - GTK_ENTRY(entry)->blink_timeout = 0; - } - - gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1); - - tmp_pos = 0; - gtk_editable_insert_text (GTK_EDITABLE (entry), text, strlen (text), &tmp_pos); -} - -/** - * gtk_entry_get_layout_offsets: - * @entry: a #GtkEntry - * @x: location to store X offset of layout, or %NULL - * @y: location to store Y offset of layout, or %NULL - * - * - * Obtains the position of the #PangoLayout used to render text - * in the entry, in widget coordinates. Useful if you want to line - * up the text in an entry with some other text, e.g. when using the - * entry to implement editable cells in a sheet widget. - * - * Also useful to convert mouse events into coordinates inside the - * #PangoLayout, e.g. to take some action if some part of the entry text - * is clicked. - * - * Note that as the user scrolls around in the entry the offsets will - * change; you'll need to connect to the "notify::scroll_offset" - * signal to track this. Remember when using the #PangoLayout - * functions you need to convert to and from pixels using - * PANGO_PIXELS() or #PANGO_SCALE. - * - * Keep in mind that the layout text may contain a preedit string, so - * gtk_entry_layout_index_to_text_index() and - * gtk_entry_text_index_to_layout_index() are needed to convert byte - * indices in the layout to byte indices in the entry contents. - * - **/ -void -gtk_item_entry_get_layout_offsets (GtkItemEntry *entry, - gint *x, - gint *y) -{ - gint text_area_x, text_area_y; - - g_return_if_fail (GTK_IS_ITEM_ENTRY (entry)); - - /* this gets coords relative to text area */ - get_layout_position (GTK_ENTRY(entry), x, y); - - /* convert to widget coords */ - get_text_area_size (GTK_ENTRY(entry), &text_area_x, &text_area_y, NULL, NULL); - - if (x) - *x += text_area_x; - - if (y) - *y += text_area_y; -} - -void -gtk_item_entry_set_justification(GtkItemEntry *entry, GtkJustification just) -{ - g_return_if_fail (GTK_IS_ITEM_ENTRY (entry)); - - entry->justification = just; -} - - -/* We display the cursor when - * - * - the selection is empty, AND - * - the widget has focus - */ - -#define CURSOR_ON_MULTIPLIER 0.66 -#define CURSOR_OFF_MULTIPLIER 0.34 -#define CURSOR_PEND_MULTIPLIER 1.0 - -static gboolean -cursor_blinks (GtkEntry *entry) -{ - GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (entry)); - gboolean blink; - - if (GTK_WIDGET_HAS_FOCUS (entry) && - entry->selection_bound == entry->current_pos) - { - g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL); - return blink; - } - else - return FALSE; -} - -static gint -get_cursor_time (GtkEntry *entry) -{ - GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (entry)); - gint time; - - g_object_get (G_OBJECT (settings), "gtk-cursor-blink-time", &time, NULL); - - return time; -} - -static void -show_cursor (GtkEntry *entry) -{ - if (!entry->cursor_visible) - { - entry->cursor_visible = TRUE; - - if (GTK_WIDGET_HAS_FOCUS (entry) && entry->selection_bound == entry->current_pos) - gtk_widget_queue_draw (GTK_WIDGET (entry)); - } -} - -static void -hide_cursor (GtkEntry *entry) -{ - if (entry->cursor_visible) - { - entry->cursor_visible = FALSE; - - if (GTK_WIDGET_HAS_FOCUS (entry) && entry->selection_bound == entry->current_pos) - gtk_widget_queue_draw (GTK_WIDGET (entry)); - } -} - -/* - * Blink! - */ -static gint -blink_cb (gpointer data) -{ - GtkEntry *entry; - - GDK_THREADS_ENTER (); - - entry = GTK_ENTRY (data); - - g_assert (GTK_WIDGET_HAS_FOCUS (entry)); - g_assert (entry->selection_bound == entry->current_pos); - - if (entry->cursor_visible) - { - hide_cursor (entry); - entry->blink_timeout = gtk_timeout_add (get_cursor_time (entry) * CURSOR_OFF_MULTIPLIER, - blink_cb, - entry); - } - else - { - show_cursor (entry); - entry->blink_timeout = gtk_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER, - blink_cb, - entry); - } - - GDK_THREADS_LEAVE (); - - /* Remove ourselves */ - return FALSE; -} - -static void -gtk_entry_check_cursor_blink (GtkEntry *entry) -{ - if (cursor_blinks (entry)) - { - if (!entry->blink_timeout) - { - entry->blink_timeout = gtk_timeout_add (get_cursor_time (entry) * CURSOR_ON_MULTIPLIER, - blink_cb, - entry); - show_cursor (entry); - } - } - else - { - if (entry->blink_timeout) - { - gtk_timeout_remove (entry->blink_timeout); - entry->blink_timeout = 0; - } - - entry->cursor_visible = TRUE; - } - -} - -static void -gtk_entry_pend_cursor_blink (GtkEntry *entry) -{ - if (cursor_blinks (entry)) - { - if (entry->blink_timeout != 0) - gtk_timeout_remove (entry->blink_timeout); - - entry->blink_timeout = gtk_timeout_add (get_cursor_time (entry) * CURSOR_PEND_MULTIPLIER, - blink_cb, - entry); - show_cursor (entry); - } -} - -void -gtk_item_entry_set_cursor_visible(GtkItemEntry *entry, gboolean visible) -{ - g_return_if_fail (GTK_IS_ITEM_ENTRY (entry)); - - GTK_ENTRY(entry)->cursor_visible = visible; -} - -gboolean -gtk_item_entry_get_cursor_visible(GtkItemEntry *entry) -{ - g_return_val_if_fail (GTK_IS_ITEM_ENTRY (entry), FALSE); - - return(GTK_ENTRY(entry)->cursor_visible); -} diff --git a/lib/gtksheet/gtkitementry.h b/lib/gtksheet/gtkitementry.h deleted file mode 100644 index 11fab7ae..00000000 --- a/lib/gtksheet/gtkitementry.h +++ /dev/null @@ -1,76 +0,0 @@ -/* GtkItemEntry - widget for gtk+ - * Copyright (C) 1999-2001 Adrian E. Feiguin - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * GtkItemEntry widget by Adrian E. Feiguin - * Based on GtkEntry widget - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -#ifndef __GTK_ITEM_ENTRY_H__ -#define __GTK_ITEM_ENTRY_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define GTK_TYPE_ITEM_ENTRY (gtk_item_entry_get_type ()) -#define GTK_ITEM_ENTRY(obj) (GTK_CHECK_CAST (obj, gtk_item_entry_get_type (), GtkItemEntry)) -#define GTK_ITEM_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, gtk_item_entry_get_type (), GtkItemEntryClass)) -#define GTK_IS_ITEM_ENTRY(obj) (GTK_CHECK_TYPE (obj, gtk_item_entry_get_type ())) -#define GTK_IS_ITEM_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY)) - - -typedef struct _GtkItemEntry GtkItemEntry; -typedef struct _GtkItemEntryClass GtkItemEntryClass; - -struct _GtkItemEntry -{ - GtkEntry parent; - - gint text_max_size; - - GtkJustification justification; -}; - -struct _GtkItemEntryClass -{ - GtkEntryClass parent_class; -}; - -GtkType gtk_item_entry_get_type (void); -GtkWidget* gtk_item_entry_new (void); -GtkWidget* gtk_item_entry_new_with_max_length (gint max); -void gtk_item_entry_set_text (GtkItemEntry *item_entry, - const gchar *text, - GtkJustification justification); - -void gtk_item_entry_set_justification (GtkItemEntry *item_entry, - GtkJustification justification); - -void gtk_item_entry_set_cursor_visible (GtkItemEntry *entry, - gboolean visible); -gboolean gtk_item_entry_get_cursor_visible (GtkItemEntry *entry); - - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTK_ITEM_ENTRY_H__ */ diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c index 9f26115c..6621cc19 100644 --- a/lib/gtksheet/gtksheet.c +++ b/lib/gtksheet/gtksheet.c @@ -1,4 +1,3 @@ -#define GDK_MULTIHEAD_SAFE 1 #define GLIB_DISABLE_DEPRECATED 1 #define GDK_DISABLE_DEPRECATED 1 #define GTK_DISABLE_DEPRECATED 1 @@ -56,7 +55,6 @@ #include #include #include -#include "gtkitementry.h" #include "gtksheet.h" #include "gtkextra-marshal.h" #include "gsheetmodel.h" @@ -533,7 +531,6 @@ static void global_button_clicked (GtkWidget *widget, static void create_sheet_entry (GtkSheet *sheet); static void gtk_sheet_size_allocate_entry (GtkSheet *sheet); -static void gtk_sheet_entry_set_max_size (GtkSheet *sheet); /* Sheet button gadgets */ @@ -2847,8 +2844,6 @@ gtk_sheet_show_active_cell (GtkSheet *sheet) GtkEntry *sheet_entry; GtkSheetCellAttr attributes; gchar *text = NULL; - const gchar *old_text; - GtkJustification justification; gint row, col; g_return_if_fail (sheet != NULL); @@ -2871,8 +2866,6 @@ gtk_sheet_show_active_cell (GtkSheet *sheet) gtk_sheet_get_attributes (sheet, row, col, &attributes); - justification = GTK_JUSTIFY_LEFT; - text = gtk_sheet_cell_get_text (sheet, row, col); if ( ! text ) @@ -2881,17 +2874,27 @@ gtk_sheet_show_active_cell (GtkSheet *sheet) gtk_entry_set_visibility (GTK_ENTRY (sheet_entry), attributes.is_visible); - /*** Added by John Gotts. Mar 25, 2005 *********/ - old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry)); - if (strcmp (old_text, text) != 0) + if ( GTK_IS_ENTRY (sheet_entry)) { - if (!GTK_IS_ITEM_ENTRY (sheet_entry)) + const gchar *old_text = gtk_entry_get_text (GTK_ENTRY (sheet_entry)); + if (strcmp (old_text, text) != 0) gtk_entry_set_text (GTK_ENTRY (sheet_entry), text); - else - gtk_item_entry_set_text (GTK_ITEM_ENTRY (sheet_entry), text, justification); + + switch (attributes.justification) + { + case GTK_JUSTIFY_RIGHT: + gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 1.0); + break; + case GTK_JUSTIFY_CENTER: + gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 0.5); + break; + case GTK_JUSTIFY_LEFT: + default: + gtk_entry_set_alignment (GTK_ENTRY (sheet_entry), 0.0); + break; + } } - gtk_sheet_entry_set_max_size (sheet); gtk_sheet_size_allocate_entry (sheet); gtk_widget_map (sheet->entry_widget); @@ -4797,11 +4800,10 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) &attributes) ) return ; + gtk_widget_ensure_style (GTK_WIDGET (sheet_entry)); + if ( GTK_WIDGET_REALIZED (sheet->entry_widget) ) { - if (!GTK_WIDGET (sheet_entry)->style) - gtk_widget_ensure_style (GTK_WIDGET (sheet_entry)); - previous_style = GTK_WIDGET (sheet_entry)->style; style = gtk_style_copy (previous_style); @@ -4822,22 +4824,16 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) if (style != previous_style) { - if (!GTK_IS_ITEM_ENTRY (sheet->entry_widget)) - { - style->bg[GTK_STATE_NORMAL] = previous_style->bg[GTK_STATE_NORMAL]; - style->fg[GTK_STATE_NORMAL] = previous_style->fg[GTK_STATE_NORMAL]; - style->bg[GTK_STATE_ACTIVE] = previous_style->bg[GTK_STATE_ACTIVE]; - style->fg[GTK_STATE_ACTIVE] = previous_style->fg[GTK_STATE_ACTIVE]; - } + style->bg[GTK_STATE_NORMAL] = previous_style->bg[GTK_STATE_NORMAL]; + style->fg[GTK_STATE_NORMAL] = previous_style->fg[GTK_STATE_NORMAL]; + style->bg[GTK_STATE_ACTIVE] = previous_style->bg[GTK_STATE_ACTIVE]; + style->fg[GTK_STATE_ACTIVE] = previous_style->fg[GTK_STATE_ACTIVE]; gtk_widget_set_style (GTK_WIDGET (sheet_entry), style); g_object_unref (style); } } - if (GTK_IS_ITEM_ENTRY (sheet_entry)) - max_size = GTK_ITEM_ENTRY (sheet_entry)->text_max_size; - else - max_size = 0; + max_size = 0; text_size = 0; text = gtk_entry_get_text (GTK_ENTRY (sheet_entry)); @@ -4847,118 +4843,17 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet) row = sheet->active_cell.row; col = sheet->active_cell.col; - rectangle_from_cell (sheet, row, col, &shentry_allocation); size = MIN (text_size, max_size); size = MAX (size, shentry_allocation.width - 2 * COLUMN_TITLES_HEIGHT); - if (GTK_IS_ITEM_ENTRY (sheet->entry_widget)) - { - shentry_allocation.height -= 2 * COLUMN_TITLES_HEIGHT; - shentry_allocation.y += COLUMN_TITLES_HEIGHT; - shentry_allocation.width = size; - - switch (GTK_ITEM_ENTRY (sheet_entry)->justification) - { - case GTK_JUSTIFY_CENTER: - shentry_allocation.x += shentry_allocation.width / 2 - size / 2; - break; - case GTK_JUSTIFY_RIGHT: - shentry_allocation.x += shentry_allocation.width - size - COLUMN_TITLES_HEIGHT; - break; - case GTK_JUSTIFY_LEFT: - case GTK_JUSTIFY_FILL: - shentry_allocation.x += COLUMN_TITLES_HEIGHT; - break; - } - } - - if (!GTK_IS_ITEM_ENTRY (sheet->entry_widget)) - { - shentry_allocation.x += 2; - shentry_allocation.y += 2; - shentry_allocation.width -= MIN (shentry_allocation.width, 3); - shentry_allocation.height -= MIN (shentry_allocation.height, 3); - } gtk_widget_size_allocate (sheet->entry_widget, &shentry_allocation); if (previous_style == style) g_object_unref (previous_style); } -static void -gtk_sheet_entry_set_max_size (GtkSheet *sheet) -{ - gint i; - gint size = 0; - gint sizel = 0, sizer = 0; - gint row, col; - GtkJustification justification; - gchar *s = NULL; - gint width; - - row = sheet->active_cell.row; - col = sheet->active_cell.col; - - if ( ! GTK_IS_ITEM_ENTRY (sheet->entry_widget) ) - return; - - justification = GTK_ITEM_ENTRY (sheet->entry_widget)->justification; - - gdk_drawable_get_size (sheet->sheet_window, &width, NULL); - - switch (justification) - { - case GTK_JUSTIFY_FILL: - case GTK_JUSTIFY_LEFT: - for (i = col + 1; i <= max_visible_column (sheet); i++) - { - if ((s = gtk_sheet_cell_get_text (sheet, row, i))) - { - g_free (s); - break; - } - size += g_sheet_column_get_width (sheet->column_geometry, i); - } - - size = MIN (size, width - - g_sheet_column_start_pixel (sheet->column_geometry, col)); - break; - case GTK_JUSTIFY_RIGHT: - for (i = col - 1; i >= min_visible_column (sheet); i--) - { - if ((s = gtk_sheet_cell_get_text (sheet, row, i))) - { - g_free (s); - break; - } - size += g_sheet_column_get_width (sheet->column_geometry, i); - } - break; - case GTK_JUSTIFY_CENTER: - for (i = col + 1; i <= max_visible_column (sheet); i++) - { - sizer += g_sheet_column_get_width (sheet->column_geometry, i); - } - for (i = col - 1; i >= min_visible_column (sheet); i--) - { - if ((s = gtk_sheet_cell_get_text (sheet, row, i))) - { - g_free (s); - break; - } - sizel += g_sheet_column_get_width (sheet->column_geometry, i); - } - size = 2 * MIN (sizel, sizer); - break; - } - - if (size != 0) - size += g_sheet_column_get_width (sheet->column_geometry, col); - GTK_ITEM_ENTRY (sheet->entry_widget)->text_max_size = size; -} - static void create_sheet_entry (GtkSheet *sheet) @@ -4979,7 +4874,7 @@ create_sheet_entry (GtkSheet *sheet) g_warning ("Entry type is %s. It must be GtkEntry subclass, or a widget containing one. " "Using default", g_type_name (sheet->entry_type)); g_object_unref (sheet->entry_container); - sheet->entry_widget = sheet->entry_container = gtk_item_entry_new (); + sheet->entry_widget = sheet->entry_container = gtk_entry_new (); } else { @@ -4988,7 +4883,7 @@ create_sheet_entry (GtkSheet *sheet) } else { - sheet->entry_widget = sheet->entry_container = gtk_item_entry_new (); + sheet->entry_widget = sheet->entry_container = gtk_entry_new (); g_object_ref_sink (sheet->entry_container); } @@ -5300,7 +5195,7 @@ adjust_scrollbars (GtkSheet *sheet) if (sheet->hadjustment) { gint last_col; - sheet->hadjustment->step_increment = 1 ; //DEFAULT_COLUMN_WIDTH; + sheet->hadjustment->step_increment = 1; sheet->hadjustment->page_increment = width; -- 2.30.2