* 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * 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 <ctype.h>
#include <string.h>
#include "gdk/gdkkeysyms.h"
#include "gdk/gdki18n.h"
#include "gtkmain.h"
-#include "gtkprivate.h"
#include "gtkselection.h"
#include "gtksignal.h"
+#define GTK_ENABLE_BROKEN
#include "gtktext.h"
#include "line-wrap.xbm"
#include "line-arrow.xbm"
guint arg_id);
static void gtk_text_init (GtkText *text);
static void gtk_text_destroy (GtkObject *object);
-static void gtk_text_finalize (GtkObject *object);
+static void gtk_text_finalize (GObject *object);
static void gtk_text_realize (GtkWidget *widget);
static void gtk_text_unrealize (GtkWidget *widget);
static void gtk_text_style_set (GtkWidget *widget,
GtkStyle *previous_style);
+static void gtk_text_state_changed (GtkWidget *widget,
+ GtkStateType previous_state);
static void gtk_text_draw_focus (GtkWidget *widget);
static void gtk_text_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_text_disconnect (GtkAdjustment *adjustment,
GtkText *text);
-static void gtk_text_insert_text (GtkEditable *editable,
- const gchar *new_text,
- gint new_text_length,
- gint *position);
-static void gtk_text_delete_text (GtkEditable *editable,
- gint start_pos,
- gint end_pos);
-static void gtk_text_update_text (GtkEditable *editable,
- gint start_pos,
- gint end_pos);
-static gchar *gtk_text_get_chars (GtkEditable *editable,
- gint start,
- gint end);
-static void gtk_text_set_selection (GtkEditable *editable,
- gint start,
- gint end);
-static void gtk_text_real_set_editable (GtkEditable *editable,
- gboolean is_editable);
+static void gtk_text_insert_text (GtkOldEditable *old_editable,
+ const gchar *new_text,
+ gint new_text_length,
+ gint *position);
+static void gtk_text_delete_text (GtkOldEditable *old_editable,
+ gint start_pos,
+ gint end_pos);
+static void gtk_text_update_text (GtkOldEditable *old_editable,
+ gint start_pos,
+ gint end_pos);
+static gchar *gtk_text_get_chars (GtkOldEditable *old_editable,
+ gint start,
+ gint end);
+static void gtk_text_set_selection (GtkOldEditable *old_editable,
+ gint start,
+ gint end);
+static void gtk_text_real_set_editable (GtkOldEditable *old_editable,
+ gboolean is_editable);
/* Event handlers */
-static void gtk_text_draw (GtkWidget *widget,
- GdkRectangle *area);
static gint gtk_text_expose (GtkWidget *widget,
GdkEventExpose *event);
static gint gtk_text_button_press (GtkWidget *widget,
guint nchars,
guint old_lines,
guint old_pixels);
+static GdkGC *create_bg_gc (GtkText *text);
static void clear_area (GtkText *text, GdkRectangle *area);
static void draw_line (GtkText* text,
gint pixel_height,
static void move_cursor_hor (GtkText *text, int count);
/* Binding actions */
-static void gtk_text_move_cursor (GtkEditable *editable,
- gint x,
- gint y);
-static void gtk_text_move_word (GtkEditable *editable,
- gint n);
-static void gtk_text_move_page (GtkEditable *editable,
- gint x,
- gint y);
-static void gtk_text_move_to_row (GtkEditable *editable,
- gint row);
-static void gtk_text_move_to_column (GtkEditable *editable,
- gint row);
-static void gtk_text_kill_char (GtkEditable *editable,
- gint direction);
-static void gtk_text_kill_word (GtkEditable *editable,
- gint direction);
-static void gtk_text_kill_line (GtkEditable *editable,
- gint direction);
+static void gtk_text_move_cursor (GtkOldEditable *old_editable,
+ gint x,
+ gint y);
+static void gtk_text_move_word (GtkOldEditable *old_editable,
+ gint n);
+static void gtk_text_move_page (GtkOldEditable *old_editable,
+ gint x,
+ gint y);
+static void gtk_text_move_to_row (GtkOldEditable *old_editable,
+ gint row);
+static void gtk_text_move_to_column (GtkOldEditable *old_editable,
+ gint row);
+static void gtk_text_kill_char (GtkOldEditable *old_editable,
+ gint direction);
+static void gtk_text_kill_word (GtkOldEditable *old_editable,
+ gint direction);
+static void gtk_text_kill_line (GtkOldEditable *old_editable,
+ gint direction);
/* To be removed */
static void gtk_text_move_forward_character (GtkText *text);
static void gtk_text_select_line (GtkText *text,
guint32 time);
-static void gtk_text_set_position (GtkEditable *editable,
- gint position);
+static void gtk_text_set_position (GtkOldEditable *old_editable,
+ gint position);
/* #define DEBUG_GTK_TEXT */
(GtkClassInitFunc) NULL,
};
- text_type = gtk_type_unique (GTK_TYPE_EDITABLE, &text_info);
+ text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info);
}
return text_type;
static void
gtk_text_class_init (GtkTextClass *class)
{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkEditableClass *editable_class;
+ GtkOldEditableClass *old_editable_class;
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
- editable_class = (GtkEditableClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_EDITABLE);
+ old_editable_class = (GtkOldEditableClass*) class;
+ parent_class = gtk_type_class (GTK_TYPE_OLD_EDITABLE);
- gtk_object_add_arg_type ("GtkText::hadjustment",
- GTK_TYPE_ADJUSTMENT,
- GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
- ARG_HADJUSTMENT);
- gtk_object_add_arg_type ("GtkText::vadjustment",
- GTK_TYPE_ADJUSTMENT,
- GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT,
- ARG_VADJUSTMENT);
- gtk_object_add_arg_type ("GtkText::line_wrap",
- GTK_TYPE_BOOL,
- GTK_ARG_READWRITE,
- ARG_LINE_WRAP);
- gtk_object_add_arg_type ("GtkText::word_wrap",
- GTK_TYPE_BOOL,
- GTK_ARG_READWRITE,
- ARG_WORD_WRAP);
+ gobject_class->finalize = gtk_text_finalize;
object_class->set_arg = gtk_text_set_arg;
object_class->get_arg = gtk_text_get_arg;
object_class->destroy = gtk_text_destroy;
- object_class->finalize = gtk_text_finalize;
widget_class->realize = gtk_text_realize;
widget_class->unrealize = gtk_text_unrealize;
widget_class->style_set = gtk_text_style_set;
- widget_class->draw_focus = gtk_text_draw_focus;
+ widget_class->state_changed = gtk_text_state_changed;
widget_class->size_request = gtk_text_size_request;
widget_class->size_allocate = gtk_text_size_allocate;
- widget_class->draw = gtk_text_draw;
widget_class->expose_event = gtk_text_expose;
widget_class->button_press_event = gtk_text_button_press;
widget_class->button_release_event = gtk_text_button_release;
widget_class->key_press_event = gtk_text_key_press;
widget_class->focus_in_event = gtk_text_focus_in;
widget_class->focus_out_event = gtk_text_focus_out;
-
- widget_class->set_scroll_adjustments_signal =
- gtk_signal_new ("set_scroll_adjustments",
- GTK_RUN_LAST,
- object_class->type,
- GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
- gtk_marshal_NONE__POINTER_POINTER,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
- editable_class->set_editable = gtk_text_real_set_editable;
- editable_class->insert_text = gtk_text_insert_text;
- editable_class->delete_text = gtk_text_delete_text;
+ old_editable_class->set_editable = gtk_text_real_set_editable;
+ old_editable_class->insert_text = gtk_text_insert_text;
+ old_editable_class->delete_text = gtk_text_delete_text;
- editable_class->move_cursor = gtk_text_move_cursor;
- editable_class->move_word = gtk_text_move_word;
- editable_class->move_page = gtk_text_move_page;
- editable_class->move_to_row = gtk_text_move_to_row;
- editable_class->move_to_column = gtk_text_move_to_column;
+ old_editable_class->move_cursor = gtk_text_move_cursor;
+ old_editable_class->move_word = gtk_text_move_word;
+ old_editable_class->move_page = gtk_text_move_page;
+ old_editable_class->move_to_row = gtk_text_move_to_row;
+ old_editable_class->move_to_column = gtk_text_move_to_column;
- editable_class->kill_char = gtk_text_kill_char;
- editable_class->kill_word = gtk_text_kill_word;
- editable_class->kill_line = gtk_text_kill_line;
+ old_editable_class->kill_char = gtk_text_kill_char;
+ old_editable_class->kill_word = gtk_text_kill_word;
+ old_editable_class->kill_line = gtk_text_kill_line;
- editable_class->update_text = gtk_text_update_text;
- editable_class->get_chars = gtk_text_get_chars;
- editable_class->set_selection = gtk_text_set_selection;
- editable_class->set_position = gtk_text_set_position;
+ old_editable_class->update_text = gtk_text_update_text;
+ old_editable_class->get_chars = gtk_text_get_chars;
+ old_editable_class->set_selection = gtk_text_set_selection;
+ old_editable_class->set_position = gtk_text_set_position;
class->set_scroll_adjustments = gtk_text_set_adjustments;
+
+ gtk_object_add_arg_type ("GtkText::hadjustment",
+ GTK_TYPE_ADJUSTMENT,
+ GTK_ARG_READWRITE,
+ ARG_HADJUSTMENT);
+ gtk_object_add_arg_type ("GtkText::vadjustment",
+ GTK_TYPE_ADJUSTMENT,
+ GTK_ARG_READWRITE,
+ ARG_VADJUSTMENT);
+ gtk_object_add_arg_type ("GtkText::line_wrap",
+ GTK_TYPE_BOOL,
+ GTK_ARG_READWRITE,
+ ARG_LINE_WRAP);
+ gtk_object_add_arg_type ("GtkText::word_wrap",
+ GTK_TYPE_BOOL,
+ GTK_ARG_READWRITE,
+ ARG_WORD_WRAP);
+
+ widget_class->set_scroll_adjustments_signal =
+ gtk_signal_new ("set_scroll_adjustments",
+ GTK_RUN_LAST,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextClass, set_scroll_adjustments),
+ gtk_marshal_VOID__OBJECT_OBJECT,
+ GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
}
static void
text->hadj = NULL;
text->vadj = NULL;
text->gc = NULL;
+ text->bg_gc = NULL;
text->line_wrap_bitmap = NULL;
text->line_arrow_bitmap = NULL;
init_properties (text);
- GTK_EDITABLE (text)->editable = FALSE;
+ GTK_OLD_EDITABLE (text)->editable = FALSE;
+ gtk_text_set_adjustments (text, NULL, NULL);
gtk_editable_set_position (GTK_EDITABLE (text), 0);
}
}
static void
-gtk_text_real_set_editable (GtkEditable *editable,
- gboolean is_editable)
+gtk_text_real_set_editable (GtkOldEditable *old_editable,
+ gboolean is_editable)
{
GtkText *text;
- g_return_if_fail (editable != NULL);
- g_return_if_fail (GTK_IS_TEXT (editable));
+ g_return_if_fail (old_editable != NULL);
+ g_return_if_fail (GTK_IS_TEXT (old_editable));
- text = GTK_TEXT (editable);
+ text = GTK_TEXT (old_editable);
- editable->editable = (is_editable != FALSE);
+ old_editable->editable = (is_editable != FALSE);
if (is_editable)
draw_cursor (text, TRUE);
const char *chars,
gint nchars)
{
- GtkEditable *editable = GTK_EDITABLE (text);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
gint new_line_count = 1;
if (text->point.index < text->first_line_start_index)
text->first_line_start_index += numwcs;
- if (text->point.index < editable->selection_start_pos)
- editable->selection_start_pos += numwcs;
- if (text->point.index < editable->selection_end_pos)
- editable->selection_end_pos += numwcs;
+ if (text->point.index < old_editable->selection_start_pos)
+ old_editable->selection_start_pos += numwcs;
+ if (text->point.index < old_editable->selection_end_pos)
+ old_editable->selection_end_pos += numwcs;
/* We'll reset the cursor later anyways if we aren't frozen */
if (text->point.index < text->cursor_mark.index)
text->cursor_mark.index += numwcs;
guint nchars)
{
guint old_lines, old_height;
- GtkEditable *editable = GTK_EDITABLE (text);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
g_return_val_if_fail (text != NULL, 0);
text->first_line_start_index -= nchars;
}
- if (text->point.index < editable->selection_start_pos)
- editable->selection_start_pos -=
- MIN(nchars, editable->selection_start_pos - text->point.index);
- if (text->point.index < editable->selection_end_pos)
- editable->selection_end_pos -=
- MIN(nchars, editable->selection_end_pos - text->point.index);
+ if (text->point.index < old_editable->selection_start_pos)
+ old_editable->selection_start_pos -=
+ MIN(nchars, old_editable->selection_start_pos - text->point.index);
+ if (text->point.index < old_editable->selection_end_pos)
+ old_editable->selection_end_pos -=
+ MIN(nchars, old_editable->selection_end_pos - text->point.index);
/* We'll reset the cursor later anyways if we aren't frozen */
if (text->point.index < text->cursor_mark.index)
move_mark_n (&text->cursor_mark,
}
static void
-gtk_text_set_position (GtkEditable *editable,
- gint position)
+gtk_text_set_position (GtkOldEditable *old_editable,
+ gint position)
{
- GtkText *text = (GtkText *) editable;
+ GtkText *text = (GtkText *) old_editable;
undraw_cursor (text, FALSE);
text->cursor_mark = find_mark (text, position);
find_cursor (text, TRUE);
draw_cursor (text, FALSE);
- gtk_editable_select_region (editable, 0, 0);
+ gtk_editable_select_region (GTK_EDITABLE (old_editable), 0, 0);
}
static gchar *
-gtk_text_get_chars (GtkEditable *editable,
- gint start_pos,
- gint end_pos)
+gtk_text_get_chars (GtkOldEditable *old_editable,
+ gint start_pos,
+ gint end_pos)
{
GtkText *text;
gchar *retval;
- g_return_val_if_fail (editable != NULL, NULL);
- g_return_val_if_fail (GTK_IS_TEXT (editable), NULL);
- text = GTK_TEXT (editable);
+ g_return_val_if_fail (old_editable != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_TEXT (old_editable), NULL);
+ text = GTK_TEXT (old_editable);
if (end_pos < 0)
end_pos = TEXT_LENGTH (text);
{
GtkText *text;
- g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TEXT (object));
- text = (GtkText*) object;
+ text = GTK_TEXT (object);
- gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
- gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
+ if (text->hadj)
+ {
+ gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
+ gtk_object_unref (GTK_OBJECT (text->hadj));
+ text->hadj = NULL;
+ }
+ if (text->vadj)
+ {
+ gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
+ gtk_object_unref (GTK_OBJECT (text->vadj));
+ text->vadj = NULL;
+ }
if (text->timer)
{
}
static void
-gtk_text_finalize (GtkObject *object)
+gtk_text_finalize (GObject *object)
{
GtkText *text;
GList *tmp_list;
- g_return_if_fail (object != NULL);
g_return_if_fail (GTK_IS_TEXT (object));
- text = (GtkText *)object;
-
- gtk_object_unref (GTK_OBJECT (text->hadj));
- gtk_object_unref (GTK_OBJECT (text->vadj));
+ text = GTK_TEXT (object);
/* Clean up the internal structures */
if (text->use_wchar)
g_free (text->text.wc);
else
g_free (text->text.ch);
- free_cache (text);
tmp_list = text->text_properties;
while (tmp_list)
g_list_free (text->tab_stops);
- GTK_OBJECT_CLASS(parent_class)->finalize (object);
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
static void
gtk_text_realize (GtkWidget *widget)
{
GtkText *text;
- GtkEditable *editable;
+ GtkOldEditable *old_editable;
GdkWindowAttr attributes;
gint attributes_mask;
g_return_if_fail (GTK_IS_TEXT (widget));
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
GTK_WIDGET_SET_FLAGS (text, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
gdk_window_set_user_data (widget->window, text);
- attributes.x = (widget->style->klass->xthickness + TEXT_BORDER_ROOM);
- attributes.y = (widget->style->klass->ythickness + TEXT_BORDER_ROOM);
+ attributes.x = (widget->style->xthickness + TEXT_BORDER_ROOM);
+ attributes.y = (widget->style->ythickness + TEXT_BORDER_ROOM);
attributes.width = MAX (1, (gint)widget->allocation.width - (gint)attributes.x * 2);
attributes.height = MAX (1, (gint)widget->allocation.height - (gint)attributes.y * 2);
+
+ attributes.cursor = gdk_cursor_new (GDK_XTERM);
+ attributes_mask |= GDK_WA_CURSOR;
text->text_area = gdk_window_new (widget->window, &attributes, attributes_mask);
gdk_window_set_user_data (text->text_area, text);
+
+ gdk_cursor_destroy (attributes.cursor); /* The X server will keep it around as long as necessary */
widget->style = gtk_style_attach (widget->style, widget->window);
/* Can't call gtk_style_set_background here because it's handled specially */
- gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]);
- gdk_window_set_background (text->text_area, &widget->style->base[GTK_STATE_NORMAL]);
+ gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_set_background (text->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+
+ if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
+ text->bg_gc = create_bg_gc (text);
text->line_wrap_bitmap = gdk_bitmap_create_from_data (text->text_area,
(gchar*) line_wrap_bits,
gdk_gc_set_exposures (text->gc, TRUE);
gdk_gc_set_foreground (text->gc, &widget->style->text[GTK_STATE_NORMAL]);
-#ifdef USE_XIM
- if (gdk_im_ready () && (editable->ic_attr = gdk_ic_attr_new ()) != NULL)
- {
- gint width, height;
- GdkColormap *colormap;
- GdkEventMask mask;
- GdkICAttr *attr = editable->ic_attr;
- GdkICAttributesType attrmask = GDK_IC_ALL_REQ;
- GdkIMStyle style;
- GdkIMStyle supported_style = GDK_IM_PREEDIT_NONE |
- GDK_IM_PREEDIT_NOTHING |
- GDK_IM_PREEDIT_POSITION |
- GDK_IM_STATUS_NONE |
- GDK_IM_STATUS_NOTHING;
-
- if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
- supported_style &= ~GDK_IM_PREEDIT_POSITION;
-
- attr->style = style = gdk_im_decide_style (supported_style);
- attr->client_window = text->text_area;
-
- if ((colormap = gtk_widget_get_colormap (widget)) !=
- gtk_widget_get_default_colormap ())
- {
- attrmask |= GDK_IC_PREEDIT_COLORMAP;
- attr->preedit_colormap = colormap;
- }
-
- switch (style & GDK_IM_PREEDIT_MASK)
- {
- case GDK_IM_PREEDIT_POSITION:
- if (widget->style && widget->style->font->type != GDK_FONT_FONTSET)
- {
- g_warning ("over-the-spot style requires fontset");
- break;
- }
-
- attrmask |= GDK_IC_PREEDIT_POSITION_REQ;
- gdk_window_get_size (text->text_area, &width, &height);
- attr->spot_location.x = 0;
- attr->spot_location.y = height;
- attr->preedit_area.x = 0;
- attr->preedit_area.y = 0;
- attr->preedit_area.width = width;
- attr->preedit_area.height = height;
- attr->preedit_fontset = widget->style->font;
-
- break;
- }
- editable->ic = gdk_ic_new (attr, attrmask);
-
- if (editable->ic == NULL)
- g_warning ("Can't create input context.");
- else
- {
- mask = gdk_window_get_events (text->text_area);
- mask |= gdk_ic_get_events (editable->ic);
- gdk_window_set_events (text->text_area, mask);
-
- if (GTK_WIDGET_HAS_FOCUS (widget))
- gdk_im_begin (editable->ic, text->text_area);
- }
- }
-#endif
-
realize_properties (text);
gdk_window_show (text->text_area);
init_properties (text);
- if (editable->selection_start_pos != editable->selection_end_pos)
- gtk_editable_claim_selection (editable, TRUE, GDK_CURRENT_TIME);
+ if (old_editable->selection_start_pos != old_editable->selection_end_pos)
+ gtk_old_editable_claim_selection (old_editable, TRUE, GDK_CURRENT_TIME);
recompute_geometry (text);
}
static void
-gtk_text_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_text_style_set (GtkWidget *widget,
+ GtkStyle *previous_style)
{
- GtkText *text;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TEXT (widget));
-
- text = GTK_TEXT (widget);
+ GtkText *text = GTK_TEXT (widget);
+
if (GTK_WIDGET_REALIZED (widget))
{
- gdk_window_set_background (widget->window, &widget->style->base[GTK_STATE_NORMAL]);
- gdk_window_set_background (text->text_area, &widget->style->base[GTK_STATE_NORMAL]);
+ gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_set_background (text->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ if (text->bg_gc)
+ {
+ gdk_gc_destroy (text->bg_gc);
+ text->bg_gc = NULL;
+ }
+
+ if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
+ text->bg_gc = create_bg_gc (text);
+
recompute_geometry (text);
}
if (text->current_font)
text_font_unref (text->current_font);
text->current_font = get_text_font (widget->style->font);
+}
- if (GTK_WIDGET_DRAWABLE (widget))
- gdk_window_clear (widget->window);
+static void
+gtk_text_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
+{
+ GtkText *text = GTK_TEXT (widget);
+
+ if (GTK_WIDGET_REALIZED (widget))
+ {
+ gdk_window_set_background (widget->window, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ gdk_window_set_background (text->text_area, &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ }
}
static void
text = GTK_TEXT (widget);
-#ifdef USE_XIM
- if (GTK_EDITABLE (widget)->ic)
- {
- gdk_ic_destroy (GTK_EDITABLE (widget)->ic);
- GTK_EDITABLE (widget)->ic = NULL;
- }
- if (GTK_EDITABLE (widget)->ic_attr)
- {
- gdk_ic_attr_destroy (GTK_EDITABLE (widget)->ic_attr);
- GTK_EDITABLE (widget)->ic_attr = NULL;
- }
-#endif
-
gdk_window_set_user_data (text->text_area, NULL);
gdk_window_destroy (text->text_area);
text->text_area = NULL;
gdk_gc_destroy (text->gc);
text->gc = NULL;
+
+ if (text->bg_gc)
+ {
+ gdk_gc_destroy (text->bg_gc);
+ text->bg_gc = NULL;
+ }
gdk_pixmap_unref (text->line_wrap_bitmap);
gdk_pixmap_unref (text->line_arrow_bitmap);
unrealize_properties (text);
+ free_cache (text);
+
if (GTK_WIDGET_CLASS (parent_class)->unrealize)
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
clear_focus_area (GtkText *text, gint area_x, gint area_y, gint area_width, gint area_height)
{
GtkWidget *widget = GTK_WIDGET (text);
-
- gint ythick = TEXT_BORDER_ROOM + widget->style->klass->ythickness;
- gint xthick = TEXT_BORDER_ROOM + widget->style->klass->xthickness;
+ GdkGC *gc;
+
+ gint ythick = TEXT_BORDER_ROOM + widget->style->ythickness;
+ gint xthick = TEXT_BORDER_ROOM + widget->style->xthickness;
gint width, height;
- gint xorig, yorig;
- gint x, y;
-
- gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
-
- yorig = - text->first_onscreen_ver_pixel + ythick;
- xorig = - text->first_onscreen_hor_pixel + xthick;
-
- while (yorig > 0)
- yorig -= height;
- while (xorig > 0)
- xorig -= width;
-
- for (y = area_y; y < area_y + area_height; )
+ if (area_width == 0 || area_height == 0)
+ return;
+
+ if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gint yoff = (y - yorig) % height;
- gint yw = MIN(height - yoff, (area_y + area_height) - y);
+ gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
+
+ gdk_gc_set_ts_origin (text->bg_gc,
+ (- text->first_onscreen_hor_pixel + xthick) % width,
+ (- text->first_onscreen_ver_pixel + ythick) % height);
- for (x = area_x; x < area_x + area_width; )
- {
- gint xoff = (x - xorig) % width;
- gint xw = MIN(width - xoff, (area_x + area_width) - x);
-
- gdk_draw_pixmap (widget->window,
- text->gc,
- widget->style->bg_pixmap[GTK_STATE_NORMAL],
- xoff,
- yoff,
- x,
- y,
- xw,
- yw);
-
- x += width - xoff;
- }
- y += height - yoff;
+ gc = text->bg_gc;
}
-}
-
+ else
+ gc = widget->style->bg_gc[widget->state];
+ gdk_draw_rectangle (GTK_WIDGET (text)->window, gc, TRUE,
+ area_x, area_y, area_width, area_height);
+}
static void
gtk_text_draw_focus (GtkWidget *widget)
if (GTK_WIDGET_DRAWABLE (widget))
{
- gint ythick = widget->style->klass->ythickness;
- gint xthick = widget->style->klass->xthickness;
+ gint ythick = widget->style->ythickness;
+ gint xthick = widget->style->xthickness;
gint xextra = TEXT_BORDER_ROOM;
gint yextra = TEXT_BORDER_ROOM;
width -= 2 * xthick;
height -= 2 * ythick;
- if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
- {
- /* top rect */
- clear_focus_area (text, x, y, width, yextra);
- /* left rect */
- clear_focus_area (text, x, y + yextra,
- xextra, y + height - 2 * yextra);
- /* right rect */
- clear_focus_area (text, x + width - xextra, y + yextra,
- xextra, height - 2 * ythick);
- /* bottom rect */
- clear_focus_area (text, x, x + height - yextra, width, yextra);
- }
+ /* top rect */
+ clear_focus_area (text, x, y, width, yextra);
+ /* left rect */
+ clear_focus_area (text, x, y + yextra,
+ xextra, y + height - 2 * yextra);
+ /* right rect */
+ clear_focus_area (text, x + width - xextra, y + yextra,
+ xextra, height - 2 * ythick);
+ /* bottom rect */
+ clear_focus_area (text, x, x + height - yextra, width, yextra);
}
else
{
g_return_if_fail (GTK_IS_TEXT (widget));
g_return_if_fail (requisition != NULL);
- xthickness = widget->style->klass->xthickness + TEXT_BORDER_ROOM;
- ythickness = widget->style->klass->ythickness + TEXT_BORDER_ROOM;
+ xthickness = widget->style->xthickness + TEXT_BORDER_ROOM;
+ ythickness = widget->style->ythickness + TEXT_BORDER_ROOM;
char_height = MIN_TEXT_HEIGHT_LINES * (widget->style->font->ascent +
widget->style->font->descent);
GtkAllocation *allocation)
{
GtkText *text;
- GtkEditable *editable;
+ GtkOldEditable *old_editable;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
g_return_if_fail (allocation != NULL);
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
allocation->width, allocation->height);
gdk_window_move_resize (text->text_area,
- widget->style->klass->xthickness + TEXT_BORDER_ROOM,
- widget->style->klass->ythickness + TEXT_BORDER_ROOM,
- MAX (1, (gint)widget->allocation.width - (gint)(widget->style->klass->xthickness +
+ widget->style->xthickness + TEXT_BORDER_ROOM,
+ widget->style->ythickness + TEXT_BORDER_ROOM,
+ MAX (1, (gint)widget->allocation.width - (gint)(widget->style->xthickness +
(gint)TEXT_BORDER_ROOM) * 2),
- MAX (1, (gint)widget->allocation.height - (gint)(widget->style->klass->ythickness +
+ MAX (1, (gint)widget->allocation.height - (gint)(widget->style->ythickness +
(gint)TEXT_BORDER_ROOM) * 2));
-#ifdef USE_XIM
- if (editable->ic && (gdk_ic_get_style (editable->ic) & GDK_IM_PREEDIT_POSITION))
- {
- gint width, height;
-
- gdk_window_get_size (text->text_area, &width, &height);
- editable->ic_attr->preedit_area.width = width;
- editable->ic_attr->preedit_area.height = height;
-
- gdk_ic_set_attr (editable->ic,
- editable->ic_attr, GDK_IC_PREEDIT_AREA);
- }
-#endif
-
recompute_geometry (text);
}
}
-static void
-gtk_text_draw (GtkWidget *widget,
- GdkRectangle *area)
-{
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TEXT (widget));
- g_return_if_fail (area != NULL);
-
- if (GTK_WIDGET_DRAWABLE (widget))
- {
- expose_text (GTK_TEXT (widget), area, TRUE);
- gtk_widget_draw_focus (widget);
- }
-}
-
static gint
gtk_text_expose (GtkWidget *widget,
GdkEventExpose *event)
else if (event->count == 0)
{
TDEBUG (("in gtk_text_expose (focus)\n"));
- gtk_widget_draw_focus (widget);
+ gtk_text_draw_focus (widget);
}
return FALSE;
gint x, y;
GdkModifierType mask;
- GTK_THREADS_ENTER ();
+ GDK_THREADS_ENTER ();
text = GTK_TEXT (data);
gtk_text_motion_notify (GTK_WIDGET (text), &event);
}
- GTK_THREADS_LEAVE ();
+ GDK_THREADS_LEAVE ();
return FALSE;
}
GdkEventButton *event)
{
GtkText *text;
- GtkEditable *editable;
- static GdkAtom ctext_atom = GDK_NONE;
+ GtkOldEditable *old_editable;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
- if (ctext_atom == GDK_NONE)
- ctext_atom = gdk_atom_intern ("COMPOUND_TEXT", FALSE);
-
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
if (text->button && (event->button != text->button))
return FALSE;
/* Set it now, so we display things right. We'll unset it
* later if things don't work out */
- editable->has_selection = TRUE;
- gtk_text_set_selection (GTK_EDITABLE(text),
+ old_editable->has_selection = TRUE;
+ gtk_text_set_selection (GTK_OLD_EDITABLE (text),
text->cursor_mark.index,
text->cursor_mark.index);
}
else if (event->type == GDK_BUTTON_PRESS)
{
- if ((event->button == 2) && editable->editable)
+ if ((event->button == 2) && old_editable->editable)
{
- if (editable->selection_start_pos == editable->selection_end_pos ||
- editable->has_selection)
+ if (old_editable->selection_start_pos == old_editable->selection_end_pos ||
+ old_editable->has_selection)
{
undraw_cursor (text, FALSE);
find_mouse_cursor (text, (gint)event->x, (gint)event->y);
}
gtk_selection_convert (widget, GDK_SELECTION_PRIMARY,
- ctext_atom, event->time);
+ gdk_atom_intern ("UTF8_STRING", FALSE),
+ event->time);
}
else
{
find_mouse_cursor (text, event->x, event->y);
draw_cursor (text, FALSE);
- gtk_text_set_selection (GTK_EDITABLE(text),
+ gtk_text_set_selection (GTK_OLD_EDITABLE (text),
text->cursor_mark.index,
text->cursor_mark.index);
- editable->has_selection = FALSE;
+ old_editable->has_selection = FALSE;
if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
}
GdkEventButton *event)
{
GtkText *text;
- GtkEditable *editable;
+ GtkOldEditable *old_editable;
g_return_val_if_fail (widget != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT (widget), FALSE);
g_return_val_if_fail (event != NULL, FALSE);
if (event->button == 1)
{
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
gtk_grab_remove (widget);
- editable->has_selection = FALSE;
- if (editable->selection_start_pos != editable->selection_end_pos)
+ old_editable->has_selection = FALSE;
+ if (old_editable->selection_start_pos != old_editable->selection_end_pos)
{
if (gtk_selection_owner_set (widget,
GDK_SELECTION_PRIMARY,
event->time))
- editable->has_selection = TRUE;
+ old_editable->has_selection = TRUE;
else
- gtk_text_update_text (editable, editable->selection_start_pos,
- editable->selection_end_pos);
+ gtk_text_update_text (old_editable, old_editable->selection_start_pos,
+ old_editable->selection_end_pos);
}
else
{
find_mouse_cursor (GTK_TEXT (widget), x, y);
draw_cursor (GTK_TEXT (widget), FALSE);
- gtk_text_set_selection (GTK_EDITABLE(text),
- GTK_EDITABLE(text)->selection_start_pos,
+ gtk_text_set_selection (GTK_OLD_EDITABLE (text),
+ GTK_OLD_EDITABLE (text)->selection_start_pos,
text->cursor_mark.index);
return FALSE;
}
static void
-gtk_text_insert_text (GtkEditable *editable,
+gtk_text_insert_text (GtkOldEditable *old_editable,
const gchar *new_text,
gint new_text_length,
gint *position)
{
- GtkText *text = GTK_TEXT (editable);
+ GtkText *text = GTK_TEXT (old_editable);
GdkFont *font;
GdkColor *fore, *back;
}
static void
-gtk_text_delete_text (GtkEditable *editable,
+gtk_text_delete_text (GtkOldEditable *old_editable,
gint start_pos,
gint end_pos)
{
g_return_if_fail (start_pos >= 0);
- text = GTK_TEXT (editable);
+ text = GTK_TEXT (old_editable);
gtk_text_set_point (text, start_pos);
if (end_pos < 0)
GdkEventKey *event)
{
GtkText *text;
- GtkEditable *editable;
+ GtkOldEditable *old_editable;
gchar key;
gint return_val;
gint position;
return_val = FALSE;
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
key = event->keyval;
return_val = TRUE;
- if ((GTK_EDITABLE(text)->editable == FALSE))
+ if ((GTK_OLD_EDITABLE(text)->editable == FALSE))
{
switch (event->keyval)
{
case GDK_Home:
if (event->state & GDK_CONTROL_MASK)
- scroll_int (text, -text->vadj->value);
+ scroll_int (text, -text->vadj->value);
+ else
+ return_val = FALSE;
break;
case GDK_End:
if (event->state & GDK_CONTROL_MASK)
scroll_int (text, +text->vadj->upper);
+ else
+ return_val = FALSE;
break;
case GDK_Page_Up: scroll_int (text, -text->vadj->page_increment); break;
case GDK_Page_Down: scroll_int (text, +text->vadj->page_increment); break;
case GDK_Return:
if (event->state & GDK_CONTROL_MASK)
gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
+ else
+ return_val = FALSE;
break;
default:
return_val = FALSE;
{
gint extend_selection;
gint extend_start;
- guint initial_pos = editable->current_pos;
+ guint initial_pos = old_editable->current_pos;
text->point = find_mark (text, text->cursor_mark.index);
if (extend_selection)
{
- editable->has_selection = TRUE;
+ old_editable->has_selection = TRUE;
- if (editable->selection_start_pos == editable->selection_end_pos)
+ if (old_editable->selection_start_pos == old_editable->selection_end_pos)
{
- editable->selection_start_pos = text->point.index;
- editable->selection_end_pos = text->point.index;
+ old_editable->selection_start_pos = text->point.index;
+ old_editable->selection_end_pos = text->point.index;
}
- extend_start = (text->point.index == editable->selection_start_pos);
+ extend_start = (text->point.index == old_editable->selection_start_pos);
}
switch (event->keyval)
if (event->state & GDK_SHIFT_MASK)
{
extend_selection = FALSE;
- gtk_editable_paste_clipboard (editable);
+ gtk_editable_paste_clipboard (GTK_EDITABLE (old_editable));
}
else if (event->state & GDK_CONTROL_MASK)
{
- gtk_editable_copy_clipboard (editable);
+ gtk_editable_copy_clipboard (GTK_EDITABLE (old_editable));
}
else
{
else if (event->state & GDK_SHIFT_MASK)
{
extend_selection = FALSE;
- gtk_editable_cut_clipboard (editable);
+ gtk_editable_cut_clipboard (GTK_EDITABLE (old_editable));
}
else
gtk_text_delete_forward_character (text);
break;
case GDK_Tab:
position = text->point.index;
- gtk_editable_insert_text (editable, "\t", 1, &position);
+ gtk_editable_insert_text (GTK_EDITABLE (old_editable), "\t", 1, &position);
break;
case GDK_Return:
if (event->state & GDK_CONTROL_MASK)
else
{
position = text->point.index;
- gtk_editable_insert_text (editable, "\n", 1, &position);
+ gtk_editable_insert_text (GTK_EDITABLE (old_editable), "\n", 1, &position);
}
break;
case GDK_Escape:
if ((key >= 'a') && (key <= 'z') && control_keys[(int) (key - 'a')])
{
- (* control_keys[(int) (key - 'a')]) (editable, event->time);
+ (* control_keys[(int) (key - 'a')]) (old_editable, event->time);
return_val = TRUE;
}
if ((key >= 'a') && (key <= 'z') && alt_keys[(int) (key - 'a')])
{
- (* alt_keys[(int) (key - 'a')]) (editable, event->time);
+ (* alt_keys[(int) (key - 'a')]) (old_editable, event->time);
return_val = TRUE;
}
{
extend_selection = FALSE;
- gtk_editable_delete_selection (editable);
+ gtk_editable_delete_selection (GTK_EDITABLE (old_editable));
position = text->point.index;
- gtk_editable_insert_text (editable, event->string, event->length, &position);
+ gtk_editable_insert_text (GTK_EDITABLE (old_editable), event->string, event->length, &position);
return_val = TRUE;
}
return_val = FALSE;
}
- if (return_val && (editable->current_pos != initial_pos))
+ if (return_val && (old_editable->current_pos != initial_pos))
{
if (extend_selection)
{
- if (editable->current_pos < editable->selection_start_pos)
- gtk_text_set_selection (editable, editable->current_pos,
- editable->selection_end_pos);
- else if (editable->current_pos > editable->selection_end_pos)
- gtk_text_set_selection (editable, editable->selection_start_pos,
- editable->current_pos);
+ if (old_editable->current_pos < old_editable->selection_start_pos)
+ gtk_text_set_selection (old_editable, old_editable->current_pos,
+ old_editable->selection_end_pos);
+ else if (old_editable->current_pos > old_editable->selection_end_pos)
+ gtk_text_set_selection (old_editable, old_editable->selection_start_pos,
+ old_editable->current_pos);
else
{
if (extend_start)
- gtk_text_set_selection (editable, editable->current_pos,
- editable->selection_end_pos);
+ gtk_text_set_selection (old_editable, old_editable->current_pos,
+ old_editable->selection_end_pos);
else
- gtk_text_set_selection (editable, editable->selection_start_pos,
- editable->current_pos);
+ gtk_text_set_selection (old_editable, old_editable->selection_start_pos,
+ old_editable->current_pos);
}
}
else
- gtk_text_set_selection (editable, 0, 0);
+ gtk_text_set_selection (old_editable, 0, 0);
- gtk_editable_claim_selection (editable,
- editable->selection_start_pos != editable->selection_end_pos,
- event->time);
+ gtk_old_editable_claim_selection (old_editable,
+ old_editable->selection_start_pos != old_editable->selection_end_pos,
+ event->time);
}
}
TDEBUG (("in gtk_text_focus_in\n"));
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
-
-#ifdef USE_XIM
- if (GTK_EDITABLE(widget)->ic)
- gdk_im_begin (GTK_EDITABLE(widget)->ic, GTK_TEXT(widget)->text_area);
-#endif
-
- draw_cursor (GTK_TEXT(widget), TRUE);
-
- return FALSE;
+ return (* GTK_WIDGET_CLASS (parent_class)->focus_in_event) (widget, event);
}
static gint
TDEBUG (("in gtk_text_focus_out\n"));
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
-
- undraw_cursor (GTK_TEXT(widget), TRUE);
-
-#ifdef USE_XIM
- gdk_im_end ();
-#endif
-
- return FALSE;
+ return (* GTK_WIDGET_CLASS (parent_class)->focus_out_event) (widget, event);
}
static void
gint i;
if (!font_cache_table)
- font_cache_table = g_hash_table_new (font_hash, (GCompareFunc) gdk_font_equal);
+ font_cache_table = g_hash_table_new (font_hash, (GEqualFunc) gdk_font_equal);
tf = g_hash_table_lookup (font_cache_table, gfont);
if (prop->flags & PROPERTY_BACKGROUND)
{
- if (!back || !gdk_color_equal (&prop->fore_color, fore))
+ if (!back || !gdk_color_equal (&prop->back_color, back))
return FALSE;
}
else
- if (fore != NULL)
+ if (back != NULL)
return FALSE;
return TRUE;
gint height;
text->current_line = NULL;
-
- if (!text->line_start_cache->next)
- {
- /* @@@ Its visible, right? */
- text->current_line = text->line_start_cache;
- return;
- }
-
- while ( ( scroll && (text->first_cut_pixels != 0) &&
- (CACHE_DATA(text->line_start_cache->next).start.index > point) ) ||
- ( (text->first_cut_pixels == 0) &&
- (CACHE_DATA(text->line_start_cache).start.index > point) ) )
+
+ TEXT_SHOW (text);
+
+ /* Scroll backwards until the point is on screen
+ */
+ while (CACHE_DATA(text->line_start_cache).start.index > point)
+ scroll_int (text, - LINE_HEIGHT(CACHE_DATA(text->line_start_cache)));
+
+ /* Now additionally try to make sure that the point is fully on screen
+ */
+ if (scroll)
{
- g_assert (text->line_start_cache->next);
- scroll_int (text, - LINE_HEIGHT(CACHE_DATA(text->line_start_cache->next)));
+ while (text->first_cut_pixels != 0 &&
+ text->line_start_cache->next &&
+ CACHE_DATA(text->line_start_cache->next).start.index > point)
+ scroll_int (text, - LINE_HEIGHT(CACHE_DATA(text->line_start_cache->next)));
}
-
- TEXT_SHOW (text);
+
gdk_window_get_size (text->text_area, NULL, &height);
for (cache = text->line_start_cache; cache; cache = cache->next)
find_cursor_at_line (GtkText* text, const LineParams* start_line, gint pixel_height)
{
GdkWChar ch;
- GtkEditable *editable = (GtkEditable *)text;
+ GtkOldEditable *old_editable = (GtkOldEditable *)text;
GtkPropertyMark mark = start_line->start;
TabStopMark tab_mark = start_line->tab_cont.tab_start;
text->cursor_char = 0;
else
text->cursor_char = ch;
-
-#ifdef USE_XIM
- if (GTK_WIDGET_HAS_FOCUS(text) && gdk_im_ready() && editable->ic &&
- (gdk_ic_get_style (editable->ic) & GDK_IM_PREEDIT_POSITION))
- {
- GdkICAttributesType mask = GDK_IC_SPOT_LOCATION |
- GDK_IC_PREEDIT_FOREGROUND |
- GDK_IC_PREEDIT_BACKGROUND;
-
- editable->ic_attr->spot_location.x = text->cursor_pos_x;
- editable->ic_attr->spot_location.y
- = text->cursor_pos_y - text->cursor_char_offset;
- editable->ic_attr->preedit_foreground = *MARK_CURRENT_FORE (text, &mark);
- editable->ic_attr->preedit_background = *MARK_CURRENT_BACK (text, &mark);
-
- if (MARK_CURRENT_FONT (text, &mark)->type == GDK_FONT_FONTSET)
- {
- mask |= GDK_IC_PREEDIT_FONTSET;
- editable->ic_attr->preedit_fontset = MARK_CURRENT_FONT (text, &mark);
- }
-
- gdk_ic_set_attr (editable->ic, editable->ic_attr, mask);
- }
-#endif
}
static void
pixel_height_of(text, text->current_line));
}
- GTK_EDITABLE (text)->current_pos = text->cursor_mark.index;
+ GTK_OLD_EDITABLE (text)->current_pos = text->cursor_mark.index;
}
static void
}
static void
-gtk_text_move_cursor (GtkEditable *editable,
- gint x,
- gint y)
+gtk_text_move_cursor (GtkOldEditable *old_editable,
+ gint x,
+ gint y)
{
if (x > 0)
{
while (x-- != 0)
- move_cursor_hor (GTK_TEXT (editable), 1);
+ move_cursor_hor (GTK_TEXT (old_editable), 1);
}
else if (x < 0)
{
while (x++ != 0)
- move_cursor_hor (GTK_TEXT (editable), -1);
+ move_cursor_hor (GTK_TEXT (old_editable), -1);
}
if (y > 0)
{
while (y-- != 0)
- move_cursor_ver (GTK_TEXT (editable), 1);
+ move_cursor_ver (GTK_TEXT (old_editable), 1);
}
- else if (x < 0)
+ else if (y < 0)
{
while (y++ != 0)
- move_cursor_ver (GTK_TEXT (editable), -1);
+ move_cursor_ver (GTK_TEXT (old_editable), -1);
}
}
}
static void
-gtk_text_move_word (GtkEditable *editable,
- gint n)
+gtk_text_move_word (GtkOldEditable *old_editable,
+ gint n)
{
if (n > 0)
{
while (n-- != 0)
- gtk_text_move_forward_word (GTK_TEXT (editable));
+ gtk_text_move_forward_word (GTK_TEXT (old_editable));
}
else if (n < 0)
{
while (n++ != 0)
- gtk_text_move_backward_word (GTK_TEXT (editable));
+ gtk_text_move_backward_word (GTK_TEXT (old_editable));
}
}
}
static void
-gtk_text_move_page (GtkEditable *editable,
- gint x,
- gint y)
+gtk_text_move_page (GtkOldEditable *old_editable,
+ gint x,
+ gint y)
{
if (y != 0)
- scroll_int (GTK_TEXT (editable),
- y * GTK_TEXT(editable)->vadj->page_increment);
+ scroll_int (GTK_TEXT (old_editable),
+ y * GTK_TEXT(old_editable)->vadj->page_increment);
}
static void
-gtk_text_move_to_row (GtkEditable *editable,
- gint row)
+gtk_text_move_to_row (GtkOldEditable *old_editable,
+ gint row)
{
}
static void
-gtk_text_move_to_column (GtkEditable *editable,
- gint column)
+gtk_text_move_to_column (GtkOldEditable *old_editable,
+ gint column)
{
GtkText *text;
- text = GTK_TEXT (editable);
+ text = GTK_TEXT (old_editable);
text->cursor_virtual_x = 0; /* FIXME */
static void
gtk_text_move_beginning_of_line (GtkText *text)
{
- gtk_text_move_to_column (GTK_EDITABLE (text), 0);
+ gtk_text_move_to_column (GTK_OLD_EDITABLE (text), 0);
}
static void
gtk_text_move_end_of_line (GtkText *text)
{
- gtk_text_move_to_column (GTK_EDITABLE (text), -1);
+ gtk_text_move_to_column (GTK_OLD_EDITABLE (text), -1);
}
static void
-gtk_text_kill_char (GtkEditable *editable,
- gint direction)
+gtk_text_kill_char (GtkOldEditable *old_editable,
+ gint direction)
{
GtkText *text;
- text = GTK_TEXT (editable);
+ text = GTK_TEXT (old_editable);
- if (editable->selection_start_pos != editable->selection_end_pos)
- gtk_editable_delete_selection (editable);
+ if (old_editable->selection_start_pos != old_editable->selection_end_pos)
+ gtk_editable_delete_selection (GTK_EDITABLE (old_editable));
else
{
if (direction >= 0)
{
if (text->point.index + 1 <= TEXT_LENGTH (text))
- gtk_editable_delete_text (editable, text->point.index, text->point.index + 1);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), text->point.index, text->point.index + 1);
}
else
{
if (text->point.index > 0)
- gtk_editable_delete_text (editable, text->point.index - 1, text->point.index);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), text->point.index - 1, text->point.index);
}
}
}
static void
gtk_text_delete_forward_character (GtkText *text)
{
- gtk_text_kill_char (GTK_EDITABLE (text), 1);
+ gtk_text_kill_char (GTK_OLD_EDITABLE (text), 1);
}
static void
gtk_text_delete_backward_character (GtkText *text)
{
- gtk_text_kill_char (GTK_EDITABLE (text), -1);
+ gtk_text_kill_char (GTK_OLD_EDITABLE (text), -1);
}
static void
-gtk_text_kill_word (GtkEditable *editable,
- gint direction)
+gtk_text_kill_word (GtkOldEditable *old_editable,
+ gint direction)
{
- if (editable->selection_start_pos != editable->selection_end_pos)
- gtk_editable_delete_selection (editable);
+ if (old_editable->selection_start_pos != old_editable->selection_end_pos)
+ gtk_editable_delete_selection (GTK_EDITABLE (old_editable));
else
{
- gint old_pos = editable->current_pos;
+ gint old_pos = old_editable->current_pos;
if (direction >= 0)
{
- gtk_text_move_word (editable, 1);
- gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+ gtk_text_move_word (old_editable, 1);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), old_pos, old_editable->current_pos);
}
else
{
- gtk_text_move_word (editable, -1);
- gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+ gtk_text_move_word (old_editable, -1);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), old_editable->current_pos, old_pos);
}
}
}
static void
gtk_text_delete_forward_word (GtkText *text)
{
- gtk_text_kill_word (GTK_EDITABLE (text), 1);
+ gtk_text_kill_word (GTK_OLD_EDITABLE (text), 1);
}
static void
gtk_text_delete_backward_word (GtkText *text)
{
- gtk_text_kill_word (GTK_EDITABLE (text), -1);
+ gtk_text_kill_word (GTK_OLD_EDITABLE (text), -1);
}
static void
-gtk_text_kill_line (GtkEditable *editable,
- gint direction)
+gtk_text_kill_line (GtkOldEditable *old_editable,
+ gint direction)
{
- gint old_pos = editable->current_pos;
+ gint old_pos = old_editable->current_pos;
if (direction >= 0)
{
- gtk_text_move_to_column (editable, -1);
- gtk_editable_delete_text (editable, old_pos, editable->current_pos);
+ gtk_text_move_to_column (old_editable, -1);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), old_pos, old_editable->current_pos);
}
else
{
- gtk_text_move_to_column (editable, 0);
- gtk_editable_delete_text (editable, editable->current_pos, old_pos);
+ gtk_text_move_to_column (old_editable, 0);
+ gtk_editable_delete_text (GTK_EDITABLE (old_editable), old_editable->current_pos, old_pos);
}
}
static void
gtk_text_delete_line (GtkText *text)
{
- gtk_text_move_to_column (GTK_EDITABLE (text), 0);
- gtk_text_kill_line (GTK_EDITABLE (text), 1);
+ gtk_text_move_to_column (GTK_OLD_EDITABLE (text), 0);
+ gtk_text_kill_line (GTK_OLD_EDITABLE (text), 1);
}
static void
gtk_text_delete_to_line_end (GtkText *text)
{
- gtk_text_kill_line (GTK_EDITABLE (text), 1);
+ gtk_text_kill_line (GTK_OLD_EDITABLE (text), 1);
}
static void
gint start_pos;
gint end_pos;
- GtkEditable *editable;
- editable = GTK_EDITABLE (text);
+ GtkOldEditable *old_editable;
+ old_editable = GTK_OLD_EDITABLE (text);
gtk_text_move_backward_word (text);
start_pos = text->cursor_mark.index;
gtk_text_move_forward_word (text);
end_pos = text->cursor_mark.index;
- editable->has_selection = TRUE;
- gtk_text_set_selection (editable, start_pos, end_pos);
- gtk_editable_claim_selection (editable, start_pos != end_pos, time);
+ old_editable->has_selection = TRUE;
+ gtk_text_set_selection (old_editable, start_pos, end_pos);
+ gtk_old_editable_claim_selection (old_editable, start_pos != end_pos, time);
}
static void
gint start_pos;
gint end_pos;
- GtkEditable *editable;
- editable = GTK_EDITABLE (text);
+ GtkOldEditable *old_editable;
+ old_editable = GTK_OLD_EDITABLE (text);
gtk_text_move_beginning_of_line (text);
start_pos = text->cursor_mark.index;
gtk_text_move_forward_character (text);
end_pos = text->cursor_mark.index;
- editable->has_selection = TRUE;
- gtk_text_set_selection (editable, start_pos, end_pos);
- gtk_editable_claim_selection (editable, start_pos != end_pos, time);
+ old_editable->has_selection = TRUE;
+ gtk_text_set_selection (old_editable, start_pos, end_pos);
+ gtk_old_editable_claim_selection (old_editable, start_pos != end_pos, time);
}
/**********************************************************************/
while ((event = gdk_event_get_graphics_expose (text->text_area)) != NULL)
{
- gtk_widget_event (GTK_WIDGET (text), event);
+ gtk_widget_send_expose (GTK_WIDGET (text), event);
if (event->expose.count == 0)
{
gdk_event_free (event);
/* Side effect: modifies text->gc
*/
-
static void
draw_bg_rect (GtkText* text, GtkPropertyMark *mark,
gint x, gint y, gint width, gint height,
gboolean already_cleared)
{
- GtkEditable *editable = GTK_EDITABLE(text);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
- if ((mark->index >= MIN(editable->selection_start_pos, editable->selection_end_pos) &&
- mark->index < MAX(editable->selection_start_pos, editable->selection_end_pos)))
+ if ((mark->index >= MIN(old_editable->selection_start_pos, old_editable->selection_end_pos) &&
+ mark->index < MAX(old_editable->selection_start_pos, old_editable->selection_end_pos)))
{
gtk_paint_flat_box(GTK_WIDGET(text)->style, text->text_area,
- editable->has_selection ?
+ old_editable->has_selection ?
GTK_STATE_SELECTED : GTK_STATE_ACTIVE,
GTK_SHADOW_NONE,
NULL, GTK_WIDGET(text), "text",
x, y, width, height);
}
else if (!gdk_color_equal(MARK_CURRENT_BACK (text, mark),
- >K_WIDGET(text)->style->base[GTK_STATE_NORMAL]))
+ >K_WIDGET(text)->style->base[GTK_WIDGET_STATE (text)]))
{
gdk_gc_set_foreground (text->gc, MARK_CURRENT_BACK (text, mark));
union { GdkWChar *wc; guchar *ch; } buffer;
GdkGC *fg_gc;
- GtkEditable *editable = GTK_EDITABLE(text);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
- guint selection_start_pos = MIN (editable->selection_start_pos, editable->selection_end_pos);
- guint selection_end_pos = MAX (editable->selection_start_pos, editable->selection_end_pos);
+ guint selection_start_pos = MIN (old_editable->selection_start_pos, old_editable->selection_end_pos);
+ guint selection_end_pos = MAX (old_editable->selection_start_pos, old_editable->selection_end_pos);
GtkPropertyMark mark = lp->start;
TabStopMark tab_mark = lp->tab_cont.tab_start;
if ((mark.index >= selection_start_pos) &&
(mark.index < selection_end_pos))
{
- if (editable->has_selection)
+ if (old_editable->has_selection)
fg_gc = GTK_WIDGET(text)->style->fg_gc[GTK_STATE_SELECTED];
else
fg_gc = GTK_WIDGET(text)->style->fg_gc[GTK_STATE_ACTIVE];
static void
undraw_cursor (GtkText* text, gint absolute)
{
- GtkEditable *editable = (GtkEditable *)text;
+ GtkOldEditable *old_editable = (GtkOldEditable *) text;
TDEBUG (("in undraw_cursor\n"));
text->cursor_drawn_level = 0;
if ((text->cursor_drawn_level ++ == 0) &&
- (editable->selection_start_pos == editable->selection_end_pos) &&
+ (old_editable->selection_start_pos == old_editable->selection_end_pos) &&
GTK_WIDGET_DRAWABLE (text) && text->line_start_cache)
{
GdkFont* font;
static void
draw_cursor (GtkText* text, gint absolute)
{
- GtkEditable *editable = (GtkEditable *)text;
+ GtkOldEditable *old_editable = (GtkOldEditable *)text;
TDEBUG (("in draw_cursor\n"));
text->cursor_drawn_level = 1;
if ((--text->cursor_drawn_level == 0) &&
- editable->editable &&
- (editable->selection_start_pos == editable->selection_end_pos) &&
+ old_editable->editable &&
+ (old_editable->selection_start_pos == old_editable->selection_end_pos) &&
GTK_WIDGET_DRAWABLE (text) && text->line_start_cache)
{
GdkFont* font;
}
}
+static GdkGC *
+create_bg_gc (GtkText *text)
+{
+ GdkGCValues values;
+
+ values.tile = GTK_WIDGET (text)->style->bg_pixmap[GTK_STATE_NORMAL];
+ values.fill = GDK_TILED;
+
+ return gdk_gc_new_with_values (text->text_area, &values,
+ GDK_GC_FILL | GDK_GC_TILE);
+}
+
static void
clear_area (GtkText *text, GdkRectangle *area)
{
GtkWidget *widget = GTK_WIDGET (text);
- if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
+ if (text->bg_gc)
{
gint width, height;
- gint x = area->x, y = area->y;
- gint xorig, yorig;
gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
- yorig = - text->first_onscreen_ver_pixel;
- xorig = - text->first_onscreen_hor_pixel;
-
- for (y = area->y; y < area->y + area->height; )
- {
- gint yoff = (y - yorig) % height;
- gint yw = MIN(height - yoff, (area->y + area->height) - y);
-
- for (x = area->x; x < area->x + area->width; )
- {
- gint xoff = (x - xorig) % width;
- gint xw = MIN(width - xoff, (area->x + area->width) - x);
-
- gdk_draw_pixmap (text->text_area,
- text->gc,
- widget->style->bg_pixmap[GTK_STATE_NORMAL],
- xoff,
- yoff,
- x,
- y,
- xw,
- yw);
-
- x += width - xoff;
- }
- y += height - yoff;
- }
+ gdk_gc_set_ts_origin (text->bg_gc,
+ (- text->first_onscreen_hor_pixel) % width,
+ (- text->first_onscreen_ver_pixel) % height);
+
+ gdk_draw_rectangle (text->text_area, text->bg_gc, TRUE,
+ area->x, area->y, area->width, area->height);
}
else
gdk_window_clear_area (text->text_area, area->x, area->y, area->width, area->height);
}
static void
-gtk_text_update_text (GtkEditable *editable,
- gint start_pos,
- gint end_pos)
+gtk_text_update_text (GtkOldEditable *old_editable,
+ gint start_pos,
+ gint end_pos)
{
- GtkText *text = GTK_TEXT (editable);
+ GtkText *text = GTK_TEXT (old_editable);
GList *cache = text->line_start_cache;
gint pixels = - text->first_cut_pixels;
/**********************************************************************/
static void
-gtk_text_set_selection (GtkEditable *editable,
- gint start,
- gint end)
+gtk_text_set_selection (GtkOldEditable *old_editable,
+ gint start,
+ gint end)
{
- GtkText *text = GTK_TEXT (editable);
+ GtkText *text = GTK_TEXT (old_editable);
guint start1, end1, start2, end2;
start1 = MIN(start,end);
end1 = MAX(start,end);
- start2 = MIN(editable->selection_start_pos, editable->selection_end_pos);
- end2 = MAX(editable->selection_start_pos, editable->selection_end_pos);
+ start2 = MIN(old_editable->selection_start_pos, old_editable->selection_end_pos);
+ end2 = MAX(old_editable->selection_start_pos, old_editable->selection_end_pos);
if (start2 < start1)
{
}
undraw_cursor (text, FALSE);
- editable->selection_start_pos = start;
- editable->selection_end_pos = end;
+ old_editable->selection_start_pos = start;
+ old_editable->selection_end_pos = end;
draw_cursor (text, FALSE);
/* Expose only what changed */
if (start1 < start2)
- gtk_text_update_text (editable, start1, MIN(end1, start2));
+ gtk_text_update_text (old_editable, start1, MIN(end1, start2));
if (end2 > end1)
- gtk_text_update_text (editable, MAX(end1, start2), end2);
+ gtk_text_update_text (old_editable, MAX(end1, start2), end2);
else if (end2 < end1)
- gtk_text_update_text (editable, end2, end1);
+ gtk_text_update_text (old_editable, end2, end1);
}
projects / ~andy / gtk / blobdiff