#include <string.h>
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkbindings.h"
#include "gtkdnd.h"
+#include "gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkmain.h"
+#include "gtkmarshalers.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"
-#include "gtksignal.h"
-#include "gtktext.h"
+#include "gtkseparatormenuitem.h"
+#include "gtksettings.h"
+#include "gtkstock.h"
#include "gtktextdisplay.h"
#include "gtktextview.h"
#include "gtkimmulticontext.h"
#include "gdk/gdkkeysyms.h"
-#include <string.h>
+#include "gtksizegroup.h" /* FIXME http://bugzilla.gnome.org/show_bug.cgi?id=72258 */
+#include "gtktextutil.h"
+#include "gtkwindow.h"
+
+/* How scrolling, validation, exposes, etc. work.
+ *
+ * The expose_event handler has the invariant that the onscreen lines
+ * have been validated.
+ *
+ * There are two ways that onscreen lines can become invalid. The first
+ * is to change which lines are onscreen. This happens when the value
+ * of a scroll adjustment changes. So the code path begins in
+ * gtk_text_view_value_changed() and goes like this:
+ * - gdk_window_scroll() to reflect the new adjustment value
+ * - validate the lines that were moved onscreen
+ * - gdk_window_process_updates() to handle the exposes immediately
+ *
+ * The second way is that you get the "invalidated" signal from the layout,
+ * indicating that lines have become invalid. This code path begins in
+ * invalidated_handler() and goes like this:
+ * - install high-priority idle which does the rest of the steps
+ * - if a scroll is pending from scroll_to_mark(), do the scroll,
+ * jumping to the gtk_text_view_value_changed() code path
+ * - otherwise, validate the onscreen lines
+ * - DO NOT process updates
+ *
+ * In both cases, validating the onscreen lines can trigger a scroll
+ * due to maintaining the first_para on the top of the screen.
+ * If validation triggers a scroll, we jump to the top of the code path
+ * for value_changed, and bail out of the current code path.
+ *
+ * Also, in size_allocate, if we invalidate some lines from changing
+ * the layout width, we need to go ahead and run the high-priority idle,
+ * because GTK sends exposes right after doing the size allocates without
+ * returning to the main loop. This is also why the high-priority idle
+ * is at a higher priority than resizing.
+ *
+ */
+
+#if 0
+#define DEBUG_VALIDATION_AND_SCROLLING
+#endif
-#define FOCUS_EDGE_WIDTH 1
-#define DRAG_THRESHOLD 8
+#ifdef DEBUG_VALIDATION_AND_SCROLLING
+#define DV(x) (x)
+#else
+#define DV(x)
+#endif
#define SCREEN_WIDTH(widget) text_window_get_width (GTK_TEXT_VIEW (widget)->text_window)
#define SCREEN_HEIGHT(widget) text_window_get_height (GTK_TEXT_VIEW (widget)->text_window)
+struct _GtkTextPendingScroll
+{
+ GtkTextMark *mark;
+ gdouble within_margin;
+ gboolean use_align;
+ gdouble xalign;
+ gdouble yalign;
+};
+
enum
{
+ SET_SCROLL_ADJUSTMENTS,
+ POPULATE_POPUP,
MOVE_CURSOR,
+ PAGE_HORIZONTALLY,
SET_ANCHOR,
INSERT_AT_CURSOR,
DELETE_FROM_CURSOR,
COPY_CLIPBOARD,
PASTE_CLIPBOARD,
TOGGLE_OVERWRITE,
- SET_SCROLL_ADJUSTMENTS,
+ MOVE_FOCUS,
LAST_SIGNAL
};
enum
{
- ARG_0,
- ARG_HEIGHT_LINES,
- ARG_WIDTH_COLUMNS,
- ARG_PIXELS_ABOVE_LINES,
- ARG_PIXELS_BELOW_LINES,
- ARG_PIXELS_INSIDE_WRAP,
- ARG_EDITABLE,
- ARG_WRAP_MODE,
- ARG_JUSTIFY,
- ARG_LEFT_MARGIN,
- ARG_RIGHT_MARGIN,
- ARG_INDENT,
- ARG_TABS,
- LAST_ARG
+ PROP_0,
+ PROP_PIXELS_ABOVE_LINES,
+ PROP_PIXELS_BELOW_LINES,
+ PROP_PIXELS_INSIDE_WRAP,
+ PROP_EDITABLE,
+ PROP_WRAP_MODE,
+ PROP_JUSTIFICATION,
+ PROP_LEFT_MARGIN,
+ PROP_RIGHT_MARGIN,
+ PROP_INDENT,
+ PROP_TABS,
+ PROP_CURSOR_VISIBLE,
+ LAST_PROP
};
static void gtk_text_view_init (GtkTextView *text_view);
static void gtk_text_view_class_init (GtkTextViewClass *klass);
static void gtk_text_view_destroy (GtkObject *object);
static void gtk_text_view_finalize (GObject *object);
-static void gtk_text_view_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-static void gtk_text_view_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+static void gtk_text_view_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_text_view_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_text_view_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void gtk_text_view_size_allocate (GtkWidget *widget,
GdkEventFocus *event);
static gint gtk_text_view_motion_event (GtkWidget *widget,
GdkEventMotion *event);
-static void gtk_text_view_draw (GtkWidget *widget,
- GdkRectangle *area);
static gint gtk_text_view_expose_event (GtkWidget *widget,
GdkEventExpose *expose);
static void gtk_text_view_draw_focus (GtkWidget *widget);
+static void gtk_text_view_grab_focus (GtkWidget *widget);
+static gboolean gtk_text_view_focus (GtkWidget *widget,
+ GtkDirectionType direction);
+
/* Source side drag signals */
static void gtk_text_view_drag_begin (GtkWidget *widget,
static void gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
GtkAdjustment *hadj,
GtkAdjustment *vadj);
-
-static void gtk_text_view_move_cursor (GtkTextView *text_view,
- GtkMovementStep step,
- gint count,
- gboolean extend_selection);
+static gboolean gtk_text_view_popup_menu (GtkWidget *widget);
+
+static void gtk_text_view_move_cursor (GtkTextView *text_view,
+ GtkMovementStep step,
+ gint count,
+ gboolean extend_selection);
+static void gtk_text_view_page_horizontally (GtkTextView *text_view,
+ gint count,
+ gboolean extend_selection);
static void gtk_text_view_set_anchor (GtkTextView *text_view);
static void gtk_text_view_scroll_pages (GtkTextView *text_view,
- gint count);
+ gint count,
+ gboolean extend_selection);
+static void gtk_text_view_scroll_hpages (GtkTextView *text_view,
+ gint count,
+ gboolean extend_selection);
static void gtk_text_view_insert_at_cursor (GtkTextView *text_view,
const gchar *str);
static void gtk_text_view_delete_from_cursor (GtkTextView *text_view,
static void gtk_text_view_copy_clipboard (GtkTextView *text_view);
static void gtk_text_view_paste_clipboard (GtkTextView *text_view);
static void gtk_text_view_toggle_overwrite (GtkTextView *text_view);
+static void gtk_text_view_move_focus (GtkTextView *text_view,
+ GtkDirectionType direction_type);
static void gtk_text_view_unselect (GtkTextView *text_view);
static void gtk_text_view_validate_onscreen (GtkTextView *text_view);
static void gtk_text_view_get_first_para_iter (GtkTextView *text_view,
GtkTextIter *iter);
-static void gtk_text_view_scroll_calc_now (GtkTextView *text_view);
+static void gtk_text_view_update_layout_width (GtkTextView *text_view);
static void gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
GtkTextAttributes *values,
GtkStyle *style);
-static void gtk_text_view_ensure_layout (GtkTextView *text_view);
-static void gtk_text_view_destroy_layout (GtkTextView *text_view);
-static void gtk_text_view_reset_im_context (GtkTextView *text_view);
-static void gtk_text_view_start_selection_drag (GtkTextView *text_view,
- const GtkTextIter *iter,
- GdkEventButton *event);
-static gboolean gtk_text_view_end_selection_drag (GtkTextView *text_view,
- GdkEventButton *event);
-static void gtk_text_view_start_selection_dnd (GtkTextView *text_view,
- const GtkTextIter *iter,
- GdkEventMotion *event);
-static void gtk_text_view_start_cursor_blink (GtkTextView *text_view,
- gboolean with_delay);
-static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view);
-
-static void gtk_text_view_value_changed (GtkAdjustment *adj,
- GtkTextView *view);
-static void gtk_text_view_commit_handler (GtkIMContext *context,
- const gchar *str,
- GtkTextView *text_view);
-static void gtk_text_view_preedit_changed_handler (GtkIMContext *context,
- GtkTextView *text_view);
+static void gtk_text_view_ensure_layout (GtkTextView *text_view);
+static void gtk_text_view_destroy_layout (GtkTextView *text_view);
+static void gtk_text_view_check_keymap_direction (GtkTextView *text_view);
+static void gtk_text_view_reset_im_context (GtkTextView *text_view);
+static void gtk_text_view_start_selection_drag (GtkTextView *text_view,
+ const GtkTextIter *iter,
+ GdkEventButton *event);
+static gboolean gtk_text_view_end_selection_drag (GtkTextView *text_view,
+ GdkEventButton *event);
+static void gtk_text_view_start_selection_dnd (GtkTextView *text_view,
+ const GtkTextIter *iter,
+ GdkEventMotion *event);
+static void gtk_text_view_check_cursor_blink (GtkTextView *text_view);
+static void gtk_text_view_pend_cursor_blink (GtkTextView *text_view);
+static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view);
+
+static void gtk_text_view_value_changed (GtkAdjustment *adj,
+ GtkTextView *view);
+static void gtk_text_view_commit_handler (GtkIMContext *context,
+ const gchar *str,
+ GtkTextView *text_view);
+static void gtk_text_view_commit_text (GtkTextView *text_view,
+ const gchar *text);
+static void gtk_text_view_preedit_changed_handler (GtkIMContext *context,
+ GtkTextView *text_view);
+static gboolean gtk_text_view_retrieve_surrounding_handler (GtkIMContext *context,
+ GtkTextView *text_view);
+static gboolean gtk_text_view_delete_surrounding_handler (GtkIMContext *context,
+ gint offset,
+ gint n_chars,
+ GtkTextView *text_view);
static void gtk_text_view_mark_set_handler (GtkTextBuffer *buffer,
const GtkTextIter *location,
static GtkAdjustment* get_hadjustment (GtkTextView *text_view);
static GtkAdjustment* get_vadjustment (GtkTextView *text_view);
-static void gtk_text_view_popup_menu (GtkTextView *text_view,
+static void gtk_text_view_do_popup (GtkTextView *text_view,
GdkEventButton *event);
+static void gtk_text_view_queue_scroll (GtkTextView *text_view,
+ GtkTextMark *mark,
+ gdouble within_margin,
+ gboolean use_align,
+ gdouble xalign,
+ gdouble yalign);
+
+static gboolean gtk_text_view_flush_scroll (GtkTextView *text_view);
+static void gtk_text_view_update_adjustments (GtkTextView *text_view);
+static void gtk_text_view_invalidate (GtkTextView *text_view);
+static void gtk_text_view_flush_first_validate (GtkTextView *text_view);
+
+static void gtk_text_view_update_im_spot_location (GtkTextView *text_view);
+
/* Container methods */
static void gtk_text_view_add (GtkContainer *container,
GtkWidget *child);
GtkWidget *child);
static void gtk_text_view_forall (GtkContainer *container,
gboolean include_internals,
- GtkCallback callback,
+ GtkCallback callback,
gpointer callback_data);
/* FIXME probably need the focus methods. */
gint y;
};
-static GtkTextViewChild* text_view_child_new_anchored (GtkWidget *child,
- GtkTextChildAnchor *anchor,
- GtkTextLayout *layout);
-static GtkTextViewChild* text_view_child_new_window (GtkWidget *child,
- GtkTextWindowType type,
- gint x,
- gint y);
-static void text_view_child_free (GtkTextViewChild *child);
-
-static void text_view_child_realize (GtkTextView *text_view,
- GtkTextViewChild *child);
+static GtkTextViewChild* text_view_child_new_anchored (GtkWidget *child,
+ GtkTextChildAnchor *anchor,
+ GtkTextLayout *layout);
+static GtkTextViewChild* text_view_child_new_window (GtkWidget *child,
+ GtkTextWindowType type,
+ gint x,
+ gint y);
+static void text_view_child_free (GtkTextViewChild *child);
+static void text_view_child_set_parent_window (GtkTextView *text_view,
+ GtkTextViewChild *child);
struct _GtkTextWindow
{
static gint text_window_get_width (GtkTextWindow *win);
static gint text_window_get_height (GtkTextWindow *win);
-static void text_window_get_allocation (GtkTextWindow *win,
- GdkRectangle *rect);
enum
TARGET_TEXT_BUFFER_CONTENTS
};
-static GtkTargetEntry target_table[] = {
+static const GtkTargetEntry target_table[] = {
{ "GTK_TEXT_BUFFER_CONTENTS", GTK_TARGET_SAME_APP,
TARGET_TEXT_BUFFER_CONTENTS },
{ "UTF8_STRING", 0, TARGET_UTF8_STRING },
{ "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
{ "TEXT", 0, TARGET_TEXT },
- { "text/plain", 0, TARGET_STRING },
{ "STRING", 0, TARGET_STRING }
};
static GtkContainerClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
-GtkType
+GType
gtk_text_view_get_type (void)
{
- static GtkType our_type = 0;
+ static GType our_type = 0;
if (our_type == 0)
{
- static const GtkTypeInfo our_info =
+ static const GTypeInfo our_info =
{
- "GtkTextView",
- sizeof (GtkTextView),
- sizeof (GtkTextViewClass),
- (GtkClassInitFunc) gtk_text_view_class_init,
- (GtkObjectInitFunc) gtk_text_view_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL
+ sizeof (GtkTextViewClass),
+ NULL, /* base_init */
+ NULL, /* base_finalize */
+ (GClassInitFunc) gtk_text_view_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkTextView),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_text_view_init,
};
- our_type = gtk_type_unique (GTK_TYPE_CONTAINER, &our_info);
+ our_type = g_type_register_static (GTK_TYPE_CONTAINER, "GtkTextView",
+ &our_info, 0);
}
return our_type;
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
"move_cursor", 3,
- GTK_TYPE_ENUM, step,
- GTK_TYPE_INT, count,
- GTK_TYPE_BOOL, FALSE);
+ G_TYPE_ENUM, step,
+ G_TYPE_INT, count,
+ G_TYPE_BOOLEAN, FALSE);
/* Selection-extending version */
gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
"move_cursor", 3,
- GTK_TYPE_ENUM, step,
- GTK_TYPE_INT, count,
- GTK_TYPE_BOOL, TRUE);
+ G_TYPE_ENUM, step,
+ G_TYPE_INT, count,
+ G_TYPE_BOOLEAN, TRUE);
}
static void
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkBindingSet *binding_set;
- parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+ parent_class = g_type_class_peek_parent (klass);
+
+ /* Default handlers and virtual methods
+ */
+ gobject_class->set_property = gtk_text_view_set_property;
+ gobject_class->get_property = gtk_text_view_get_property;
+
+ object_class->destroy = gtk_text_view_destroy;
+ gobject_class->finalize = gtk_text_view_finalize;
+
+ widget_class->realize = gtk_text_view_realize;
+ widget_class->unrealize = gtk_text_view_unrealize;
+ widget_class->style_set = gtk_text_view_style_set;
+ widget_class->direction_changed = gtk_text_view_direction_changed;
+ widget_class->size_request = gtk_text_view_size_request;
+ widget_class->size_allocate = gtk_text_view_size_allocate;
+ widget_class->event = gtk_text_view_event;
+ widget_class->key_press_event = gtk_text_view_key_press_event;
+ widget_class->key_release_event = gtk_text_view_key_release_event;
+ widget_class->button_press_event = gtk_text_view_button_press_event;
+ widget_class->button_release_event = gtk_text_view_button_release_event;
+ widget_class->focus_in_event = gtk_text_view_focus_in_event;
+ widget_class->focus_out_event = gtk_text_view_focus_out_event;
+ widget_class->motion_notify_event = gtk_text_view_motion_event;
+ widget_class->expose_event = gtk_text_view_expose_event;
+ widget_class->grab_focus = gtk_text_view_grab_focus;
+ widget_class->focus = gtk_text_view_focus;
+
+ widget_class->drag_begin = gtk_text_view_drag_begin;
+ widget_class->drag_end = gtk_text_view_drag_end;
+ widget_class->drag_data_get = gtk_text_view_drag_data_get;
+ widget_class->drag_data_delete = gtk_text_view_drag_data_delete;
+
+ widget_class->drag_leave = gtk_text_view_drag_leave;
+ widget_class->drag_motion = gtk_text_view_drag_motion;
+ widget_class->drag_drop = gtk_text_view_drag_drop;
+ widget_class->drag_data_received = gtk_text_view_drag_data_received;
+
+ widget_class->popup_menu = gtk_text_view_popup_menu;
+
+ container_class->add = gtk_text_view_add;
+ container_class->remove = gtk_text_view_remove;
+ container_class->forall = gtk_text_view_forall;
+
+ klass->move_cursor = gtk_text_view_move_cursor;
+ klass->page_horizontally = gtk_text_view_page_horizontally;
+ klass->set_anchor = gtk_text_view_set_anchor;
+ klass->insert_at_cursor = gtk_text_view_insert_at_cursor;
+ klass->delete_from_cursor = gtk_text_view_delete_from_cursor;
+ klass->cut_clipboard = gtk_text_view_cut_clipboard;
+ klass->copy_clipboard = gtk_text_view_copy_clipboard;
+ klass->paste_clipboard = gtk_text_view_paste_clipboard;
+ klass->toggle_overwrite = gtk_text_view_toggle_overwrite;
+ klass->move_focus = gtk_text_view_move_focus;
+ klass->set_scroll_adjustments = gtk_text_view_set_scroll_adjustments;
/*
- * Arguments
+ * Properties
*/
- gtk_object_add_arg_type ("GtkTextView::height_lines", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_HEIGHT_LINES);
- gtk_object_add_arg_type ("GtkTextView::width_columns", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_WIDTH_COLUMNS);
- gtk_object_add_arg_type ("GtkTextView::pixels_above_lines", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES);
- gtk_object_add_arg_type ("GtkTextView::pixels_below_lines", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_PIXELS_BELOW_LINES);
- gtk_object_add_arg_type ("GtkTextView::pixels_inside_wrap", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_PIXELS_INSIDE_WRAP);
- gtk_object_add_arg_type ("GtkTextView::editable", GTK_TYPE_BOOL,
- GTK_ARG_READWRITE, ARG_EDITABLE);
- gtk_object_add_arg_type ("GtkTextView::wrap_mode", GTK_TYPE_ENUM,
- GTK_ARG_READWRITE, ARG_WRAP_MODE);
- gtk_object_add_arg_type ("GtkTextView::justify", GTK_TYPE_ENUM,
- GTK_ARG_READWRITE, ARG_JUSTIFY);
- gtk_object_add_arg_type ("GtkTextView::left_margin", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_LEFT_MARGIN);
- gtk_object_add_arg_type ("GtkTextView::right_margin", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_RIGHT_MARGIN);
- gtk_object_add_arg_type ("GtkTextView::indent", GTK_TYPE_INT,
- GTK_ARG_READWRITE, ARG_INDENT);
- gtk_object_add_arg_type ("GtkTextView::tabs", GTK_TYPE_POINTER, /* FIXME */
- GTK_ARG_READWRITE, ARG_TABS);
+
+ g_object_class_install_property (gobject_class,
+ PROP_PIXELS_ABOVE_LINES,
+ g_param_spec_int ("pixels_above_lines",
+ _("Pixels Above Lines"),
+ _("Pixels of blank space above paragraphs"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_PIXELS_BELOW_LINES,
+ g_param_spec_int ("pixels_below_lines",
+ _("Pixels Below Lines"),
+ _("Pixels of blank space below paragraphs"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_PIXELS_INSIDE_WRAP,
+ g_param_spec_int ("pixels_inside_wrap",
+ _("Pixels Inside Wrap"),
+ _("Pixels of blank space between wrapped lines in a paragraph"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_EDITABLE,
+ g_param_spec_boolean ("editable",
+ _("Editable"),
+ _("Whether the text can be modified by the user"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_WRAP_MODE,
+ g_param_spec_enum ("wrap_mode",
+ _("Wrap Mode"),
+ _("Whether to wrap lines never, at word boundaries, or at character boundaries"),
+ GTK_TYPE_WRAP_MODE,
+ GTK_WRAP_NONE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_JUSTIFICATION,
+ g_param_spec_enum ("justification",
+ _("Justification"),
+ _("Left, right, or center justification"),
+ GTK_TYPE_JUSTIFICATION,
+ GTK_JUSTIFY_LEFT,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_LEFT_MARGIN,
+ g_param_spec_int ("left_margin",
+ _("Left Margin"),
+ _("Width of the left margin in pixels"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_RIGHT_MARGIN,
+ g_param_spec_int ("right_margin",
+ _("Right Margin"),
+ _("Width of the right margin in pixels"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_INDENT,
+ g_param_spec_int ("indent",
+ _("Indent"),
+ _("Amount to indent the paragraph, in pixels"),
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_TABS,
+ g_param_spec_boxed ("tabs",
+ _("Tabs"),
+ _("Custom tabs for this text"),
+ PANGO_TYPE_TAB_ARRAY,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_CURSOR_VISIBLE,
+ g_param_spec_boolean ("cursor_visible",
+ _("Cursor Visible"),
+ _("If the insertion cursor is shown"),
+ TRUE,
+ G_PARAM_READWRITE));
+
/*
* Signals
*/
signals[MOVE_CURSOR] =
- gtk_signal_new ("move_cursor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, move_cursor),
- gtk_marshal_VOID__ENUM_INT_BOOLEAN,
- GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
-
+ g_signal_new ("move_cursor",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, move_cursor),
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM_INT_BOOLEAN,
+ G_TYPE_NONE, 3,
+ GTK_TYPE_MOVEMENT_STEP,
+ G_TYPE_INT,
+ G_TYPE_BOOLEAN);
+
+ signals[PAGE_HORIZONTALLY] =
+ g_signal_new ("page_horizontally",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, page_horizontally),
+ NULL, NULL,
+ _gtk_marshal_VOID__INT_BOOLEAN,
+ G_TYPE_NONE, 2,
+ G_TYPE_INT,
+ G_TYPE_BOOLEAN);
+
signals[SET_ANCHOR] =
- gtk_signal_new ("set_anchor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, set_anchor),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("set_anchor",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, set_anchor),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[INSERT_AT_CURSOR] =
- gtk_signal_new ("insert_at_cursor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, insert_at_cursor),
- gtk_marshal_VOID__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
+ g_signal_new ("insert_at_cursor",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, insert_at_cursor),
+ NULL, NULL,
+ _gtk_marshal_VOID__STRING,
+ G_TYPE_NONE, 1,
+ G_TYPE_STRING);
signals[DELETE_FROM_CURSOR] =
- gtk_signal_new ("delete_from_cursor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, delete_from_cursor),
- gtk_marshal_VOID__ENUM_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
+ g_signal_new ("delete_from_cursor",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, delete_from_cursor),
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM_INT,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_DELETE_TYPE,
+ G_TYPE_INT);
signals[CUT_CLIPBOARD] =
- gtk_signal_new ("cut_clipboard",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, cut_clipboard),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("cut_clipboard",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, cut_clipboard),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[COPY_CLIPBOARD] =
- gtk_signal_new ("copy_clipboard",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, copy_clipboard),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("copy_clipboard",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, copy_clipboard),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[PASTE_CLIPBOARD] =
- gtk_signal_new ("paste_clipboard",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, paste_clipboard),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
+ g_signal_new ("paste_clipboard",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, paste_clipboard),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
signals[TOGGLE_OVERWRITE] =
- gtk_signal_new ("toggle_overwrite",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, toggle_overwrite),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
-
- signals[SET_SCROLL_ADJUSTMENTS] = widget_class->set_scroll_adjustments_signal =
- gtk_signal_new ("set_scroll_adjustments",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, set_scroll_adjustments),
- gtk_marshal_VOID__POINTER_POINTER,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
+ g_signal_new ("toggle_overwrite",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, toggle_overwrite),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
+ signals[MOVE_FOCUS] =
+ g_signal_new ("move_focus",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, move_focus),
+ NULL, NULL,
+ _gtk_marshal_VOID__ENUM,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_DIRECTION_TYPE);
+
+ signals[SET_SCROLL_ADJUSTMENTS] =
+ g_signal_new ("set_scroll_adjustments",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkTextViewClass, set_scroll_adjustments),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT_OBJECT,
+ G_TYPE_NONE, 2,
+ GTK_TYPE_ADJUSTMENT,
+ GTK_TYPE_ADJUSTMENT);
+ widget_class->set_scroll_adjustments_signal = signals[SET_SCROLL_ADJUSTMENTS];
+
+ signals[POPULATE_POPUP] =
+ g_signal_new ("populate_popup",
+ G_OBJECT_CLASS_TYPE (gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTextViewClass, populate_popup),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT,
+ G_TYPE_NONE, 1,
+ GTK_TYPE_MENU);
+
/*
* Key bindings
*/
binding_set = gtk_binding_set_by_class (klass);
-
+
/* Moving the insertion point */
add_move_binding (binding_set, GDK_Right, 0,
- GTK_MOVEMENT_POSITIONS, 1);
+ GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+ add_move_binding (binding_set, GDK_KP_Right, 0,
+ GTK_MOVEMENT_VISUAL_POSITIONS, 1);
+
add_move_binding (binding_set, GDK_Left, 0,
- GTK_MOVEMENT_POSITIONS, -1);
-
- add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
- GTK_MOVEMENT_CHARS, 1);
-
- add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
- GTK_MOVEMENT_CHARS, -1);
+ GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+ add_move_binding (binding_set, GDK_KP_Left, 0,
+ GTK_MOVEMENT_VISUAL_POSITIONS, -1);
+
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
+ add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_WORDS, 1);
+
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
- /* Eventually we want to move by display lines, not paragraphs */
+ add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_WORDS, 1);
+
add_move_binding (binding_set, GDK_Up, 0,
GTK_MOVEMENT_DISPLAY_LINES, -1);
+ add_move_binding (binding_set, GDK_KP_Up, 0,
+ GTK_MOVEMENT_DISPLAY_LINES, -1);
+
add_move_binding (binding_set, GDK_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
- add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
- GTK_MOVEMENT_DISPLAY_LINES, -1);
-
- add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KP_Down, 0,
GTK_MOVEMENT_DISPLAY_LINES, 1);
+
+ add_move_binding (binding_set, GDK_Up, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_PARAGRAPHS, -1);
- add_move_binding (binding_set, GDK_a, GDK_CONTROL_MASK,
- GTK_MOVEMENT_PARAGRAPH_ENDS, -1);
-
- add_move_binding (binding_set, GDK_e, GDK_CONTROL_MASK,
- GTK_MOVEMENT_PARAGRAPH_ENDS, 1);
-
- add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
- GTK_MOVEMENT_WORDS, 1);
-
- add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
- GTK_MOVEMENT_WORDS, -1);
+ add_move_binding (binding_set, GDK_KP_Up, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_PARAGRAPHS, -1);
+
+ add_move_binding (binding_set, GDK_Down, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_PARAGRAPHS, 1);
+ add_move_binding (binding_set, GDK_KP_Down, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_PARAGRAPHS, 1);
+
add_move_binding (binding_set, GDK_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+ add_move_binding (binding_set, GDK_KP_Home, 0,
+ GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+
add_move_binding (binding_set, GDK_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+ add_move_binding (binding_set, GDK_KP_End, 0,
+ GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+
add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
+ add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_BUFFER_ENDS, -1);
+
add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
+ add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+ GTK_MOVEMENT_BUFFER_ENDS, 1);
+
add_move_binding (binding_set, GDK_Page_Up, 0,
GTK_MOVEMENT_PAGES, -1);
+ add_move_binding (binding_set, GDK_KP_Page_Up, 0,
+ GTK_MOVEMENT_PAGES, -1);
+
add_move_binding (binding_set, GDK_Page_Down, 0,
GTK_MOVEMENT_PAGES, 1);
+ add_move_binding (binding_set, GDK_KP_Page_Down, 0,
+ GTK_MOVEMENT_PAGES, 1);
- /* Setting the cut/paste/copy anchor */
- gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
- "set_anchor", 0);
+ /* Select all
+ */
+ gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+ "move_cursor", 3,
+ GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+ G_TYPE_INT, -1,
+ G_TYPE_BOOLEAN, FALSE);
+ gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+ "move_cursor", 3,
+ GTK_TYPE_MOVEMENT_STEP, GTK_MOVEMENT_BUFFER_ENDS,
+ G_TYPE_INT, 1,
+ G_TYPE_BOOLEAN, TRUE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_CONTROL_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, -1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, -1,
+ G_TYPE_BOOLEAN, TRUE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, -1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Up, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, -1,
+ G_TYPE_BOOLEAN, TRUE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_CONTROL_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, 1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, 1,
+ G_TYPE_BOOLEAN, TRUE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, 1,
+ G_TYPE_BOOLEAN, FALSE);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Page_Down, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
+ "page_horizontally", 2,
+ G_TYPE_INT, 1,
+ G_TYPE_BOOLEAN, TRUE);
+
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, 1);
-
- gtk_binding_entry_add_signal (binding_set, GDK_d, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, 1);
-
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_CHARS,
+ G_TYPE_INT, 1);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, 0,
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_CHARS,
+ G_TYPE_INT, 1);
+
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, -1);
-
- gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, 1);
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_CHARS,
+ G_TYPE_INT, -1);
- gtk_binding_entry_add_signal (binding_set, GDK_d, GDK_MOD1_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, 1);
+ /* Make this do the same as Backspace, to help with mis-typing */
+ gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_SHIFT_MASK,
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_CHARS,
+ G_TYPE_INT, -1);
+ gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ G_TYPE_INT, 1);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Delete, GDK_CONTROL_MASK,
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ G_TYPE_INT, 1);
+
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, -1);
-
- gtk_binding_entry_add_signal (binding_set, GDK_k, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
- GTK_TYPE_INT, 1);
-
- gtk_binding_entry_add_signal (binding_set, GDK_u, GDK_CONTROL_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPHS,
- GTK_TYPE_INT, 1);
-
- gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_MOD1_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
- GTK_TYPE_INT, 1);
- gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_MOD1_MASK,
- "insert_at_cursor", 1,
- GTK_TYPE_STRING, " ");
-
- gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_MOD1_MASK,
- "delete_from_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
- GTK_TYPE_INT, 1);
+ "delete_from_cursor", 2,
+ G_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ G_TYPE_INT, -1);
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
- "cut_clipboard", 0);
-
- gtk_binding_entry_add_signal (binding_set, GDK_w, GDK_CONTROL_MASK,
- "cut_clipboard", 0);
-
+ "cut_clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
- "copy_clipboard", 0);
-
+ "copy_clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
- "paste_clipboard", 0);
+ "paste_clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_y, GDK_CONTROL_MASK,
- "paste_clipboard", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_SHIFT_MASK,
+ "cut_clipboard", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_CONTROL_MASK,
+ "copy_clipboard", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_Insert, GDK_SHIFT_MASK,
+ "paste_clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
- "toggle_overwrite", 0);
-
- /*
- * Default handlers and virtual methods
- */
- object_class->set_arg = gtk_text_view_set_arg;
- object_class->get_arg = gtk_text_view_get_arg;
-
- object_class->destroy = gtk_text_view_destroy;
- gobject_class->finalize = gtk_text_view_finalize;
-
- widget_class->realize = gtk_text_view_realize;
- widget_class->unrealize = gtk_text_view_unrealize;
- widget_class->style_set = gtk_text_view_style_set;
- widget_class->direction_changed = gtk_text_view_direction_changed;
- widget_class->size_request = gtk_text_view_size_request;
- widget_class->size_allocate = gtk_text_view_size_allocate;
- widget_class->event = gtk_text_view_event;
- widget_class->key_press_event = gtk_text_view_key_press_event;
- widget_class->key_release_event = gtk_text_view_key_release_event;
- widget_class->button_press_event = gtk_text_view_button_press_event;
- widget_class->button_release_event = gtk_text_view_button_release_event;
- widget_class->focus_in_event = gtk_text_view_focus_in_event;
- widget_class->focus_out_event = gtk_text_view_focus_out_event;
- widget_class->motion_notify_event = gtk_text_view_motion_event;
- widget_class->expose_event = gtk_text_view_expose_event;
- widget_class->draw = gtk_text_view_draw;
- widget_class->draw_focus = gtk_text_view_draw_focus;
-
- widget_class->drag_begin = gtk_text_view_drag_begin;
- widget_class->drag_end = gtk_text_view_drag_end;
- widget_class->drag_data_get = gtk_text_view_drag_data_get;
- widget_class->drag_data_delete = gtk_text_view_drag_data_delete;
-
- widget_class->drag_leave = gtk_text_view_drag_leave;
- widget_class->drag_motion = gtk_text_view_drag_motion;
- widget_class->drag_drop = gtk_text_view_drag_drop;
- widget_class->drag_data_received = gtk_text_view_drag_data_received;
-
- container_class->add = gtk_text_view_add;
- container_class->remove = gtk_text_view_remove;
- container_class->forall = gtk_text_view_forall;
-
- klass->move_cursor = gtk_text_view_move_cursor;
- klass->set_anchor = gtk_text_view_set_anchor;
- klass->insert_at_cursor = gtk_text_view_insert_at_cursor;
- klass->delete_from_cursor = gtk_text_view_delete_from_cursor;
- klass->cut_clipboard = gtk_text_view_cut_clipboard;
- klass->copy_clipboard = gtk_text_view_copy_clipboard;
- klass->paste_clipboard = gtk_text_view_paste_clipboard;
- klass->toggle_overwrite = gtk_text_view_toggle_overwrite;
- klass->set_scroll_adjustments = gtk_text_view_set_scroll_adjustments;
+ "toggle_overwrite", 0);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Insert, 0,
+ "toggle_overwrite", 0);
+
+ /* Control-tab focus motion */
+ gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_CONTROL_MASK,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_CONTROL_MASK,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_FORWARD);
+
+ gtk_binding_entry_add_signal (binding_set, GDK_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
+ gtk_binding_entry_add_signal (binding_set, GDK_KP_Tab, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ "move_focus", 1,
+ GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
}
-void
+static void
gtk_text_view_init (GtkTextView *text_view)
{
GtkWidget *widget;
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
/* Set up default style */
- text_view->wrap_mode = GTK_WRAPMODE_NONE;
+ text_view->wrap_mode = GTK_WRAP_NONE;
text_view->pixels_above_lines = 0;
text_view->pixels_below_lines = 0;
text_view->pixels_inside_wrap = 0;
text_view->editable = TRUE;
gtk_drag_dest_set (widget,
- GTK_DEST_DEFAULT_DROP,
+ 0,
target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_COPY | GDK_ACTION_MOVE);
*/
text_view->im_context = gtk_im_multicontext_new ();
- gtk_signal_connect (GTK_OBJECT (text_view->im_context), "commit",
- GTK_SIGNAL_FUNC (gtk_text_view_commit_handler), text_view);
-
- gtk_signal_connect (GTK_OBJECT (text_view->im_context), "preedit_changed",
- GTK_SIGNAL_FUNC (gtk_text_view_preedit_changed_handler), text_view);
+ g_signal_connect (text_view->im_context, "commit",
+ G_CALLBACK (gtk_text_view_commit_handler), text_view);
+ g_signal_connect (text_view->im_context, "preedit_changed",
+ G_CALLBACK (gtk_text_view_preedit_changed_handler), text_view);
+ g_signal_connect (text_view->im_context, "retrieve_surrounding",
+ G_CALLBACK (gtk_text_view_retrieve_surrounding_handler), text_view);
+ g_signal_connect (text_view->im_context, "delete_surrounding",
+ G_CALLBACK (gtk_text_view_delete_surrounding_handler), text_view);
text_view->cursor_visible = TRUE;
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
+
+ text_view->pending_place_cursor_button = 0;
+
+ /* We handle all our own redrawing */
+ gtk_widget_set_redraw_on_allocate (widget, FALSE);
}
/**
GtkWidget*
gtk_text_view_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_text_view_get_type ()));
+ return g_object_new (GTK_TYPE_TEXT_VIEW, NULL);
}
/**
g_slist_free (copy);
- gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->buffer),
- gtk_text_view_mark_set_handler, text_view);
- gtk_object_unref (GTK_OBJECT (text_view->buffer));
+ g_signal_handlers_disconnect_by_func (text_view->buffer,
+ gtk_text_view_mark_set_handler,
+ text_view);
+ g_object_unref (text_view->buffer);
text_view->dnd_mark = NULL;
+
+ if (GTK_WIDGET_REALIZED (text_view))
+ {
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_remove_selection_clipboard (text_view->buffer, clipboard);
+ }
}
text_view->buffer = buffer;
{
GtkTextIter start;
- gtk_object_ref (GTK_OBJECT (buffer));
- gtk_object_sink (GTK_OBJECT (buffer));
+ g_object_ref (buffer);
if (text_view->layout)
gtk_text_layout_set_buffer (text_view->layout, buffer);
text_view->first_para_pixels = 0;
- gtk_signal_connect (GTK_OBJECT (text_view->buffer), "mark_set",
- gtk_text_view_mark_set_handler, text_view);
- }
+ g_signal_connect (text_view->buffer, "mark_set",
+ G_CALLBACK (gtk_text_view_mark_set_handler), text_view);
+ if (GTK_WIDGET_REALIZED (text_view))
+ {
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_add_selection_clipboard (text_view->buffer, clipboard);
+ }
+ }
+
if (GTK_WIDGET_VISIBLE (text_view))
gtk_widget_queue_draw (GTK_WIDGET (text_view));
+
+ DV(g_print ("Invalidating due to set_buffer\n"));
+ gtk_text_view_invalidate (text_view);
}
static GtkTextBuffer*
GtkTextBuffer *b;
b = gtk_text_buffer_new (NULL);
gtk_text_view_set_buffer (text_view, b);
- g_object_unref (G_OBJECT (b));
+ g_object_unref (b);
}
return text_view->buffer;
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (iter != NULL);
- g_return_if_fail (text_view->layout != NULL);
+ gtk_text_view_ensure_layout (text_view);
+
gtk_text_layout_get_iter_at_pixel (text_view->layout,
iter,
x,
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (gtk_text_iter_get_buffer (iter) == get_buffer (text_view));
+ gtk_text_view_ensure_layout (text_view);
+
gtk_text_layout_get_iter_location (text_view->layout, iter, location);
}
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (gtk_text_iter_get_buffer (iter) == get_buffer (text_view));
+ gtk_text_view_ensure_layout (text_view);
+
gtk_text_layout_get_line_yrange (text_view->layout,
iter,
y,
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
+ gtk_text_view_ensure_layout (text_view);
+
gtk_text_layout_get_line_at_y (text_view->layout,
target_iter,
y,
line_top);
}
-static void
-set_adjustment_clamped (GtkAdjustment *adj, gfloat val)
+static gboolean
+set_adjustment_clamped (GtkAdjustment *adj, gdouble val)
{
+ DV (g_print (" Setting adj to raw value %g\n", val));
+
/* We don't really want to clamp to upper; we want to clamp to
upper - page_size which is the highest value the scrollbar
will let us reach. */
if (val < adj->lower)
val = adj->lower;
- gtk_adjustment_set_value (adj, val);
+ if (val != adj->value)
+ {
+ DV (g_print (" Setting adj to clamped value %g\n", val));
+ gtk_adjustment_set_value (adj, val);
+ return TRUE;
+ }
+ else
+ return FALSE;
}
-static gboolean
-gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
- GtkTextMark *mark,
- gint margin,
- gfloat percentage)
+/**
+ * gtk_text_view_scroll_to_iter:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ * @within_margin: margin as a [0.0,0.5) fraction of screen size
+ * @use_align: whether to use alignment arguments (if %FALSE, just get the mark onscreen)
+ * @xalign: horizontal alignment of mark within visible area.
+ * @yalign: vertical alignment of mark within visible area
+ *
+ * Scrolls @text_view so that @iter is on the screen in the position
+ * indicated by @xalign and @yalign. An alignment of 0.0 indicates
+ * left or top, 1.0 indicates right or bottom, 0.5 means center. If @use_align
+ * is %FALSE, the text scrolls the minimal distance to get the mark onscreen,
+ * possibly not scrolling at all. The effective screen for purposes
+ * of this function is reduced by a margin of size @within_margin.
+ * NOTE: This function uses the currently-computed height of the
+ * lines in the text buffer. Note that line heights are computed
+ * in an idle handler; so this function may not have the desired effect
+ * if it's called before the height computations. To avoid oddness,
+ * consider using gtk_text_view_scroll_to_mark() which saves a point
+ * to be scrolled to after line validation.
+ *
+ * Return value: %TRUE if scrolling occurred
+ **/
+gboolean
+gtk_text_view_scroll_to_iter (GtkTextView *text_view,
+ GtkTextIter *iter,
+ gdouble within_margin,
+ gboolean use_align,
+ gdouble xalign,
+ gdouble yalign)
{
- GtkTextIter iter;
GdkRectangle rect;
GdkRectangle screen;
gint screen_bottom;
gint screen_right;
+ gint scroll_dest;
GtkWidget *widget;
gboolean retval = FALSE;
gint scroll_inc;
-
+ gint screen_xoffset, screen_yoffset;
gint current_x_scroll, current_y_scroll;
+ /* FIXME why don't we do the validate-at-scroll-destination thing
+ * from flush_scroll in this function? I think it wasn't done before
+ * because changed_handler was screwed up, but I could be wrong.
+ */
+
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
- g_return_val_if_fail (mark != NULL, FALSE);
-
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (within_margin >= 0.0 && within_margin < 0.5, FALSE);
+ g_return_val_if_fail (xalign >= 0.0 && xalign <= 1.0, FALSE);
+ g_return_val_if_fail (yalign >= 0.0 && yalign <= 1.0, FALSE);
+
widget = GTK_WIDGET (text_view);
- if (!GTK_WIDGET_MAPPED (widget))
- {
- g_warning ("FIXME need to implement scroll_to_mark for unmapped GtkTextView?");
- return FALSE;
- }
-
- gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, mark);
-
+ DV(g_print(G_STRLOC"\n"));
+
gtk_text_layout_get_iter_location (text_view->layout,
- &iter,
+ iter,
&rect);
- /* Be sure the scroll region is up-to-date */
- gtk_text_view_scroll_calc_now (text_view);
-
+ DV (g_print (" target rect %d,%d %d x %d\n", rect.x, rect.y, rect.width, rect.height));
+
current_x_scroll = text_view->xoffset;
current_y_scroll = text_view->yoffset;
screen.y = current_y_scroll;
screen.width = SCREEN_WIDTH (widget);
screen.height = SCREEN_HEIGHT (widget);
+
+ screen_xoffset = screen.width * within_margin;
+ screen_yoffset = screen.height * within_margin;
+
+ screen.x += screen_xoffset;
+ screen.y += screen_yoffset;
+ screen.width -= screen_xoffset * 2;
+ screen.height -= screen_yoffset * 2;
+
+ /* paranoia check */
+ if (screen.width < 1)
+ screen.width = 1;
+ if (screen.height < 1)
+ screen.height = 1;
+
+ screen_right = screen.x + screen.width;
+ screen_bottom = screen.y + screen.height;
+
+ /* The alignment affects the point in the target character that we
+ * choose to align. If we're doing right/bottom alignment, we align
+ * the right/bottom edge of the character the mark is at; if we're
+ * doing left/top we align the left/top edge of the character; if
+ * we're doing center alignment we align the center of the
+ * character.
+ */
+
+ /* Vertical scroll */
- {
- /* Clamp margin so it's not too large. */
- gint small_dimension = MIN (screen.width, screen.height);
- gint max_rect_dim;
-
- if (margin > (small_dimension/2 - 5)) /* 5 is arbitrary */
- margin = (small_dimension/2 - 5);
-
- if (margin < 0)
- margin = 0;
-
- /* make sure rectangle fits in the leftover space */
-
- max_rect_dim = MAX (rect.width, rect.height);
-
- if (max_rect_dim > (small_dimension - margin*2))
- margin -= max_rect_dim - (small_dimension - margin*2);
-
- if (margin < 0)
- margin = 0;
- }
-
- g_assert (margin >= 0);
-
- screen.x += margin;
- screen.y += margin;
-
- screen.width -= margin*2;
- screen.height -= margin*2;
-
- screen_bottom = screen.y + screen.height;
- screen_right = screen.x + screen.width;
+ scroll_inc = 0;
+ scroll_dest = current_y_scroll;
+
+ if (use_align)
+ {
+ scroll_dest = rect.y + (rect.height * yalign) - (screen.height * yalign);
+
+ /* if scroll_dest < screen.y, we move a negative increment (up),
+ * else a positive increment (down)
+ */
+ scroll_inc = scroll_dest - screen.y + screen_yoffset;
+ }
+ else
+ {
+ /* move minimum to get onscreen */
+ if (rect.y < screen.y)
+ {
+ scroll_dest = rect.y;
+ scroll_inc = scroll_dest - screen.y - screen_yoffset;
+ }
+ else if ((rect.y + rect.height) > screen_bottom)
+ {
+ scroll_dest = rect.y + rect.height;
+ scroll_inc = scroll_dest - screen_bottom + screen_yoffset;
+ }
+ }
+
+ if (scroll_inc != 0)
+ {
+ retval = set_adjustment_clamped (get_vadjustment (text_view),
+ current_y_scroll + scroll_inc);
- /* Vertical scroll (only vertical gets adjusted) */
+ DV (g_print (" vert increment %d\n", scroll_inc));
+ }
+ /* Horizontal scroll */
+
scroll_inc = 0;
- if (rect.y < screen.y)
+ scroll_dest = current_x_scroll;
+
+ if (use_align)
+ {
+ scroll_dest = rect.x + (rect.width * xalign) - (screen.width * xalign);
+
+ /* if scroll_dest < screen.y, we move a negative increment (left),
+ * else a positive increment (right)
+ */
+ scroll_inc = scroll_dest - screen.x + screen_xoffset;
+ }
+ else
{
- gint scroll_dest = rect.y;
- scroll_inc = (scroll_dest - screen.y) * percentage;
+ /* move minimum to get onscreen */
+ if (rect.x < screen.x)
+ {
+ scroll_dest = rect.x;
+ scroll_inc = scroll_dest - screen.x - screen_xoffset;
+ }
+ else if ((rect.x + rect.width) > screen_right)
+ {
+ scroll_dest = rect.x + rect.width;
+ scroll_inc = scroll_dest - screen_right + screen_xoffset;
+ }
}
- else if ((rect.y + rect.height) > screen_bottom)
+
+ if (scroll_inc != 0)
{
- gint scroll_dest = rect.y + rect.height;
- scroll_inc = (scroll_dest - screen_bottom) * percentage;
+ retval = set_adjustment_clamped (get_hadjustment (text_view),
+ current_x_scroll + scroll_inc);
+
+ DV (g_print (" horiz increment %d\n", scroll_inc));
}
+
+ if (retval)
+ DV(g_print (">Actually scrolled ("G_STRLOC")\n"));
+ else
+ DV(g_print (">Didn't end up scrolling ("G_STRLOC")\n"));
+
+ return retval;
+}
- if (scroll_inc != 0)
+static void
+free_pending_scroll (GtkTextPendingScroll *scroll)
+{
+ if (!gtk_text_mark_get_deleted (scroll->mark))
+ gtk_text_buffer_delete_mark (gtk_text_mark_get_buffer (scroll->mark),
+ scroll->mark);
+ g_object_unref (scroll->mark);
+ g_free (scroll);
+}
+
+static void
+cancel_pending_scroll (GtkTextView *text_view)
+{
+ if (text_view->pending_scroll)
{
- set_adjustment_clamped (get_vadjustment (text_view),
- current_y_scroll + scroll_inc);
- retval = TRUE;
+ free_pending_scroll (text_view->pending_scroll);
+ text_view->pending_scroll = NULL;
}
+}
+
+static void
+gtk_text_view_queue_scroll (GtkTextView *text_view,
+ GtkTextMark *mark,
+ gdouble within_margin,
+ gboolean use_align,
+ gdouble xalign,
+ gdouble yalign)
+{
+ GtkTextIter iter;
+ GtkTextPendingScroll *scroll;
- /* Horizontal scroll */
+ DV(g_print(G_STRLOC"\n"));
+
+ scroll = g_new (GtkTextPendingScroll, 1);
- scroll_inc = 0;
- if (rect.x < screen.x)
+ scroll->within_margin = within_margin;
+ scroll->use_align = use_align;
+ scroll->xalign = xalign;
+ scroll->yalign = yalign;
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, mark);
+
+ scroll->mark = gtk_text_buffer_create_mark (get_buffer (text_view),
+ NULL,
+ &iter,
+ gtk_text_mark_get_left_gravity (mark));
+
+ g_object_ref (scroll->mark);
+
+ cancel_pending_scroll (text_view);
+
+ text_view->pending_scroll = scroll;
+}
+
+static gboolean
+gtk_text_view_flush_scroll (GtkTextView *text_view)
+{
+ GtkTextIter iter;
+ GtkTextPendingScroll *scroll;
+ gboolean retval;
+ GtkWidget *widget;
+
+ widget = GTK_WIDGET (text_view);
+
+ DV(g_print(G_STRLOC"\n"));
+
+ if (text_view->pending_scroll == NULL)
{
- gint scroll_dest = rect.x;
- scroll_inc = scroll_dest - screen.x;
+ DV (g_print ("in flush scroll, no pending scroll\n"));
+ return FALSE;
}
- else if ((rect.x + rect.width) > screen_right)
+
+ scroll = text_view->pending_scroll;
+
+ /* avoid recursion */
+ text_view->pending_scroll = NULL;
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, scroll->mark);
+
+ /* Validate area around the scroll destination, so the adjustment
+ * can meaningfully point into that area. We must validate
+ * enough area to be sure that after we scroll, everything onscreen
+ * is valid; otherwise, validation will maintain the first para
+ * in one place, but may push the target iter off the bottom of
+ * the screen.
+ */
+ DV(g_print (">Validating scroll destination ("G_STRLOC")\n"));
+ gtk_text_layout_validate_yrange (text_view->layout, &iter,
+ - (widget->allocation.height * 2),
+ widget->allocation.height * 2);
+
+ DV(g_print (">Done validating scroll destination ("G_STRLOC")\n"));
+
+ /* Ensure we have updated width/height */
+ gtk_text_view_update_adjustments (text_view);
+
+ retval = gtk_text_view_scroll_to_iter (text_view,
+ &iter,
+ scroll->within_margin,
+ scroll->use_align,
+ scroll->xalign,
+ scroll->yalign);
+
+ free_pending_scroll (scroll);
+
+ return retval;
+}
+
+static void
+gtk_text_view_set_adjustment_upper (GtkAdjustment *adj, gdouble upper)
+{
+ if (upper != adj->upper)
{
- gint scroll_dest = rect.x + rect.width;
- scroll_inc = scroll_dest - screen_right;
+ gdouble min = MAX (0.0, upper - adj->page_size);
+ gboolean value_changed = FALSE;
+
+ adj->upper = upper;
+
+ if (adj->value > min)
+ {
+ adj->value = min;
+ value_changed = TRUE;
+ }
+
+ gtk_adjustment_changed (adj);
+ DV(g_print(">Changed adj upper to %g ("G_STRLOC")\n", upper));
+
+ if (value_changed)
+ {
+ DV(g_print(">Changed adj value because upper decreased ("G_STRLOC")\n"));
+ gtk_adjustment_value_changed (adj);
+ }
}
+}
- if (scroll_inc != 0)
+static void
+gtk_text_view_update_adjustments (GtkTextView *text_view)
+{
+ gint width = 0, height = 0;
+
+ DV(g_print(">Updating adjustments ("G_STRLOC")\n"));
+
+ if (text_view->layout)
+ gtk_text_layout_get_size (text_view->layout, &width, &height);
+
+ if (text_view->width != width || text_view->height != height)
{
- set_adjustment_clamped (get_hadjustment (text_view),
- current_x_scroll + scroll_inc);
- retval = TRUE;
+ text_view->width = width;
+ text_view->height = height;
+
+ gtk_text_view_set_adjustment_upper (get_hadjustment (text_view),
+ MAX (SCREEN_WIDTH (text_view), width));
+ gtk_text_view_set_adjustment_upper (get_vadjustment (text_view),
+ MAX (SCREEN_HEIGHT (text_view), height));
+
+ /* hadj/vadj exist since we called get_hadjustment/get_vadjustment above */
+
+ /* Set up the step sizes; we'll say that a page is
+ our allocation minus one step, and a step is
+ 1/10 of our allocation. */
+ text_view->hadjustment->step_increment =
+ SCREEN_WIDTH (text_view) / 10.0;
+ text_view->hadjustment->page_increment =
+ SCREEN_WIDTH (text_view) * 0.9;
+
+ text_view->vadjustment->step_increment =
+ SCREEN_HEIGHT (text_view) / 10.0;
+ text_view->vadjustment->page_increment =
+ SCREEN_HEIGHT (text_view) * 0.9;
+
+ gtk_adjustment_changed (get_hadjustment (text_view));
+ gtk_adjustment_changed (get_vadjustment (text_view));
}
+}
- return retval;
+static void
+gtk_text_view_update_layout_width (GtkTextView *text_view)
+{
+ DV(g_print(">Updating layout width ("G_STRLOC")\n"));
+
+ gtk_text_view_ensure_layout (text_view);
+
+ gtk_text_layout_set_screen_width (text_view->layout,
+ SCREEN_WIDTH (text_view));
+}
+
+static void
+gtk_text_view_update_im_spot_location (GtkTextView *text_view)
+{
+ GdkRectangle area;
+ gint cursor_x_pos, cursor_y_pos;
+
+ if (text_view->layout == NULL)
+ return;
+
+ gtk_text_view_get_virtual_cursor_pos (text_view, &cursor_x_pos, &cursor_y_pos);
+
+ area.x = cursor_x_pos;
+ area.y = cursor_y_pos;
+ area.width = area.height = 0;
+
+ gtk_im_context_set_cursor_location (text_view->im_context, &area);
}
/**
* gtk_text_view_scroll_to_mark:
* @text_view: a #GtkTextView
* @mark: a #GtkTextMark
- * @mark_within_margin: a margin
+ * @within_margin: margin as a [0.0,0.5) fraction of screen size
+ * @use_align: whether to use alignment arguments (if %FALSE, just get the mark onscreen)
+ * @xalign: horizontal alignment of mark within visible area.
+ * @yalign: vertical alignment of mark within visible area
*
- * Scrolls @text_view so that @mark is on the screen. If
- * @mark_within_margin is nonzero, the mark will be moved onscreen by
- * that many pixels. For example, if @mark_within_margin is 5, the
- * mark will be at least 5 pixels away from the edge of the screen,
- * if possible.
+ * Scrolls @text_view so that @mark is on the screen in the position
+ * indicated by @xalign and @yalign. An alignment of 0.0 indicates
+ * left or top, 1.0 indicates right or bottom, 0.5 means center. If @use_align
+ * is %FALSE, the text scrolls the minimal distance to get the mark onscreen,
+ * possibly not scrolling at all. The effective screen for purposes
+ * of this function is reduced by a margin of size @within_margin.
*
- * Return value: TRUE if scrolling occurred
**/
-gboolean
+void
gtk_text_view_scroll_to_mark (GtkTextView *text_view,
GtkTextMark *mark,
- gint mark_within_margin)
+ gdouble within_margin,
+ gboolean use_align,
+ gdouble xalign,
+ gdouble yalign)
+{
+ g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
+ g_return_if_fail (GTK_IS_TEXT_MARK (mark));
+ g_return_if_fail (within_margin >= 0.0 && within_margin < 0.5);
+ g_return_if_fail (xalign >= 0.0 && xalign <= 1.0);
+ g_return_if_fail (yalign >= 0.0 && yalign <= 1.0);
+
+ gtk_text_view_queue_scroll (text_view, mark,
+ within_margin,
+ use_align,
+ xalign,
+ yalign);
+
+ /* If no validation is pending, we need to go ahead and force an
+ * immediate scroll.
+ */
+ if (text_view->layout &&
+ gtk_text_layout_is_valid (text_view->layout))
+ gtk_text_view_flush_scroll (text_view);
+}
+
+/**
+ * gtk_text_view_scroll_mark_onscreen:
+ * @text_view: a #GtkTextView
+ * @mark: a mark in the buffer for @text_view
+ *
+ * Scrolls @text_view the minimum distance such that @mark is contained
+ * within the visible area of the widget.
+ *
+ **/
+void
+gtk_text_view_scroll_mark_onscreen (GtkTextView *text_view,
+ GtkTextMark *mark)
{
- g_return_val_if_fail (mark_within_margin >= 0, FALSE);
+ g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
+ g_return_if_fail (GTK_IS_TEXT_MARK (mark));
- return gtk_text_view_scroll_to_mark_adjusted (text_view, mark,
- mark_within_margin, 1.0);
+ gtk_text_view_scroll_to_mark (text_view, mark, 0.0, FALSE, 0.0, 0.0);
}
static gboolean
* Moves a mark within the buffer so that it's
* located within the currently-visible text area.
*
- * Return value: %TRUE if scrolling occurred
+ * Return value: %TRUE if the mark moved (wasn't already onscreen)
**/
gboolean
gtk_text_view_move_mark_onscreen (GtkTextView *text_view,
{
GtkWidget *widget;
- g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
widget = GTK_WIDGET (text_view);
visible_rect->y = text_view->yoffset;
visible_rect->width = SCREEN_WIDTH (widget);
visible_rect->height = SCREEN_HEIGHT (widget);
+
+ DV(g_print(" visible rect: %d,%d %d x %d\n",
+ visible_rect->x,
+ visible_rect->y,
+ visible_rect->width,
+ visible_rect->height));
}
}
gtk_text_view_set_wrap_mode (GtkTextView *text_view,
GtkWrapMode wrap_mode)
{
- g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
if (text_view->wrap_mode != wrap_mode)
gtk_text_layout_default_style_changed (text_view->layout);
}
}
+
+ g_object_notify (G_OBJECT (text_view), "wrap_mode");
}
/**
GtkWrapMode
gtk_text_view_get_wrap_mode (GtkTextView *text_view)
{
- g_return_val_if_fail (text_view != NULL, GTK_WRAPMODE_NONE);
- g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAPMODE_NONE);
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), GTK_WRAP_NONE);
return text_view->wrap_mode;
}
gboolean setting)
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
+ setting = setting != FALSE;
if (text_view->editable != setting)
{
text_view->layout->default_style->editable = text_view->editable;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "editable");
}
}
return text_view->editable;
}
+/**
+ * gtk_text_view_set_pixels_above_lines:
+ * @text_view: a #GtkTextView
+ * @pixels_above_lines: pixels above paragraphs
+ *
+ * Sets the default number of blank pixels above paragraphs in @text_view.
+ * Tags in the buffer for @text_view may override the defaults.
+ *
+ **/
void
gtk_text_view_set_pixels_above_lines (GtkTextView *text_view,
gint pixels_above_lines)
text_view->layout->default_style->pixels_above_lines = pixels_above_lines;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "pixels_above_lines");
}
}
+/**
+ * gtk_text_view_get_pixels_above_lines:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default number of pixels to put above paragraphs.
+ *
+ * Return value: default number of pixels above paragraphs
+ **/
gint
gtk_text_view_get_pixels_above_lines (GtkTextView *text_view)
{
return text_view->pixels_above_lines;
}
+/**
+ * gtk_text_view_set_pixels_below_lines:
+ * @text_view: a #GtkTextView
+ * @pixels_below_lines: pixels below paragraphs
+ *
+ * Sets the default number of pixels of blank space
+ * to put below paragraphs in @text_view. May be overridden
+ * by tags applied to @text_view's buffer.
+ *
+ **/
void
gtk_text_view_set_pixels_below_lines (GtkTextView *text_view,
gint pixels_below_lines)
text_view->layout->default_style->pixels_below_lines = pixels_below_lines;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "pixels_below_lines");
}
}
+/**
+ * gtk_text_view_get_pixels_below_lines:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the value set by gtk_text_view_set_pixels_below_lines().
+ *
+ * Return value: default number of blank pixels below paragraphs
+ **/
gint
gtk_text_view_get_pixels_below_lines (GtkTextView *text_view)
{
return text_view->pixels_below_lines;
}
+/**
+ * gtk_text_view_set_pixels_inside_wrap:
+ * @text_view: a #GtkTextView
+ * @pixels_inside_wrap: default number of pixels between wrapped lines
+ *
+ * Sets the default number of pixels of blank space to leave between
+ * display/wrapped lines within a paragraph. May be overridden by
+ * tags in @text_view's buffer.
+ *
+ **/
void
gtk_text_view_set_pixels_inside_wrap (GtkTextView *text_view,
gint pixels_inside_wrap)
text_view->layout->default_style->pixels_inside_wrap = pixels_inside_wrap;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "pixels_inside_wrap");
}
}
+/**
+ * gtk_text_view_get_pixels_inside_wrap:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the value set by gtk_text_view_set_pixels_inside_wrap().
+ *
+ * Return value: default number of pixels of blank space between wrapped lines
+ **/
gint
gtk_text_view_get_pixels_inside_wrap (GtkTextView *text_view)
{
return text_view->pixels_inside_wrap;
}
+/**
+ * gtk_text_view_set_justification:
+ * @text_view: a #GtkTextView
+ * @justification: justification
+ *
+ * Sets the default justification of text in @text_view.
+ * Tags in the view's buffer may override the default.
+ *
+ **/
void
gtk_text_view_set_justification (GtkTextView *text_view,
- GtkJustification justify)
+ GtkJustification justification)
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
- if (text_view->justify != justify)
+ if (text_view->justify != justification)
{
- text_view->justify = justify;
+ text_view->justify = justification;
if (text_view->layout)
{
- text_view->layout->default_style->justify = justify;
+ text_view->layout->default_style->justification = justification;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "justification");
}
}
+/**
+ * gtk_text_view_get_justification:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default justification of paragraphs in @text_view.
+ * Tags in the buffer may override the default.
+ *
+ * Return value: default justification
+ **/
GtkJustification
gtk_text_view_get_justification (GtkTextView *text_view)
{
return text_view->justify;
}
+/**
+ * gtk_text_view_set_left_margin:
+ * @text_view: a #GtkTextView
+ * @left_margin: left margin in pixels
+ *
+ * Sets the default left margin for text in @text_view.
+ * Tags in the buffer may override the default.
+ *
+ **/
void
gtk_text_view_set_left_margin (GtkTextView *text_view,
gint left_margin)
text_view->layout->default_style->left_margin = left_margin;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "left_margin");
}
}
+/**
+ * gtk_text_view_get_left_margin:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default left margin size of paragraphs in the @text_view.
+ * Tags in the buffer may override the default.
+ *
+ * Return value: left margin in pixels
+ **/
gint
gtk_text_view_get_left_margin (GtkTextView *text_view)
{
return text_view->left_margin;
}
+/**
+ * gtk_text_view_set_right_margin:
+ * @text_view: a #GtkTextView
+ * @right_margin: right margin in pixels
+ *
+ * Sets the default right margin for text in the text view.
+ * Tags in the buffer may override the default.
+ *
+ **/
void
gtk_text_view_set_right_margin (GtkTextView *text_view,
gint right_margin)
text_view->layout->default_style->right_margin = right_margin;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "right_margin");
}
}
+/**
+ * gtk_text_view_get_right_margin:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default right margin for text in @text_view. Tags
+ * in the buffer may override the default.
+ *
+ * Return value: right margin in pixels
+ **/
gint
gtk_text_view_get_right_margin (GtkTextView *text_view)
{
return text_view->right_margin;
}
+/**
+ * gtk_text_view_set_indent:
+ * @text_view: a #GtkTextView
+ * @indent: indentation in pixels
+ *
+ * Sets the default indentation for paragraphs in @text_view.
+ * Tags in the buffer may override the default.
+ *
+ **/
void
gtk_text_view_set_indent (GtkTextView *text_view,
gint indent)
text_view->layout->default_style->indent = indent;
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "indent");
}
}
+/**
+ * gtk_text_view_get_indent:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default indentation of paragraphs in @text_view.
+ * Tags in the view's buffer may override the default.
+ * The indentation may be negative.
+ *
+ * Return value: number of pixels of indentation
+ **/
gint
gtk_text_view_get_indent (GtkTextView *text_view)
{
return text_view->indent;
}
+/**
+ * gtk_text_view_set_tabs:
+ * @text_view: a #GtkTextView
+ * @tabs: tabs as a #PangoTabArray
+ *
+ * Sets the default tab stops for paragraphs in @text_view.
+ * Tags in the buffer may override the default.
+ *
+ **/
void
gtk_text_view_set_tabs (GtkTextView *text_view,
PangoTabArray *tabs)
gtk_text_layout_default_style_changed (text_view->layout);
}
+
+ g_object_notify (G_OBJECT (text_view), "tabs");
}
+/**
+ * gtk_text_view_get_tabs:
+ * @text_view: a #GtkTextView
+ *
+ * Gets the default tabs for @text_view. Tags in the buffer may
+ * override the defaults. The returned array will be %NULL if
+ * "standard" (8-space) tabs are used. Free the return value
+ * with pango_tab_array_free().
+ *
+ * Return value: copy of default tab array, or %NULL if "standard" tabs are used; must be freed with pango_tab_array_free().
+ **/
PangoTabArray*
gtk_text_view_get_tabs (GtkTextView *text_view)
{
if (text_view->layout)
{
gtk_text_layout_set_cursor_visible (text_view->layout, setting);
-
- if (setting)
- gtk_text_view_start_cursor_blink (text_view, FALSE);
- else
- gtk_text_view_stop_cursor_blink (text_view);
+ gtk_text_view_check_cursor_blink (text_view);
}
}
+
+ g_object_notify (G_OBJECT (text_view), "cursor_visible");
}
}
return FALSE;
}
+static void
+gtk_text_view_remove_validate_idles (GtkTextView *text_view)
+{
+ if (text_view->first_validate_idle != 0)
+ {
+ DV (g_print ("Removing first validate idle: %s\n", G_STRLOC));
+ g_source_remove (text_view->first_validate_idle);
+ text_view->first_validate_idle = 0;
+ }
+
+ if (text_view->incremental_validate_idle != 0)
+ {
+ g_source_remove (text_view->incremental_validate_idle);
+ text_view->incremental_validate_idle = 0;
+ }
+}
+
static void
gtk_text_view_destroy (GtkObject *object)
{
layout = text_view->layout;
- gtk_text_view_destroy_layout (text_view);
+ gtk_text_view_remove_validate_idles (text_view);
gtk_text_view_set_buffer (text_view, NULL);
+ gtk_text_view_destroy_layout (text_view);
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
g_return_if_fail (text_view->buffer == NULL);
- if (text_view->hadjustment)
- gtk_object_unref (GTK_OBJECT (text_view->hadjustment));
- if (text_view->vadjustment)
- gtk_object_unref (GTK_OBJECT (text_view->vadjustment));
-
+ gtk_text_view_destroy_layout (text_view);
+ gtk_text_view_set_buffer (text_view, NULL);
+
+ cancel_pending_scroll (text_view);
+
+ if (text_view->tabs)
+ pango_tab_array_free (text_view->tabs);
+
+ if (text_view->hadjustment)
+ g_object_unref (text_view->hadjustment);
+ if (text_view->vadjustment)
+ g_object_unref (text_view->vadjustment);
+
text_window_free (text_view->text_window);
if (text_view->left_window)
if (text_view->bottom_window)
text_window_free (text_view->bottom_window);
- gtk_object_unref (GTK_OBJECT (text_view->im_context));
-
+ g_object_unref (text_view->im_context);
+
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
-gtk_text_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gtk_text_view_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_HEIGHT_LINES:
- g_warning ("FIXME");
+ case PROP_PIXELS_ABOVE_LINES:
+ gtk_text_view_set_pixels_above_lines (text_view, g_value_get_int (value));
break;
- case ARG_WIDTH_COLUMNS:
- g_warning ("FIXME");
+ case PROP_PIXELS_BELOW_LINES:
+ gtk_text_view_set_pixels_below_lines (text_view, g_value_get_int (value));
break;
- case ARG_PIXELS_ABOVE_LINES:
- gtk_text_view_set_pixels_above_lines (text_view, GTK_VALUE_INT (*arg));
+ case PROP_PIXELS_INSIDE_WRAP:
+ gtk_text_view_set_pixels_inside_wrap (text_view, g_value_get_int (value));
break;
- case ARG_PIXELS_BELOW_LINES:
- gtk_text_view_set_pixels_below_lines (text_view, GTK_VALUE_INT (*arg));
+ case PROP_EDITABLE:
+ gtk_text_view_set_editable (text_view, g_value_get_boolean (value));
break;
- case ARG_PIXELS_INSIDE_WRAP:
- gtk_text_view_set_pixels_inside_wrap (text_view, GTK_VALUE_INT (*arg));
+ case PROP_WRAP_MODE:
+ gtk_text_view_set_wrap_mode (text_view, g_value_get_enum (value));
break;
-
- case ARG_EDITABLE:
- gtk_text_view_set_editable (text_view, GTK_VALUE_BOOL (*arg));
- break;
-
- case ARG_WRAP_MODE:
- gtk_text_view_set_wrap_mode (text_view, GTK_VALUE_ENUM (*arg));
+
+ case PROP_JUSTIFICATION:
+ gtk_text_view_set_justification (text_view, g_value_get_enum (value));
break;
- case ARG_JUSTIFY:
- gtk_text_view_set_justification (text_view, GTK_VALUE_ENUM (*arg));
+ case PROP_LEFT_MARGIN:
+ gtk_text_view_set_left_margin (text_view, g_value_get_int (value));
break;
- case ARG_LEFT_MARGIN:
- gtk_text_view_set_left_margin (text_view, GTK_VALUE_INT (*arg));
+ case PROP_RIGHT_MARGIN:
+ gtk_text_view_set_right_margin (text_view, g_value_get_int (value));
break;
- case ARG_RIGHT_MARGIN:
- gtk_text_view_set_right_margin (text_view, GTK_VALUE_INT (*arg));
+ case PROP_INDENT:
+ gtk_text_view_set_indent (text_view, g_value_get_int (value));
break;
- case ARG_INDENT:
- gtk_text_view_set_indent (text_view, GTK_VALUE_INT (*arg));
+ case PROP_TABS:
+ gtk_text_view_set_tabs (text_view, g_value_get_boxed (value));
break;
- case ARG_TABS:
- gtk_text_view_set_tabs (text_view, GTK_VALUE_POINTER (*arg));
+ case PROP_CURSOR_VISIBLE:
+ gtk_text_view_set_cursor_visible (text_view, g_value_get_boolean (value));
break;
default:
}
static void
-gtk_text_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gtk_text_view_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (object);
- switch (arg_id)
+ switch (prop_id)
{
- case ARG_HEIGHT_LINES:
- g_warning ("FIXME");
+ case PROP_PIXELS_ABOVE_LINES:
+ g_value_set_int (value, text_view->pixels_above_lines);
break;
- case ARG_WIDTH_COLUMNS:
- g_warning ("FIXME");
+ case PROP_PIXELS_BELOW_LINES:
+ g_value_set_int (value, text_view->pixels_below_lines);
break;
- case ARG_PIXELS_ABOVE_LINES:
- GTK_VALUE_INT (*arg) = text_view->pixels_above_lines;
+ case PROP_PIXELS_INSIDE_WRAP:
+ g_value_set_int (value, text_view->pixels_inside_wrap);
break;
- case ARG_PIXELS_BELOW_LINES:
- GTK_VALUE_INT (*arg) = text_view->pixels_below_lines;
+ case PROP_EDITABLE:
+ g_value_set_boolean (value, text_view->editable);
break;
-
- case ARG_PIXELS_INSIDE_WRAP:
- GTK_VALUE_INT (*arg) = text_view->pixels_inside_wrap;
- break;
-
- case ARG_EDITABLE:
- GTK_VALUE_BOOL (*arg) = text_view->editable;
+
+ case PROP_WRAP_MODE:
+ g_value_set_enum (value, text_view->wrap_mode);
break;
- case ARG_WRAP_MODE:
- GTK_VALUE_ENUM (*arg) = text_view->wrap_mode;
+ case PROP_JUSTIFICATION:
+ g_value_set_enum (value, text_view->justify);
break;
- case ARG_JUSTIFY:
- GTK_VALUE_ENUM (*arg) = text_view->justify;
+ case PROP_LEFT_MARGIN:
+ g_value_set_int (value, text_view->left_margin);
break;
- case ARG_LEFT_MARGIN:
- GTK_VALUE_INT (*arg) = text_view->left_margin;
+ case PROP_RIGHT_MARGIN:
+ g_value_set_int (value, text_view->right_margin);
break;
- case ARG_RIGHT_MARGIN:
- GTK_VALUE_INT (*arg) = text_view->right_margin;
+ case PROP_INDENT:
+ g_value_set_int (value, text_view->indent);
break;
- case ARG_INDENT:
- GTK_VALUE_INT (*arg) = text_view->indent;
+ case PROP_TABS:
+ g_value_set_boxed (value, text_view->tabs);
break;
- case ARG_TABS:
- GTK_VALUE_POINTER (*arg) = gtk_text_view_get_tabs (text_view);
+ case PROP_CURSOR_VISIBLE:
+ g_value_set_boolean (value, text_view->cursor_visible);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
{
GtkTextView *text_view;
GSList *tmp_list;
-
+ gint focus_edge_width;
+ gint focus_width;
+ gboolean interior_focus;
+
text_view = GTK_TEXT_VIEW (widget);
- requisition->width = text_view->text_window->requisition.width + FOCUS_EDGE_WIDTH * 2;
- requisition->height = text_view->text_window->requisition.height + FOCUS_EDGE_WIDTH * 2;
+ gtk_widget_style_get (widget,
+ "interior_focus", &interior_focus,
+ "focus_line_width", &focus_width,
+ NULL);
+
+ if (interior_focus)
+ focus_edge_width = 0;
+ else
+ focus_edge_width = focus_width;
+
+ if (text_view->layout)
+ {
+ text_view->text_window->requisition.width = text_view->layout->width;
+ text_view->text_window->requisition.height = text_view->layout->height;
+ }
+ else
+ {
+ text_view->text_window->requisition.width = 0;
+ text_view->text_window->requisition.height = 0;
+ }
+
+ requisition->width = text_view->text_window->requisition.width + focus_edge_width * 2;
+ requisition->height = text_view->text_window->requisition.height + focus_edge_width * 2;
if (text_view->left_window)
requisition->width += text_view->left_window->requisition.width;
if (text_view->bottom_window)
requisition->height += text_view->bottom_window->requisition.height;
+ requisition->width += GTK_CONTAINER (text_view)->border_width * 2;
+ requisition->height += GTK_CONTAINER (text_view)->border_width * 2;
+
tmp_list = text_view->children;
while (tmp_list != NULL)
{
GtkRequisition child_req;
GtkRequisition old_req;
- old_req = child->widget->requisition;
-
+ gtk_widget_get_child_requisition (child->widget, &old_req);
+
gtk_widget_size_request (child->widget, &child_req);
+ gtk_widget_get_child_requisition (child->widget, &child_req);
+
+ /* Invalidate layout lines if required */
if (text_view->layout &&
(old_req.width != child_req.width ||
old_req.height != child_req.height))
}
else
{
-
+ GtkRequisition child_req;
+
+ gtk_widget_size_request (child->widget, &child_req);
}
tmp_list = g_slist_next (tmp_list);
}
static void
-gtk_text_view_update_child_allocation (GtkTextView *text_view,
- GtkTextViewChild *vc)
+gtk_text_view_compute_child_allocation (GtkTextView *text_view,
+ GtkTextViewChild *vc,
+ GtkAllocation *allocation)
{
gint buffer_y;
GtkTextIter iter;
- GtkAllocation allocation;
+ GtkRequisition req;
gtk_text_buffer_get_iter_at_child_anchor (get_buffer (text_view),
&iter,
buffer_y += vc->from_top_of_line;
- allocation.x = vc->from_left_of_buffer;
- allocation.y = buffer_y;
- allocation.width = vc->widget->requisition.width;
- allocation.height = vc->widget->requisition.height;
+ allocation->x = vc->from_left_of_buffer - text_view->xoffset;
+ allocation->y = buffer_y - text_view->yoffset;
+
+ gtk_widget_get_child_requisition (vc->widget, &req);
+ allocation->width = req.width;
+ allocation->height = req.height;
+}
+
+static void
+gtk_text_view_update_child_allocation (GtkTextView *text_view,
+ GtkTextViewChild *vc)
+{
+ GtkAllocation allocation;
+
+ gtk_text_view_compute_child_allocation (text_view, vc, &allocation);
gtk_widget_size_allocate (vc->widget, &allocation);
+
+#if 0
+ g_print ("allocation for %p allocated to %d,%d yoffset = %d\n",
+ vc->widget,
+ vc->widget->allocation.x,
+ vc->widget->allocation.y,
+ text_view->yoffset);
+#endif
}
static void
* window coordinates, then size_allocate the child.
*/
- vc = gtk_object_get_data (GTK_OBJECT (child),
- "gtk-text-view-child");
+ vc = g_object_get_data (G_OBJECT (child),
+ "gtk-text-view-child");
g_assert (vc != NULL);
- printf ("child allocated at %d,%d\n", x, y);
+ DV (g_print ("child allocated at %d,%d\n", x, y));
vc->from_left_of_buffer = x;
vc->from_top_of_line = y;
}
static void
-gtk_text_view_validate_children (GtkTextView *text_view)
+gtk_text_view_allocate_children (GtkTextView *text_view)
{
GSList *tmp_list;
+ DV(g_print(G_STRLOC"\n"));
+
tmp_list = text_view->children;
while (tmp_list != NULL)
{
}
else
{
+ GtkAllocation allocation;
+ GtkRequisition child_req;
+
+ g_assert (child != NULL);
+
+ allocation.x = child->x;
+ allocation.y = child->y;
+ gtk_widget_get_child_requisition (child->widget, &child_req);
+
+ allocation.width = child_req.width;
+ allocation.height = child_req.height;
+
+ gtk_widget_size_allocate (child->widget, &allocation);
}
tmp_list = g_slist_next (tmp_list);
GdkRectangle right_rect;
GdkRectangle top_rect;
GdkRectangle bottom_rect;
-
+ gint focus_edge_width;
+ gint focus_width;
+ gboolean interior_focus;
+ gboolean size_changed;
+
text_view = GTK_TEXT_VIEW (widget);
+ DV(g_print(G_STRLOC"\n"));
+
+ size_changed =
+ widget->allocation.width != allocation->width ||
+ widget->allocation.height != allocation->height;
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
* windows get at least a 1x1 allocation.
*/
- width = allocation->width - FOCUS_EDGE_WIDTH * 2;
+ gtk_widget_style_get (widget,
+ "interior_focus", &interior_focus,
+ "focus_line_width", &focus_width,
+ NULL);
+
+ if (interior_focus)
+ focus_edge_width = 0;
+ else
+ focus_edge_width = focus_width;
+
+ width = allocation->width - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
if (text_view->left_window)
left_rect.width = text_view->left_window->requisition.width;
else
- left_rect.width = 1;
+ left_rect.width = 0;
width -= left_rect.width;
if (text_view->right_window)
right_rect.width = text_view->right_window->requisition.width;
else
- right_rect.width = 1;
+ right_rect.width = 0;
width -= right_rect.width;
bottom_rect.width = text_rect.width;
- height = allocation->height - FOCUS_EDGE_WIDTH * 2;
+ height = allocation->height - focus_edge_width * 2 - GTK_CONTAINER (text_view)->border_width * 2;
if (text_view->top_window)
top_rect.height = text_view->top_window->requisition.height;
else
- top_rect.height = 1;
+ top_rect.height = 0;
height -= top_rect.height;
if (text_view->bottom_window)
bottom_rect.height = text_view->bottom_window->requisition.height;
else
- bottom_rect.height = 1;
+ bottom_rect.height = 0;
height -= bottom_rect.height;
right_rect.height = text_rect.height;
/* Origins */
- left_rect.x = FOCUS_EDGE_WIDTH;
- top_rect.y = FOCUS_EDGE_WIDTH;
+ left_rect.x = focus_edge_width + GTK_CONTAINER (text_view)->border_width;
+ top_rect.y = focus_edge_width + GTK_CONTAINER (text_view)->border_width;
text_rect.x = left_rect.x + left_rect.width;
text_rect.y = top_rect.y + top_rect.height;
text_window_size_allocate (text_view->bottom_window,
&bottom_rect);
- gtk_text_view_ensure_layout (text_view);
- gtk_text_layout_set_screen_width (text_view->layout,
- SCREEN_WIDTH (text_view));
-
- gtk_text_view_validate_children (text_view);
-
- gtk_text_view_validate_onscreen (text_view);
- gtk_text_view_scroll_calc_now (text_view);
+ gtk_text_view_update_layout_width (text_view);
+
+ /* Note that this will do some layout validation */
+ gtk_text_view_allocate_children (text_view);
/* Now adjust the value of the adjustment to keep the cursor at the
* same place in the buffer
if (y != text_view->yoffset)
{
- vadj->value = text_view->yoffset = y;
+ vadj->value = y;
yoffset_changed = TRUE;
}
text_view->hadjustment->page_size = SCREEN_WIDTH (text_view);
- text_view->hadjustment->page_increment = SCREEN_WIDTH (text_view) / 2;
+ text_view->hadjustment->page_increment = SCREEN_WIDTH (text_view) * 0.9;
+ text_view->hadjustment->step_increment = SCREEN_WIDTH (text_view) * 0.1;
text_view->hadjustment->lower = 0;
text_view->hadjustment->upper = MAX (SCREEN_WIDTH (text_view),
text_view->width);
- gtk_signal_emit_by_name (GTK_OBJECT (text_view->hadjustment), "changed");
+ gtk_adjustment_changed (text_view->hadjustment);
text_view->vadjustment->page_size = SCREEN_HEIGHT (text_view);
- text_view->vadjustment->page_increment = SCREEN_HEIGHT (text_view) / 2;
+ text_view->vadjustment->page_increment = SCREEN_HEIGHT (text_view) * 0.9;
+ text_view->vadjustment->step_increment = SCREEN_HEIGHT (text_view) * 0.1;
text_view->vadjustment->lower = 0;
text_view->vadjustment->upper = MAX (SCREEN_HEIGHT (text_view),
text_view->height);
- gtk_signal_emit_by_name (GTK_OBJECT (text_view->vadjustment), "changed");
+ gtk_adjustment_changed (text_view->vadjustment);
if (yoffset_changed)
gtk_adjustment_value_changed (vadj);
+
+ /* The GTK resize loop processes all the pending exposes right
+ * after doing the resize stuff, so the idle sizer won't have a
+ * chance to run. So we do the work here.
+ */
+ gtk_text_view_flush_first_validate (text_view);
+
+ /* widget->window doesn't get auto-redrawn as the layout is computed, so has to
+ * be invalidated
+ */
+ if (size_changed && GTK_WIDGET_REALIZED (widget))
+ gdk_window_invalidate_rect (widget->window, NULL, FALSE);
}
static void
gtk_text_view_validate_onscreen (GtkTextView *text_view)
{
GtkWidget *widget = GTK_WIDGET (text_view);
-
+
+ DV(g_print(">Validating onscreen ("G_STRLOC")\n"));
+
if (SCREEN_HEIGHT (widget) > 0)
{
GtkTextIter first_para;
+
+ /* Be sure we've validated the stuff onscreen; if we
+ * scrolled, these calls won't have any effect, because
+ * they were called in the recursive validate_onscreen
+ */
gtk_text_view_get_first_para_iter (text_view, &first_para);
gtk_text_layout_validate_yrange (text_view->layout,
text_view->first_para_pixels +
SCREEN_HEIGHT (widget));
}
+
+ text_view->onscreen_validated = TRUE;
+
+ DV(g_print(">Done validating onscreen, onscreen_validated = TRUE ("G_STRLOC")\n"));
+
+ /* This can have the odd side effect of triggering a scroll, which should
+ * flip "onscreen_validated" back to FALSE, but should also get us
+ * back into this function to turn it on again.
+ */
+ gtk_text_view_update_adjustments (text_view);
+
+ g_assert (text_view->onscreen_validated);
+}
+
+static void
+gtk_text_view_flush_first_validate (GtkTextView *text_view)
+{
+ if (text_view->first_validate_idle == 0)
+ return;
+
+ /* Do this first, which means that if an "invalidate"
+ * occurs during any of this process, a new first_validate_callback
+ * will be installed, and we'll start again.
+ */
+ DV (g_print ("removing first validate in %s\n", G_STRLOC));
+ g_source_remove (text_view->first_validate_idle);
+ text_view->first_validate_idle = 0;
+
+ /* be sure we have up-to-date screen size set on the
+ * layout.
+ */
+ gtk_text_view_update_layout_width (text_view);
+
+ /* Bail out if we invalidated stuff; scrolling right away will just
+ * confuse the issue.
+ */
+ if (text_view->first_validate_idle != 0)
+ {
+ DV(g_print(">Width change forced requeue ("G_STRLOC")\n"));
+ }
+ else
+ {
+ /* scroll to any marks, if that's pending. This can jump us to
+ * the validation codepath used for scrolling onscreen, if so we
+ * bail out. It won't jump if already in that codepath since
+ * value_changed is not recursive, so also validate if
+ * necessary.
+ */
+ if (!gtk_text_view_flush_scroll (text_view) ||
+ !text_view->onscreen_validated)
+ gtk_text_view_validate_onscreen (text_view);
+
+ DV(g_print(">Leaving first validate idle ("G_STRLOC")\n"));
+
+ g_assert (text_view->onscreen_validated);
+ }
}
static gboolean
{
GtkTextView *text_view = data;
- gtk_text_view_validate_onscreen (text_view);
+ GDK_THREADS_ENTER ();
+
+ /* Note that some of this code is duplicated at the end of size_allocate,
+ * keep in sync with that.
+ */
+
+ DV(g_print(G_STRLOC"\n"));
- text_view->first_validate_idle = 0;
+ gtk_text_view_flush_first_validate (text_view);
+
+ GDK_THREADS_LEAVE ();
+
return FALSE;
}
incremental_validate_callback (gpointer data)
{
GtkTextView *text_view = data;
+ gboolean result = TRUE;
+ GDK_THREADS_ENTER ();
+
+ DV(g_print(G_STRLOC"\n"));
+
gtk_text_layout_validate (text_view->layout, 2000);
+
+ gtk_text_view_update_adjustments (text_view);
+
if (gtk_text_layout_is_valid (text_view->layout))
{
text_view->incremental_validate_idle = 0;
- return FALSE;
+ result = FALSE;
+ }
+
+ GDK_THREADS_LEAVE ();
+
+ return result;
+}
+
+static void
+gtk_text_view_invalidate (GtkTextView *text_view)
+{
+ DV (g_print (">Invalidate, onscreen_validated = %d now FALSE ("G_STRLOC")\n",
+ text_view->onscreen_validated));
+
+ text_view->onscreen_validated = FALSE;
+
+ /* We'll invalidate when the layout is created */
+ if (text_view->layout == NULL)
+ return;
+
+ if (!text_view->first_validate_idle)
+ {
+ text_view->first_validate_idle = g_idle_add_full (GTK_PRIORITY_RESIZE - 2, first_validate_callback, text_view, NULL);
+ DV (g_print (G_STRLOC": adding first validate idle %d\n",
+ text_view->first_validate_idle));
+ }
+
+ if (!text_view->incremental_validate_idle)
+ {
+ text_view->incremental_validate_idle = g_idle_add_full (GTK_TEXT_VIEW_PRIORITY_VALIDATE, incremental_validate_callback, text_view, NULL);
+ DV (g_print (G_STRLOC": adding incremental validate idle %d\n",
+ text_view->incremental_validate_idle));
}
- else
- return TRUE;
}
static void
text_view = GTK_TEXT_VIEW (data);
- if (!text_view->first_validate_idle)
- text_view->first_validate_idle = g_idle_add_full (GTK_PRIORITY_RESIZE - 1, first_validate_callback, text_view, NULL);
-
- if (!text_view->incremental_validate_idle)
- text_view->incremental_validate_idle = g_idle_add_full (GDK_PRIORITY_REDRAW + 1, incremental_validate_callback, text_view, NULL);
+ DV (g_print ("Invalidating due to layout invalidate signal\n"));
+ gtk_text_view_invalidate (text_view);
}
static void
-changed_handler (GtkTextLayout *layout,
- gint start_y,
- gint old_height,
- gint new_height,
- gpointer data)
+changed_handler (GtkTextLayout *layout,
+ gint start_y,
+ gint old_height,
+ gint new_height,
+ gpointer data)
{
GtkTextView *text_view;
GtkWidget *widget;
GdkRectangle visible_rect;
GdkRectangle redraw_rect;
-
+
text_view = GTK_TEXT_VIEW (data);
widget = GTK_WIDGET (data);
+
+ DV(g_print(">Lines Validated ("G_STRLOC")\n"));
if (GTK_WIDGET_REALIZED (text_view))
{
if (old_height == new_height)
redraw_rect.height = old_height;
- else
+ else if (start_y + old_height > visible_rect.y)
redraw_rect.height = MAX (0, visible_rect.y + visible_rect.height - start_y);
-
+ else
+ redraw_rect.height = 0;
+
if (gdk_rectangle_intersect (&redraw_rect, &visible_rect, &redraw_rect))
{
/* text_window_invalidate_rect() takes buffer coordinates */
text_window_invalidate_rect (text_view->text_window,
&redraw_rect);
+ DV(g_print(" invalidated rect: %d,%d %d x %d\n",
+ redraw_rect.x,
+ redraw_rect.y,
+ redraw_rect.width,
+ redraw_rect.height));
+
if (text_view->left_window)
text_window_invalidate_rect (text_view->left_window,
&redraw_rect);
if (text_view->bottom_window)
text_window_invalidate_rect (text_view->bottom_window,
&redraw_rect);
+
+ gtk_text_view_update_im_spot_location (text_view);
}
}
-
+
if (old_height != new_height)
{
gboolean yoffset_changed = FALSE;
GSList *tmp_list;
+ int new_first_para_top;
+ int old_first_para_top;
+ GtkTextIter first;
- if (start_y + old_height <= text_view->yoffset - text_view->first_para_pixels)
+ /* If the bottom of the old area was above the top of the
+ * screen, we need to scroll to keep the current top of the
+ * screen in place. Remember that first_para_pixels is the
+ * position of the top of the screen in coordinates relative to
+ * the first paragraph onscreen.
+ *
+ * In short we are adding the height delta of the portion of the
+ * changed region above first_para_mark to text_view->yoffset.
+ */
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &first,
+ text_view->first_para_mark);
+
+ gtk_text_layout_get_line_yrange (layout, &first, &new_first_para_top, NULL);
+
+ old_first_para_top = text_view->yoffset - text_view->first_para_pixels;
+
+ if (new_first_para_top != old_first_para_top)
{
- text_view->yoffset += new_height - old_height;
+ text_view->yoffset += new_first_para_top - old_first_para_top;
+
get_vadjustment (text_view)->value = text_view->yoffset;
yoffset_changed = TRUE;
}
if (yoffset_changed)
- gtk_adjustment_value_changed (get_vadjustment (text_view));
+ {
+ DV(g_print ("Changing scroll position (%s)\n", G_STRLOC));
+ gtk_adjustment_value_changed (get_vadjustment (text_view));
+ }
/* FIXME be smarter about which anchored widgets we update */
tmp_list = g_slist_next (tmp_list);
}
}
-
- gtk_text_view_scroll_calc_now (text_view);
+
+ {
+ GtkRequisition old_req;
+ GtkRequisition new_req;
+
+ old_req = widget->requisition;
+
+ /* Use this instead of gtk_widget_size_request wrapper
+ * to avoid the optimization which just returns widget->requisition
+ * if a resize hasn't been queued.
+ */
+ GTK_WIDGET_GET_CLASS (widget)->size_request (widget, &new_req);
+
+ if (old_req.width != new_req.width ||
+ old_req.height != new_req.height)
+ {
+ /* FIXME http://bugzilla.gnome.org/show_bug.cgi?id=72258 */
+ _gtk_size_group_queue_resize (widget);
+ }
+ }
}
static void
widget->window);
gtk_text_view_ensure_layout (text_view);
+
+ if (text_view->buffer)
+ {
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_add_selection_clipboard (text_view->buffer, clipboard);
+ }
+
+ tmp_list = text_view->children;
+ while (tmp_list != NULL)
+ {
+ GtkTextViewChild *vc = tmp_list->data;
+
+ text_view_child_set_parent_window (text_view, vc);
+
+ tmp_list = tmp_list->next;
+ }
}
static void
gtk_text_view_unrealize (GtkWidget *widget)
{
GtkTextView *text_view;
- GSList *tmp_list;
text_view = GTK_TEXT_VIEW (widget);
- if (text_view->first_validate_idle)
+ if (text_view->buffer)
{
- g_source_remove (text_view->first_validate_idle);
- text_view->first_validate_idle = 0;
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_remove_selection_clipboard (text_view->buffer, clipboard);
}
- if (text_view->incremental_validate_idle)
- {
- g_source_remove (text_view->incremental_validate_idle);
- text_view->incremental_validate_idle = 0;
- }
+ gtk_text_view_remove_validate_idles (text_view);
if (text_view->popup_menu)
{
if (text_view->bottom_window)
gdk_window_set_background (text_view->bottom_window->bin_window,
&widget->style->bg[GTK_WIDGET_STATE (widget)]);
+ }
+ if (text_view->layout && previous_style)
+ {
gtk_text_view_set_attributes_from_style (text_view,
text_view->layout->default_style,
widget->style);
}
}
+
+static void
+set_invisible_cursor (GdkWindow *window)
+{
+ GdkBitmap *empty_bitmap;
+ GdkCursor *cursor;
+ GdkColor useless;
+ char invisible_cursor_bits[] = { 0x0 };
+
+ useless.red = useless.green = useless.blue = 0;
+ useless.pixel = 0;
+
+ empty_bitmap = gdk_bitmap_create_from_data (window,
+ invisible_cursor_bits,
+ 1, 1);
+
+ cursor = gdk_cursor_new_from_pixmap (empty_bitmap,
+ empty_bitmap,
+ &useless,
+ &useless, 0, 0);
+
+ gdk_window_set_cursor (window, cursor);
+
+ gdk_cursor_unref (cursor);
+
+ g_object_unref (empty_bitmap);
+}
+
+static void
+gtk_text_view_obscure_mouse_cursor (GtkTextView *text_view)
+{
+ if (text_view->mouse_cursor_obscured)
+ return;
+
+ set_invisible_cursor (text_view->text_window->bin_window);
+
+ text_view->mouse_cursor_obscured = TRUE;
+}
+
/*
* Events
*/
{
GSList *tags;
GSList *tmp;
- gint retval = FALSE;
+ gboolean retval = FALSE;
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
y += text_view->yoffset;
/* FIXME this is slow and we do it twice per event.
- My favorite solution is to have GtkTextLayout cache
- the last couple lookups. */
+ * My favorite solution is to have GtkTextLayout cache
+ * the last couple lookups.
+ */
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&iter,
x, y);
static gint
gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
{
- gint retval = FALSE;
+ gboolean retval = FALSE;
+ gboolean obscure = FALSE;
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
-
+ GtkTextMark *insert;
+ GtkTextIter iter;
+ gboolean can_insert;
+
if (text_view->layout == NULL ||
get_buffer (text_view) == NULL)
return FALSE;
- if (gtk_im_context_filter_keypress (text_view->im_context, event))
+ insert = gtk_text_buffer_get_insert (get_buffer (text_view));
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, insert);
+ can_insert = gtk_text_iter_can_insert (&iter, text_view->editable);
+ if (can_insert &&
+ gtk_im_context_filter_keypress (text_view->im_context, event))
{
text_view->need_im_reset = TRUE;
+ obscure = TRUE;
retval = TRUE;
}
+ /* Binding set */
else if (GTK_WIDGET_CLASS (parent_class)->key_press_event &&
GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
retval = TRUE;
- else if (event->keyval == GDK_Return)
+ /* use overall editability not can_insert, more predictable for users */
+ else if (text_view->editable &&
+ (event->keyval == GDK_Return ||
+ event->keyval == GDK_KP_Enter))
{
- gtk_text_buffer_insert_interactive_at_cursor (get_buffer (text_view), "\n", 1,
- text_view->editable);
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ /* this won't actually insert the newline if the cursor isn't
+ * editable
+ */
+ gtk_text_view_commit_text (text_view, "\n");
+
+ obscure = TRUE;
retval = TRUE;
}
/* Pass through Tab as literal tab, unless Control is held down */
- else if (event->keyval == GDK_Tab && !(event->state & GDK_CONTROL_MASK))
+ else if ((event->keyval == GDK_Tab ||
+ event->keyval == GDK_KP_Tab) &&
+ !(event->state & GDK_CONTROL_MASK))
{
- gtk_text_buffer_insert_interactive_at_cursor (get_buffer (text_view), "\t", 1,
- text_view->editable);
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ /* If the text widget isn't editable overall, move the focus
+ * instead
+ */
+ if (text_view->editable)
+ {
+ gtk_text_view_commit_text (text_view, "\t");
+ obscure = TRUE;
+ }
+ else
+ gtk_text_view_move_focus (text_view,
+ (event->state & GDK_SHIFT_MASK) ?
+ GTK_DIR_TAB_BACKWARD: GTK_DIR_TAB_FORWARD);
+
retval = TRUE;
}
else
retval = FALSE;
- gtk_text_view_start_cursor_blink (text_view, TRUE);
+ if (obscure)
+ gtk_text_view_obscure_mouse_cursor (text_view);
+
+ gtk_text_view_pend_cursor_blink (text_view);
return retval;
}
static gint
gtk_text_view_key_release_event (GtkWidget *widget, GdkEventKey *event)
{
- return FALSE;
+ GtkTextView *text_view = GTK_TEXT_VIEW (widget);
+ GtkTextMark *insert;
+ GtkTextIter iter;
+
+ if (text_view->layout == NULL || get_buffer (text_view) == NULL)
+ return FALSE;
+
+ insert = gtk_text_buffer_get_insert (get_buffer (text_view));
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view), &iter, insert);
+ if (gtk_text_iter_can_insert (&iter, text_view->editable) &&
+ gtk_im_context_filter_keypress (text_view->im_context, event))
+ {
+ text_view->need_im_reset = TRUE;
+ return TRUE;
+ }
+ else
+ return GTK_WIDGET_CLASS (parent_class)->key_release_event (widget, event);
}
static gint
text_view = GTK_TEXT_VIEW (widget);
+ text_view->disable_scroll_on_focus = TRUE;
gtk_widget_grab_focus (widget);
+ text_view->disable_scroll_on_focus = FALSE;
if (event->window != text_view->text_window->bin_window)
{
{
text_view->drag_start_x = event->x;
text_view->drag_start_y = event->y;
+ text_view->pending_place_cursor_button = event->button;
}
else
{
event->x + text_view->xoffset,
event->y + text_view->yoffset);
- gtk_text_buffer_paste_primary (get_buffer (text_view),
- &iter,
- text_view->editable);
+ gtk_text_buffer_paste_clipboard (get_buffer (text_view),
+ gtk_widget_get_clipboard (widget, GDK_SELECTION_PRIMARY),
+ &iter,
+ text_view->editable);
return TRUE;
}
else if (event->button == 3)
{
- gtk_text_view_popup_menu (text_view, event);
+ gtk_text_view_do_popup (text_view, event);
}
}
+ else if ((event->type == GDK_2BUTTON_PRESS ||
+ event->type == GDK_3BUTTON_PRESS) &&
+ event->button == 1)
+ {
+ GtkTextIter start, end;
+
+ /* End the selection drag, otherwise we'd clear the new
+ * word/line selection on button release
+ */
+ gtk_text_view_end_selection_drag (text_view, event);
- return FALSE;
-}
-
-static gint
-gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
-{
- GtkTextView *text_view;
-
- text_view = GTK_TEXT_VIEW (widget);
-
- if (event->window != text_view->text_window->bin_window)
- return FALSE;
+ gtk_text_layout_get_iter_at_pixel (text_view->layout,
+ &start,
+ event->x + text_view->xoffset,
+ event->y + text_view->yoffset);
- if (event->button == 1)
- {
- if (text_view->drag_start_x >= 0)
+ end = start;
+
+ if (event->type == GDK_2BUTTON_PRESS)
{
- text_view->drag_start_x = -1;
- text_view->drag_start_y = -1;
+ if (gtk_text_iter_inside_word (&start))
+ {
+ if (!gtk_text_iter_starts_word (&start))
+ gtk_text_iter_backward_word_start (&start);
+
+ if (!gtk_text_iter_ends_word (&end))
+ gtk_text_iter_forward_word_end (&end);
+ }
+ }
+ else if (event->type == GDK_3BUTTON_PRESS)
+ {
+ if (gtk_text_view_starts_display_line (text_view, &start))
+ {
+ /* If on a display line boundary, we assume the user
+ * clicked off the end of a line and we therefore select
+ * the line before the boundary.
+ */
+ gtk_text_view_backward_display_line_start (text_view, &start);
+ }
+ else
+ {
+ /* start isn't on the start of a line, so we move it to the
+ * start, and move end to the end unless it's already there.
+ */
+ gtk_text_view_backward_display_line_start (text_view, &start);
+
+ if (!gtk_text_view_starts_display_line (text_view, &end))
+ gtk_text_view_forward_display_line_end (text_view, &end);
+ }
+ }
+
+ if (event->state & GDK_SHIFT_MASK)
+ {
+ /* Take union of old and new selection */
+ GtkTextIter old_start, old_end;
+
+ gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
+ &old_start, &old_end);
+
+ gtk_text_iter_order (&start, &old_start);
+ gtk_text_iter_order (&old_end, &end);
+
+ /* Now start is the first of the starts, and end is the
+ * last of the ends
+ */
+ }
+
+ gtk_text_buffer_move_mark_by_name (get_buffer (text_view),
+ "selection_bound",
+ &start);
+ gtk_text_buffer_move_mark_by_name (get_buffer (text_view),
+ "insert",
+ &end);
+
+ text_view->just_selected_element = TRUE;
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gint
+gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
+{
+ GtkTextView *text_view;
+
+ text_view = GTK_TEXT_VIEW (widget);
+
+ if (event->window != text_view->text_window->bin_window)
+ return FALSE;
+
+ if (event->button == 1)
+ {
+ if (text_view->drag_start_x >= 0)
+ {
+ text_view->drag_start_x = -1;
+ text_view->drag_start_y = -1;
}
if (gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), event))
return TRUE;
- else
+ else if (text_view->just_selected_element)
{
- /* Unselect everything; probably we were dragging, or clicked
- * outside the text.
+ text_view->just_selected_element = FALSE;
+ return FALSE;
+ }
+ else if (text_view->pending_place_cursor_button == event->button)
+ {
+ GtkTextIter iter;
+
+ /* Unselect everything; we clicked inside selection, but
+ * didn't move by the drag threshold, so just clear selection
+ * and place cursor.
*/
- gtk_text_view_unselect (text_view);
+ gtk_text_layout_get_iter_at_pixel (text_view->layout,
+ &iter,
+ event->x + text_view->xoffset,
+ event->y + text_view->yoffset);
+
+ gtk_text_buffer_place_cursor (get_buffer (text_view), &iter);
+
+ text_view->pending_place_cursor_button = 0;
+
return FALSE;
}
}
return FALSE;
}
+static void
+keymap_direction_changed (GdkKeymap *keymap,
+ GtkTextView *text_view)
+{
+ gtk_text_view_check_keymap_direction (text_view);
+}
+
static gint
gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
- GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
+ gtk_widget_queue_draw (widget);
+ DV(g_print (G_STRLOC": focus_in_event\n"));
+
if (text_view->cursor_visible && text_view->layout)
{
gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
- gtk_text_view_start_cursor_blink (text_view, FALSE);
+ gtk_text_view_check_cursor_blink (text_view);
}
+ g_signal_connect (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
+ "direction_changed",
+ G_CALLBACK (keymap_direction_changed), text_view);
+ gtk_text_view_check_keymap_direction (text_view);
+
text_view->need_im_reset = TRUE;
gtk_im_context_focus_in (GTK_TEXT_VIEW (widget)->im_context);
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
- GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
+ gtk_widget_queue_draw (widget);
+ DV(g_print (G_STRLOC": focus_out_event\n"));
+
if (text_view->cursor_visible && text_view->layout)
{
gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
- gtk_text_view_stop_cursor_blink (text_view);
+ gtk_text_view_check_cursor_blink (text_view);
}
+ g_signal_handlers_disconnect_by_func (gdk_keymap_get_for_display (gtk_widget_get_display (widget)),
+ keymap_direction_changed,
+ text_view);
+
text_view->need_im_reset = TRUE;
gtk_im_context_focus_out (GTK_TEXT_VIEW (widget)->im_context);
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
+ if (text_view->mouse_cursor_obscured)
+ {
+ GdkCursor *cursor;
+
+ cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
+ GDK_XTERM);
+ gdk_window_set_cursor (text_view->text_window->bin_window, cursor);
+ gdk_cursor_unref (cursor);
+ text_view->mouse_cursor_obscured = FALSE;
+ }
+
if (event->window == text_view->text_window->bin_window &&
text_view->drag_start_x >= 0)
{
gint x, y;
- gint dx, dy;
gdk_window_get_pointer (text_view->text_window->bin_window,
&x, &y, NULL);
- dx = text_view->drag_start_x - x;
- dy = text_view->drag_start_y - y;
-
- if (ABS (dx) > DRAG_THRESHOLD ||
- ABS (dy) > DRAG_THRESHOLD)
+ if (gtk_drag_check_threshold (widget,
+ text_view->drag_start_x,
+ text_view->drag_start_y,
+ x, y))
{
GtkTextIter iter;
gint buffer_x, buffer_y;
}
static void
-gtk_text_view_paint (GtkWidget *widget, GdkRectangle *area)
+gtk_text_view_paint (GtkWidget *widget,
+ GdkRectangle *area,
+ GdkEventExpose *event)
{
GtkTextView *text_view;
-
+ GList *child_exposes;
+ GList *tmp_list;
+ GdkRegion *updates;
+
text_view = GTK_TEXT_VIEW (widget);
g_return_if_fail (text_view->layout != NULL);
g_return_if_fail (text_view->xoffset >= 0);
g_return_if_fail (text_view->yoffset >= 0);
- gtk_text_view_validate_onscreen (text_view);
+ while (text_view->first_validate_idle != 0)
+ {
+ DV (g_print (G_STRLOC": first_validate_idle: %d\n",
+ text_view->first_validate_idle));
+ gtk_text_view_flush_first_validate (text_view);
+ }
+ /* More regions could have become invalid in the above loop */
+ updates = gdk_window_get_update_area (text_view->text_window->bin_window);
+ if (updates)
+ {
+ GdkRectangle rect;
+
+ gdk_region_get_clipbox (updates, &rect);
+
+ gdk_rectangle_union (area, &rect, area);
+
+ gdk_region_destroy (updates);
+ }
+
+ if (!text_view->onscreen_validated)
+ {
+ g_warning (G_STRLOC ": somehow some text lines were modified or scrolling occurred since the last validation of lines on the screen - may be a text widget bug.");
+ g_assert_not_reached ();
+ }
+
#if 0
printf ("painting %d,%d %d x %d\n",
area->x, area->y,
area->width, area->height);
#endif
+ child_exposes = NULL;
gtk_text_layout_draw (text_view->layout,
widget,
text_view->text_window->bin_window,
+ NULL,
text_view->xoffset,
text_view->yoffset,
area->x, area->y,
- area->width, area->height);
-}
-
-static void
-send_expose (GtkTextView *text_view,
- GtkTextWindow *win,
- GdkRectangle *area)
-{
- GdkEventExpose event;
-
- event.type = GDK_EXPOSE;
- event.send_event = TRUE;
- event.window = win->bin_window;
- event.area = *area;
- event.count = 0;
-
- /* Fix coordinates (convert widget coords to window coords) */
- gtk_text_view_window_to_buffer_coords (text_view,
- GTK_TEXT_WINDOW_WIDGET,
- event.area.x,
- event.area.y,
- &event.area.x,
- &event.area.y);
-
- gtk_text_view_buffer_to_window_coords (text_view,
- win->type,
- event.area.x,
- event.area.y,
- &event.area.x,
- &event.area.y);
-
-
- gdk_window_ref (event.window);
- gtk_widget_event (GTK_WIDGET (text_view), (GdkEvent*) &event);
- gdk_window_unref (event.window);
-}
-
-static void
-gtk_text_view_draw (GtkWidget *widget, GdkRectangle *area)
-{
- GdkRectangle intersection;
- GtkTextView *text_view;
-
- text_view = GTK_TEXT_VIEW (widget);
-
- gtk_text_view_paint (widget, area);
-
- /* If the area overlaps the "edge" of the widget, draw the focus
- * rectangle
- */
- if (area->x < FOCUS_EDGE_WIDTH ||
- area->y < FOCUS_EDGE_WIDTH ||
- (area->x + area->width) > (widget->allocation.width - FOCUS_EDGE_WIDTH) ||
- (area->y + area->height) > (widget->allocation.height - FOCUS_EDGE_WIDTH))
- gtk_widget_draw_focus (widget);
-
- /* Synthesize expose events for the user-drawn border windows,
- * just as we would for a drawing area.
- */
-
- if (text_view->left_window &&
- gdk_rectangle_intersect (area, &text_view->left_window->allocation,
- &intersection))
- send_expose (text_view, text_view->left_window, &intersection);
+ area->width, area->height,
+ &child_exposes);
- if (text_view->right_window &&
- gdk_rectangle_intersect (area, &text_view->right_window->allocation,
- &intersection))
- send_expose (text_view, text_view->right_window, &intersection);
+ tmp_list = child_exposes;
+ while (tmp_list != NULL)
+ {
+ GtkWidget *child = tmp_list->data;
+
+ gtk_container_propagate_expose (GTK_CONTAINER (text_view),
+ child,
+ event);
- if (text_view->top_window &&
- gdk_rectangle_intersect (area, &text_view->top_window->allocation,
- &intersection))
- send_expose (text_view, text_view->top_window, &intersection);
+ g_object_unref (child);
+
+ tmp_list = tmp_list->next;
+ }
- if (text_view->bottom_window &&
- gdk_rectangle_intersect (area, &text_view->bottom_window->allocation,
- &intersection))
- send_expose (text_view, text_view->bottom_window, &intersection);
+ g_list_free (child_exposes);
}
static gint
gtk_text_view_expose_event (GtkWidget *widget, GdkEventExpose *event)
{
+ GSList *tmp_list;
+
if (event->window == gtk_text_view_get_window (GTK_TEXT_VIEW (widget),
GTK_TEXT_WINDOW_TEXT))
- gtk_text_view_paint (widget, &event->area);
+ {
+ DV(g_print (">Exposed ("G_STRLOC")\n"));
+ gtk_text_view_paint (widget, &event->area, event);
+ }
if (event->window == widget->window)
- gtk_widget_draw_focus (widget);
+ gtk_text_view_draw_focus (widget);
- return TRUE;
+ /* Propagate exposes to all children not in the buffer. */
+ tmp_list = GTK_TEXT_VIEW (widget)->children;
+ while (tmp_list != NULL)
+ {
+ GtkTextViewChild *vc = tmp_list->data;
+
+ /* propagate_expose checks that event->window matches
+ * child->window
+ */
+ if (vc->type != GTK_TEXT_WINDOW_TEXT)
+ gtk_container_propagate_expose (GTK_CONTAINER (widget),
+ vc->widget,
+ event);
+
+ tmp_list = tmp_list->next;
+ }
+
+ return FALSE;
}
static void
gtk_text_view_draw_focus (GtkWidget *widget)
{
+ gboolean interior_focus;
+
+ /* We clear the focus if we are in interior focus mode. */
+ gtk_widget_style_get (widget,
+ "interior_focus", &interior_focus,
+ NULL);
+
if (GTK_WIDGET_DRAWABLE (widget))
{
- if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- gtk_paint_focus (widget->style, widget->window,
+ if (GTK_WIDGET_HAS_FOCUS (widget) && !interior_focus)
+ {
+ gtk_paint_focus (widget->style, widget->window, GTK_WIDGET_STATE (widget),
NULL, widget, "textview",
0, 0,
- widget->allocation.width - 1,
- widget->allocation.height - 1);
+ widget->allocation.width,
+ widget->allocation.height);
}
else
{
}
}
+static void
+gtk_text_view_grab_focus (GtkWidget *widget)
+{
+ GtkTextView *text_view;
+
+ text_view = GTK_TEXT_VIEW (widget);
+
+ GTK_WIDGET_CLASS (parent_class)->grab_focus (widget);
+
+ if (!text_view->disable_scroll_on_focus)
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
+}
+
+static gboolean
+gtk_text_view_focus (GtkWidget *widget,
+ GtkDirectionType direction)
+{
+ GtkTextView *text_view;
+ GtkContainer *container;
+ gboolean result;
+
+ text_view = GTK_TEXT_VIEW (widget);
+ container = GTK_CONTAINER (widget);
+
+ if (!gtk_widget_is_focus (widget) &&
+ container->focus_child == NULL)
+ {
+ gtk_widget_grab_focus (widget);
+ return TRUE;
+ }
+ else
+ {
+ /*
+ * Unset CAN_FOCUS flag so that gtk_container_focus() allows
+ * children to get the focus
+ */
+ GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
+ result = GTK_WIDGET_CLASS (parent_class)->focus (widget, direction);
+ GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+
+ return result;
+ }
+}
+
/*
* Container
*/
{
GSList *iter;
GtkTextView *text_view;
+ GSList *copy;
g_return_if_fail (GTK_IS_TEXT_VIEW (container));
g_return_if_fail (callback != NULL);
text_view = GTK_TEXT_VIEW (container);
- iter = text_view->children;
+ copy = g_slist_copy (text_view->children);
+ iter = copy;
while (iter != NULL)
{
iter = g_slist_next (iter);
}
+
+ g_slist_free (copy);
}
-/* Note that CURSOR_ON_TIME is effectively added to PREBLINK_TIME
- * because blinking starts with the cursor turned on.
- */
-#define PREBLINK_TIME 300
-#define CURSOR_ON_TIME 800
-#define CURSOR_OFF_TIME 400
+#define CURSOR_ON_MULTIPLIER 0.66
+#define CURSOR_OFF_MULTIPLIER 0.34
+#define CURSOR_PEND_MULTIPLIER 1.0
-/*
- * preblink!
- */
+static gboolean
+cursor_blinks (GtkTextView *text_view)
+{
+ GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
+ gboolean blink;
+
+#ifdef DEBUG_VALIDATION_AND_SCROLLING
+ return FALSE;
+#endif
+ if (gtk_debug_flags & GTK_DEBUG_UPDATES)
+ return FALSE;
+
+ g_object_get (G_OBJECT (settings), "gtk-cursor-blink", &blink, NULL);
+ return blink;
+}
static gint
-preblink_cb (gpointer data)
+get_cursor_time (GtkTextView *text_view)
{
- GtkTextView *text_view = GTK_TEXT_VIEW (data);
+ GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
+ gint time;
- text_view->preblink_timeout = 0;
- gtk_text_view_start_cursor_blink (text_view, FALSE);
+ g_object_get (G_OBJECT (settings), "gtk-cursor-blink-time", &time, NULL);
- /* Remove ourselves */
- return FALSE;
+ return time;
}
/*
static gint
blink_cb (gpointer data)
{
- GtkTextView *text_view = GTK_TEXT_VIEW (data);
+ GtkTextView *text_view;
gboolean visible;
+
+ GDK_THREADS_ENTER ();
+
+ text_view = GTK_TEXT_VIEW (data);
g_assert (text_view->layout);
g_assert (GTK_WIDGET_HAS_FOCUS (text_view));
visible = gtk_text_layout_get_cursor_visible (text_view->layout);
if (visible)
- text_view->blink_timeout = gtk_timeout_add (CURSOR_OFF_TIME,
+ text_view->blink_timeout = gtk_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER,
blink_cb,
text_view);
else
- text_view->blink_timeout = gtk_timeout_add (CURSOR_ON_TIME,
+ text_view->blink_timeout = gtk_timeout_add (get_cursor_time (text_view) * CURSOR_ON_MULTIPLIER,
blink_cb,
text_view);
gtk_text_layout_set_cursor_visible (text_view->layout,
!visible);
+ GDK_THREADS_LEAVE ();
+
/* Remove ourselves */
return FALSE;
}
+
static void
-gtk_text_view_start_cursor_blink(GtkTextView *text_view,
- gboolean with_delay)
+gtk_text_view_stop_cursor_blink (GtkTextView *text_view)
{
- if (!text_view->cursor_visible)
- return;
-
- if (text_view->preblink_timeout != 0)
- {
- gtk_timeout_remove (text_view->preblink_timeout);
- text_view->preblink_timeout = 0;
+ if (text_view->blink_timeout)
+ {
+ gtk_timeout_remove (text_view->blink_timeout);
+ text_view->blink_timeout = 0;
}
-
- if (with_delay)
+}
+
+static void
+gtk_text_view_check_cursor_blink (GtkTextView *text_view)
+{
+ if (text_view->layout != NULL &&
+ text_view->cursor_visible &&
+ GTK_WIDGET_HAS_FOCUS (text_view))
{
- if (text_view->blink_timeout != 0)
- {
- gtk_timeout_remove (text_view->blink_timeout);
- text_view->blink_timeout = 0;
- }
-
- gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
-
- text_view->preblink_timeout = gtk_timeout_add (PREBLINK_TIME,
- preblink_cb,
- text_view);
+ if (cursor_blinks (text_view))
+ {
+ if (text_view->blink_timeout == 0)
+ {
+ gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
+
+ text_view->blink_timeout = gtk_timeout_add (get_cursor_time (text_view) * CURSOR_OFF_MULTIPLIER,
+ blink_cb,
+ text_view);
+ }
+ }
+ else
+ gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
}
else
{
- if (text_view->blink_timeout == 0)
- {
- gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
-
- text_view->blink_timeout = gtk_timeout_add (CURSOR_ON_TIME,
- blink_cb,
- text_view);
- }
+ gtk_text_view_stop_cursor_blink (text_view);
}
}
static void
-gtk_text_view_stop_cursor_blink (GtkTextView *text_view)
+gtk_text_view_pend_cursor_blink(GtkTextView *text_view)
{
- if (text_view->preblink_timeout)
+ if (text_view->layout != NULL &&
+ text_view->cursor_visible &&
+ GTK_WIDGET_HAS_FOCUS (text_view) &&
+ cursor_blinks (text_view))
{
- gtk_timeout_remove (text_view->preblink_timeout);
- text_view->preblink_timeout = 0;
- }
-
- if (text_view->blink_timeout)
- {
- gtk_timeout_remove (text_view->blink_timeout);
- text_view->blink_timeout = 0;
+ if (text_view->blink_timeout != 0)
+ {
+ gtk_timeout_remove (text_view->blink_timeout);
+ text_view->blink_timeout = 0;
+ }
+
+ gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
+
+ text_view->blink_timeout = gtk_timeout_add (get_cursor_time (text_view) * CURSOR_PEND_MULTIPLIER,
+ blink_cb,
+ text_view);
}
}
+
/*
* Key binding handlers
*/
}
static void
-gtk_text_view_move_cursor (GtkTextView *text_view,
- GtkMovementStep step,
- gint count,
- gboolean extend_selection)
+move_cursor (GtkTextView *text_view,
+ const GtkTextIter *new_location,
+ gboolean extend_selection)
+{
+ if (extend_selection)
+ gtk_text_buffer_move_mark_by_name (get_buffer (text_view),
+ "insert",
+ new_location);
+ else
+ gtk_text_buffer_place_cursor (get_buffer (text_view),
+ new_location);
+}
+
+/* FIXME when we are unfrozen and can change GtkMovementStep,
+ * fix this
+ */
+#define PAGE_HORIZONTALLY_HACK_VALUE 57
+
+static void
+gtk_text_view_move_cursor_internal (GtkTextView *text_view,
+ GtkMovementStep step,
+ gint count,
+ gboolean extend_selection)
{
GtkTextIter insert;
GtkTextIter newplace;
if (step == GTK_MOVEMENT_PAGES)
{
- gtk_text_view_scroll_pages (text_view, count);
- gtk_text_view_start_cursor_blink (text_view, TRUE);
+ gtk_text_view_scroll_pages (text_view, count, extend_selection);
+ gtk_text_view_pend_cursor_blink (text_view);
+ return;
+ }
+ else if (step == PAGE_HORIZONTALLY_HACK_VALUE)
+ {
+ gtk_text_view_scroll_hpages (text_view, count, extend_selection);
+ gtk_text_view_pend_cursor_blink (text_view);
return;
}
switch (step)
{
- case GTK_MOVEMENT_CHARS:
- gtk_text_iter_forward_chars (&newplace, count);
+ case GTK_MOVEMENT_LOGICAL_POSITIONS:
+ gtk_text_iter_forward_cursor_positions (&newplace, count);
break;
- case GTK_MOVEMENT_POSITIONS:
+ case GTK_MOVEMENT_VISUAL_POSITIONS:
gtk_text_layout_move_iter_visually (text_view->layout,
&newplace, count);
break;
break;
case GTK_MOVEMENT_PARAGRAPHS:
- /* This should almost certainly instead be doing the parallel thing to WORD */
- /* gtk_text_iter_down_lines (&newplace, count); */
- /* FIXME */
+ if (count > 0)
+ {
+ if (!gtk_text_iter_ends_line (&newplace))
+ {
+ gtk_text_iter_forward_to_line_end (&newplace);
+ --count;
+ }
+ }
+ else if (count < 0)
+ {
+ if (gtk_text_iter_get_line_offset (&newplace) > 0)
+ {
+ gtk_text_iter_set_line_offset (&newplace, 0);
+ ++count;
+ }
+ }
+
+ if (count != 0)
+ {
+ gtk_text_iter_forward_lines (&newplace, count);
+ gtk_text_iter_set_line_offset (&newplace, 0);
+ }
break;
case GTK_MOVEMENT_PARAGRAPH_ENDS:
if (count > 0)
- gtk_text_iter_forward_to_newline (&newplace);
+ {
+ if (!gtk_text_iter_ends_line (&newplace))
+ gtk_text_iter_forward_to_line_end (&newplace);
+ }
else if (count < 0)
- gtk_text_iter_set_line_offset (&newplace, 0);
+ {
+ gtk_text_iter_set_line_offset (&newplace, 0);
+ }
break;
case GTK_MOVEMENT_BUFFER_ENDS:
if (count > 0)
- gtk_text_buffer_get_last_iter (get_buffer (text_view), &newplace);
+ gtk_text_buffer_get_end_iter (get_buffer (text_view), &newplace);
else if (count < 0)
gtk_text_buffer_get_iter_at_offset (get_buffer (text_view), &newplace, 0);
break;
-
+
default:
break;
}
if (!gtk_text_iter_equal (&insert, &newplace))
{
- if (extend_selection)
- gtk_text_buffer_move_mark (get_buffer (text_view),
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- &newplace);
- else
- gtk_text_buffer_place_cursor (get_buffer (text_view), &newplace);
+ move_cursor (text_view, &newplace, extend_selection);
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"), 0);
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
if (step == GTK_MOVEMENT_DISPLAY_LINES)
{
}
}
- gtk_text_view_start_cursor_blink (text_view, TRUE);
+ gtk_text_view_pend_cursor_blink (text_view);
+}
+
+static void
+gtk_text_view_move_cursor (GtkTextView *text_view,
+ GtkMovementStep step,
+ gint count,
+ gboolean extend_selection)
+{
+ gtk_text_view_move_cursor_internal (text_view, step, count, extend_selection);
+}
+
+static void
+gtk_text_view_page_horizontally (GtkTextView *text_view,
+ gint count,
+ gboolean extend_selection)
+{
+ gtk_text_view_move_cursor_internal (text_view, PAGE_HORIZONTALLY_HACK_VALUE,
+ count, extend_selection);
}
static void
static void
gtk_text_view_scroll_pages (GtkTextView *text_view,
- gint count)
+ gint count,
+ gboolean extend_selection)
{
- gfloat newval;
+ gdouble newval;
+ gdouble oldval;
GtkAdjustment *adj;
gint cursor_x_pos, cursor_y_pos;
GtkTextIter new_insert;
g_return_if_fail (text_view->vadjustment != NULL);
+ cancel_pending_scroll (text_view);
+
adj = text_view->vadjustment;
/* Validate the region that will be brought into view by the cursor motion
}
gtk_text_layout_validate_yrange (text_view->layout, &anchor, y0, y1);
+ /* FIXME do we need to update the adjustment ranges here? */
- gtk_text_view_get_virtual_cursor_pos (text_view, &cursor_x_pos, &cursor_y_pos);
+ if (count < 0 && adj->value <= (adj->lower + 1e-12))
+ {
+ /* already at top, just be sure we are at offset 0 */
+ gtk_text_buffer_get_start_iter (get_buffer (text_view), &new_insert);
+ move_cursor (text_view, &new_insert, extend_selection);
+ }
+ else if (count > 0 && adj->value >= (adj->upper - adj->page_size - 1e-12))
+ {
+ /* already at bottom, just be sure we are at the end */
+ gtk_text_buffer_get_end_iter (get_buffer (text_view), &new_insert);
+ move_cursor (text_view, &new_insert, extend_selection);
+ }
+ else
+ {
+ gtk_text_view_get_virtual_cursor_pos (text_view, &cursor_x_pos, &cursor_y_pos);
+
+ newval = adj->value;
+ oldval = adj->value;
+
+ newval += count * adj->page_increment;
+
+ set_adjustment_clamped (adj, newval);
+ cursor_y_pos += adj->value - oldval;
+
+ gtk_text_layout_get_iter_at_pixel (text_view->layout, &new_insert, cursor_x_pos, cursor_y_pos);
+ clamp_iter_onscreen (text_view, &new_insert);
+ move_cursor (text_view, &new_insert, extend_selection);
+
+ gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, cursor_y_pos);
+ }
+
+ /* Adjust to have the cursor _entirely_ onscreen, move_mark_onscreen
+ * only guarantees 1 pixel onscreen.
+ */
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
+}
- newval = adj->value;
+static void
+gtk_text_view_scroll_hpages (GtkTextView *text_view,
+ gint count,
+ gboolean extend_selection)
+{
+ gdouble newval;
+ gdouble oldval;
+ GtkAdjustment *adj;
+ gint cursor_x_pos, cursor_y_pos;
+ GtkTextIter new_insert;
+ gint y, height;
+
+ g_return_if_fail (text_view->hadjustment != NULL);
+
+ cancel_pending_scroll (text_view);
+
+ adj = text_view->hadjustment;
+
+ /* Validate the line that we're moving within.
+ */
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+ &new_insert,
+ gtk_text_buffer_get_mark (get_buffer (text_view), "insert"));
+ gtk_text_layout_get_line_yrange (text_view->layout, &new_insert, &y, &height);
+ gtk_text_layout_validate_yrange (text_view->layout, &new_insert, y, y + height);
+ /* FIXME do we need to update the adjustment ranges here? */
+
+ if (count < 0 && adj->value <= (adj->lower + 1e-12))
+ {
+ /* already at far left, just be sure we are at offset 0 */
+ gtk_text_iter_set_line_offset (&new_insert, 0);
+ move_cursor (text_view, &new_insert, extend_selection);
+ }
+ else if (count > 0 && adj->value >= (adj->upper - adj->page_size - 1e-12))
+ {
+ /* already at far right, just be sure we are at the end */
+ gtk_text_iter_forward_to_line_end (&new_insert);
+ move_cursor (text_view, &new_insert, extend_selection);
+ }
+ else
+ {
+ gtk_text_view_get_virtual_cursor_pos (text_view, &cursor_x_pos, &cursor_y_pos);
- newval += count * adj->page_increment;
+ newval = adj->value;
+ oldval = adj->value;
+
+ newval += count * adj->page_increment;
- cursor_y_pos += newval - adj->value;
- set_adjustment_clamped (adj, newval);
+ set_adjustment_clamped (adj, newval);
+ cursor_x_pos += adj->value - oldval;
- gtk_text_layout_get_iter_at_pixel (text_view->layout, &new_insert, cursor_x_pos, cursor_y_pos);
- clamp_iter_onscreen (text_view, &new_insert);
- gtk_text_buffer_place_cursor (get_buffer (text_view), &new_insert);
+ gtk_text_layout_get_iter_at_pixel (text_view->layout, &new_insert, cursor_x_pos, cursor_y_pos);
+ clamp_iter_onscreen (text_view, &new_insert);
+ move_cursor (text_view, &new_insert, extend_selection);
- gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, cursor_y_pos);
+ gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, cursor_y_pos);
+ }
+ /* FIXME for lines shorter than the overall widget width, this results in a
+ * "bounce" effect as we scroll to the right of the widget, then scroll
+ * back to get the end of the line onscreen.
+ * http://bugzilla.gnome.org/show_bug.cgi?id=68963
+ */
+
/* Adjust to have the cursor _entirely_ onscreen, move_mark_onscreen
* only guarantees 1 pixel onscreen.
*/
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
}
static gboolean
*end = *center;
if (gtk_text_iter_backward_find_char (start, not_whitespace, NULL, NULL))
- gtk_text_iter_next_char (start); /* we want the first whitespace... */
+ gtk_text_iter_forward_char (start); /* we want the first whitespace... */
if (whitespace (gtk_text_iter_get_char (end), NULL))
gtk_text_iter_forward_find_char (end, not_whitespace, NULL, NULL);
static void
gtk_text_view_delete_from_cursor (GtkTextView *text_view,
- GtkDeleteType type,
- gint count)
+ GtkDeleteType type,
+ gint count)
{
GtkTextIter insert;
GtkTextIter start;
switch (type)
{
case GTK_DELETE_CHARS:
- gtk_text_iter_forward_chars (&end, count);
+ gtk_text_iter_forward_cursor_positions (&end, count);
break;
case GTK_DELETE_WORD_ENDS:
* simply delete that newline, instead of
* moving to the next one.
*/
- if (gtk_text_iter_get_char (&end) == '\n')
+ if (gtk_text_iter_ends_line (&end))
{
- gtk_text_iter_next_char (&end);
+ gtk_text_iter_forward_line (&end);
--count;
}
while (count > 0)
{
- if (!gtk_text_iter_forward_to_newline (&end))
+ if (!gtk_text_iter_forward_to_line_end (&end))
break;
--count;
if (count > 0)
{
gtk_text_iter_set_line_offset (&start, 0);
- gtk_text_iter_forward_to_newline (&end);
+ gtk_text_iter_forward_to_line_end (&end);
/* Do the lines beyond the first. */
while (count > 1)
{
- gtk_text_iter_forward_to_newline (&end);
+ gtk_text_iter_forward_to_line_end (&end);
--count;
}
if (!gtk_text_iter_equal (&start, &end))
{
+ gtk_text_buffer_begin_user_action (get_buffer (text_view));
+
if (gtk_text_buffer_delete_interactive (get_buffer (text_view), &start, &end,
text_view->editable))
{
text_view->editable);
}
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view), "insert"),
- 0);
+ gtk_text_buffer_end_user_action (get_buffer (text_view));
+
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view), "insert"));
}
}
static void
gtk_text_view_cut_clipboard (GtkTextView *text_view)
{
- gtk_text_buffer_cut_clipboard (get_buffer (text_view), text_view->editable);
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_CLIPBOARD);
+
+ gtk_text_buffer_cut_clipboard (get_buffer (text_view),
+ clipboard,
+ text_view->editable);
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
}
static void
gtk_text_view_copy_clipboard (GtkTextView *text_view)
{
- gtk_text_buffer_copy_clipboard (get_buffer (text_view));
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_CLIPBOARD);
+
+ gtk_text_buffer_copy_clipboard (get_buffer (text_view),
+ clipboard);
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
}
static void
gtk_text_view_paste_clipboard (GtkTextView *text_view)
{
- gtk_text_buffer_paste_clipboard (get_buffer (text_view), text_view->editable);
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ GtkClipboard *clipboard = gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_CLIPBOARD);
+
+ gtk_text_buffer_paste_clipboard (get_buffer (text_view),
+ clipboard,
+ NULL,
+ text_view->editable);
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
}
static void
text_view->overwrite_mode = !text_view->overwrite_mode;
}
+static void
+gtk_text_view_move_focus (GtkTextView *text_view,
+ GtkDirectionType direction_type)
+{
+ GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (text_view));
+
+ if (!GTK_WIDGET_TOPLEVEL (toplevel))
+ return;
+
+ /* Propagate to toplevel */
+ g_signal_emit_by_name (toplevel, "move_focus", direction_type);
+}
+
/*
* Selections
*/
&insert);
}
-static gboolean
-move_insert_to_pointer_and_scroll (GtkTextView *text_view, gboolean partial_scroll)
+static void
+move_mark_to_pointer_and_scroll (GtkTextView *text_view,
+ const gchar *mark_name)
{
gint x, y;
GdkModifierType state;
GtkTextIter newplace;
- gint adjust = 0;
- gboolean in_threshold = FALSE;
+ /* DV(g_print (G_STRLOC": begin\n")); */
+
gdk_window_get_pointer (text_view->text_window->bin_window,
&x, &y, &state);
- /* Adjust movement by how long we've been selecting, to
- get an acceleration effect. The exact numbers are
- pretty arbitrary. We have a threshold before we
- start to accelerate. */
- /* uncommenting this printf helps visualize how it works. */
- /* printf ("%d\n", text_view->scrolling_accel_factor); */
-
- if (text_view->scrolling_accel_factor > 10)
- adjust = (text_view->scrolling_accel_factor - 10) * 75;
-
- if (y < 0) /* scrolling upward */
- adjust = -adjust;
-
- /* No adjust if the pointer has moved back inside the window for sure.
- Also I'm adding a small threshold where no adjust is added,
- in case you want to do a continuous slow scroll. */
-#define SLOW_SCROLL_TH 7
- if (x >= (0 - SLOW_SCROLL_TH) &&
- x < (SCREEN_WIDTH (text_view) + SLOW_SCROLL_TH) &&
- y >= (0 - SLOW_SCROLL_TH) &&
- y < (SCREEN_HEIGHT (text_view) + SLOW_SCROLL_TH))
- {
- adjust = 0;
- in_threshold = TRUE;
- }
-
+ /* DV(g_print (G_STRLOC": get iter at pixel\n"); */
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&newplace,
x + text_view->xoffset,
- y + text_view->yoffset + adjust);
+ y + text_view->yoffset);
{
- gboolean scrolled = FALSE;
- GtkTextMark *insert_mark =
- gtk_text_buffer_get_mark (get_buffer (text_view), "insert");
+ GtkTextMark *mark =
+ gtk_text_buffer_get_mark (get_buffer (text_view), mark_name);
+ /* This may invalidate the layout */
+ DV(g_print (G_STRLOC": move mark\n"));
gtk_text_buffer_move_mark (get_buffer (text_view),
- insert_mark,
+ mark,
&newplace);
- if (partial_scroll)
- scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 0.7);
- else
- scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 1.0);
-
- if (scrolled)
- {
- /* We want to avoid rapid jump to super-accelerated when you
- leave the slow scroll threshold after scrolling for a
- while. So we slowly decrease accel when scrolling inside
- the threshold.
- */
- if (in_threshold)
- {
- if (text_view->scrolling_accel_factor > 1)
- text_view->scrolling_accel_factor -= 2;
- }
- else
- text_view->scrolling_accel_factor += 1;
- }
- else
- {
- /* If we don't scroll we're probably inside the window, but
- potentially just a bit outside. We decrease acceleration
- while the user is fooling around inside the window.
- Acceleration decreases faster than it increases. */
- if (text_view->scrolling_accel_factor > 4)
- text_view->scrolling_accel_factor -= 5;
- }
-
- return scrolled;
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view, mark);
}
+
+ DV (g_print ("first validate idle leaving %s is %d\n",
+ G_STRLOC, text_view->first_validate_idle));
}
static gint
{
GtkTextView *text_view;
+ GDK_THREADS_ENTER ();
+
text_view = GTK_TEXT_VIEW (data);
- if (move_insert_to_pointer_and_scroll (text_view, TRUE))
- {
- return TRUE; /* remain installed. */
- }
- else
- {
- text_view->selection_drag_scan_timeout = 0;
- return FALSE; /* remove ourselves */
- }
+ DV(g_print (G_STRLOC": calling move_mark_to_pointer_and_scroll\n"));
+ move_mark_to_pointer_and_scroll (text_view, "insert");
+
+ GDK_THREADS_LEAVE ();
+
+ return TRUE; /* remain installed. */
+}
+
+#define DND_SCROLL_MARGIN 0.20
+
+static gint
+drag_scan_timeout (gpointer data)
+{
+ GtkTextView *text_view;
+ gint x, y;
+ GdkModifierType state;
+ GtkTextIter newplace;
+
+ GDK_THREADS_ENTER ();
+
+ text_view = GTK_TEXT_VIEW (data);
+
+ gdk_window_get_pointer (text_view->text_window->bin_window,
+ &x, &y, &state);
+
+ gtk_text_layout_get_iter_at_pixel (text_view->layout,
+ &newplace,
+ x + text_view->xoffset,
+ y + text_view->yoffset);
+
+ gtk_text_buffer_move_mark (get_buffer (text_view),
+ text_view->dnd_mark,
+ &newplace);
+
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_to_mark (text_view,
+ text_view->dnd_mark,
+ DND_SCROLL_MARGIN, FALSE, 0.0, 0.0);
+
+ GDK_THREADS_LEAVE ();
+
+ return TRUE;
}
static gint
selection_motion_event_handler (GtkTextView *text_view, GdkEventMotion *event, gpointer data)
{
- if (move_insert_to_pointer_and_scroll (text_view, TRUE))
- {
- /* If we had to scroll offscreen, insert a timeout to do so
- again. Note that in the timeout, even if the mouse doesn't
- move, due to this scroll xoffset/yoffset will have changed
- and we'll need to scroll again. */
- if (text_view->selection_drag_scan_timeout != 0) /* reset on every motion event */
- gtk_timeout_remove (text_view->selection_drag_scan_timeout);
+ DV(g_print (G_STRLOC": calling move_mark_to_pointer_and_scroll\n"));
+ move_mark_to_pointer_and_scroll (text_view, "insert");
- text_view->selection_drag_scan_timeout =
- gtk_timeout_add (50, selection_scan_timeout, text_view);
- }
+ /* If we had to scroll offscreen, insert a timeout to do so
+ * again. Note that in the timeout, even if the mouse doesn't
+ * move, due to this scroll xoffset/yoffset will have changed
+ * and we'll need to scroll again.
+ */
+ if (text_view->scroll_timeout != 0) /* reset on every motion event */
+ gtk_timeout_remove (text_view->scroll_timeout);
+
+ text_view->scroll_timeout =
+ gtk_timeout_add (50, selection_scan_timeout, text_view);
return TRUE;
}
GdkEventButton *button)
{
GtkTextIter newplace;
-
+ GtkTextBuffer *buffer;
+
g_return_if_fail (text_view->selection_drag_handler == 0);
gtk_grab_add (GTK_WIDGET (text_view));
- text_view->scrolling_accel_factor = 0;
-
+ buffer = get_buffer (text_view);
+
newplace = *iter;
- gtk_text_buffer_place_cursor (get_buffer (text_view), &newplace);
-
- text_view->selection_drag_handler = gtk_signal_connect (GTK_OBJECT (text_view),
- "motion_notify_event",
- GTK_SIGNAL_FUNC (selection_motion_event_handler),
- NULL);
-}
-
-/* returns whether we were really dragging */
-static gboolean
-gtk_text_view_end_selection_drag (GtkTextView *text_view, GdkEventButton *event)
-{
- if (text_view->selection_drag_handler == 0)
- return FALSE;
-
- gtk_signal_disconnect (GTK_OBJECT (text_view), text_view->selection_drag_handler);
- text_view->selection_drag_handler = 0;
-
- text_view->scrolling_accel_factor = 0;
-
- if (text_view->selection_drag_scan_timeout != 0)
- {
- gtk_timeout_remove (text_view->selection_drag_scan_timeout);
- text_view->selection_drag_scan_timeout = 0;
- }
-
- /* one last update to current position */
- move_insert_to_pointer_and_scroll (text_view, FALSE);
-
- gtk_grab_remove (GTK_WIDGET (text_view));
-
- return TRUE;
-}
-
-/*
- * Layout utils
- */
-
-static void
-gtk_text_view_set_adjustment_upper (GtkAdjustment *adj, gfloat upper)
-{
- if (upper != adj->upper)
+ if (button->state & GDK_SHIFT_MASK)
{
- gfloat min = MAX (0., upper - adj->page_size);
- gboolean value_changed = FALSE;
+ /* Extend selection */
+ GtkTextIter start, end;
- adj->upper = upper;
+ gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
- if (adj->value > min)
+ if (gtk_text_iter_compare (&newplace, &start) <= 0)
{
- adj->value = min;
- value_changed = TRUE;
+ gtk_text_buffer_move_mark_by_name (buffer, "insert",
+ &newplace);
+
+ gtk_text_buffer_move_mark_by_name (buffer, "selection_bound",
+ &end);
}
+ else if (gtk_text_iter_compare (&newplace, &end) >= 0)
+ {
+ gtk_text_buffer_move_mark_by_name (buffer, "insert",
+ &newplace);
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed");
- if (value_changed)
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
+ gtk_text_buffer_move_mark_by_name (buffer, "selection_bound",
+ &start);
+ }
+ }
+ else
+ {
+ /* Replace selection */
+ gtk_text_buffer_place_cursor (buffer, &newplace);
}
+
+ text_view->selection_drag_handler = g_signal_connect (text_view,
+ "motion_notify_event",
+ G_CALLBACK (selection_motion_event_handler),
+ NULL);
}
-static void
-gtk_text_view_scroll_calc_now (GtkTextView *text_view)
+/* returns whether we were really dragging */
+static gboolean
+gtk_text_view_end_selection_drag (GtkTextView *text_view, GdkEventButton *event)
{
- gint width = 0, height = 0;
-
- gtk_text_view_ensure_layout (text_view);
-
-
- gtk_text_layout_set_screen_width (text_view->layout,
- SCREEN_WIDTH (text_view));
+ if (text_view->selection_drag_handler == 0)
+ return FALSE;
- gtk_text_layout_get_size (text_view->layout, &width, &height);
+ g_signal_handler_disconnect (text_view, text_view->selection_drag_handler);
+ text_view->selection_drag_handler = 0;
- if (text_view->width != width || text_view->height != height)
+ if (text_view->scroll_timeout != 0)
{
- text_view->width = width;
- text_view->height = height;
-
- gtk_text_view_set_adjustment_upper (get_hadjustment (text_view),
- MAX (SCREEN_WIDTH (text_view), width));
- gtk_text_view_set_adjustment_upper (get_vadjustment (text_view),
- MAX (SCREEN_HEIGHT (text_view), height));
+ gtk_timeout_remove (text_view->scroll_timeout);
+ text_view->scroll_timeout = 0;
+ }
- /* hadj/vadj exist since we called get_hadjustment/get_vadjustment above */
+ /* one last update to current position */
+ DV(g_print (G_STRLOC": calling move_mark_to_pointer_and_scroll\n"));
+ move_mark_to_pointer_and_scroll (text_view, "insert");
- /* Set up the step sizes; we'll say that a page is
- our allocation minus one step, and a step is
- 1/10 of our allocation. */
- text_view->hadjustment->step_increment =
- SCREEN_WIDTH (text_view) / 10.0;
- text_view->hadjustment->page_increment =
- SCREEN_WIDTH (text_view) * 0.9;
+ gtk_grab_remove (GTK_WIDGET (text_view));
- text_view->vadjustment->step_increment =
- SCREEN_HEIGHT (text_view) / 10.0;
- text_view->vadjustment->page_increment =
- SCREEN_HEIGHT (text_view) * 0.9;
- }
+ return TRUE;
}
+/*
+ * Layout utils
+ */
+
static void
gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
- GtkTextAttributes *values,
+ GtkTextAttributes *values,
GtkStyle *style)
{
values->appearance.bg_color = style->base[GTK_STATE_NORMAL];
- values->appearance.fg_color = style->fg[GTK_STATE_NORMAL];
+ values->appearance.fg_color = style->text[GTK_STATE_NORMAL];
+
+ if (values->font)
+ pango_font_description_free (values->font);
- if (values->font.family_name)
- g_free (values->font.family_name);
+ values->font = pango_font_description_copy (style->font_desc);
+}
- values->font = *style->font_desc;
- values->font.family_name = g_strdup (style->font_desc->family_name);
+static void
+gtk_text_view_check_keymap_direction (GtkTextView *text_view)
+{
+ if (text_view->layout)
+ {
+ gboolean split_cursor;
+ GtkTextDirection new_dir;
+ GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (text_view));
+
+ g_object_get (G_OBJECT (settings),
+ "gtk-split-cursor", &split_cursor,
+ NULL);
+ if (split_cursor)
+ {
+ new_dir = GTK_TEXT_DIR_NONE;
+ }
+ else
+ {
+ GdkKeymap *keymap = gdk_keymap_get_for_display (gtk_widget_get_display (GTK_WIDGET (text_view)));
+ new_dir = (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_LTR) ?
+ GTK_TEXT_DIR_LTR : GTK_TEXT_DIR_RTL;
+ }
+
+ if (text_view->layout->cursor_direction != new_dir)
+ gtk_text_layout_set_cursor_direction (text_view->layout, new_dir);
+ }
}
static void
GtkTextAttributes *style;
PangoContext *ltr_context, *rtl_context;
GSList *tmp_list;
+
+ DV(g_print(G_STRLOC"\n"));
text_view->layout = gtk_text_layout_new ();
- gtk_signal_connect (GTK_OBJECT (text_view->layout),
- "invalidated",
- GTK_SIGNAL_FUNC (invalidated_handler),
- text_view);
+ g_signal_connect (text_view->layout,
+ "invalidated",
+ G_CALLBACK (invalidated_handler),
+ text_view);
- gtk_signal_connect (GTK_OBJECT (text_view->layout),
- "changed",
- GTK_SIGNAL_FUNC (changed_handler),
- text_view);
+ g_signal_connect (text_view->layout,
+ "changed",
+ G_CALLBACK (changed_handler),
+ text_view);
- gtk_signal_connect (GTK_OBJECT (text_view->layout),
- "allocate_child",
- GTK_SIGNAL_FUNC (gtk_text_view_child_allocated),
- text_view);
+ g_signal_connect (text_view->layout,
+ "allocate_child",
+ G_CALLBACK (gtk_text_view_child_allocated),
+ text_view);
if (get_buffer (text_view))
gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));
if ((GTK_WIDGET_HAS_FOCUS (text_view) && text_view->cursor_visible))
- gtk_text_view_start_cursor_blink (text_view, FALSE);
+ gtk_text_view_pend_cursor_blink (text_view);
else
gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
gtk_text_layout_set_contexts (text_view->layout, ltr_context, rtl_context);
- g_object_unref (G_OBJECT (ltr_context));
- g_object_unref (G_OBJECT (rtl_context));
+ g_object_unref (ltr_context);
+ g_object_unref (rtl_context);
+
+ gtk_text_view_check_keymap_direction (text_view);
style = gtk_text_attributes_new ();
style->tabs = text_view->tabs ? pango_tab_array_copy (text_view->tabs) : NULL;
style->wrap_mode = text_view->wrap_mode;
- style->justify = text_view->justify;
+ style->justification = text_view->justify;
style->direction = gtk_widget_get_direction (GTK_WIDGET (text_view));
gtk_text_layout_set_default_style (text_view->layout, style);
tmp_list = g_slist_next (tmp_list);
}
+
+ gtk_text_view_invalidate (text_view);
}
}
+/**
+ * gtk_text_view_get_default_attributes:
+ * @text_view: a #GtkTextView
+ *
+ * Obtains a copy of the default text attributes. These are the
+ * attributes used for text unless a tag overrides them.
+ * You'd typically pass the default attributes in to
+ * gtk_text_iter_get_attributes() in order to get the
+ * attributes in effect at a given text position.
+ *
+ * The return value is a copy owned by the caller of this function,
+ * and should be freed.
+ *
+ * Return value: a new #GtkTextAttributes
+ **/
+GtkTextAttributes*
+gtk_text_view_get_default_attributes (GtkTextView *text_view)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), NULL);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_attributes_copy (text_view->layout->default_style);
+}
+
static void
gtk_text_view_destroy_layout (GtkTextView *text_view)
{
if (text_view->layout)
{
- /* Remove layout from all anchored children */
GSList *tmp_list;
+ gtk_text_view_remove_validate_idles (text_view);
+
+ g_signal_handlers_disconnect_by_func (text_view->layout,
+ invalidated_handler,
+ text_view);
+ g_signal_handlers_disconnect_by_func (text_view->layout,
+ changed_handler,
+ text_view);
+
+ /* Remove layout from all anchored children */
tmp_list = text_view->children;
while (tmp_list != NULL)
{
gtk_text_view_stop_cursor_blink (text_view);
gtk_text_view_end_selection_drag (text_view, NULL);
- gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->layout),
- invalidated_handler, text_view);
- gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->layout),
- changed_handler, text_view);
- gtk_object_unref (GTK_OBJECT (text_view->layout));
+ g_object_unref (text_view->layout);
text_view->layout = NULL;
}
}
gtk_text_view_reset_im_context (GtkTextView *text_view)
{
if (text_view->need_im_reset)
- text_view->need_im_reset = 0;
-
- gtk_im_context_reset (text_view->im_context);
+ {
+ text_view->need_im_reset = FALSE;
+ gtk_im_context_reset (text_view->im_context);
+ }
}
/*
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
-
+ text_view->pending_place_cursor_button = 0;
+
target_list = gtk_target_list_new (target_table,
G_N_ELEMENTS (target_table));
gtk_target_list_unref (target_list);
gtk_drag_set_icon_default (context);
-
- /* We're inside the selection, so start without being able
- * to accept the drag.
- */
- gdk_drag_status (context, 0, event->time);
- gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
}
static void
gtk_text_view_drag_begin (GtkWidget *widget,
GdkDragContext *context)
{
-
+ /* do nothing */
}
static void
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
- gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
}
static void
if (str)
{
- gtk_selection_data_set_text (selection_data, str);
+ gtk_selection_data_set_text (selection_data, str, -1);
g_free (str);
}
}
GdkDragContext *context,
guint time)
{
+ GtkTextView *text_view;
+
+ text_view = GTK_TEXT_VIEW (widget);
+ gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
+
+ if (text_view->scroll_timeout != 0)
+ gtk_timeout_remove (text_view->scroll_timeout);
+ text_view->scroll_timeout = 0;
}
static gboolean
GtkTextIter end;
GdkRectangle target_rect;
gint bx, by;
+ GdkDragAction suggested_action = 0;
text_view = GTK_TEXT_VIEW (widget);
target_rect = text_view->text_window->allocation;
-
+
if (x < target_rect.x ||
y < target_rect.y ||
x > (target_rect.x + target_rect.width) ||
y > (target_rect.y + target_rect.height))
- return FALSE; /* outside the text window */
+ return FALSE; /* outside the text window, allow parent widgets to handle event */
gtk_text_view_window_to_buffer_coords (text_view,
GTK_TEXT_WINDOW_WIDGET,
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&newplace,
bx, by);
-
- if (gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
+
+ if (gtk_drag_dest_find_target (widget, context,
+ gtk_drag_dest_get_target_list (widget)) == GDK_NONE)
+ {
+ /* can't accept any of the offered targets */
+ }
+ else if (gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
&start, &end) &&
- gtk_text_iter_in_range (&newplace, &start, &end))
+ gtk_text_iter_compare (&newplace, &start) >= 0 &&
+ gtk_text_iter_compare (&newplace, &end) <= 0)
{
/* We're inside the selection. */
- gdk_drag_status (context, 0, time);
- gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
}
else
{
- if (gtk_text_iter_editable (&newplace, text_view->editable))
+ if (gtk_text_iter_can_insert (&newplace, text_view->editable))
{
GtkWidget *source_widget;
- GdkDragAction suggested_action;
suggested_action = context->suggested_action;
if ((context->actions & GDK_ACTION_MOVE) != 0)
suggested_action = GDK_ACTION_MOVE;
}
-
- gtk_text_mark_set_visible (text_view->dnd_mark,
- text_view->cursor_visible);
-
- gdk_drag_status (context, suggested_action, time);
}
else
{
/* Can't drop here. */
- gdk_drag_status (context, 0, time);
- gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
}
}
+ if (suggested_action != 0)
+ {
+ gtk_text_mark_set_visible (text_view->dnd_mark,
+ text_view->cursor_visible);
+
+ gdk_drag_status (context, suggested_action, time);
+ }
+ else
+ {
+ gdk_drag_status (context, 0, time);
+ gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
+ }
+
gtk_text_buffer_move_mark (get_buffer (text_view),
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "gtk_drag_target"),
+ text_view->dnd_mark,
&newplace);
- {
- /* The effect of this is that the text scrolls if you're near
- the edge. We have to scroll whether or not we're inside
- the selection. */
- gint margin;
-
- margin = MIN (SCREEN_WIDTH (widget), SCREEN_HEIGHT (widget));
- margin /= 5;
-
- gtk_text_view_scroll_to_mark_adjusted (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "gtk_drag_target"),
- margin, 1.0);
- }
+ DV(g_print (G_STRLOC": scrolling to mark\n"));
+ gtk_text_view_scroll_to_mark (text_view,
+ text_view->dnd_mark,
+ DND_SCROLL_MARGIN, FALSE, 0.0, 0.0);
+
+ if (text_view->scroll_timeout != 0) /* reset on every motion event */
+ gtk_timeout_remove (text_view->scroll_timeout);
+
+ text_view->scroll_timeout =
+ gtk_timeout_add (50, drag_scan_timeout, text_view);
+ /* TRUE return means don't propagate the drag motion to parent
+ * widgets that may also be drop sites.
+ */
return TRUE;
}
gint y,
guint time)
{
-#if 0
- /* called automatically. */
- if (context->targets)
- {
- gtk_drag_get_data (widget, context,
- GPOINTER_TO_INT (context->targets->data),
- time);
- return TRUE;
- }
+ GtkTextView *text_view;
+ GtkTextIter drop_point;
+ GdkAtom target = GDK_NONE;
+
+ text_view = GTK_TEXT_VIEW (widget);
+
+ if (text_view->scroll_timeout != 0)
+ gtk_timeout_remove (text_view->scroll_timeout);
+
+ text_view->scroll_timeout = 0;
+
+ gtk_text_mark_set_visible (text_view->dnd_mark, FALSE);
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+ &drop_point,
+ text_view->dnd_mark);
+
+ if (gtk_text_iter_can_insert (&drop_point, text_view->editable))
+ target = gtk_drag_dest_find_target (widget, context, NULL);
+
+ if (target != GDK_NONE)
+ gtk_drag_get_data (widget, context, target, time);
else
- return FALSE;
-#endif
+ gtk_drag_finish (context, FALSE, FALSE, time);
+
return TRUE;
}
{
GtkTextIter drop_point;
GtkTextView *text_view;
- GtkTextMark *drag_target_mark;
+ gboolean success = FALSE;
text_view = GTK_TEXT_VIEW (widget);
- drag_target_mark = gtk_text_buffer_get_mark (get_buffer (text_view),
- "gtk_drag_target");
-
- if (drag_target_mark == NULL)
- return;
+ if (!text_view->dnd_mark)
+ goto done;
gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
&drop_point,
- drag_target_mark);
+ text_view->dnd_mark);
+
+ if (!gtk_text_iter_can_insert (&drop_point, text_view->editable))
+ goto done;
if (selection_data->target == gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
{
}
else
insert_text_data (text_view, &drop_point, selection_data);
+
+ success = TRUE;
+
+ done:
+ gtk_drag_finish (context, success,
+ success && context->action == GDK_ACTION_MOVE,
+ time);
}
static GtkAdjustment*
{
gboolean need_adjust = FALSE;
- g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
if (hadj)
if (text_view->hadjustment && (text_view->hadjustment != hadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (text_view->hadjustment), text_view);
- gtk_object_unref (GTK_OBJECT (text_view->hadjustment));
+ g_signal_handlers_disconnect_by_func (text_view->hadjustment,
+ gtk_text_view_value_changed,
+ text_view);
+ g_object_unref (text_view->hadjustment);
}
if (text_view->vadjustment && (text_view->vadjustment != vadj))
{
- gtk_signal_disconnect_by_data (GTK_OBJECT (text_view->vadjustment), text_view);
- gtk_object_unref (GTK_OBJECT (text_view->vadjustment));
+ g_signal_handlers_disconnect_by_func (text_view->vadjustment,
+ gtk_text_view_value_changed,
+ text_view);
+ g_object_unref (text_view->vadjustment);
}
if (text_view->hadjustment != hadj)
{
text_view->hadjustment = hadj;
- gtk_object_ref (GTK_OBJECT (text_view->hadjustment));
+ g_object_ref (text_view->hadjustment);
gtk_object_sink (GTK_OBJECT (text_view->hadjustment));
-
- gtk_signal_connect (GTK_OBJECT (text_view->hadjustment), "value_changed",
- (GtkSignalFunc) gtk_text_view_value_changed,
- text_view);
+
+ g_signal_connect (text_view->hadjustment, "value_changed",
+ G_CALLBACK (gtk_text_view_value_changed),
+ text_view);
need_adjust = TRUE;
}
if (text_view->vadjustment != vadj)
{
text_view->vadjustment = vadj;
- gtk_object_ref (GTK_OBJECT (text_view->vadjustment));
+ g_object_ref (text_view->vadjustment);
gtk_object_sink (GTK_OBJECT (text_view->vadjustment));
-
- gtk_signal_connect (GTK_OBJECT (text_view->vadjustment), "value_changed",
- (GtkSignalFunc) gtk_text_view_value_changed,
- text_view);
+
+ g_signal_connect (text_view->vadjustment, "value_changed",
+ G_CALLBACK (gtk_text_view_value_changed),
+ text_view);
need_adjust = TRUE;
}
gtk_text_view_value_changed (NULL, text_view);
}
+/* FIXME this adjust_allocation is a big cut-and-paste from
+ * GtkCList, needs to be some "official" way to do this
+ * factored out.
+ */
+typedef struct
+{
+ GdkWindow *window;
+ int dx;
+ int dy;
+} ScrollData;
+
+/* The window to which widget->window is relative */
+#define ALLOCATION_WINDOW(widget) \
+ (GTK_WIDGET_NO_WINDOW (widget) ? \
+ (widget)->window : \
+ gdk_window_get_parent ((widget)->window))
+
+static void
+adjust_allocation_recurse (GtkWidget *widget,
+ gpointer data)
+{
+ ScrollData *scroll_data = data;
+
+ /* Need to really size allocate instead of just poking
+ * into widget->allocation if the widget is not realized.
+ * FIXME someone figure out why this was.
+ */
+ if (!GTK_WIDGET_REALIZED (widget))
+ {
+ if (GTK_WIDGET_VISIBLE (widget))
+ {
+ GdkRectangle tmp_rectangle = widget->allocation;
+ tmp_rectangle.x += scroll_data->dx;
+ tmp_rectangle.y += scroll_data->dy;
+
+ gtk_widget_size_allocate (widget, &tmp_rectangle);
+ }
+ }
+ else
+ {
+ if (ALLOCATION_WINDOW (widget) == scroll_data->window)
+ {
+ widget->allocation.x += scroll_data->dx;
+ widget->allocation.y += scroll_data->dy;
+
+ if (GTK_IS_CONTAINER (widget))
+ gtk_container_forall (GTK_CONTAINER (widget),
+ adjust_allocation_recurse,
+ data);
+ }
+ }
+}
+
+static void
+adjust_allocation (GtkWidget *widget,
+ int dx,
+ int dy)
+{
+ ScrollData scroll_data;
+
+ if (GTK_WIDGET_REALIZED (widget))
+ scroll_data.window = ALLOCATION_WINDOW (widget);
+ else
+ scroll_data.window = NULL;
+
+ scroll_data.dx = dx;
+ scroll_data.dy = dy;
+
+ adjust_allocation_recurse (widget, &scroll_data);
+}
+
static void
gtk_text_view_value_changed (GtkAdjustment *adj,
GtkTextView *text_view)
gint line_top;
gint dx = 0;
gint dy = 0;
+
+ /* Note that we oddly call this function with adj == NULL
+ * sometimes
+ */
+
+ text_view->onscreen_validated = FALSE;
+ DV(g_print(">Scroll offset changed %s/%g, onscreen_validated = FALSE ("G_STRLOC")\n",
+ adj == text_view->hadjustment ? "hadj" : adj == text_view->vadjustment ? "vadj" : "none",
+ adj ? adj->value : 0.0));
+
if (adj == text_view->hadjustment)
{
dx = text_view->xoffset - (gint)adj->value;
text_view->first_para_pixels = adj->value - line_top;
}
}
-
- if (GTK_WIDGET_REALIZED (text_view) && (dx != 0 || dy != 0))
+
+ if (dx != 0 || dy != 0)
{
- if (dy != 0)
+ GSList *tmp_list;
+
+ if (GTK_WIDGET_REALIZED (text_view))
{
- if (text_view->left_window)
- text_window_scroll (text_view->left_window, 0, dy);
- if (text_view->right_window)
- text_window_scroll (text_view->right_window, 0, dy);
+ if (dy != 0)
+ {
+ if (text_view->left_window)
+ text_window_scroll (text_view->left_window, 0, dy);
+ if (text_view->right_window)
+ text_window_scroll (text_view->right_window, 0, dy);
+ }
+
+ if (dx != 0)
+ {
+ if (text_view->top_window)
+ text_window_scroll (text_view->top_window, dx, 0);
+ if (text_view->bottom_window)
+ text_window_scroll (text_view->bottom_window, dx, 0);
+ }
+
+ /* It looks nicer to scroll the main area last, because
+ * it takes a while, and making the side areas update
+ * afterward emphasizes the slowness of scrolling the
+ * main area.
+ */
+ text_window_scroll (text_view->text_window, dx, dy);
}
-
- if (dx != 0)
+
+ /* Children are now "moved" in the text window, poke
+ * into widget->allocation for each child
+ */
+ tmp_list = text_view->children;
+ while (tmp_list != NULL)
{
- if (text_view->top_window)
- text_window_scroll (text_view->top_window, dx, 0);
- if (text_view->bottom_window)
- text_window_scroll (text_view->bottom_window, dx, 0);
+ GtkTextViewChild *child = tmp_list->data;
+
+ if (child->anchor)
+ adjust_allocation (child->widget, dx, dy);
+
+ tmp_list = g_slist_next (tmp_list);
}
+ }
- /* It looks nicer to scroll the main area last, because
- * it takes a while, and making the side areas update
- * afterward emphasizes the slowness of scrolling the
- * main area.
- */
- text_window_scroll (text_view->text_window, dx, dy);
+ /* This could result in invalidation, which would install the
+ * first_validate_idle, which would validate onscreen;
+ * but we're going to go ahead and validate here, so
+ * first_validate_idle shouldn't have anything to do.
+ */
+ gtk_text_view_update_layout_width (text_view);
+
+ /* note that validation of onscreen could invoke this function
+ * recursively, by scrolling to maintain first_para, or in response
+ * to updating the layout width, however there is no problem with
+ * that, or shouldn't be.
+ */
+ gtk_text_view_validate_onscreen (text_view);
+
+ /* process exposes */
+ if (GTK_WIDGET_REALIZED (text_view))
+ {
+ DV (g_print ("Processing updates (%s)\n", G_STRLOC));
+
+ if (text_view->left_window)
+ gdk_window_process_updates (text_view->left_window->bin_window, TRUE);
+
+ if (text_view->right_window)
+ gdk_window_process_updates (text_view->right_window->bin_window, TRUE);
+
+ if (text_view->top_window)
+ gdk_window_process_updates (text_view->top_window->bin_window, TRUE);
+
+ if (text_view->bottom_window)
+ gdk_window_process_updates (text_view->bottom_window->bin_window, TRUE);
+
+ gdk_window_process_updates (text_view->text_window->bin_window, TRUE);
+ }
+
+ /* If this got installed, get rid of it, it's just a waste of time. */
+ if (text_view->first_validate_idle != 0)
+ {
+ g_source_remove (text_view->first_validate_idle);
+ text_view->first_validate_idle = 0;
}
+
+ gtk_text_view_update_im_spot_location (text_view);
+
+ DV(g_print(">End scroll offset changed handler ("G_STRLOC")\n"));
}
static void
const gchar *str,
GtkTextView *text_view)
{
+ gtk_text_view_commit_text (text_view, str);
+}
+
+static void
+gtk_text_view_commit_text (GtkTextView *text_view,
+ const gchar *str)
+{
+ gboolean had_selection;
+
+ gtk_text_buffer_begin_user_action (get_buffer (text_view));
+
+ had_selection = gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
+ NULL, NULL);
+
gtk_text_buffer_delete_selection (get_buffer (text_view), TRUE,
text_view->editable);
}
else
{
- if (text_view->overwrite_mode)
- gtk_text_view_delete_from_cursor (text_view, GTK_DELETE_CHARS, 1);
+ if (!had_selection && text_view->overwrite_mode)
+ {
+ GtkTextIter insert;
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+ &insert,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
+ if (!gtk_text_iter_ends_line (&insert))
+ gtk_text_view_delete_from_cursor (text_view, GTK_DELETE_CHARS, 1);
+ }
gtk_text_buffer_insert_interactive_at_cursor (get_buffer (text_view), str, -1,
text_view->editable);
}
- gtk_text_view_scroll_to_mark (text_view,
- gtk_text_buffer_get_mark (get_buffer (text_view),
- "insert"),
- 0);
+ gtk_text_buffer_end_user_action (get_buffer (text_view));
+
+ DV(g_print (G_STRLOC": scrolling onscreen\n"));
+ gtk_text_view_scroll_mark_onscreen (text_view,
+ gtk_text_buffer_get_mark (get_buffer (text_view),
+ "insert"));
+}
+
+static void
+gtk_text_view_preedit_changed_handler (GtkIMContext *context,
+ GtkTextView *text_view)
+{
+ gchar *str;
+ PangoAttrList *attrs;
+ gint cursor_pos;
+
+ gtk_im_context_get_preedit_string (context, &str, &attrs, &cursor_pos);
+ gtk_text_layout_set_preedit_string (text_view->layout, str, attrs, cursor_pos);
+
+ pango_attr_list_unref (attrs);
+ g_free (str);
+}
+
+static gboolean
+gtk_text_view_retrieve_surrounding_handler (GtkIMContext *context,
+ GtkTextView *text_view)
+{
+ GtkTextIter start;
+ GtkTextIter end;
+ gint pos;
+ gchar *text;
+
+ gtk_text_buffer_get_iter_at_mark (text_view->buffer, &start,
+ gtk_text_buffer_get_insert (text_view->buffer));
+ end = start;
+
+ pos = gtk_text_iter_get_line_index (&start);
+ gtk_text_iter_set_line_offset (&start, 0);
+ gtk_text_iter_forward_to_line_end (&end);
+
+ text = gtk_text_iter_get_slice (&start, &end);
+ gtk_im_context_set_surrounding (context, text, -1, pos);
+ g_free (text);
+
+ return TRUE;
}
-static void
-gtk_text_view_preedit_changed_handler (GtkIMContext *context,
- GtkTextView *text_view)
+static gboolean
+gtk_text_view_delete_surrounding_handler (GtkIMContext *context,
+ gint offset,
+ gint n_chars,
+ GtkTextView *text_view)
{
- gchar *str;
- PangoAttrList *attrs;
- gint cursor_pos;
+ GtkTextIter start;
+ GtkTextIter end;
- gtk_im_context_get_preedit_string (context, &str, &attrs, &cursor_pos);
- gtk_text_layout_set_preedit_string (text_view->layout, str, attrs, cursor_pos);
+ gtk_text_buffer_get_iter_at_mark (text_view->buffer, &start,
+ gtk_text_buffer_get_insert (text_view->buffer));
+ end = start;
- pango_attr_list_unref (attrs);
- g_free (str);
+ gtk_text_iter_forward_chars (&start, offset);
+ gtk_text_iter_forward_chars (&end, offset + n_chars);
+
+ gtk_text_buffer_delete (text_view->buffer, &start, &end);
+
+ return TRUE;
}
static void
{
text_view->virtual_cursor_x = -1;
text_view->virtual_cursor_y = -1;
+ gtk_text_view_update_im_spot_location (text_view);
need_reset = TRUE;
}
else if (mark == gtk_text_buffer_get_selection_bound (buffer))
activate_cb (GtkWidget *menuitem,
GtkTextView *text_view)
{
- const gchar *signal = gtk_object_get_data (GTK_OBJECT (menuitem), "gtk-signal");
- gtk_signal_emit_by_name (GTK_OBJECT (text_view), signal);
+ const gchar *signal = g_object_get_data (G_OBJECT (menuitem), "gtk-signal");
+ g_signal_emit_by_name (text_view, signal);
}
static void
append_action_signal (GtkTextView *text_view,
GtkWidget *menu,
- const gchar *label,
- const gchar *signal)
+ const gchar *stock_id,
+ const gchar *signal,
+ gboolean sensitive)
{
- GtkWidget *menuitem = gtk_menu_item_new_with_label (label);
+ GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
- gtk_object_set_data (GTK_OBJECT (menuitem), "gtk-signal", (char *)signal);
- gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
- activate_cb, text_view);
+ g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
+ g_signal_connect (menuitem, "activate",
+ G_CALLBACK (activate_cb), text_view);
+ gtk_widget_set_sensitive (menuitem, sensitive);
+
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
}
}
static void
-gtk_text_view_popup_menu (GtkTextView *text_view,
- GdkEventButton *event)
+popup_position_func (GtkMenu *menu,
+ gint *x,
+ gint *y,
+ gboolean *push_in,
+ gpointer user_data)
+{
+ GtkTextView *text_view;
+ GtkWidget *widget;
+ GdkRectangle cursor_rect;
+ GdkRectangle onscreen_rect;
+ gint root_x, root_y;
+ GtkTextIter iter;
+ GtkRequisition req;
+ GdkScreen *screen;
+
+ text_view = GTK_TEXT_VIEW (user_data);
+ widget = GTK_WIDGET (text_view);
+
+ g_return_if_fail (GTK_WIDGET_REALIZED (text_view));
+
+ screen = gtk_widget_get_screen (widget);
+
+ gdk_window_get_origin (widget->window, &root_x, &root_y);
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+ &iter,
+ gtk_text_buffer_get_insert (get_buffer (text_view)));
+
+ gtk_text_view_get_iter_location (text_view,
+ &iter,
+ &cursor_rect);
+
+ gtk_text_view_get_visible_rect (text_view, &onscreen_rect);
+
+ gtk_widget_size_request (text_view->popup_menu, &req);
+
+ /* can't use rectangle_intersect since cursor rect can have 0 width */
+ if (cursor_rect.x >= onscreen_rect.x &&
+ cursor_rect.x < onscreen_rect.x + onscreen_rect.width &&
+ cursor_rect.y >= onscreen_rect.y &&
+ cursor_rect.y < onscreen_rect.y + onscreen_rect.height)
+ {
+ gtk_text_view_buffer_to_window_coords (text_view,
+ GTK_TEXT_WINDOW_WIDGET,
+ cursor_rect.x, cursor_rect.y,
+ &cursor_rect.x, &cursor_rect.y);
+
+ *x = root_x + cursor_rect.x + cursor_rect.width;
+ *y = root_y + cursor_rect.y + cursor_rect.height;
+ }
+ else
+ {
+ /* Just center the menu, since cursor is offscreen. */
+ *x = root_x + (widget->allocation.width / 2 - req.width / 2);
+ *y = root_y + (widget->allocation.height / 2 - req.height / 2);
+ }
+
+ /* Ensure sanity */
+ *x = CLAMP (*x, root_x, (root_x + widget->allocation.width));
+ *y = CLAMP (*y, root_y, (root_y + widget->allocation.height));
+
+ *x = CLAMP (*x, 0, MAX (0, gdk_screen_get_width (screen) - req.width));
+ *y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (screen) - req.height));
+}
+
+typedef struct
+{
+ GtkTextView *text_view;
+ gint button;
+ guint time;
+} PopupInfo;
+
+static gboolean
+range_contains_editable_text (const GtkTextIter *start,
+ const GtkTextIter *end,
+ gboolean default_editability)
+{
+ GtkTextIter iter = *start;
+
+ while (gtk_text_iter_compare (&iter, end) < 0)
+ {
+ if (gtk_text_iter_editable (&iter, default_editability))
+ return TRUE;
+
+ gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
+ }
+
+ return FALSE;
+}
+
+static void
+unichar_chosen_func (const char *text,
+ gpointer data)
+{
+ GtkTextView *text_view = GTK_TEXT_VIEW (data);
+
+ gtk_text_view_commit_text (text_view, text);
+}
+
+static void
+popup_targets_received (GtkClipboard *clipboard,
+ GtkSelectionData *data,
+ gpointer user_data)
{
- if (!text_view->popup_menu)
+ PopupInfo *info = user_data;
+ GtkTextView *text_view = info->text_view;
+
+ if (GTK_WIDGET_REALIZED (text_view))
{
+ /* We implicitely rely here on the fact that if we are pasting ourself, we'll
+ * have text targets as well as the private GTK_TEXT_BUFFER_CONTENTS target.
+ */
+ gboolean clipboard_contains_text = gtk_selection_data_targets_include_text (data);
GtkWidget *menuitem;
+ GtkWidget *submenu;
+ gboolean have_selection;
+ gboolean can_insert;
+ GtkTextIter iter;
+ GtkTextIter sel_start, sel_end;
+
+ if (text_view->popup_menu)
+ gtk_widget_destroy (text_view->popup_menu);
text_view->popup_menu = gtk_menu_new ();
-
+
gtk_menu_attach_to_widget (GTK_MENU (text_view->popup_menu),
GTK_WIDGET (text_view),
popup_menu_detach);
-
- append_action_signal (text_view, text_view->popup_menu, _("Cut"), "cut_clipboard");
- append_action_signal (text_view, text_view->popup_menu, _("Copy"), "copy_clipboard");
- append_action_signal (text_view, text_view->popup_menu, _("Paste"), "paste_clipboard");
-
- menuitem = gtk_menu_item_new (); /* Separator */
+
+ have_selection = gtk_text_buffer_get_selection_bounds (get_buffer (text_view),
+ &sel_start, &sel_end);
+
+ gtk_text_buffer_get_iter_at_mark (get_buffer (text_view),
+ &iter,
+ gtk_text_buffer_get_insert (get_buffer (text_view)));
+
+ can_insert = gtk_text_iter_can_insert (&iter, text_view->editable);
+
+ append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_CUT, "cut_clipboard",
+ have_selection &&
+ range_contains_editable_text (&sel_start, &sel_end,
+ text_view->editable));
+ append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_COPY, "copy_clipboard",
+ have_selection);
+ append_action_signal (text_view, text_view->popup_menu, GTK_STOCK_PASTE, "paste_clipboard",
+ can_insert && clipboard_contains_text);
+
+ menuitem = gtk_separator_menu_item_new ();
gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
-
+
+ menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
+ gtk_widget_show (menuitem);
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+
gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (text_view->im_context),
- GTK_MENU_SHELL (text_view->popup_menu));
+ GTK_MENU_SHELL (submenu));
+
+ menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode control character"));
+ gtk_widget_show (menuitem);
+ gtk_widget_set_sensitive (menuitem, can_insert);
+
+ submenu = gtk_menu_new ();
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
+ gtk_menu_shell_append (GTK_MENU_SHELL (text_view->popup_menu), menuitem);
+
+ _gtk_text_util_append_special_char_menuitems (GTK_MENU_SHELL (submenu),
+ unichar_chosen_func,
+ text_view);
+
+ g_signal_emit (text_view,
+ signals[POPULATE_POPUP],
+ 0,
+ text_view->popup_menu);
+
+ if (info->button)
+ gtk_menu_popup (GTK_MENU (text_view->popup_menu), NULL, NULL,
+ NULL, NULL,
+ info->button, info->time);
+ else
+ {
+ gtk_menu_popup (GTK_MENU (text_view->popup_menu), NULL, NULL,
+ popup_position_func, text_view,
+ 0, gtk_get_current_event_time ());
+ gtk_menu_shell_select_first (GTK_MENU_SHELL (text_view->popup_menu), FALSE);
+ }
}
- gtk_menu_popup (GTK_MENU (text_view->popup_menu), NULL, NULL,
- NULL, NULL,
- event->button, event->time);
+ g_object_unref (text_view);
+ g_free (info);
}
+static void
+gtk_text_view_do_popup (GtkTextView *text_view,
+ GdkEventButton *event)
+{
+ PopupInfo *info = g_new (PopupInfo, 1);
+
+ /* should not need this, see http://bugzilla.gnome.org/show_bug.cgi?id=74620 */
+ gtk_text_view_end_selection_drag (text_view, event);
+
+ /* In order to know what entries we should make sensitive, we
+ * ask for the current targets of the clipboard, and when
+ * we get them, then we actually pop up the menu.
+ */
+ info->text_view = g_object_ref (text_view);
+
+ if (event)
+ {
+ info->button = event->button;
+ info->time = event->time;
+ }
+ else
+ {
+ info->button = 0;
+ info->time = gtk_get_current_event_time ();
+ }
+
+ gtk_clipboard_request_contents (gtk_widget_get_clipboard (GTK_WIDGET (text_view),
+ GDK_SELECTION_CLIPBOARD),
+ gdk_atom_intern ("TARGETS", FALSE),
+ popup_targets_received,
+ info);
+}
+static gboolean
+gtk_text_view_popup_menu (GtkWidget *widget)
+{
+ gtk_text_view_do_popup (GTK_TEXT_VIEW (widget), NULL);
+ return TRUE;
+}
/* Child GdkWindows */
if (win->type == GTK_TEXT_WINDOW_TEXT)
{
/* I-beam cursor */
- cursor = gdk_cursor_new (GDK_XTERM);
+ cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (parent),
+ GDK_XTERM);
gdk_window_set_cursor (win->bin_window, cursor);
- gdk_cursor_destroy (cursor);
+ gdk_cursor_unref (cursor);
gtk_im_context_set_client_window (GTK_TEXT_VIEW (win->widget)->im_context,
win->window);
if (dx != 0 || dy != 0)
{
gdk_window_scroll (win->bin_window, dx, dy);
- gdk_window_process_updates (win->bin_window, TRUE);
}
}
}
gdk_window_invalidate_rect (win->bin_window, &window_rect, FALSE);
+
+#if 0
+ {
+ GdkColor color = { 0, 65535, 0, 0 };
+ GdkGC *gc = gdk_gc_new (win->bin_window);
+ gdk_gc_set_rgb_fg_color (gc, &color);
+ gdk_draw_rectangle (win->bin_window,
+ gc, TRUE, window_rect.x, window_rect.y,
+ window_rect.width, window_rect.height);
+ g_object_unref (gc);
+ }
+#endif
}
static gint
return win->allocation.height;
}
-static void
-text_window_get_allocation (GtkTextWindow *win,
- GdkRectangle *rect)
-{
- *rect = win->allocation;
-}
-
/* Windows */
return NULL;
break;
- default:
- g_warning ("%s: Unknown GtkTextWindowType", G_STRLOC);
+ case GTK_TEXT_WINDOW_PRIVATE:
+ g_warning ("%s: You can't get GTK_TEXT_WINDOW_PRIVATE, it has \"PRIVATE\" in the name because it is private.", G_GNUC_FUNCTION);
return NULL;
break;
}
+
+ g_warning ("%s: Unknown GtkTextWindowType", G_GNUC_FUNCTION);
+ return NULL;
}
/**
GtkTextWindow *win;
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
- g_return_val_if_fail (GDK_IS_WINDOW (text_view), 0);
+ g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
if (window == GTK_WIDGET (text_view)->window)
return GTK_TEXT_WINDOW_WIDGET;
gint buffer_y,
gint *window_x,
gint *window_y)
-{
+{
if (window_x)
{
- *window_x = buffer_x - text_view->xoffset + FOCUS_EDGE_WIDTH;
- if (text_view->left_window)
- *window_x += text_view->left_window->allocation.width;
+ *window_x = buffer_x - text_view->xoffset;
+ *window_x += text_view->text_window->allocation.x;
}
if (window_y)
{
- *window_y = buffer_y - text_view->yoffset + FOCUS_EDGE_WIDTH;
- if (text_view->top_window)
- *window_y += text_view->top_window->allocation.height;
+ *window_y = buffer_y - text_view->yoffset;
+ *window_y += text_view->text_window->allocation.y;
}
}
/**
* gtk_text_view_buffer_to_window_coords:
* @text_view: a #GtkTextView
- * @win: a #GtkTextWindowType
+ * @win: a #GtkTextWindowType except #GTK_TEXT_WINDOW_PRIVATE
* @buffer_x: buffer x coordinate
* @buffer_y: buffer y coordinate
* @window_x: window x coordinate return location
* @window_y: window y coordinate return location
*
* Converts coordinate (@buffer_x, @buffer_y) to coordinates for the window
- * @win, and stores the result in (@window_x, @window_y).
+ * @win, and stores the result in (@window_x, @window_y).
+ *
+ * Note that you can't convert coordinates for a nonexisting window (see
+ * gtk_text_view_set_border_window_size()).
**/
void
gtk_text_view_buffer_to_window_coords (GtkTextView *text_view,
gint widget_y,
gint *buffer_x,
gint *buffer_y)
-{
+{
if (buffer_x)
{
- *buffer_x = widget_x - FOCUS_EDGE_WIDTH + text_view->xoffset;
- if (text_view->left_window)
- *buffer_x -= text_view->left_window->allocation.width;
+ *buffer_x = widget_x + text_view->xoffset;
+ *buffer_x -= text_view->text_window->allocation.x;
}
if (buffer_y)
{
- *buffer_y = widget_y - FOCUS_EDGE_WIDTH + text_view->yoffset;
- if (text_view->top_window)
- *buffer_y -= text_view->top_window->allocation.height;
+ *buffer_y = widget_y + text_view->yoffset;
+ *buffer_y -= text_view->text_window->allocation.y;
}
}
/**
* gtk_text_view_window_to_buffer_coords:
* @text_view: a #GtkTextView
- * @win: a #GtkTextWindowType
+ * @win: a #GtkTextWindowType except #GTK_TEXT_WINDOW_PRIVATE
* @window_x: window x coordinate
* @window_y: window y coordinate
* @buffer_x: buffer x coordinate return location
*
* Converts coordinates on the window identified by @win to buffer
* coordinates, storing the result in (@buffer_x,@buffer_y).
+ *
+ * Note that you can't convert coordinates for a nonexisting window (see
+ * gtk_text_view_set_border_window_size()).
**/
void
gtk_text_view_window_to_buffer_coords (GtkTextView *text_view,
*winp = text_window_new (type,
GTK_WIDGET (text_view),
width, 0);
+ /* if the widget is already realized we need to realize the child manually */
+ if (GTK_WIDGET_REALIZED (text_view))
+ text_window_realize (*winp, GTK_WIDGET (text_view)->window);
}
else
{
if ((*winp)->requisition.width == width)
return;
+
+ (*winp)->requisition.width = width;
}
gtk_widget_queue_resize (GTK_WIDGET (text_view));
*winp = text_window_new (type,
GTK_WIDGET (text_view),
0, height);
+
+ /* if the widget is already realized we need to realize the child manually */
+ if (GTK_WIDGET_REALIZED (text_view))
+ text_window_realize (*winp, GTK_WIDGET (text_view)->window);
}
else
{
if ((*winp)->requisition.height == height)
return;
+
+ (*winp)->requisition.height = height;
}
gtk_widget_queue_resize (GTK_WIDGET (text_view));
*
* Sets the width of %GTK_TEXT_WINDOW_LEFT or %GTK_TEXT_WINDOW_RIGHT,
* or the height of %GTK_TEXT_WINDOW_TOP or %GTK_TEXT_WINDOW_BOTTOM.
- * Automatically destroys the corresponding window if the size is set to 0,
- * and creates the window if the size is set to non-zero.
+ * Automatically destroys the corresponding window if the size is set
+ * to 0, and creates the window if the size is set to non-zero. This
+ * function can only be used for the "border windows," it doesn't work
+ * with #GTK_TEXT_WINDOW_WIDGET, #GTK_TEXT_WINDOW_TEXT, or
+ * #GTK_TEXT_WINDOW_PRIVATE.
**/
void
gtk_text_view_set_border_window_size (GtkTextView *text_view,
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (size >= 0);
- g_return_if_fail (type != GTK_TEXT_WINDOW_WIDGET);
- g_return_if_fail (type != GTK_TEXT_WINDOW_TEXT);
switch (type)
{
break;
default:
- g_warning ("Can't set size of center or widget or private GtkTextWindowType in %s", G_STRLOC);
+ g_warning ("Can only set size of left/right/top/bottom border windows with gtk_text_view_set_border_window_size()");
break;
}
}
/**
- * gtk_text_view_set_text_window_size:
+ * gtk_text_view_get_border_window_size:
* @text_view: a #GtkTextView
- * @width: a width in pixels
- * @height: a height in pixels
+ * @type: window to return size from
*
- * Sets the size request for the main text window (%GTK_TEXT_WINDOW_TEXT).
- * If the widget gets more space than it requested, the main text window
- * will be larger than this.
+ * Gets the width of the specified border window. See
+ * gtk_text_view_set_border_window_size().
*
+ * Return value: width of window
**/
-void
-gtk_text_view_set_text_window_size (GtkTextView *text_view,
- gint width,
- gint height)
+gint
+gtk_text_view_get_border_window_size (GtkTextView *text_view,
+ GtkTextWindowType type)
{
- GtkTextWindow *win;
-
- g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
- g_return_if_fail (width > 0);
- g_return_if_fail (height > 0);
-
- win = text_view->text_window;
-
- if (win->requisition.width == width &&
- win->requisition.height == height)
- return;
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), 0);
+
+ switch (type)
+ {
+ case GTK_TEXT_WINDOW_LEFT:
+ if (text_view->left_window)
+ return text_view->left_window->requisition.width;
+
+ case GTK_TEXT_WINDOW_RIGHT:
+ if (text_view->right_window)
+ return text_view->right_window->requisition.width;
+
+ case GTK_TEXT_WINDOW_TOP:
+ if (text_view->top_window)
+ return text_view->top_window->requisition.height;
- win->requisition.width = width;
- win->requisition.height = height;
+ case GTK_TEXT_WINDOW_BOTTOM:
+ if (text_view->bottom_window)
+ return text_view->bottom_window->requisition.height;
+
+ default:
+ g_warning ("Can only get size of left/right/top/bottom border windows with gtk_text_view_get_border_window_size()");
+ break;
+ }
- gtk_widget_queue_resize (GTK_WIDGET (text_view));
+ return 0;
}
/*
vc = g_new (GtkTextViewChild, 1);
+ vc->type = GTK_TEXT_WINDOW_PRIVATE;
vc->widget = child;
vc->anchor = anchor;
vc->from_top_of_line = 0;
vc->from_left_of_buffer = 0;
- g_object_ref (G_OBJECT (vc->widget));
- g_object_ref (G_OBJECT (vc->anchor));
+ g_object_ref (vc->widget);
+ g_object_ref (vc->anchor);
- gtk_object_set_data (GTK_OBJECT (child),
- "gtk-text-view-child",
- vc);
+ g_object_set_data (G_OBJECT (child),
+ "gtk-text-view-child",
+ vc);
gtk_text_child_anchor_register_child (anchor, child, layout);
vc->from_top_of_line = 0;
vc->from_left_of_buffer = 0;
-
- g_object_ref (G_OBJECT (vc->widget));
+
+ g_object_ref (vc->widget);
vc->type = type;
vc->x = x;
vc->y = y;
+ g_object_set_data (G_OBJECT (child),
+ "gtk-text-view-child",
+ vc);
+
return vc;
}
static void
text_view_child_free (GtkTextViewChild *child)
{
-
- gtk_object_remove_data (GTK_OBJECT (child->widget),
- "gtk-text-view-child");
+ g_object_set_data (G_OBJECT (child->widget),
+ "gtk-text-view-child", NULL);
if (child->anchor)
{
gtk_text_child_anchor_unregister_child (child->anchor,
child->widget);
- g_object_unref (G_OBJECT (child->anchor));
+ g_object_unref (child->anchor);
}
- g_object_unref (G_OBJECT (child->widget));
+ g_object_unref (child->widget);
g_free (child);
}
static void
-text_view_child_realize (GtkTextView *text_view,
- GtkTextViewChild *vc)
+text_view_child_set_parent_window (GtkTextView *text_view,
+ GtkTextViewChild *vc)
{
if (vc->anchor)
gtk_widget_set_parent_window (vc->widget,
vc->type);
gtk_widget_set_parent_window (vc->widget, window);
}
-
- gtk_widget_realize (vc->widget);
}
static void
text_view->children = g_slist_prepend (text_view->children,
vc);
- gtk_widget_set_parent (vc->widget, GTK_WIDGET (text_view));
-
if (GTK_WIDGET_REALIZED (text_view))
- text_view_child_realize (text_view, vc);
-
- if (GTK_WIDGET_VISIBLE (text_view) && GTK_WIDGET_VISIBLE (vc->widget))
- {
- if (GTK_WIDGET_MAPPED (text_view))
- gtk_widget_map (vc->widget);
-
- gtk_widget_queue_resize (vc->widget);
- }
+ text_view_child_set_parent_window (text_view, vc);
+
+ gtk_widget_set_parent (vc->widget, GTK_WIDGET (text_view));
}
+/**
+ * gtk_text_view_add_child_at_anchor:
+ * @text_view: a #GtkTextView
+ * @child: a #GtkWidget
+ * @anchor: a #GtkTextChildAnchor in the #GtkTextBuffer for @text_view
+ *
+ * Adds a child widget in the text buffer, at the given @anchor.
+ *
+ **/
void
gtk_text_view_add_child_at_anchor (GtkTextView *text_view,
GtkWidget *child,
text_view->layout);
add_child (text_view, vc);
+
+ g_assert (vc->widget == child);
+ g_assert (gtk_widget_get_parent (child) == GTK_WIDGET (text_view));
}
+/**
+ * gtk_text_view_add_child_in_window:
+ * @text_view: a #GtkTextView
+ * @child: a #GtkWidget
+ * @which_window: which window the child should appear in
+ * @xpos: X position of child in window coordinates
+ * @ypos: Y position of child in window coordinates
+ *
+ * Adds a child at fixed coordinates in one of the text widget's
+ * windows. The window must have nonzero size (see
+ * gtk_text_view_set_border_window_size()). Note that the child
+ * coordinates are given relative to the #GdkWindow in question, and
+ * that these coordinates have no sane relationship to scrolling. When
+ * placing a child in #GTK_TEXT_WINDOW_WIDGET, scrolling is
+ * irrelevant, the child floats above all scrollable areas. But when
+ * placing a child in one of the scrollable windows (border windows or
+ * text window), you'll need to compute the child's correct position
+ * in buffer coordinates any time scrolling occurs or buffer changes
+ * occur, and then call gtk_text_view_move_child() to update the
+ * child's position. Unfortunately there's no good way to detect that
+ * scrolling has occurred, using the current API; a possible hack
+ * would be to update all child positions when the scroll adjustments
+ * change or the text buffer changes. See bug 64518 on
+ * bugzilla.gnome.org for status of fixing this issue.
+ *
+ **/
void
gtk_text_view_add_child_in_window (GtkTextView *text_view,
GtkWidget *child,
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (xpos >= 0);
- g_return_if_fail (ypos >= 0);
g_return_if_fail (child->parent == NULL);
vc = text_view_child_new_window (child, which_window,
xpos, ypos);
add_child (text_view, vc);
+
+ g_assert (vc->widget == child);
+ g_assert (gtk_widget_get_parent (child) == GTK_WIDGET (text_view));
}
+/**
+ * gtk_text_view_move_child:
+ * @text_view: a #GtkTextView
+ * @child: child widget already added to the text view
+ * @xpos: new X position in window coordinates
+ * @ypos: new Y position in window coordinates
+ *
+ * Updates the position of a child, as for gtk_text_view_add_child_in_window().
+ *
+ **/
void
gtk_text_view_move_child (GtkTextView *text_view,
GtkWidget *child,
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (xpos >= 0);
- g_return_if_fail (ypos >= 0);
g_return_if_fail (child->parent == (GtkWidget*) text_view);
- vc = gtk_object_get_data (GTK_OBJECT (child),
- "gtk-text-view-child");
+ vc = g_object_get_data (G_OBJECT (child),
+ "gtk-text-view-child");
g_assert (vc != NULL);
+ if (vc->x == xpos &&
+ vc->y == ypos)
+ return;
+
vc->x = xpos;
vc->y = ypos;
}
+/* Iterator operations */
+
+/**
+ * gtk_text_view_forward_display_line:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ *
+ * Moves the given @iter forward by one display (wrapped) line. A
+ * display line is different from a paragraph. Paragraphs are
+ * separated by newlines or other paragraph separator characters.
+ * Display lines are created by line-wrapping a paragraph. If
+ * wrapping is turned off, display lines and paragraphs will be the
+ * same. Display lines are divided differently for each view, since
+ * they depend on the view's width; paragraphs are the same in all
+ * views, since they depend on the contents of the #GtkTextBuffer.
+ *
+ * Return value: %TRUE if @iter was moved and is not on the end iterator
+ **/
+gboolean
+gtk_text_view_forward_display_line (GtkTextView *text_view,
+ GtkTextIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_move_iter_to_next_line (text_view->layout, iter);
+}
+
+/**
+ * gtk_text_view_backward_display_line:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ *
+ * Moves the given @iter backward by one display (wrapped) line. A
+ * display line is different from a paragraph. Paragraphs are
+ * separated by newlines or other paragraph separator characters.
+ * Display lines are created by line-wrapping a paragraph. If
+ * wrapping is turned off, display lines and paragraphs will be the
+ * same. Display lines are divided differently for each view, since
+ * they depend on the view's width; paragraphs are the same in all
+ * views, since they depend on the contents of the #GtkTextBuffer.
+ *
+ * Return value: %TRUE if @iter was moved and is not on the end iterator
+ **/
+gboolean
+gtk_text_view_backward_display_line (GtkTextView *text_view,
+ GtkTextIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_move_iter_to_previous_line (text_view->layout, iter);
+}
+
+/**
+ * gtk_text_view_forward_display_line_end:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ *
+ * Moves the given @iter forward to the next display line end. A
+ * display line is different from a paragraph. Paragraphs are
+ * separated by newlines or other paragraph separator characters.
+ * Display lines are created by line-wrapping a paragraph. If
+ * wrapping is turned off, display lines and paragraphs will be the
+ * same. Display lines are divided differently for each view, since
+ * they depend on the view's width; paragraphs are the same in all
+ * views, since they depend on the contents of the #GtkTextBuffer.
+ *
+ * Return value: %TRUE if @iter was moved and is not on the end iterator
+ **/
+gboolean
+gtk_text_view_forward_display_line_end (GtkTextView *text_view,
+ GtkTextIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_move_iter_to_line_end (text_view->layout, iter, 1);
+}
+
+/**
+ * gtk_text_view_backward_display_line_start:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ *
+ * Moves the given @iter backward to the next display line start. A
+ * display line is different from a paragraph. Paragraphs are
+ * separated by newlines or other paragraph separator characters.
+ * Display lines are created by line-wrapping a paragraph. If
+ * wrapping is turned off, display lines and paragraphs will be the
+ * same. Display lines are divided differently for each view, since
+ * they depend on the view's width; paragraphs are the same in all
+ * views, since they depend on the contents of the #GtkTextBuffer.
+ *
+ * Return value: %TRUE if @iter was moved and is not on the end iterator
+ **/
+gboolean
+gtk_text_view_backward_display_line_start (GtkTextView *text_view,
+ GtkTextIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_move_iter_to_line_end (text_view->layout, iter, -1);
+}
+
+/**
+ * gtk_text_view_starts_display_line:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ *
+ * Determines whether @iter is at the start of a display line.
+ * See gtk_text_view_forward_display_line() for an explanation of
+ * display lines vs. paragraphs.
+ *
+ * Return value: %TRUE if @iter begins a wrapped line
+ **/
+gboolean
+gtk_text_view_starts_display_line (GtkTextView *text_view,
+ const GtkTextIter *iter)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_iter_starts_line (text_view->layout, iter);
+}
+
+/**
+ * gtk_text_view_move_visually:
+ * @text_view: a #GtkTextView
+ * @iter: a #GtkTextIter
+ * @count: number of lines to move
+ *
+ * Moves @iter up or down by @count display (wrapped) lines.
+ * See gtk_text_view_forward_display_line() for an explanation of
+ * display lines vs. paragraphs.
+ *
+ * Return value: %TRUE if @iter moved and is not on the end iterator
+ **/
+gboolean
+gtk_text_view_move_visually (GtkTextView *text_view,
+ GtkTextIter *iter,
+ gint count)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ gtk_text_view_ensure_layout (text_view);
+
+ return gtk_text_layout_move_iter_visually (text_view->layout, iter, count);
+}
projects / ~andy / gtk / blobdiff