* 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"
+
+#define GTK_DISABLE_DEPRECATED
+#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 (GObject *object);
GtkAllocation *allocation);
static void gtk_text_adjustment (GtkAdjustment *adjustment,
GtkText *text);
-static void gtk_text_insert_text (GtkOldEditable *old_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 (GtkOldEditable *old_editable,
+static void gtk_text_delete_text (GtkEditable *editable,
gint start_pos,
gint end_pos);
static void gtk_text_update_text (GtkOldEditable *old_editable,
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);
#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 */
+ };
+ 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 = G_OBJECT_CLASS (class);
+ GObjectClass *gobject_class;
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GtkOldEditableClass *old_editable_class;
-
+
+ gobject_class = G_OBJECT_CLASS (class);
object_class = (GtkObjectClass*) class;
widget_class = (GtkWidgetClass*) class;
old_editable_class = (GtkOldEditableClass*) class;
parent_class = gtk_type_class (GTK_TYPE_OLD_EDITABLE);
gobject_class->finalize = gtk_text_finalize;
-
- object_class->set_arg = gtk_text_set_arg;
- object_class->get_arg = gtk_text_get_arg;
+ gobject_class->set_property = gtk_text_set_property;
+ gobject_class->get_property = gtk_text_get_property;
+
object_class->destroy = gtk_text_destroy;
widget_class->realize = gtk_text_realize;
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;
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;
old_editable_class->move_cursor = gtk_text_move_cursor;
old_editable_class->move_word = gtk_text_move_word;
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);
-
+ 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 ("set_scroll_adjustments",
+ 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_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;
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);
{
GtkText *text;
- g_return_if_fail (old_editable != NULL);
g_return_if_fail (GTK_IS_TEXT (old_editable));
text = GTK_TEXT (old_editable);
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));
gtk_object_unref (GTK_OBJECT (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,
(GtkSignalFunc) 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,
(GtkSignalFunc) 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)
+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;
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;
}
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;
+ 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;
gint position)
{
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);
gchar *retval;
- 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);
static void
gtk_text_destroy (GtkObject *object)
{
- GtkText *text;
-
- g_return_if_fail (GTK_IS_TEXT (object));
-
- text = GTK_TEXT (object);
+ GtkText *text = GTK_TEXT (object);
if (text->hadj)
{
if (text->timer)
{
- gtk_timeout_remove (text->timer);
+ g_source_remove (text->timer);
text->timer = 0;
}
static void
gtk_text_finalize (GObject *object)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (object);
GList *tmp_list;
-
- g_return_if_fail (GTK_IS_TEXT (object));
-
- text = GTK_TEXT (object);
/* 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);
static void
gtk_text_realize (GtkWidget *widget)
{
- GtkText *text;
- GtkOldEditable *old_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);
- old_editable = GTK_OLD_EDITABLE (widget);
+
GTK_WIDGET_SET_FLAGS (text, GTK_REALIZED);
attributes.window_type = GDK_WINDOW_CHILD;
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.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);
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
static void
gtk_text_unrealize (GtkWidget *widget)
{
- 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);
gdk_window_set_user_data (text->text_area, NULL);
gdk_window_destroy (text->text_area);
gc = text->bg_gc;
}
else
- gc = widget->style->bg_gc[widget->state];
+ gc = widget->style->base_gc[widget->state];
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);
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,
gtk_text_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
+ GdkFont *font;
gint xthickness;
gint ythickness;
gint char_height;
gint char_width;
-
- g_return_if_fail (widget != NULL);
- g_return_if_fail (GTK_IS_TEXT (widget));
- g_return_if_fail (requisition != NULL);
-
+
xthickness = widget->style->xthickness + TEXT_BORDER_ROOM;
ythickness = widget->style->ythickness + TEXT_BORDER_ROOM;
+
+ font = gtk_style_get_font (widget->style);
- 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;
- 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);
- old_editable = GTK_OLD_EDITABLE (widget);
-
+ GtkText *text = GTK_TEXT (widget);
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
{
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"));
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;
- 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);
-
- text = GTK_TEXT (widget);
- old_editable = GTK_OLD_EDITABLE (widget);
+ GtkText *text = GTK_TEXT (widget);
+ GtkOldEditable *old_editable = GTK_OLD_EDITABLE (widget);
if (text->button && (event->button != text->button))
return FALSE;
}
gtk_selection_convert (widget, GDK_SELECTION_PRIMARY,
- gdk_atom_intern ("UTF8_STRING", FALSE),
+ 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);
text->cursor_mark.index);
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);
+ 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;
+ GtkText *text = GTK_TEXT (widget);
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);
-
- text = GTK_TEXT (widget);
-
+ 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;
}
{
text = GTK_TEXT (widget);
old_editable = GTK_OLD_EDITABLE (widget);
+ display = gtk_widget_get_display (widget);
gtk_grab_remove (widget);
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))
+ if (gtk_selection_owner_set_for_display (display,
+ widget,
+ GDK_SELECTION_PRIMARY,
+ event->time))
old_editable->has_selection = TRUE;
else
gtk_text_update_text (old_editable, old_editable->selection_start_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;
{
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);
}
static void
-gtk_text_insert_text (GtkOldEditable *old_editable,
+gtk_text_insert_text (GtkEditable *editable,
const gchar *new_text,
gint new_text_length,
gint *position)
{
- GtkText *text = GTK_TEXT (old_editable);
+ GtkText *text = GTK_TEXT (editable);
GdkFont *font;
GdkColor *fore, *back;
}
static void
-gtk_text_delete_text (GtkOldEditable *old_editable,
+gtk_text_delete_text (GtkEditable *editable,
gint start_pos,
gint end_pos)
{
- GtkText *text;
+ GtkText *text = GTK_TEXT (editable);
g_return_if_fail (start_pos >= 0);
-
- text = GTK_TEXT (old_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;
- GtkOldEditable *old_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);
- old_editable = GTK_OLD_EDITABLE (widget);
-
+
key = event->keyval;
return_val = TRUE;
{
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);
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
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)
{
}
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)
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 (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");
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')]) (old_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')]) (old_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;
return_val = TRUE;
}
- else
- return_val = FALSE;
}
if (return_val && (old_editable->current_pos != initial_pos))
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"));
-
- return (* GTK_WIDGET_CLASS (parent_class)->focus_in_event) (widget, event);
-}
-
-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"));
-
- return (* GTK_WIDGET_CLASS (parent_class)->focus_out_event) (widget, event);
-}
-
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 */
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)
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;
}
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);
find_cursor_at_line (GtkText* text, const LineParams* start_line, gint pixel_height)
{
GdkWChar ch;
- GtkOldEditable *old_editable = (GtkOldEditable *)text;
GtkPropertyMark mark = start_line->start;
TabStopMark tab_mark = start_line->tab_cont.tab_start;
}
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;
gdk_window_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);
- 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;
(mark.index < selection_end_pos))
{
if (old_editable->has_selection)
- fg_gc = GTK_WIDGET(text)->style->fg_gc[GTK_STATE_SELECTED];
+ 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
{
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;
}
g_warning ("incorrect property list length in %s:%d -- bad!", msg, line);
}
#endif
+
+#define __GTK_TEXT_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff