* 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-1999. See the AUTHORS
+ * 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 "config.h"
+
#include <ctype.h>
#include <string.h>
+
+#undef GDK_DISABLE_DEPRECATED
+
#include "gdk/gdkkeysyms.h"
#include "gdk/gdki18n.h"
+
+#undef GTK_DISABLE_DEPRECATED
+
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtkselection.h"
#include "gtksignal.h"
+#include "gtkstyle.h"
+#define GTK_ENABLE_BROKEN
#include "gtktext.h"
#include "line-wrap.xbm"
#include "line-arrow.xbm"
+#include "gtkprivate.h"
+#include "gtkintl.h"
+
+#include "gtkalias.h"
#define INITIAL_BUFFER_SIZE 1024
#define MARK_CURRENT_FONT(text, mark) \
((MARK_CURRENT_PROPERTY(mark)->flags & PROPERTY_FONT) ? \
MARK_CURRENT_PROPERTY(mark)->font->gdk_font : \
- GTK_WIDGET (text)->style->font)
+ gtk_style_get_font (GTK_WIDGET (text)->style))
#define MARK_CURRENT_FORE(text, mark) \
((MARK_CURRENT_PROPERTY(mark)->flags & PROPERTY_FOREGROUND) ? \
&MARK_CURRENT_PROPERTY(mark)->fore_color : \
#define CACHE_DATA(c) (*(LineParams*)(c)->data)
enum {
- ARG_0,
- ARG_HADJUSTMENT,
- ARG_VADJUSTMENT,
- ARG_LINE_WRAP,
- ARG_WORD_WRAP
+ PROP_0,
+ PROP_HADJUSTMENT,
+ PROP_VADJUSTMENT,
+ PROP_LINE_WRAP,
+ PROP_WORD_WRAP
};
typedef struct _TextProperty TextProperty;
static void gtk_text_class_init (GtkTextClass *klass);
-static void gtk_text_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-static void gtk_text_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+static void gtk_text_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_text_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_text_editable_init (GtkEditableClass *iface);
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);
GtkAllocation *allocation);
static void gtk_text_adjustment (GtkAdjustment *adjustment,
GtkText *text);
-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 (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 (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);
+
+static void gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
+ GtkText *text);
/* 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,
GdkEventMotion *event);
static gint gtk_text_key_press (GtkWidget *widget,
GdkEventKey *event);
-static gint gtk_text_focus_in (GtkWidget *widget,
- GdkEventFocus *event);
-static gint gtk_text_focus_out (GtkWidget *widget,
- GdkEventFocus *event);
static void move_gap (GtkText* text, guint index);
static void make_forward_space (GtkText* text, guint len);
static void text_font_unref (GtkTextFont *text_font);
static void insert_text_property (GtkText* text, GdkFont* font,
- GdkColor *fore, GdkColor* back, guint len);
+ const GdkColor *fore, const GdkColor* back, guint len);
static TextProperty* new_text_property (GtkText *text, GdkFont* font,
- GdkColor* fore, GdkColor* back, guint length);
+ const GdkColor* fore, const GdkColor* back, guint length);
static void destroy_text_property (TextProperty *prop);
static void init_properties (GtkText *text);
static void realize_property (GtkText *text, TextProperty *prop);
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 */
#define TEXT_SHOW_ADJ(text,adj,msg)
#endif
-/* Memory Management. */
-static GMemChunk *params_mem_chunk = NULL;
-static GMemChunk *text_property_chunk = NULL;
-
static GtkWidgetClass *parent_class = NULL;
-
-static const GtkTextFunction control_keys[26] =
-{
- (GtkTextFunction)gtk_text_move_beginning_of_line, /* a */
- (GtkTextFunction)gtk_text_move_backward_character, /* b */
- (GtkTextFunction)gtk_editable_copy_clipboard, /* c */
- (GtkTextFunction)gtk_text_delete_forward_character, /* d */
- (GtkTextFunction)gtk_text_move_end_of_line, /* e */
- (GtkTextFunction)gtk_text_move_forward_character, /* f */
- NULL, /* g */
- (GtkTextFunction)gtk_text_delete_backward_character, /* h */
- NULL, /* i */
- NULL, /* j */
- (GtkTextFunction)gtk_text_delete_to_line_end, /* k */
- NULL, /* l */
- NULL, /* m */
- (GtkTextFunction)gtk_text_move_next_line, /* n */
- NULL, /* o */
- (GtkTextFunction)gtk_text_move_previous_line, /* p */
- NULL, /* q */
- NULL, /* r */
- NULL, /* s */
- NULL, /* t */
- (GtkTextFunction)gtk_text_delete_line, /* u */
- (GtkTextFunction)gtk_editable_paste_clipboard, /* v */
- (GtkTextFunction)gtk_text_delete_backward_word, /* w */
- (GtkTextFunction)gtk_editable_cut_clipboard, /* x */
- NULL, /* y */
- NULL, /* z */
-};
-
-static const GtkTextFunction alt_keys[26] =
-{
- NULL, /* a */
- (GtkTextFunction)gtk_text_move_backward_word, /* b */
- NULL, /* c */
- (GtkTextFunction)gtk_text_delete_forward_word, /* d */
- NULL, /* e */
- (GtkTextFunction)gtk_text_move_forward_word, /* f */
- NULL, /* g */
- NULL, /* h */
- NULL, /* i */
- NULL, /* j */
- NULL, /* k */
- NULL, /* l */
- NULL, /* m */
- NULL, /* n */
- NULL, /* o */
- NULL, /* p */
- NULL, /* q */
- NULL, /* r */
- NULL, /* s */
- NULL, /* t */
- NULL, /* u */
- NULL, /* v */
- NULL, /* w */
- NULL, /* x */
- NULL, /* y */
- NULL, /* z */
-};
-
-
/**********************************************************************/
/* Widget Crap */
/**********************************************************************/
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
+
+ static const GInterfaceInfo editable_info =
+ {
+ (GInterfaceInitFunc) gtk_text_editable_init, /* interface_init */
+ NULL, /* interface_finalize */
+ NULL /* interface_data */
+ };
- text_type = gtk_type_unique (GTK_TYPE_EDITABLE, &text_info);
+ I_("GtkText");
+ text_type = gtk_type_unique (GTK_TYPE_OLD_EDITABLE, &text_info);
+ g_type_add_interface_static (text_type,
+ GTK_TYPE_EDITABLE,
+ &editable_info);
}
return text_type;
static void
gtk_text_class_init (GtkTextClass *class)
{
+ GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkEditableClass *editable_class;
-
+ GtkOldEditableClass *old_editable_class;
+
+ gobject_class = G_OBJECT_CLASS (class);
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
- editable_class = (GtkEditableClass*) class;
- parent_class = gtk_type_class (GTK_TYPE_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);
-
- object_class->set_arg = gtk_text_set_arg;
- object_class->get_arg = gtk_text_get_arg;
+ old_editable_class = (GtkOldEditableClass*) class;
+ parent_class = gtk_type_class (GTK_TYPE_OLD_EDITABLE);
+
+ gobject_class->finalize = gtk_text_finalize;
+ gobject_class->set_property = gtk_text_set_property;
+ gobject_class->get_property = gtk_text_get_property;
+
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->motion_notify_event = gtk_text_motion_notify;
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;
- 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;
+
+ g_object_class_install_property (gobject_class,
+ PROP_HADJUSTMENT,
+ g_param_spec_object ("hadjustment",
+ P_("Horizontal Adjustment"),
+ P_("Horizontal adjustment for the text widget"),
+ GTK_TYPE_ADJUSTMENT,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_VADJUSTMENT,
+ g_param_spec_object ("vadjustment",
+ P_("Vertical Adjustment"),
+ P_("Vertical adjustment for the text widget"),
+ GTK_TYPE_ADJUSTMENT,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_LINE_WRAP,
+ g_param_spec_boolean ("line-wrap",
+ P_("Line Wrap"),
+ P_("Whether lines are wrapped at widget edges"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_WORD_WRAP,
+ g_param_spec_boolean ("word-wrap",
+ P_("Word Wrap"),
+ P_("Whether words are wrapped at widget edges"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
+ widget_class->set_scroll_adjustments_signal =
+ gtk_signal_new (I_("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
-gtk_text_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_text_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkText *text;
text = GTK_TEXT (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_HADJUSTMENT:
+ case PROP_HADJUSTMENT:
gtk_text_set_adjustments (text,
- GTK_VALUE_POINTER (*arg),
+ g_value_get_object (value),
text->vadj);
break;
- case ARG_VADJUSTMENT:
+ case PROP_VADJUSTMENT:
gtk_text_set_adjustments (text,
text->hadj,
- GTK_VALUE_POINTER (*arg));
+ g_value_get_object (value));
break;
- case ARG_LINE_WRAP:
- gtk_text_set_line_wrap (text, GTK_VALUE_BOOL (*arg));
+ case PROP_LINE_WRAP:
+ gtk_text_set_line_wrap (text, g_value_get_boolean (value));
break;
- case ARG_WORD_WRAP:
- gtk_text_set_word_wrap (text, GTK_VALUE_BOOL (*arg));
+ case PROP_WORD_WRAP:
+ gtk_text_set_word_wrap (text, g_value_get_boolean (value));
break;
default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
-gtk_text_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id)
+gtk_text_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkText *text;
text = GTK_TEXT (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_HADJUSTMENT:
- GTK_VALUE_POINTER (*arg) = text->hadj;
+ case PROP_HADJUSTMENT:
+ g_value_set_object (value, text->hadj);
break;
- case ARG_VADJUSTMENT:
- GTK_VALUE_POINTER (*arg) = text->vadj;
+ case PROP_VADJUSTMENT:
+ g_value_set_object (value, text->vadj);
break;
- case ARG_LINE_WRAP:
- GTK_VALUE_BOOL (*arg) = text->line_wrap;
+ case PROP_LINE_WRAP:
+ g_value_set_boolean (value, text->line_wrap);
break;
- case ARG_WORD_WRAP:
- GTK_VALUE_BOOL (*arg) = text->word_wrap;
+ case PROP_WORD_WRAP:
+ g_value_set_boolean (value, text->word_wrap);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
+static void
+gtk_text_editable_init (GtkEditableClass *iface)
+{
+ iface->insert_text = gtk_text_insert_text;
+ iface->delete_text = gtk_text_delete_text;
+}
+
static void
gtk_text_init (GtkText *text)
{
text->freeze_count = 0;
- if (!params_mem_chunk)
- params_mem_chunk = g_mem_chunk_new ("LineParams",
- sizeof (LineParams),
- 256 * sizeof (LineParams),
- G_ALLOC_AND_FREE);
-
text->default_tab_width = 4;
text->tab_stops = 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);
}
if (vadj)
g_return_val_if_fail (GTK_IS_ADJUSTMENT (vadj), NULL);
- text = gtk_widget_new (GTK_TYPE_TEXT,
+ text = g_object_new (GTK_TYPE_TEXT,
"hadjustment", hadj,
"vadjustment", vadj,
NULL);
void
gtk_text_set_word_wrap (GtkText *text,
- gint word_wrap)
+ gboolean word_wrap)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->word_wrap = (word_wrap != FALSE);
recompute_geometry (text);
gtk_widget_queue_draw (GTK_WIDGET (text));
}
+
+ g_object_notify (G_OBJECT (text), "word-wrap");
}
void
gtk_text_set_line_wrap (GtkText *text,
- gint line_wrap)
+ gboolean line_wrap)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->line_wrap = (line_wrap != FALSE);
recompute_geometry (text);
gtk_widget_queue_draw (GTK_WIDGET (text));
}
+
+ g_object_notify (G_OBJECT (text), "line-wrap");
}
void
gtk_text_set_editable (GtkText *text,
gboolean is_editable)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
gtk_editable_set_editable (GTK_EDITABLE (text), is_editable);
}
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 (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);
GtkAdjustment *hadj,
GtkAdjustment *vadj)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (hadj)
g_return_if_fail (GTK_IS_ADJUSTMENT (hadj));
if (text->hadj && (text->hadj != hadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->hadj), text);
- gtk_object_unref (GTK_OBJECT (text->hadj));
+ g_object_unref (text->hadj);
}
if (text->vadj && (text->vadj != vadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
- gtk_object_unref (GTK_OBJECT (text->vadj));
+ g_object_unref (text->vadj);
}
+ g_object_freeze_notify (G_OBJECT (text));
if (text->hadj != hadj)
{
text->hadj = hadj;
- gtk_object_ref (GTK_OBJECT (text->hadj));
- gtk_object_sink (GTK_OBJECT (text->hadj));
+ g_object_ref_sink (text->hadj);
gtk_signal_connect (GTK_OBJECT (text->hadj), "changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->hadj), "value_changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ gtk_signal_connect (GTK_OBJECT (text->hadj), "value-changed",
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->hadj), "disconnect",
- (GtkSignalFunc) gtk_text_disconnect,
+ gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy",
+ G_CALLBACK (gtk_text_adjustment_destroyed),
text);
gtk_text_adjustment (hadj, text);
+
+ g_object_notify (G_OBJECT (text), "hadjustment");
}
if (text->vadj != vadj)
{
text->vadj = vadj;
- gtk_object_ref (GTK_OBJECT (text->vadj));
- gtk_object_sink (GTK_OBJECT (text->vadj));
+ g_object_ref_sink (text->vadj);
gtk_signal_connect (GTK_OBJECT (text->vadj), "changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->vadj), "value_changed",
- (GtkSignalFunc) gtk_text_adjustment,
+ gtk_signal_connect (GTK_OBJECT (text->vadj), "value-changed",
+ G_CALLBACK (gtk_text_adjustment),
text);
- gtk_signal_connect (GTK_OBJECT (text->vadj), "disconnect",
- (GtkSignalFunc) gtk_text_disconnect,
+ gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy",
+ G_CALLBACK (gtk_text_adjustment_destroyed),
text);
gtk_text_adjustment (vadj, text);
+
+ g_object_notify (G_OBJECT (text), "vadjustment");
}
+ g_object_thaw_notify (G_OBJECT (text));
}
void
gtk_text_set_point (GtkText *text,
guint index)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
g_return_if_fail (index <= TEXT_LENGTH (text));
guint
gtk_text_get_point (GtkText *text)
{
- g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (GTK_IS_TEXT (text), 0);
return text->point.index;
guint
gtk_text_get_length (GtkText *text)
{
- g_return_val_if_fail (text != NULL, 0);
g_return_val_if_fail (GTK_IS_TEXT (text), 0);
return TEXT_LENGTH (text);
void
gtk_text_freeze (GtkText *text)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
text->freeze_count++;
void
gtk_text_thaw (GtkText *text)
{
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (text->freeze_count)
}
void
-gtk_text_insert (GtkText *text,
- GdkFont *font,
- GdkColor *fore,
- GdkColor *back,
- const char *chars,
- gint nchars)
-{
- GtkEditable *editable = GTK_EDITABLE (text);
+gtk_text_insert (GtkText *text,
+ GdkFont *font,
+ const GdkColor *fore,
+ const GdkColor *back,
+ const char *chars,
+ gint nchars)
+{
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
gint new_line_count = 1;
guint i;
gint numwcs;
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (nchars < 0)
if ((TEXT_LENGTH (text) == 0) && (text->use_wchar == FALSE))
{
- GtkWidget *widget;
- widget = GTK_WIDGET (text);
+ GtkWidget *widget = GTK_WIDGET (text);
+
gtk_widget_ensure_style (widget);
- if ((widget->style) && (widget->style->font->type == GDK_FONT_FONTSET))
+ if ((widget->style) &&
+ (gtk_style_get_font (widget->style)->type == GDK_FONT_FONTSET))
{
text->use_wchar = TRUE;
g_free (text->text.ch);
text->text.wc = g_new (GdkWChar, INITIAL_BUFFER_SIZE);
text->text_len = INITIAL_BUFFER_SIZE;
- if (text->scratch_buffer.ch)
- g_free (text->scratch_buffer.ch);
+ g_free (text->scratch_buffer.ch);
text->scratch_buffer.wc = NULL;
text->scratch_buffer_len = 0;
}
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;
gtk_text_thaw (text);
}
-gint
+gboolean
gtk_text_backward_delete (GtkText *text,
guint nchars)
{
- g_return_val_if_fail (text != NULL, 0);
- g_return_val_if_fail (GTK_IS_TEXT (text), 0);
+ g_return_val_if_fail (GTK_IS_TEXT (text), FALSE);
if (nchars > text->point.index || nchars <= 0)
return FALSE;
return gtk_text_forward_delete (text, nchars);
}
-gint
+gboolean
gtk_text_forward_delete (GtkText *text,
guint nchars)
{
- guint old_lines, old_height;
- GtkEditable *editable = GTK_EDITABLE (text);
+ guint old_lines = 0, old_height = 0;
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (text);
gboolean frozen = FALSE;
- g_return_val_if_fail (text != NULL, 0);
- g_return_val_if_fail (GTK_IS_TEXT (text), 0);
+ g_return_val_if_fail (GTK_IS_TEXT (text), FALSE);
if (text->point.index + nchars > TEXT_LENGTH (text) || nchars <= 0)
return FALSE;
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;
+
+ if (position < 0)
+ position = gtk_text_get_length (text);
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 (GTK_IS_TEXT (old_editable), NULL);
+ text = GTK_TEXT (old_editable);
if (end_pos < 0)
end_pos = TEXT_LENGTH (text);
static void
gtk_text_destroy (GtkObject *object)
{
- GtkText *text;
-
- g_return_if_fail (object != NULL);
- g_return_if_fail (GTK_IS_TEXT (object));
-
- text = (GtkText*) object;
+ GtkText *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);
+ g_object_unref (text->hadj);
+ text->hadj = NULL;
+ }
+ if (text->vadj)
+ {
+ gtk_signal_disconnect_by_data (GTK_OBJECT (text->vadj), text);
+ g_object_unref (text->vadj);
+ text->vadj = NULL;
+ }
if (text->timer)
{
- gtk_timeout_remove (text->timer);
+ g_source_remove (text->timer);
text->timer = 0;
}
}
static void
-gtk_text_finalize (GtkObject *object)
+gtk_text_finalize (GObject *object)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (object);
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));
/* Clean up the internal structures */
if (text->use_wchar)
if (text->use_wchar)
{
- if (text->scratch_buffer.wc)
- g_free (text->scratch_buffer.wc);
+ g_free (text->scratch_buffer.wc);
}
else
{
- if (text->scratch_buffer.ch)
- g_free (text->scratch_buffer.ch);
+ g_free (text->scratch_buffer.ch);
}
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;
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
GdkWindowAttr attributes;
gint attributes_mask;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TEXT (widget));
-
- text = GTK_TEXT (widget);
- editable = GTK_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_for_display (gtk_widget_get_display (widget), 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_unref (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);
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);
+ g_object_unref (text->bg_gc);
text->bg_gc = NULL;
}
recompute_geometry (text);
}
-
+
if (text->current_font)
text_font_unref (text->current_font);
- text->current_font = get_text_font (widget->style->font);
+ text->current_font = get_text_font (gtk_style_get_font (widget->style));
}
static void
-gtk_text_unrealize (GtkWidget *widget)
+gtk_text_state_changed (GtkWidget *widget,
+ GtkStateType previous_state)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (widget);
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TEXT (widget));
-
- 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)
+ if (GTK_WIDGET_REALIZED (widget))
{
- gdk_ic_attr_destroy (GTK_EDITABLE (widget)->ic_attr);
- GTK_EDITABLE (widget)->ic_attr = NULL;
+ 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)]);
}
-#endif
+}
+
+static void
+gtk_text_unrealize (GtkWidget *widget)
+{
+ GtkText *text = GTK_TEXT (widget);
gdk_window_set_user_data (text->text_area, NULL);
gdk_window_destroy (text->text_area);
text->text_area = NULL;
- gdk_gc_destroy (text->gc);
+ g_object_unref (text->gc);
text->gc = NULL;
if (text->bg_gc)
{
- gdk_gc_destroy (text->bg_gc);
+ g_object_unref (text->bg_gc);
text->bg_gc = NULL;
}
- gdk_pixmap_unref (text->line_wrap_bitmap);
- gdk_pixmap_unref (text->line_arrow_bitmap);
+ g_object_unref (text->line_wrap_bitmap);
+ g_object_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);
+ GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
}
static void
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;
- gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
+ if (area_width == 0 || area_height == 0)
+ return;
+
+ if (widget->style->bg_pixmap[GTK_STATE_NORMAL])
+ {
+ gdk_drawable_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);
+ gdk_gc_set_ts_origin (text->bg_gc,
+ (- text->first_onscreen_hor_pixel + xthick) % width,
+ (- text->first_onscreen_ver_pixel + ythick) % height);
+
+ gc = text->bg_gc;
+ }
+ else
+ gc = widget->style->base_gc[widget->state];
- gdk_draw_rectangle (GTK_WIDGET (text)->window, text->bg_gc, TRUE,
+ gdk_draw_rectangle (GTK_WIDGET (text)->window, gc, TRUE,
area_x, area_y, area_width, area_height);
}
gint width, height;
gint x, y;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_TEXT (widget));
text = GTK_TEXT (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;
xextra -= 1;
yextra -= 1;
- gtk_paint_focus (widget->style, widget->window,
+ gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
NULL, widget, "text",
0, 0,
- widget->allocation.width - 1,
- widget->allocation.height - 1);
+ widget->allocation.width,
+ widget->allocation.height);
}
gtk_paint_shadow (widget->style, widget->window,
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
{
gtk_text_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
+ GdkFont *font;
gint xthickness;
gint ythickness;
gint char_height;
gint char_width;
+
+ xthickness = widget->style->xthickness + TEXT_BORDER_ROOM;
+ ythickness = widget->style->ythickness + TEXT_BORDER_ROOM;
+
+ font = gtk_style_get_font (widget->style);
- g_return_if_fail (widget != NULL);
- 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;
-
- char_height = MIN_TEXT_HEIGHT_LINES * (widget->style->font->ascent +
- widget->style->font->descent);
+ char_height = MIN_TEXT_HEIGHT_LINES * (font->ascent +
+ font->descent);
- char_width = MIN_TEXT_WIDTH_LINES * (gdk_text_width (widget->style->font,
+ char_width = MIN_TEXT_WIDTH_LINES * (gdk_text_width (font,
"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
26)
/ 26);
gtk_text_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkText *text;
- GtkEditable *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);
-
+ GtkText *text = GTK_TEXT (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)
{
- 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->window == GTK_TEXT (widget)->text_area)
{
TDEBUG (("in gtk_text_expose (expose)\n"));
else if (event->count == 0)
{
TDEBUG (("in gtk_text_expose (focus)\n"));
- gtk_widget_draw_focus (widget);
+ gtk_text_draw_focus (widget);
}
return FALSE;
gtk_text_scroll_timeout (gpointer data)
{
GtkText *text;
- GdkEventMotion event;
gint x, y;
GdkModifierType mask;
- GDK_THREADS_ENTER ();
-
text = GTK_TEXT (data);
text->timer = 0;
if (mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK))
{
- event.is_hint = 0;
- event.x = x;
- event.y = y;
- event.state = mask;
+ GdkEvent *event = gdk_event_new (GDK_MOTION_NOTIFY);
+
+ event->motion.is_hint = 0;
+ event->motion.x = x;
+ event->motion.y = y;
+ event->motion.state = mask;
- gtk_text_motion_notify (GTK_WIDGET (text), &event);
+ gtk_text_motion_notify (GTK_WIDGET (text), (GdkEventMotion *)event);
+
+ gdk_event_free (event);
}
- GDK_THREADS_LEAVE ();
-
return FALSE;
}
gtk_text_button_press (GtkWidget *widget,
GdkEventButton *event)
{
- GtkText *text;
- GtkEditable *editable;
- static GdkAtom ctext_atom = GDK_NONE;
-
- 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);
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *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_static_string ("UTF8_STRING"),
+ event->time);
}
else
{
+ GdkDisplay *display = gtk_widget_get_display (widget);
+
gtk_grab_add (widget);
undraw_cursor (text, FALSE);
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;
- if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
- gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
+ old_editable->has_selection = FALSE;
+ if (gdk_selection_owner_get_for_display (display,
+ GDK_SELECTION_PRIMARY) == widget->window)
+ gtk_selection_owner_set_for_display (display,
+ NULL,
+ GDK_SELECTION_PRIMARY,
+ event->time);
}
}
- return FALSE;
+ return TRUE;
}
static gint
gtk_text_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- GtkText *text;
- GtkEditable *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);
-
- text = GTK_TEXT (widget);
-
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable;
+ GdkDisplay *display;
+
gtk_grab_remove (widget);
if (text->button != event->button)
if (text->timer)
{
- gtk_timeout_remove (text->timer);
+ g_source_remove (text->timer);
text->timer = 0;
}
if (event->button == 1)
{
text = GTK_TEXT (widget);
- editable = GTK_EDITABLE (widget);
+ old_editable = GTK_OLD_EDITABLE (widget);
+ display = gtk_widget_get_display (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;
+ if (gtk_selection_owner_set_for_display (display,
+ widget,
+ GDK_SELECTION_PRIMARY,
+ event->time))
+ 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
{
- if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
- gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
+ if (gdk_selection_owner_get_for_display (display,
+ GDK_SELECTION_PRIMARY) == widget->window)
+ gtk_selection_owner_set_for_display (display,
+ NULL,
+ GDK_SELECTION_PRIMARY,
+ event->time);
}
}
else if (event->button == 3)
find_cursor (text, TRUE);
draw_cursor (text, FALSE);
- return FALSE;
+ return TRUE;
}
static gint
gtk_text_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (widget);
gint x, y;
gint height;
GdkModifierType mask;
-
- 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);
-
- text = GTK_TEXT (widget);
-
+
x = event->x;
y = event->y;
mask = event->state;
!(mask & (GDK_BUTTON1_MASK | GDK_BUTTON3_MASK)))
return FALSE;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
if ((y < 0) || (y > height))
{
if (text->timer == 0)
{
- text->timer = gtk_timeout_add (SCROLL_TIME,
- gtk_text_scroll_timeout,
- text);
+ text->timer = gdk_threads_add_timeout (SCROLL_TIME,
+ gtk_text_scroll_timeout,
+ text);
if (y < 0)
scroll_int (text, y/2);
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;
gint start_pos,
gint end_pos)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (editable);
g_return_if_fail (start_pos >= 0);
-
- text = GTK_TEXT (editable);
-
+
gtk_text_set_point (text, start_pos);
if (end_pos < 0)
end_pos = TEXT_LENGTH (text);
gtk_text_key_press (GtkWidget *widget,
GdkEventKey *event)
{
- GtkText *text;
- GtkEditable *editable;
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
gchar key;
gint return_val;
gint position;
-
- 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);
-
- return_val = FALSE;
-
- text = GTK_TEXT (widget);
- editable = GTK_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:
+ case GDK_Home:
+ case GDK_KP_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:
+ case GDK_KP_End:
if (event->state & GDK_CONTROL_MASK)
scroll_int (text, +text->vadj->upper);
+ else
+ return_val = FALSE;
break;
+ case GDK_KP_Page_Up:
case GDK_Page_Up: scroll_int (text, -text->vadj->page_increment); break;
+ case GDK_KP_Page_Down:
case GDK_Page_Down: scroll_int (text, +text->vadj->page_increment); break;
+ case GDK_KP_Up:
case GDK_Up: scroll_int (text, -KEY_SCROLL_PIXELS); break;
+ case GDK_KP_Down:
case GDK_Down: scroll_int (text, +KEY_SCROLL_PIXELS); break;
case GDK_Return:
+ case GDK_ISO_Enter:
+ case GDK_KP_Enter:
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)
{
+ case GDK_KP_Home:
case GDK_Home:
if (event->state & GDK_CONTROL_MASK)
move_cursor_buffer_ver (text, -1);
else
gtk_text_move_beginning_of_line (text);
break;
+ case GDK_KP_End:
case GDK_End:
if (event->state & GDK_CONTROL_MASK)
move_cursor_buffer_ver (text, +1);
else
gtk_text_move_end_of_line (text);
break;
+ case GDK_KP_Page_Up:
case GDK_Page_Up: move_cursor_page_ver (text, -1); break;
+ case GDK_KP_Page_Down:
case GDK_Page_Down: move_cursor_page_ver (text, +1); break;
/* CUA has Ctrl-Up/Ctrl-Down as paragraph up down */
+ case GDK_KP_Up:
case GDK_Up: move_cursor_ver (text, -1); break;
+ case GDK_KP_Down:
case GDK_Down: move_cursor_ver (text, +1); break;
+ case GDK_KP_Left:
case GDK_Left:
if (event->state & GDK_CONTROL_MASK)
gtk_text_move_backward_word (text);
else
move_cursor_hor (text, -1);
break;
+ case GDK_KP_Right:
case GDK_Right:
if (event->state & GDK_CONTROL_MASK)
gtk_text_move_forward_word (text);
case GDK_Clear:
gtk_text_delete_line (text);
break;
+ case GDK_KP_Insert:
case GDK_Insert:
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
{
}
break;
case GDK_Delete:
+ case GDK_KP_Delete:
if (event->state & GDK_CONTROL_MASK)
gtk_text_delete_forward_word (text);
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:
+ case GDK_ISO_Left_Tab:
+ case GDK_KP_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_KP_Enter:
+ case GDK_ISO_Enter:
case GDK_Return:
if (event->state & GDK_CONTROL_MASK)
gtk_signal_emit_by_name (GTK_OBJECT (text), "activate");
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 (event->state & GDK_CONTROL_MASK)
{
+ return_val = TRUE;
if ((key >= 'A') && (key <= 'Z'))
key -= 'A' - 'a';
-
- if ((key >= 'a') && (key <= 'z') && control_keys[(int) (key - 'a')])
+
+ switch (key)
{
- (* control_keys[(int) (key - 'a')]) (editable, event->time);
- return_val = TRUE;
+ case 'a':
+ gtk_text_move_beginning_of_line (text);
+ break;
+ case 'b':
+ gtk_text_move_backward_character (text);
+ break;
+ case 'c':
+ gtk_editable_copy_clipboard (GTK_EDITABLE (text));
+ break;
+ case 'd':
+ gtk_text_delete_forward_character (text);
+ break;
+ case 'e':
+ gtk_text_move_end_of_line (text);
+ break;
+ case 'f':
+ gtk_text_move_forward_character (text);
+ break;
+ case 'h':
+ gtk_text_delete_backward_character (text);
+ break;
+ case 'k':
+ gtk_text_delete_to_line_end (text);
+ break;
+ case 'n':
+ gtk_text_move_next_line (text);
+ break;
+ case 'p':
+ gtk_text_move_previous_line (text);
+ break;
+ case 'u':
+ gtk_text_delete_line (text);
+ break;
+ case 'v':
+ gtk_editable_paste_clipboard (GTK_EDITABLE (text));
+ break;
+ case 'w':
+ gtk_text_delete_backward_word (text);
+ break;
+ case 'x':
+ gtk_editable_cut_clipboard (GTK_EDITABLE (text));
+ break;
+ default:
+ return_val = FALSE;
}
-
+
break;
}
else if (event->state & GDK_MOD1_MASK)
{
+ return_val = TRUE;
if ((key >= 'A') && (key <= 'Z'))
key -= 'A' - 'a';
- if ((key >= 'a') && (key <= 'z') && alt_keys[(int) (key - 'a')])
+ switch (key)
{
- (* alt_keys[(int) (key - 'a')]) (editable, event->time);
- return_val = TRUE;
+ case 'b':
+ gtk_text_move_backward_word (text);
+ break;
+ case 'd':
+ gtk_text_delete_forward_word (text);
+ break;
+ case 'f':
+ gtk_text_move_forward_word (text);
+ break;
+ default:
+ return_val = FALSE;
}
break;
{
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;
}
- else
- 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);
}
}
return return_val;
}
-static gint
-gtk_text_focus_in (GtkWidget *widget,
- GdkEventFocus *event)
-{
- 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);
-
- 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;
-}
-
-static gint
-gtk_text_focus_out (GtkWidget *widget,
- GdkEventFocus *event)
-{
- 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);
-
- 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;
-}
-
static void
gtk_text_adjustment (GtkAdjustment *adjustment,
GtkText *text)
{
- g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
/* Just ignore it if we haven't been size-allocated and realized yet */
}
static void
-gtk_text_disconnect (GtkAdjustment *adjustment,
- GtkText *text)
+gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
+ GtkText *text)
{
- g_return_if_fail (adjustment != NULL);
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- g_return_if_fail (text != NULL);
g_return_if_fail (GTK_IS_TEXT (text));
if (adjustment == text->hadj)
{
tab_cont->pixel_offset = 0;
tab_cont->tab_start.tab_stops = text->tab_stops;
- tab_cont->tab_start.to_next_tab = (gulong) text->tab_stops->data;
+ tab_cont->tab_start.to_next_tab = (gintptr) text->tab_stops->data;
if (!tab_cont->tab_start.to_next_tab)
tab_cont->tab_start.to_next_tab = text->default_tab_width;
for (;;)
{
if (alloc)
- lp = g_chunk_new (LineParams, params_mem_chunk);
+ lp = g_slice_new (LineParams);
else
lp = &lpbuf;
static void
fetch_lines_backward (GtkText* text)
{
- GList* new_lines = NULL, *new_line_start;
+ GList *new_line_start;
GtkPropertyMark mark;
if (CACHE_DATA(text->line_start_cache).start.index == 0)
CACHE_DATA(text->line_start_cache).start.index - 1,
&CACHE_DATA(text->line_start_cache).start);
- new_line_start = new_lines = fetch_lines (text, &mark, NULL, FetchLinesCount, 1);
+ new_line_start = fetch_lines (text, &mark, NULL, FetchLinesCount, 1);
while (new_line_start->next)
new_line_start = new_line_start->next;
new_pixels = total_line_height (text, new_line, 1);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (old_pixels != new_pixels)
{
if (!widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- pixel_height + old_pixels,
- 0,
- pixel_height + new_pixels,
- width,
- height);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ pixel_height + old_pixels,
+ 0,
+ pixel_height + new_pixels,
+ width,
+ height);
}
text->vadj->upper += new_pixels;
text->vadj->upper -= old_pixels;
new_pixels = total_line_height (text, new_lines, new_line_count);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (old_pixels != new_pixels)
{
if (!widget->style->bg_pixmap[GTK_STATE_NORMAL])
{
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- pixel_height + old_pixels,
- 0,
- pixel_height + new_pixels,
- width,
- height + (old_pixels - new_pixels) - pixel_height);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ pixel_height + old_pixels,
+ 0,
+ pixel_height + new_pixels,
+ width,
+ height + (old_pixels - new_pixels) - pixel_height);
}
text->vadj->upper += new_pixels;
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);
}
static gint
-text_properties_equal (TextProperty* prop, GdkFont* font, GdkColor *fore, GdkColor *back)
+text_properties_equal (TextProperty* prop, GdkFont* font, const GdkColor *fore, const GdkColor *back)
{
if (prop->flags & PROPERTY_FONT)
{
}
static TextProperty*
-new_text_property (GtkText *text, GdkFont *font, GdkColor* fore,
- GdkColor* back, guint length)
+new_text_property (GtkText *text, GdkFont *font, const GdkColor* fore,
+ const GdkColor* back, guint length)
{
TextProperty *prop;
- if (text_property_chunk == NULL)
- {
- text_property_chunk = g_mem_chunk_new ("text property mem chunk",
- sizeof(TextProperty),
- 1024*sizeof(TextProperty),
- G_ALLOC_AND_FREE);
- }
-
- prop = g_chunk_new(TextProperty, text_property_chunk);
+ prop = g_slice_new (TextProperty);
prop->flags = 0;
if (font)
if (prop->font)
text_font_unref (prop->font);
- g_mem_chunk_free (text_property_chunk, prop);
+ g_slice_free (TextProperty, prop);
}
/* Flop the memory between the point and the gap around like a
* point. */
static void
insert_text_property (GtkText* text, GdkFont* font,
- GdkColor *fore, GdkColor* back, guint len)
+ const GdkColor *fore, const GdkColor* back, guint len)
{
GtkPropertyMark *mark = &text->point;
TextProperty* forward_prop = MARK_CURRENT_PROPERTY(mark);
scroll_int (text, - LINE_HEIGHT(CACHE_DATA(text->line_start_cache->next)));
}
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
for (cache = text->line_start_cache; cache; cache = cache->next)
{
if (tab_mark->tab_stops->next)
{
tab_mark->tab_stops = tab_mark->tab_stops->next;
- tab_mark->to_next_tab = (gulong) tab_mark->tab_stops->data;
+ tab_mark->to_next_tab = (gintptr) tab_mark->tab_stops->data;
}
else
{
find_cursor_at_line (GtkText* text, const LineParams* start_line, gint pixel_height)
{
GdkWChar ch;
- GtkEditable *editable = (GtkEditable *)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
}
for (; cache; cache = cache->next)
- g_mem_chunk_free (params_mem_chunk, cache->data);
+ g_slice_free (LineParams, cache->data);
g_list_free (text->line_start_cache);
list = member->next;
- g_mem_chunk_free (params_mem_chunk, member->data);
+ g_slice_free (LineParams, member->data);
g_list_free_1 (member);
return list;
}
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 (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);
}
/**********************************************************************/
{
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
- adj->step_increment = MIN (adj->upper, (float) SCROLL_PIXELS);
- adj->page_increment = MIN (adj->upper, height - (float) KEY_SCROLL_PIXELS);
+ adj->step_increment = MIN (adj->upper, SCROLL_PIXELS);
+ adj->page_increment = MIN (adj->upper, height - KEY_SCROLL_PIXELS);
adj->page_size = MIN (adj->upper, height);
adj->value = MIN (adj->value, adj->upper - adj->page_size);
adj->value = MAX (adj->value, 0.0);
text->first_cut_pixels = 0;
}
- text->vadj->value = (float) text->first_onscreen_ver_pixel;
+ text->vadj->value = text->first_onscreen_ver_pixel;
}
svdata->pixel_height += LINE_HEIGHT (*lp);
data.pixel_height = 0;
line_params_iterate (text, &mark, NULL, FALSE, &data, set_vertical_scroll_iterator);
- text->vadj->upper = (float) data.pixel_height;
+ text->vadj->upper = data.pixel_height;
orig_value = (gint) text->vadj->value;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
- text->vadj->step_increment = MIN (text->vadj->upper, (float) SCROLL_PIXELS);
- text->vadj->page_increment = MIN (text->vadj->upper, height - (float) KEY_SCROLL_PIXELS);
+ text->vadj->step_increment = MIN (text->vadj->upper, SCROLL_PIXELS);
+ text->vadj->page_increment = MIN (text->vadj->upper, height - KEY_SCROLL_PIXELS);
text->vadj->page_size = MIN (text->vadj->upper, height);
text->vadj->value = MIN (text->vadj->value, text->vadj->upper - text->vadj->page_size);
text->vadj->value = MAX (text->vadj->value, 0.0);
static void
scroll_int (GtkText* text, gint diff)
{
- gfloat upper;
+ gdouble upper;
text->vadj->value += diff;
text->vadj->value = MIN (text->vadj->value, upper);
text->vadj->value = MAX (text->vadj->value, 0.0);
- gtk_signal_emit_by_name (GTK_OBJECT (text->vadj), "value_changed");
+ gtk_signal_emit_by_name (GTK_OBJECT (text->vadj), "value-changed");
}
static void
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);
GList *cache = text->line_start_cache;
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
for (; cache->next; cache = cache->next)
if (pixel_height_of(text, cache->next) > height)
real_diff += 1;
}
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (height > real_diff)
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- real_diff,
- 0,
- 0,
- width,
- height - real_diff);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ real_diff,
+ 0,
+ 0,
+ width,
+ height - real_diff);
rect.x = 0;
rect.y = MAX (0, height - real_diff);
real_diff += 1;
}
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
if (height > real_diff)
- gdk_draw_pixmap (text->text_area,
- text->gc,
- text->text_area,
- 0,
- 0,
- 0,
- real_diff,
- width,
- height - real_diff);
+ gdk_draw_drawable (text->text_area,
+ text->gc,
+ text->text_area,
+ 0,
+ 0,
+ 0,
+ real_diff,
+ width,
+ height - real_diff);
rect.x = 0;
rect.y = 0;
text->cursor_pos_y += real_diff;
cursor_max = drawn_cursor_max(text);
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
if (cursor_max >= height)
find_mouse_cursor (text, text->cursor_pos_x,
gint ch_width;
GdkFont *font;
- gdk_window_get_size (text->text_area, (gint*) &max_display_pixels, NULL);
+ gdk_drawable_get_size (text->text_area, (gint*) &max_display_pixels, NULL);
max_display_pixels -= LINE_WRAP_ROOM;
lp.wraps = 0;
/* 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)
- fg_gc = GTK_WIDGET(text)->style->fg_gc[GTK_STATE_SELECTED];
+ if (old_editable->has_selection)
+ fg_gc = GTK_WIDGET(text)->style->text_gc[GTK_STATE_SELECTED];
else
- fg_gc = GTK_WIDGET(text)->style->fg_gc[GTK_STATE_ACTIVE];
+ fg_gc = GTK_WIDGET(text)->style->text_gc[GTK_STATE_ACTIVE];
}
else
{
len = 1;
- gdk_window_get_size (text->text_area, &pixels_remaining, NULL);
+ gdk_drawable_get_size (text->text_area, &pixels_remaining, NULL);
pixels_remaining -= (LINE_WRAP_ROOM + running_offset);
space_width = MARK_CURRENT_TEXT_FONT(text, &mark)->char_widths[' '];
bitmap_height = line_arrow_height;
}
- gdk_window_get_size (text->text_area, &width, NULL);
+ gdk_drawable_get_size (text->text_area, &width, NULL);
width -= LINE_WRAP_ROOM;
gdk_gc_set_stipple (text->gc,
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 gint
drawn_cursor_max (GtkText* text)
{
- GdkFont* font;
-
g_assert(text->cursor_mark.property);
- font = MARK_CURRENT_FONT(text, &text->cursor_mark);
-
return text->cursor_pos_y - text->cursor_char_offset;
}
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;
{
gint width, height;
- gdk_window_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
+ gdk_drawable_get_size (widget->style->bg_pixmap[GTK_STATE_NORMAL], &width, &height);
gdk_gc_set_ts_origin (text->bg_gc,
(- text->first_onscreen_hor_pixel) % width,
gint max_y = MAX (0, area->y + area->height);
gint height;
- gdk_window_get_size (text->text_area, NULL, &height);
+ gdk_drawable_get_size (text->text_area, NULL, &height);
max_y = MIN (max_y, height);
TDEBUG (("in expose x=%d y=%d w=%d h=%d\n", 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;
if (end_pos < start_pos)
return;
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
area.x = 0;
area.y = -1;
area.width = width;
GTK_TEXT_INDEX (text, mark.index - 1) != LINE_DELIM)
decrement_mark (&mark);
- gdk_window_get_size (text->text_area, &width, &height);
+ gdk_drawable_get_size (text->text_area, &width, &height);
/* Fetch an entire line, to make sure that we get all the text
* we backed over above, in addition to enough text to fill up
/**********************************************************************/
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);
}
g_warning ("incorrect property list length in %s:%d -- bad!", msg, line);
}
#endif
+
+#define __GTK_TEXT_C__
+#include "gtkaliasdef.c"