[gtksourceview/wip/search] search: add update-highlight signal
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview/wip/search] search: add update-highlight signal
- Date: Wed, 19 Jun 2013 11:17:25 +0000 (UTC)
commit 84c609e974548e5287feb27822ebd5e419c8e8c2
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Jun 19 12:56:32 2013 +0200
search: add update-highlight signal
gtksourceview/gtksourcesearch.c | 54 ++++++++++++++++++++++++++++++++++++--
gtksourceview/gtksourcesearch.h | 6 ++++
2 files changed, 57 insertions(+), 3 deletions(-)
---
diff --git a/gtksourceview/gtksourcesearch.c b/gtksourceview/gtksourcesearch.c
index 5fb4ef8..48c4fbf 100644
--- a/gtksourceview/gtksourcesearch.c
+++ b/gtksourceview/gtksourcesearch.c
@@ -22,8 +22,9 @@
#include "gtksourcesearch.h"
#include "gtksourcebuffer.h"
#include "gtksourcestylescheme.h"
-#include "gtktextregion.h"
#include "gtksourcestyle-private.h"
+#include "gtksourceview-marshal.h"
+#include "gtktextregion.h"
#include <string.h>
@@ -42,6 +43,14 @@ struct _GtkSourceSearchPrivate
GtkTextTag *found_tag;
};
+enum
+{
+ UPDATE_HIGHLIGHT,
+ LAST_SIGNAL
+};
+
+static guint search_signals[LAST_SIGNAL] = { 0 };
+
#define GTK_SOURCE_SEARCH_GET_PRIVATE(object) \
(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GTK_SOURCE_TYPE_SEARCH, \
@@ -136,6 +145,34 @@ clear_search (GtkSourceSearch *search)
}
static void
+add_subregion (GtkSourceSearch *search,
+ GtkTextIter *start,
+ GtkTextIter *end)
+{
+ if (search->priv->region == NULL)
+ {
+ return;
+ }
+
+ if (!gtk_text_iter_starts_line (start))
+ {
+ gtk_text_iter_set_line_offset (start, 0);
+ }
+
+ if (!gtk_text_iter_ends_line (end))
+ {
+ gtk_text_iter_forward_to_line_end (end);
+ }
+
+ gtk_text_region_add (search->priv->region, start, end);
+
+ gtk_text_iter_backward_lines (start, search->priv->text_nb_lines);
+ gtk_text_iter_forward_lines (end, search->priv->text_nb_lines);
+
+ g_signal_emit (search, search_signals[UPDATE_HIGHLIGHT], 0, start, end);
+}
+
+static void
update (GtkSourceSearch *search)
{
GtkTextIter start;
@@ -156,8 +193,7 @@ update (GtkSourceSearch *search)
search->priv->region = gtk_text_region_new (search->priv->buffer);
gtk_text_buffer_get_bounds (search->priv->buffer, &start, &end);
-
- gtk_text_region_add (search->priv->region, &start, &end);
+ add_subregion (search, &start, &end);
}
static void
@@ -194,6 +230,18 @@ _gtk_source_search_class_init (GtkSourceSearchClass *klass)
object_class->dispose = _gtk_source_search_dispose;
object_class->finalize = _gtk_source_search_finalize;
+ search_signals[UPDATE_HIGHLIGHT] =
+ g_signal_new ("update-highlight",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkSourceSearchClass, update_highlight),
+ NULL, NULL,
+ _gtksourceview_marshal_VOID__BOXED_BOXED,
+ G_TYPE_NONE,
+ 2,
+ GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
+ GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE);
+
g_type_class_add_private (object_class, sizeof (GtkSourceSearchPrivate));
}
diff --git a/gtksourceview/gtksourcesearch.h b/gtksourceview/gtksourcesearch.h
index 4a6e45d..1dde5ba 100644
--- a/gtksourceview/gtksourcesearch.h
+++ b/gtksourceview/gtksourcesearch.h
@@ -48,6 +48,12 @@ struct _GtkSourceSearch
struct _GtkSourceSearchClass
{
GObjectClass parent_class;
+
+ /* Signals */
+
+ void (* update_highlight) (GtkSourceSearch *search,
+ GtkTextIter *start,
+ GtkTextIter *end);
};
G_GNUC_INTERNAL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]