]> Pileus Git - ~andy/gtk/blobdiff - tests/testtext.c
Use gtk_box_new() instead gtk_[v|h]box_new()
[~andy/gtk] / tests / testtext.c
index f9c4bcaca9e2782673486629889c86d7a65cd0e7..84159822ca1a92c7c131b936df7584836e32ad51 100644 (file)
@@ -1,3 +1,24 @@
+/* testtext.c
+ * Copyright (C) 2000 Red Hat, Inc
+ * Author: Havoc Pennington
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
 #include <stdio.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -7,6 +28,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "prop-editor.h"
+
 typedef struct _Buffer Buffer;
 typedef struct _View View;
 
@@ -20,8 +43,17 @@ struct _Buffer
   GtkTextBuffer *buffer;
   char *filename;
   gint untitled_serial;
+  GtkTextTag *invisible_tag;
   GtkTextTag *not_editable_tag;
   GtkTextTag *found_text_tag;
+  GtkTextTag *rise_tag;
+  GtkTextTag *large_tag;
+  GtkTextTag *indent_tag;
+  GtkTextTag *margin_tag;
+  GtkTextTag *custom_tabs_tag;
+  GSList *color_tags;
+  guint color_cycle_timeout;
+  gdouble start_hue;
 };
 
 struct _View
@@ -46,6 +78,12 @@ static void     buffer_filename_set (Buffer *buffer);
 static void     buffer_search_forward (Buffer *buffer,
                                        const char *str,
                                        View *view);
+static void     buffer_search_backward (Buffer *buffer,
+                                       const char *str,
+                                       View *view);
+static void     buffer_set_colors      (Buffer  *buffer,
+                                        gboolean enabled);
+static void     buffer_cycle_colors    (Buffer  *buffer);
 
 static View *view_from_widget (GtkWidget *widget);
 
@@ -54,6 +92,7 @@ static void  check_close_view (View   *view);
 static void  close_view       (View   *view);
 static void  view_set_title   (View   *view);
 static void  view_init_menus  (View   *view);
+static void  view_add_example_widgets (View *view);
 
 GSList *buffers = NULL;
 GSList *views = NULL;
@@ -61,14 +100,14 @@ GSList *views = NULL;
 static void
 push_active_window (GtkWindow *window)
 {
-  gtk_object_ref (GTK_OBJECT (window));
+  g_object_ref (window);
   active_window_stack = g_slist_prepend (active_window_stack, window);
 }
 
 static void
 pop_active_window (void)
 {
-  gtk_object_unref (active_window_stack->data);
+  g_object_unref (active_window_stack->data);
   active_window_stack = g_slist_delete_link (active_window_stack, active_window_stack);
 }
 
@@ -90,9 +129,9 @@ typedef gboolean (*FileselOKFunc) (const char *filename, gpointer data);
 static void
 filesel_ok_cb (GtkWidget *button, GtkWidget *filesel)
 {
-  FileselOKFunc ok_func = gtk_object_get_data (GTK_OBJECT (filesel), "ok-func");
-  gpointer data = gtk_object_get_data (GTK_OBJECT (filesel), "ok-data");
-  gint *result = gtk_object_get_data (GTK_OBJECT (filesel), "ok-result");
+  FileselOKFunc ok_func = (FileselOKFunc)g_object_get_data (G_OBJECT (filesel), "ok-func");
+  gpointer data = g_object_get_data (G_OBJECT (filesel), "ok-data");
+  gint *result = g_object_get_data (G_OBJECT (filesel), "ok-result");
   
   gtk_widget_hide (filesel);
   
@@ -125,19 +164,19 @@ filesel_run (GtkWindow    *parent,
     gtk_file_selection_set_filename (GTK_FILE_SELECTION (filesel), start_file);
 
   
-  gtk_object_set_data (GTK_OBJECT (filesel), "ok-func", func);
-  gtk_object_set_data (GTK_OBJECT (filesel), "ok-data", data);
-  gtk_object_set_data (GTK_OBJECT (filesel), "ok-result", &result);
-
-  gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->ok_button),
-                     "clicked",
-                     GTK_SIGNAL_FUNC (filesel_ok_cb), filesel);
-  gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesel)->cancel_button),
-                            "clicked",
-                            GTK_SIGNAL_FUNC (gtk_widget_destroy), GTK_OBJECT (filesel));
-
-  gtk_signal_connect (GTK_OBJECT (filesel), "destroy",
-                     GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+  g_object_set_data (G_OBJECT (filesel), "ok-func", func);
+  g_object_set_data (G_OBJECT (filesel), "ok-data", data);
+  g_object_set_data (G_OBJECT (filesel), "ok-result", &result);
+
+  g_signal_connect (GTK_FILE_SELECTION (filesel)->ok_button,
+                   "clicked",
+                   G_CALLBACK (filesel_ok_cb), filesel);
+  g_signal_connect_swapped (GTK_FILE_SELECTION (filesel)->cancel_button,
+                           "clicked",
+                           G_CALLBACK (gtk_widget_destroy), filesel);
+
+  g_signal_connect (filesel, "destroy",
+                   G_CALLBACK (gtk_main_quit), NULL);
   gtk_window_set_modal (GTK_WINDOW (filesel), TRUE);
 
   gtk_widget_show (filesel);
@@ -154,14 +193,14 @@ static void
 msgbox_yes_cb (GtkWidget *widget, gboolean *result)
 {
   *result = 0;
-  gtk_object_destroy (GTK_OBJECT (gtk_widget_get_toplevel (widget)));
+  gtk_widget_destroy (gtk_widget_get_toplevel (widget));
 }
 
 static void
 msgbox_no_cb (GtkWidget *widget, gboolean *result)
 {
   *result = 1;
-  gtk_object_destroy (GTK_OBJECT (gtk_widget_get_toplevel (widget)));
+  gtk_widget_destroy (gtk_widget_get_toplevel (widget));
 }
 
 static gboolean
@@ -169,14 +208,17 @@ msgbox_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
   if (event->keyval == GDK_Escape)
     {
-      gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "key_press_event");
-      gtk_object_destroy (GTK_OBJECT (widget));
+      g_signal_stop_emission_by_name (widget, "key_press_event");
+      gtk_widget_destroy (widget);
       return TRUE;
     }
 
   return FALSE;
 }
 
+/* Don't copy this example, it's all crack-smoking - you can just use
+ * GtkMessageDialog now
+ */
 gint
 msgbox_run (GtkWindow  *parent,
            const char *message,
@@ -209,17 +251,17 @@ msgbox_run (GtkWindow  *parent,
 
   /* Quit our recursive main loop when the dialog is destroyed.
    */
-  gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-                     GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+  g_signal_connect (dialog, "destroy",
+                   G_CALLBACK (gtk_main_quit), NULL);
 
   /* Catch Escape key presses and have them destroy the dialog
    */
-  gtk_signal_connect (GTK_OBJECT (dialog), "key_press_event",
-                     GTK_SIGNAL_FUNC (msgbox_key_press_cb), NULL);
+  g_signal_connect (dialog, "key_press_event",
+                   G_CALLBACK (msgbox_key_press_cb), NULL);
 
   /* Fill in the contents of the widget
    */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (dialog), vbox);
   
   label = gtk_label_new (message);
@@ -227,10 +269,10 @@ msgbox_run (GtkWindow  *parent,
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
 
-  separator = gtk_hseparator_new ();
+  separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
 
-  button_box = gtk_hbutton_box_new ();
+  button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (button_box), 8);
   
@@ -241,14 +283,14 @@ msgbox_run (GtkWindow  *parent,
   if (yes_button)
     {
       button = gtk_button_new_with_label (yes_button);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_container_add (GTK_CONTAINER (button_box), button);
 
       if (default_index == 0)
        gtk_widget_grab_default (button);
       
-      gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                         GTK_SIGNAL_FUNC (msgbox_yes_cb), &result);
+      g_signal_connect (button, "clicked",
+                       G_CALLBACK (msgbox_yes_cb), &result);
     }
 
   /* When No is clicked, call the msgbox_no_cb
@@ -257,14 +299,14 @@ msgbox_run (GtkWindow  *parent,
   if (no_button)
     {
       button = gtk_button_new_with_label (no_button);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_container_add (GTK_CONTAINER (button_box), button);
 
       if (default_index == 0)
        gtk_widget_grab_default (button);
       
-      gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                         GTK_SIGNAL_FUNC (msgbox_no_cb), &result);
+      g_signal_connect (button, "clicked",
+                       G_CALLBACK (msgbox_no_cb), &result);
     }
 
   /* When Cancel is clicked, destroy the dialog
@@ -272,14 +314,14 @@ msgbox_run (GtkWindow  *parent,
   if (cancel_button)
     {
       button = gtk_button_new_with_label (cancel_button);
-      GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+      gtk_widget_set_can_default (button, TRUE);
       gtk_container_add (GTK_CONTAINER (button_box), button);
       
       if (default_index == 1)
        gtk_widget_grab_default (button);
       
-      gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
-                                GTK_SIGNAL_FUNC (gtk_object_destroy), GTK_OBJECT (dialog));
+      g_signal_connect_swapped (button, "clicked",
+                               G_CALLBACK (gtk_object_destroy), dialog);
     }
 
   gtk_widget_show_all (dialog);
@@ -291,6 +333,7 @@ msgbox_run (GtkWindow  *parent,
   return result;
 }
 
+#ifdef DO_BLINK
 /*
  * Example buffer filling code
  */
@@ -302,7 +345,7 @@ blink_timeout (gpointer data)
   
   tag = GTK_TEXT_TAG (data);
 
-  gtk_object_set (GTK_OBJECT (tag),
+  g_object_set (tag,
                  "foreground", flip ? "blue" : "purple",
                  NULL);
 
@@ -310,6 +353,7 @@ blink_timeout (gpointer data)
 
   return TRUE;
 }
+#endif
 
 static gint
 tag_event_handler (GtkTextTag *tag, GtkWidget *widget, GdkEvent *event,
@@ -376,14 +420,13 @@ tag_event_handler (GtkTextTag *tag, GtkWidget *widget, GdkEvent *event,
 static void
 setup_tag (GtkTextTag *tag)
 {
-
-  gtk_signal_connect (GTK_OBJECT (tag),
-                     "event",
-                     GTK_SIGNAL_FUNC (tag_event_handler),
-                     NULL);
+  g_signal_connect (tag,
+                   "event",
+                   G_CALLBACK (tag_event_handler),
+                   NULL);
 }
 
-static char  *book_closed_xpm[] = {
+static const char  *book_closed_xpm[] = {
 "16 16 6 1",
 "       c None s None",
 ".      c black",
@@ -408,24 +451,28 @@ static char  *book_closed_xpm[] = {
 "      ..        ",
 "                "};
 
-
-
 void
 fill_example_buffer (GtkTextBuffer *buffer)
 {
   GtkTextIter iter, iter2;
   GtkTextTag *tag;
+  GtkTextChildAnchor *anchor;
   GdkColor color;
   GdkColor color2;
-  GdkPixmap *pixmap;
-  GdkBitmap *mask;
+  GdkPixbuf *pixbuf;
   int i;
   char *str;
   
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
+  /* FIXME this is broken if called twice on a buffer, since
+   * we try to create tags a second time.
+   */
+  
+  tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
 
-  /*       gtk_timeout_add (1000, blink_timeout, tag); */
-      
+#ifdef DO_BLINK
+  g_timeout_add (1000, (GSourceFunc)blink_timeout, tag);
+#endif     
   setup_tag (tag);
   
   color.red = color.green = 0;
@@ -433,79 +480,92 @@ fill_example_buffer (GtkTextBuffer *buffer)
   color2.red = 0xfff;
   color2.blue = 0x0;
   color2.green = 0;
-  gtk_object_set (GTK_OBJECT (tag),
-                "foreground_gdk", &color,
-                "background_gdk", &color2,
-                "font", "Sans 24",
-                NULL);
+  g_object_set (tag,
+                "foreground_gdk", &color,
+                "background_gdk", &color2,
+                "size_points", 24.0,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_red", NULL);
 
   setup_tag (tag);
       
   color.blue = color.green = 0;
   color.red = 0xffff;
-  gtk_object_set (GTK_OBJECT (tag),
-                "offset", -4,
-                "foreground_gdk", &color,
-                NULL);
+  g_object_set (tag,
+                "rise", -4 * PANGO_SCALE,
+                "foreground_gdk", &color,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  tag = gtk_text_buffer_create_tag (buffer, "bg_green", NULL);
 
   setup_tag (tag);
       
   color.blue = color.red = 0;
   color.green = 0xffff;
-  gtk_object_set (GTK_OBJECT (tag),
-                "background_gdk", &color,
-                "font", "Sans 10",
-                NULL);
+  g_object_set (tag,
+                "background_gdk", &color,
+                "size_points", 10.0,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "overstrike");
+  tag = gtk_text_buffer_create_tag (buffer, "strikethrough", NULL);
 
   setup_tag (tag);
       
-  gtk_object_set (GTK_OBJECT (tag),
-                "overstrike", TRUE,
-                NULL);
+  g_object_set (tag,
+                "strikethrough", TRUE,
+                NULL);
 
 
-  tag = gtk_text_buffer_create_tag (buffer, "underline");
+  tag = gtk_text_buffer_create_tag (buffer, "underline", NULL);
 
   setup_tag (tag);
       
-  gtk_object_set (GTK_OBJECT (tag),
-                "underline", PANGO_UNDERLINE_SINGLE,
-                NULL);
+  g_object_set (tag,
+                "underline", PANGO_UNDERLINE_SINGLE,
+                NULL);
+
+  tag = gtk_text_buffer_create_tag (buffer, "underline_error", NULL);
 
   setup_tag (tag);
       
-  gtk_object_set (GTK_OBJECT (tag),
-                "underline", PANGO_UNDERLINE_SINGLE,
-                NULL);
+  g_object_set (tag,
+                "underline", PANGO_UNDERLINE_ERROR,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "centered");
+  tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
       
-  gtk_object_set (GTK_OBJECT (tag),
-                "justify", GTK_JUSTIFY_CENTER,
-                NULL);
+  g_object_set (tag,
+                "justification", GTK_JUSTIFY_CENTER,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
+  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote", NULL);
       
-  gtk_object_set (GTK_OBJECT (tag),
-                "wrap_mode", GTK_WRAPMODE_WORD,
-                "direction", GTK_TEXT_DIR_RTL,
-                "left_wrapped_line_margin", 20,
-                "left_margin", 20,
-                "right_margin", 20,
-                NULL);
+  g_object_set (tag,
+                "wrap_mode", GTK_WRAP_WORD,
+                "direction", GTK_TEXT_DIR_RTL,
+                "indent", 30,
+                "left_margin", 20,
+                "right_margin", 20,
+                NULL);
+
+
+  tag = gtk_text_buffer_create_tag (buffer, "negative_indent", NULL);
+      
+  g_object_set (tag,
+                "indent", -25,
+                NULL);
+  
+  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
+
+  anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
+
+  g_object_ref (anchor);
   
-  pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
-                                                 gtk_widget_get_default_colormap (),
-                                                 &mask,
-                                                 NULL, book_closed_xpm);
+  g_object_set_data_full (G_OBJECT (buffer), "anchor", anchor,
+                          (GDestroyNotify) g_object_unref);
   
-  g_assert (pixmap != NULL);
+  pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
   
   i = 0;
   while (i < 100)
@@ -514,7 +574,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
       
       gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
           
-      gtk_text_buffer_insert_pixmap (buffer, &iter, pixmap, mask);
+      gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
           
       str = g_strdup_printf ("%d Hello World! blah blah blah blah blah blah blah blah blah blah blah blah\nwoo woo woo woo woo woo woo woo woo woo woo woo woo woo woo\n",
                            i);
@@ -529,7 +589,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                             "(Hello World!)\nfoo foo Hello this is some text we are using to text word wrap. It has punctuation! gee; blah - hmm, great.\nnew line with a significant quantity of text on it. This line really does contain some text. More text! More text! More text!\n"
                             /* This is UTF8 stuff, Emacs doesn't
                                really know how to display it */
-                            "German (Deutsch Süd) Grüß Gott Greek (Ελληνικά) Γειά σας Hebrew   שלום Japanese (日本語)\n", -1);
+                            "German (Deutsch S\303\274d) Gr\303\274\303\237 Gott Greek (\316\225\316\273\316\273\316\267\316\275\316\271\316\272\316\254) \316\223\316\265\316\271\316\254 \317\203\316\261\317\202 Hebrew(\327\251\327\234\327\225\327\235) Hebrew punctuation(\xd6\xbf\327\251\xd6\xbb\xd6\xbc\xd6\xbb\xd6\xbf\327\234\xd6\xbc\327\225\xd6\xbc\xd6\xbb\xd6\xbb\xd6\xbf\327\235\xd6\xbc\xd6\xbb\xd6\xbf) Japanese (\346\227\245\346\234\254\350\252\236) Thai (\340\270\252\340\270\247\340\270\261\340\270\252\340\270\224\340\270\265\340\270\204\340\270\243\340\270\261\340\270\232) Thai wrong spelling (\340\270\204\340\270\263\340\270\225\340\271\210\340\270\255\340\271\204\340\270\233\340\270\231\340\270\267\340\271\210\340\270\252\340\270\260\340\270\201\340\270\224\340\270\234\340\270\264\340\270\224 \340\270\236\340\270\261\340\270\261\340\271\211\340\270\261\340\270\261\340\271\210\340\270\207\340\271\202\340\270\201\340\270\260)\n", -1);
 
       temp_mark =
         gtk_text_buffer_create_mark (buffer, "tmp_mark", &iter, TRUE);
@@ -545,10 +605,15 @@ fill_example_buffer (GtkTextBuffer *buffer)
 
       gtk_text_buffer_apply_tag_by_name (buffer, "underline", &iter, &iter2);
 
+      gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 4);
+      gtk_text_buffer_get_iter_at_line_offset (buffer, &iter2, 1, 7);
+
+      gtk_text_buffer_apply_tag_by_name (buffer, "underline_error", &iter, &iter2);
+
       gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 1, 14);
       gtk_text_buffer_get_iter_at_line_offset (buffer, &iter2, 1, 24);
 
-      gtk_text_buffer_apply_tag_by_name (buffer, "overstrike", &iter, &iter2);
+      gtk_text_buffer_apply_tag_by_name (buffer, "strikethrough", &iter, &iter2);
           
       gtk_text_buffer_get_iter_at_line_offset (buffer, &iter, 0, 9);
       gtk_text_buffer_get_iter_at_line_offset (buffer, &iter2, 0, 16);
@@ -574,21 +639,30 @@ fill_example_buffer (GtkTextBuffer *buffer)
 
       gtk_text_buffer_move_mark (buffer, temp_mark, &iter);
       gtk_text_buffer_insert (buffer, &iter, "Word wrapped, Right-to-left Quote\n", -1);
-      gtk_text_buffer_insert (buffer, &iter, "وقد بدأ ثلاث من أكثر المؤسسات تقدما في شبكة اكسيون برامجها كمنظمات لا تسعى للربح، ثم تحولت في السنوات الخمس الماضية إلى مؤسسات مالية منظمة، وباتت جزءا من النظام المالي في بلدانها، ولكنها تتخصص في خدمة قطاع المشروعات الصغيرة. وأحد أكثر هذه المؤسسات نجاحا هو »بانكوسول« في بوليفيا.\n", -1);
+      gtk_text_buffer_insert (buffer, &iter, "\331\210\331\202\330\257 \330\250\330\257\330\243 \330\253\331\204\330\247\330\253 \331\205\331\206 \330\243\331\203\330\253\330\261 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \330\252\331\202\330\257\331\205\330\247 \331\201\331\212 \330\264\330\250\331\203\330\251 \330\247\331\203\330\263\331\212\331\210\331\206 \330\250\330\261\330\247\331\205\330\254\331\207\330\247 \331\203\331\205\331\206\330\270\331\205\330\247\330\252 \331\204\330\247 \330\252\330\263\330\271\331\211 \331\204\331\204\330\261\330\250\330\255\330\214 \330\253\331\205 \330\252\330\255\331\210\331\204\330\252 \331\201\331\212 \330\247\331\204\330\263\331\206\331\210\330\247\330\252 \330\247\331\204\330\256\331\205\330\263 \330\247\331\204\331\205\330\247\330\266\331\212\330\251 \330\245\331\204\331\211 \331\205\330\244\330\263\330\263\330\247\330\252 \331\205\330\247\331\204\331\212\330\251 \331\205\331\206\330\270\331\205\330\251\330\214 \331\210\330\250\330\247\330\252\330\252 \330\254\330\262\330\241\330\247 \331\205\331\206 \330\247\331\204\331\206\330\270\330\247\331\205 \330\247\331\204\331\205\330\247\331\204\331\212 \331\201\331\212 \330\250\331\204\330\257\330\247\331\206\331\207\330\247\330\214 \331\210\331\204\331\203\331\206\331\207\330\247 \330\252\330\252\330\256\330\265\330\265 \331\201\331\212 \330\256\330\257\331\205\330\251 \331\202\330\267\330\247\330\271 \330\247\331\204\331\205\330\264\330\261\331\210\330\271\330\247\330\252 \330\247\331\204\330\265\330\272\331\212\330\261\330\251. \331\210\330\243\330\255\330\257 \330\243\331\203\330\253\330\261 \331\207\330\260\331\207 \330\247\331\204\331\205\330\244\330\263\330\263\330\247\330\252 \331\206\330\254\330\247\330\255\330\247 \331\207\331\210 \302\273\330\250\330\247\331\206\331\203\331\210\330\263\331\210\331\204\302\253 \331\201\331\212 \330\250\331\210\331\204\331\212\331\201\331\212\330\247.\n", -1);
       gtk_text_buffer_get_iter_at_mark (buffer, &iter2, temp_mark);
       gtk_text_buffer_apply_tag_by_name (buffer, "rtl_quote", &iter2, &iter);
-         
+
+      gtk_text_buffer_insert_with_tags (buffer, &iter,
+                                        "Paragraph with negative indentation. blah blah blah blah blah. The quick brown fox jumped over the lazy dog.\n",
+                                        -1,
+                                        gtk_text_tag_table_lookup (gtk_text_buffer_get_tag_table (buffer),
+                                                                   "negative_indent"),
+                                        NULL);
+      
       ++i;
     }
 
-  gdk_pixmap_unref (pixmap);
-  if (mask)
-    gdk_bitmap_unref (mask);
+  g_object_unref (pixbuf);
   
   printf ("%d lines %d chars\n",
-        gtk_text_buffer_get_line_count (buffer),
-        gtk_text_buffer_get_char_count (buffer));
+          gtk_text_buffer_get_line_count (buffer),
+          gtk_text_buffer_get_char_count (buffer));
 
+  /* Move cursor to start */
+  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
+  gtk_text_buffer_place_cursor (buffer, &iter);
+  
   gtk_text_buffer_set_modified (buffer, FALSE);
 }
 
@@ -615,25 +689,18 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
   while (!feof (f))
     {
       gint count;
-      char *leftover, *next;
+      const char *leftover;
       int to_read = 2047  - remaining;
-      
+
       count = fread (buf + remaining, 1, to_read, f);
       buf[count + remaining] = '\0';
 
-      leftover = next = buf;
-      while (next)
-       {
-         leftover = next;
-         if (!*leftover)
-           break;
-         
-         next = g_utf8_next_char (next);
-       }
-
+      g_utf8_validate (buf, count + remaining, &leftover);
+      
+      g_assert (g_utf8_validate (buf, leftover - buf, NULL));
       gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf);
 
-      remaining = buf + remaining + count - leftover;
+      remaining = (buf + remaining + count) - leftover;
       g_memmove (buf, leftover, remaining);
 
       if (remaining > 6 || count < to_read)
@@ -650,7 +717,7 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename)
   /* We had a newline in the buffer to begin with. (The buffer always contains
    * a newline, so we delete to the end of the buffer to clean up.
    */
-  gtk_text_buffer_get_last_iter (buffer, &end);
+  gtk_text_buffer_get_end_iter (buffer, &end);
   gtk_text_buffer_delete (buffer, &iter, &end);
   
   gtk_text_buffer_set_modified (buffer, FALSE);
@@ -678,7 +745,7 @@ static View *
 get_empty_view (View *view)
 {
   if (!view->buffer->filename &&
-      !gtk_text_buffer_modified (view->buffer->buffer))
+      !gtk_text_buffer_get_modified (view->buffer->buffer))
     return view;
   else
     return create_view (create_buffer ());
@@ -687,17 +754,15 @@ get_empty_view (View *view)
 static View *
 view_from_widget (GtkWidget *widget)
 {
-  GtkWidget *app;
-
   if (GTK_IS_MENU_ITEM (widget))
     {
       GtkItemFactory *item_factory = gtk_item_factory_from_widget (widget);
-      return gtk_object_get_data (GTK_OBJECT (item_factory), "view");      
+      return g_object_get_data (G_OBJECT (item_factory), "view");      
     }
   else
     {
       GtkWidget *app = gtk_widget_get_toplevel (widget);
-      return gtk_object_get_data (GTK_OBJECT (app), "view");
+      return g_object_get_data (G_OBJECT (app), "view");
     }
 }
 
@@ -825,6 +890,36 @@ do_example (gpointer             callback_data,
   new_view = get_empty_view (view);
   
   fill_example_buffer (new_view->buffer->buffer);
+
+  view_add_example_widgets (new_view);
+}
+
+
+static void
+do_insert_and_scroll (gpointer             callback_data,
+                      guint                callback_action,
+                      GtkWidget           *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextBuffer *buffer;
+  GtkTextIter start, end;
+  GtkTextMark *mark;
+  
+  buffer = view->buffer->buffer;
+
+  gtk_text_buffer_get_bounds (buffer, &start, &end);
+  mark = gtk_text_buffer_create_mark (buffer, NULL, &end, /* right grav */ FALSE);
+
+  gtk_text_buffer_insert (buffer, &end,
+                          "Hello this is multiple lines of text\n"
+                          "Line 1\n"  "Line 2\n"
+                          "Line 3\n"  "Line 4\n"
+                          "Line 5\n",
+                          -1);
+
+  gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (view->text_view), mark,
+                                0, TRUE, 0.0, 1.0);
+  gtk_text_buffer_delete_mark (buffer, mark);
 }
 
 static void
@@ -848,6 +943,34 @@ do_direction_changed (gpointer             callback_data,
   gtk_widget_queue_resize (view->text_view);
 }
 
+
+static void
+do_spacing_changed (gpointer             callback_data,
+                    guint                callback_action,
+                    GtkWidget           *widget)
+{
+  View *view = view_from_widget (widget);
+
+  if (callback_action)
+    {
+      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (view->text_view),
+                                            23);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (view->text_view),
+                                            21);
+      gtk_text_view_set_pixels_inside_wrap (GTK_TEXT_VIEW (view->text_view),
+                                            9);
+    }
+  else
+    {
+      gtk_text_view_set_pixels_above_lines (GTK_TEXT_VIEW (view->text_view),
+                                            0);
+      gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW (view->text_view),
+                                            0);
+      gtk_text_view_set_pixels_inside_wrap (GTK_TEXT_VIEW (view->text_view),
+                                            0);
+    }
+}
+
 static void
 do_editable_changed (gpointer callback_data,
                      guint callback_action,
@@ -858,6 +981,19 @@ do_editable_changed (gpointer callback_data,
   gtk_text_view_set_editable (GTK_TEXT_VIEW (view->text_view), callback_action);
 }
 
+static void
+change_cursor_color (GtkWidget *widget,
+                    gboolean   set)
+{
+  if (set)
+    {
+      GdkColor red = {0, 65535, 0, 0};
+      gtk_widget_modify_cursor (widget, &red, &red);
+    }
+  else
+    gtk_widget_modify_cursor (widget, NULL, NULL);
+}
+
 static void
 do_cursor_visible_changed (gpointer callback_data,
                            guint callback_action,
@@ -865,7 +1001,30 @@ do_cursor_visible_changed (gpointer callback_data,
 {
   View *view = view_from_widget (widget);
 
-  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view->text_view), callback_action);
+  switch (callback_action)
+    {
+    case 0:
+      gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view->text_view), FALSE);
+      break;
+    case 1:
+      gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view->text_view), TRUE);
+      change_cursor_color (view->text_view, FALSE);
+      break;
+    case 2:
+      gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view->text_view), TRUE);
+      change_cursor_color (view->text_view, TRUE);
+      break;
+    }
+}
+
+static void
+do_color_cycle_changed (gpointer callback_data,
+                        guint callback_action,
+                        GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+
+  buffer_set_colors (view->buffer, callback_action);
 }
 
 static void
@@ -896,145 +1055,957 @@ do_apply_editable (gpointer callback_data,
 }
 
 static void
-dialog_response_callback (GtkWidget *dialog, gint response_id, gpointer data)
+do_apply_invisible (gpointer callback_data,
+                    guint callback_action,
+                    GtkWidget *widget)
 {
-  GtkTextBuffer *buffer;
-  View *view = data;
-  GtkTextIter start, end;
-  gchar *search_string;
-  
-  buffer = gtk_object_get_data (GTK_OBJECT (dialog), "buffer");
-
-  gtk_text_buffer_get_bounds (buffer, &start, &end);
-
-  /* Remove trailing newline */
-  gtk_text_iter_prev_char (&end);
-  
-  search_string = gtk_text_iter_get_text (&start, &end);
-
-  printf ("Searching for `%s'\n", search_string);
-  
-  buffer_search_forward (view->buffer, search_string, view);
-
-  g_free (search_string);
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
   
-  gtk_widget_destroy (dialog);
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->invisible_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->invisible_tag,
+                                     &start, &end);
+        }
+    }
 }
 
 static void
-do_search (gpointer callback_data,
-           guint callback_action,
-           GtkWidget *widget)
+do_apply_rise (gpointer callback_data,
+              guint callback_action,
+              GtkWidget *widget)
 {
   View *view = view_from_widget (widget);
-  GtkWidget *dialog;
-  GtkWidget *search_text;
-  GtkTextBuffer *buffer;
-
-#if 0
-  
-  dialog = gtk_dialog_new_with_buttons ("Search",
-                                        GTK_WINDOW (view->window),
-                                        GTK_DIALOG_DESTROY_WITH_PARENT,
-                                        GTK_STOCK_BUTTON_CLOSE,
-                                        GTK_RESPONSE_NONE, NULL);
-
-  buffer = gtk_text_buffer_new (NULL);
-
-  /* FIXME memory leak once buffer is a GObject */
-  search_text = gtk_text_view_new_with_buffer (buffer);
-
-  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox),
-                    search_text,
-                    TRUE, TRUE, 0);
-
-  gtk_object_set_data (GTK_OBJECT (dialog), "buffer", buffer);
+  GtkTextIter start;
+  GtkTextIter end;
   
-  gtk_signal_connect (GTK_OBJECT (dialog),
-                      "response",
-                      GTK_SIGNAL_FUNC (dialog_response_callback),
-                      view);
-
-  gtk_widget_show (search_text);
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->rise_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->rise_tag,
+                                     &start, &end);
+        }
+    }
+}
 
-  gtk_widget_grab_focus (search_text);
+static void
+do_apply_large (gpointer callback_data,
+               guint callback_action,
+               GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
   
-  gtk_widget_show_all (dialog);
-#endif
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->large_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->large_tag,
+                                     &start, &end);
+        }
+    }
 }
 
 static void
-view_init_menus (View *view)
+do_apply_indent (gpointer callback_data,
+                guint callback_action,
+                GtkWidget *widget)
 {
-  GtkTextDirection direction = gtk_widget_get_direction (view->text_view);
-  GtkWrapMode wrap_mode = gtk_text_view_get_wrap_mode (GTK_TEXT_VIEW (view->text_view));
-  GtkWidget *menu_item = NULL;
-
-  switch (direction)
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
+  
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
     {
-    case GTK_TEXT_DIR_LTR:
-      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Left-to-Right");
-      break;
-    case GTK_TEXT_DIR_RTL:
-      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Right-to-Left");
-      break;
-    default:
-      break;
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->indent_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->indent_tag,
+                                     &start, &end);
+        }
     }
+}
 
-  if (menu_item)
-    gtk_menu_item_activate (GTK_MENU_ITEM (menu_item));
-
-  switch (wrap_mode)
+static void
+do_apply_margin (gpointer callback_data,
+                guint callback_action,
+                GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
+  
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
     {
-    case GTK_WRAPMODE_NONE:
-      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
-      break;
-    case GTK_WRAPMODE_WORD:
-      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
-      break;
-    default:
-      break;
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->margin_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->margin_tag,
+                                     &start, &end);
+        }
     }
-  
-  if (menu_item)
-    gtk_menu_item_activate (GTK_MENU_ITEM (menu_item));
 }
 
-static GtkItemFactoryEntry menu_items[] =
+static void
+do_apply_tabs (gpointer callback_data,
+               guint callback_action,
+               GtkWidget *widget)
 {
-  { "/_File",            NULL,         0,           0, "<Branch>" },
-  { "/File/_New",        "<control>N", do_new,      0, NULL },
-  { "/File/New _View",   NULL,         do_new_view, 0, NULL },
-  { "/File/_Open",       "<control>O", do_open,     0, NULL },
-  { "/File/_Save",       "<control>S", do_save,     0, NULL },
-  { "/File/Save _As...", NULL,         do_save_as,  0, NULL },
-  { "/File/sep1",        NULL,         0,           0, "<Separator>" },
-  { "/File/_Close",     "<control>W" , do_close,    0, NULL },
-  { "/File/E_xit",      "<control>Q" , do_exit,     0, NULL },
-
-  { "/_Edit", NULL, 0, 0, "<Branch>" },
-  { "/Edit/Find...", NULL, do_search, 0, NULL },
-
-  { "/_Settings",        NULL,         0,                0, "<Branch>" },
-  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAPMODE_NONE, "<RadioItem>" },
-  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAPMODE_WORD, "/Settings/Wrap Off" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
-  { "/Settings/Editable", NULL,      do_editable_changed,  TRUE, "<RadioItem>" },
-  { "/Settings/Not editable",    NULL,      do_editable_changed,  FALSE, "/Settings/Editable" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
-
-  { "/Settings/Cursor visible",    NULL,      do_cursor_visible_changed,  TRUE, "<RadioItem>" },
-  { "/Settings/Cursor not visible", NULL,      do_cursor_visible_changed,  FALSE, "/Settings/Cursor visible" },
-  { "/Settings/sep1",        NULL,      0,                0, "<Separator>" },
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
+  
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      if (callback_action)
+        {
+          gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                      view->buffer->custom_tabs_tag,
+                                      &start, &end);
+        }
+      else
+        {
+          gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                     view->buffer->custom_tabs_tag,
+                                     &start, &end);
+        }
+    }
+}
+
+static void
+do_apply_colors (gpointer callback_data,
+                 guint callback_action,
+                 GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  Buffer *buffer = view->buffer;
+  GtkTextIter start;
+  GtkTextIter end;
+  
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      if (!callback_action)
+        {
+          GSList *tmp;
+          
+          tmp = buffer->color_tags;
+          while (tmp != NULL)
+            {
+              gtk_text_buffer_remove_tag (view->buffer->buffer,
+                                          tmp->data,
+                                          &start, &end);              
+              tmp = g_slist_next (tmp);
+            }
+        }
+      else
+        {
+          GSList *tmp;
+          
+          tmp = buffer->color_tags;
+          while (TRUE)
+            {
+              GtkTextIter next;
+              gboolean done = FALSE;
+              
+              next = start;
+              gtk_text_iter_forward_char (&next);
+              gtk_text_iter_forward_char (&next);
+
+              if (gtk_text_iter_compare (&next, &end) >= 0)
+                {
+                  next = end;
+                  done = TRUE;
+                }
+              
+              gtk_text_buffer_apply_tag (view->buffer->buffer,
+                                         tmp->data,
+                                         &start, &next);
+
+              start = next;
+
+              if (done)
+                return;
+              
+              tmp = g_slist_next (tmp);
+              if (tmp == NULL)
+                tmp = buffer->color_tags;
+            } 
+        }
+    }
+}
+
+static void
+do_remove_tags (gpointer callback_data,
+                guint callback_action,
+                GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextIter start;
+  GtkTextIter end;
+  
+  if (gtk_text_buffer_get_selection_bounds (view->buffer->buffer,
+                                            &start, &end))
+    {
+      gtk_text_buffer_remove_all_tags (view->buffer->buffer,
+                                       &start, &end);
+    }
+}
+
+static void
+do_properties (gpointer callback_data,
+                guint callback_action,
+                GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+
+  create_prop_editor (G_OBJECT (view->text_view), 0);
+}
+
+static void
+rich_text_store_populate (GtkListStore  *store,
+                          GtkTextBuffer *buffer,
+                          gboolean       deserialize)
+{
+  GdkAtom *formats;
+  gint     n_formats;
+  gint     i;
+
+  gtk_list_store_clear (store);
+
+  if (deserialize)
+    formats = gtk_text_buffer_get_deserialize_formats (buffer, &n_formats);
+  else
+    formats = gtk_text_buffer_get_serialize_formats (buffer, &n_formats);
+
+  for (i = 0; i < n_formats; i++)
+    {
+      GtkTreeIter  iter;
+      gchar       *mime_type;
+      gboolean     can_create_tags = FALSE;
+
+      mime_type = gdk_atom_name (formats[i]);
+
+      if (deserialize)
+        can_create_tags =
+          gtk_text_buffer_deserialize_get_can_create_tags (buffer, formats[i]);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter,
+                          0, formats[i],
+                          1, mime_type,
+                          2, can_create_tags,
+                          -1);
+
+      g_free (mime_type);
+    }
+
+  g_free (formats);
+}
+
+static void
+rich_text_paste_target_list_notify (GtkTextBuffer    *buffer,
+                                    const GParamSpec *pspec,
+                                    GtkListStore     *store)
+{
+  rich_text_store_populate (store, buffer, TRUE);
+}
+
+static void
+rich_text_copy_target_list_notify (GtkTextBuffer    *buffer,
+                                   const GParamSpec *pspec,
+                                   GtkListStore     *store)
+{
+  rich_text_store_populate (store, buffer, FALSE);
+}
+
+static void
+rich_text_can_create_tags_toggled (GtkCellRendererToggle *toggle,
+                                   const gchar           *path,
+                                   GtkTreeModel          *model)
+{
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_get_iter_from_string (model, &iter, path))
+    {
+      GtkTextBuffer *buffer;
+      GdkAtom        format;
+      gboolean       can_create_tags;
+
+      buffer = g_object_get_data (G_OBJECT (model), "buffer");
+
+      gtk_tree_model_get (model, &iter,
+                          0, &format,
+                          2, &can_create_tags,
+                          -1);
+
+      gtk_text_buffer_deserialize_set_can_create_tags (buffer, format,
+                                                       !can_create_tags);
+
+      gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                          2, !can_create_tags,
+                          -1);
+    }
+}
+
+static void
+rich_text_unregister_clicked (GtkWidget   *button,
+                              GtkTreeView *tv)
+{
+  GtkTreeSelection *sel = gtk_tree_view_get_selection (tv);
+  GtkTreeModel     *model;
+  GtkTreeIter       iter;
+
+  if (gtk_tree_selection_get_selected (sel, &model, &iter))
+    {
+      GtkTextBuffer *buffer;
+      gboolean       deserialize;
+      GdkAtom        format;
+
+      buffer = g_object_get_data (G_OBJECT (model), "buffer");
+      deserialize = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model),
+                                                        "deserialize"));
+
+      gtk_tree_model_get (model, &iter,
+                          0, &format,
+                          -1);
+
+      if (deserialize)
+        gtk_text_buffer_unregister_deserialize_format (buffer, format);
+      else
+        gtk_text_buffer_unregister_serialize_format (buffer, format);
+    }
+}
+
+static void
+rich_text_register_clicked (GtkWidget   *button,
+                            GtkTreeView *tv)
+{
+  GtkWidget *dialog;
+  GtkWidget *label;
+  GtkWidget *entry;
+
+  dialog = gtk_dialog_new_with_buttons ("Register new Tagset",
+                                        GTK_WINDOW (gtk_widget_get_toplevel (button)),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                                        GTK_STOCK_OK,     GTK_RESPONSE_OK,
+                                        NULL);
+  label = gtk_label_new ("Enter tagset name or leave blank for "
+                         "unrestricted internal format:");
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), label,
+                      FALSE, FALSE, 0);
+
+  entry = gtk_entry_new ();
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), entry,
+                      FALSE, FALSE, 0);
+
+  gtk_widget_show_all (dialog);
+
+  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
+    {
+      GtkTreeModel  *model  = gtk_tree_view_get_model (tv);
+      GtkTextBuffer *buffer = g_object_get_data (G_OBJECT (model), "buffer");
+      const gchar   *tagset = gtk_entry_get_text (GTK_ENTRY (entry));
+      gboolean       deserialize;
+
+      deserialize = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (model),
+                                                        "deserialize"));
+
+      if (tagset && ! strlen (tagset))
+        tagset = NULL;
+
+      if (deserialize)
+        gtk_text_buffer_register_deserialize_tagset (buffer, tagset);
+      else
+        gtk_text_buffer_register_serialize_tagset (buffer, tagset);
+    }
+
+  gtk_widget_destroy (dialog);
+}
+
+static void
+do_rich_text (gpointer callback_data,
+              guint deserialize,
+              GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextBuffer *buffer;
+  GtkWidget *dialog;
+  GtkWidget *tv;
+  GtkWidget *sw;
+  GtkWidget *hbox;
+  GtkWidget *button;
+  GtkListStore *store;
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view->text_view));
+
+  dialog = gtk_dialog_new_with_buttons (deserialize ?
+                                        "Rich Text Paste & Drop" :
+                                        "Rich Text Copy & Drag",
+                                        GTK_WINDOW (view->window),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        GTK_STOCK_CLOSE, 0,
+                                        NULL);
+  g_signal_connect (dialog, "response",
+                    G_CALLBACK (gtk_widget_destroy),
+                    NULL);
+
+  store = gtk_list_store_new (3,
+                              G_TYPE_POINTER,
+                              G_TYPE_STRING,
+                              G_TYPE_BOOLEAN);
+
+  g_object_set_data (G_OBJECT (store), "buffer", buffer);
+  g_object_set_data (G_OBJECT (store), "deserialize",
+                     GUINT_TO_POINTER (deserialize));
+
+  tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+  g_object_unref (store);
+
+  gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tv),
+                                               0, "Rich Text Format",
+                                               gtk_cell_renderer_text_new (),
+                                               "text", 1,
+                                               NULL);
+
+  if (deserialize)
+    {
+      GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new ();
+
+      gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tv),
+                                                   1, "Can Create Tags",
+                                                   renderer,
+                                                   "active", 2,
+                                                   NULL);
+
+      g_signal_connect (renderer, "toggled",
+                        G_CALLBACK (rich_text_can_create_tags_toggled),
+                        store);
+    }
+
+  sw = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_size_request (sw, 300, 100);
+  gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), sw);
+
+  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw), tv);
+
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+                      FALSE, FALSE, 0);
+
+  button = gtk_button_new_with_label ("Unregister Selected Format");
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (rich_text_unregister_clicked),
+                    tv);
+
+  button = gtk_button_new_with_label ("Register New Tagset\n"
+                                      "for the Internal Format");
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+
+  g_signal_connect (button, "clicked",
+                    G_CALLBACK (rich_text_register_clicked),
+                    tv);
+
+  if (deserialize)
+    g_signal_connect_object (buffer, "notify::paste-target-list",
+                             G_CALLBACK (rich_text_paste_target_list_notify),
+                             G_OBJECT (store), 0);
+  else
+    g_signal_connect_object (buffer, "notify::copy-target-list",
+                             G_CALLBACK (rich_text_copy_target_list_notify),
+                             G_OBJECT (store), 0);
+
+  rich_text_store_populate (store, buffer, deserialize);
+
+  gtk_widget_show_all (dialog);
+}
+
+enum
+{
+  RESPONSE_FORWARD,
+  RESPONSE_BACKWARD
+};
+
+static void
+dialog_response_callback (GtkWidget *dialog, gint response_id, gpointer data)
+{
+  GtkTextBuffer *buffer;
+  View *view = data;
+  GtkTextIter start, end;
+  gchar *search_string;
+
+  if (response_id != RESPONSE_FORWARD &&
+      response_id != RESPONSE_BACKWARD)
+    {
+      gtk_widget_destroy (dialog);
+      return;
+    }
+  
+  buffer = g_object_get_data (G_OBJECT (dialog), "buffer");
+
+  gtk_text_buffer_get_bounds (buffer, &start, &end);
+  
+  search_string = gtk_text_iter_get_text (&start, &end);
+
+  g_print ("Searching for `%s'\n", search_string);
+
+  if (response_id == RESPONSE_FORWARD)
+    buffer_search_forward (view->buffer, search_string, view);
+  else if (response_id == RESPONSE_BACKWARD)
+    buffer_search_backward (view->buffer, search_string, view);
+    
+  g_free (search_string);
+  
+  gtk_widget_destroy (dialog);
+}
+
+static void
+do_copy  (gpointer callback_data,
+          guint callback_action,
+          GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextBuffer *buffer;
+
+  buffer = view->buffer->buffer;
+
+  gtk_text_buffer_copy_clipboard (buffer,
+                                  gtk_clipboard_get (GDK_NONE));
+}
+
+static void
+do_search (gpointer callback_data,
+           guint callback_action,
+           GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkWidget *dialog;
+  GtkWidget *search_text;
+  GtkTextBuffer *buffer;
+
+  dialog = gtk_dialog_new_with_buttons ("Search",
+                                        GTK_WINDOW (view->window),
+                                        GTK_DIALOG_DESTROY_WITH_PARENT,
+                                        "Forward", RESPONSE_FORWARD,
+                                        "Backward", RESPONSE_BACKWARD,
+                                        GTK_STOCK_CANCEL,
+                                        GTK_RESPONSE_NONE, NULL);
+
+
+  buffer = gtk_text_buffer_new (NULL);
+
+  search_text = gtk_text_view_new_with_buffer (buffer);
+
+  g_object_unref (buffer);
+  
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+                    search_text,
+                    TRUE, TRUE, 0);
+
+  g_object_set_data (G_OBJECT (dialog), "buffer", buffer);
+  
+  g_signal_connect (dialog,
+                    "response",
+                    G_CALLBACK (dialog_response_callback),
+                    view);
+
+  gtk_widget_show (search_text);
+
+  gtk_widget_grab_focus (search_text);
+  
+  gtk_widget_show_all (dialog);
+}
+
+static void
+do_select_all (gpointer callback_data,
+               guint callback_action,
+               GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkTextBuffer *buffer;
+  GtkTextIter start, end;
+
+  buffer = view->buffer->buffer;
+
+  gtk_text_buffer_get_bounds (buffer, &start, &end);
+  gtk_text_buffer_select_range (buffer, &start, &end);
+}
+
+typedef struct
+{
+  /* position is in coordinate system of text_view_move_child */
+  int click_x;
+  int click_y;
+  int start_x;
+  int start_y;
+  int button;
+} ChildMoveInfo;
+
+static gboolean
+movable_child_callback (GtkWidget *child,
+                        GdkEvent  *event,
+                        gpointer   data)
+{
+  ChildMoveInfo *info;
+  GtkTextView *text_view;
+
+  text_view = GTK_TEXT_VIEW (data);
+  
+  g_return_val_if_fail (GTK_IS_EVENT_BOX (child), FALSE);
+  g_return_val_if_fail (gtk_widget_get_parent (child) == GTK_WIDGET (text_view), FALSE);  
+  
+  info = g_object_get_data (G_OBJECT (child),
+                            "testtext-move-info");
+
+  if (info == NULL)
+    {
+      info = g_new (ChildMoveInfo, 1);      
+      info->start_x = -1;
+      info->start_y = -1;
+      info->button = -1;
+      g_object_set_data_full (G_OBJECT (child),
+                              "testtext-move-info",
+                              info,
+                              g_free);
+    }
+  
+  switch (event->type)
+    {
+    case GDK_BUTTON_PRESS:
+      if (info->button < 0)
+        {
+          if (gdk_pointer_grab (event->button.window,
+                                FALSE,
+                                GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
+                                GDK_BUTTON_RELEASE_MASK,
+                                NULL,
+                                NULL,
+                                event->button.time) != GDK_GRAB_SUCCESS)
+            return FALSE;
+          
+          info->button = event->button.button;
+          
+          info->start_x = child->allocation.x;
+          info->start_y = child->allocation.y;
+          info->click_x = child->allocation.x + event->button.x;
+          info->click_y = child->allocation.y + event->button.y;
+        }
+      break;
+
+    case GDK_BUTTON_RELEASE:
+      if (info->button < 0)
+        return FALSE;
+
+      if (info->button == event->button.button)
+        {
+          int x, y;
+          
+          gdk_pointer_ungrab (event->button.time);
+          info->button = -1;
+
+          /* convert to window coords from event box coords */
+          x = info->start_x + (event->button.x + child->allocation.x - info->click_x);
+          y = info->start_y + (event->button.y + child->allocation.y - info->click_y);
+
+          gtk_text_view_move_child (text_view,
+                                    child,
+                                    x, y);
+        }
+      break;
+
+    case GDK_MOTION_NOTIFY:
+      {
+        int x, y;
+        
+        if (info->button < 0)
+          return FALSE;
+        
+        gdk_window_get_pointer (child->window, &x, &y, NULL); /* ensure more events */
+
+        /* to window coords from event box coords */
+        x += child->allocation.x;
+        y += child->allocation.y;
+        
+        x = info->start_x + (x - info->click_x);
+        y = info->start_y + (y - info->click_y);
+        
+        gtk_text_view_move_child (text_view,
+                                  child,
+                                  x, y);
+      }
+      break;
+
+    default:
+      break;
+    }
+
+  return FALSE;
+}
+
+static void
+add_movable_child (GtkTextView      *text_view,
+                   GtkTextWindowType window)
+{
+  GtkWidget *event_box;
+  GtkWidget *label;
+  GdkColor color;
+  
+  label = gtk_label_new ("Drag me around");  
+  
+  event_box = gtk_event_box_new ();
+  gtk_widget_add_events (event_box,
+                         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
+                         GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK);
+
+  color.red = 0xffff;
+  color.green = color.blue = 0;
+  gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &color);
+  
+  gtk_container_add (GTK_CONTAINER (event_box), label);
+
+  gtk_widget_show_all (event_box);
+
+  g_signal_connect (event_box, "event",
+                    G_CALLBACK (movable_child_callback),
+                    text_view);
+
+  gtk_text_view_add_child_in_window (text_view,
+                                     event_box,
+                                     window,
+                                     0, 0);
+}
+
+static void
+do_add_children (gpointer callback_data,
+                 guint callback_action,
+                 GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+
+  add_movable_child (GTK_TEXT_VIEW (view->text_view),
+                     GTK_TEXT_WINDOW_WIDGET);
+  add_movable_child (GTK_TEXT_VIEW (view->text_view),
+                     GTK_TEXT_WINDOW_LEFT);
+  add_movable_child (GTK_TEXT_VIEW (view->text_view),
+                     GTK_TEXT_WINDOW_RIGHT);
+}
+
+static void
+do_add_focus_children (gpointer callback_data,
+                       guint callback_action,
+                       GtkWidget *widget)
+{
+  View *view = view_from_widget (widget);
+  GtkWidget *child;
+  GtkTextChildAnchor *anchor;
+  GtkTextIter iter;
+  GtkTextView *text_view;
+
+  text_view = GTK_TEXT_VIEW (view->text_view);
+  
+  child = gtk_button_new_with_mnemonic ("Button _A in widget->window");
+
+  gtk_text_view_add_child_in_window (text_view,
+                                     child,
+                                     GTK_TEXT_WINDOW_WIDGET,
+                                     200, 200);
+
+  child = gtk_button_new_with_mnemonic ("Button _B in widget->window");
+
+  gtk_text_view_add_child_in_window (text_view,
+                                     child,
+                                     GTK_TEXT_WINDOW_WIDGET,
+                                     350, 300);
+
+  child = gtk_button_new_with_mnemonic ("Button _C in left window");
+
+  gtk_text_view_add_child_in_window (text_view,
+                                     child,
+                                     GTK_TEXT_WINDOW_LEFT,
+                                     0, 0);
+
+  child = gtk_button_new_with_mnemonic ("Button _D in right window");
+  
+  gtk_text_view_add_child_in_window (text_view,
+                                     child,
+                                     GTK_TEXT_WINDOW_RIGHT,
+                                     0, 0);
+
+  gtk_text_buffer_get_start_iter (view->buffer->buffer, &iter);
+  
+  anchor = gtk_text_buffer_create_child_anchor (view->buffer->buffer, &iter);
+
+  child = gtk_button_new_with_mnemonic ("Button _E in buffer");
+  
+  gtk_text_view_add_child_at_anchor (text_view, child, anchor);
+
+  anchor = gtk_text_buffer_create_child_anchor (view->buffer->buffer, &iter);
+
+  child = gtk_button_new_with_mnemonic ("Button _F in buffer");
+  
+  gtk_text_view_add_child_at_anchor (text_view, child, anchor);
+
+  anchor = gtk_text_buffer_create_child_anchor (view->buffer->buffer, &iter);
+
+  child = gtk_button_new_with_mnemonic ("Button _G in buffer");
+  
+  gtk_text_view_add_child_at_anchor (text_view, child, anchor);
+
+  /* show all the buttons */
+  gtk_widget_show_all (view->text_view);
+}
+
+static void
+view_init_menus (View *view)
+{
+  GtkTextDirection direction = gtk_widget_get_direction (view->text_view);
+  GtkWrapMode wrap_mode = gtk_text_view_get_wrap_mode (GTK_TEXT_VIEW (view->text_view));
+  GtkWidget *menu_item = NULL;
+
+  switch (direction)
+    {
+    case GTK_TEXT_DIR_LTR:
+      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Left-to-Right");
+      break;
+    case GTK_TEXT_DIR_RTL:
+      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Right-to-Left");
+      break;
+    default:
+      break;
+    }
+
+  if (menu_item)
+    gtk_menu_item_activate (GTK_MENU_ITEM (menu_item));
+
+  switch (wrap_mode)
+    {
+    case GTK_WRAP_NONE:
+      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Off");
+      break;
+    case GTK_WRAP_WORD:
+      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Words");
+      break;
+    case GTK_WRAP_CHAR:
+      menu_item = gtk_item_factory_get_widget (view->item_factory, "/Settings/Wrap Chars");
+      break;
+    default:
+      break;
+    }
+  
+  if (menu_item)
+    gtk_menu_item_activate (GTK_MENU_ITEM (menu_item));
+}
+
+static GtkItemFactoryEntry menu_items[] =
+{
+  { "/_File",            NULL,         NULL,        0, "<Branch>" },
+  { "/File/_New",        "<control>N", do_new,      0, NULL },
+  { "/File/New _View",   NULL,         do_new_view, 0, NULL },
+  { "/File/_Open",       "<control>O", do_open,     0, NULL },
+  { "/File/_Save",       "<control>S", do_save,     0, NULL },
+  { "/File/Save _As...", NULL,         do_save_as,  0, NULL },
+  { "/File/sep1",        NULL,         NULL,        0, "<Separator>" },
+  { "/File/_Close",     "<control>W" , do_close,    0, NULL },
+  { "/File/E_xit",      "<control>Q" , do_exit,     0, NULL },
+
+  { "/_Edit", NULL, 0, 0, "<Branch>" },
+  { "/Edit/Copy", NULL, do_copy, 0, NULL },
+  { "/Edit/sep1", NULL, NULL, 0, "<Separator>" },
+  { "/Edit/Find...", NULL, do_search, 0, NULL },
+  { "/Edit/Select All", "<control>A", do_select_all, 0, NULL }, 
+
+  { "/_Settings",        NULL,         NULL,             0, "<Branch>" },
+  { "/Settings/Wrap _Off",   NULL,      do_wrap_changed,  GTK_WRAP_NONE, "<RadioItem>" },
+  { "/Settings/Wrap _Words", NULL,      do_wrap_changed,  GTK_WRAP_WORD, "/Settings/Wrap Off" },
+  { "/Settings/Wrap _Chars", NULL,      do_wrap_changed,  GTK_WRAP_CHAR, "/Settings/Wrap Off" },
+  { "/Settings/sep1",        NULL,      NULL,             0, "<Separator>" },
+  { "/Settings/Editable", NULL,      do_editable_changed,  TRUE, "<RadioItem>" },
+  { "/Settings/Not editable",    NULL,      do_editable_changed,  FALSE, "/Settings/Editable" },
+  { "/Settings/sep1",        NULL,      NULL,             0, "<Separator>" },
+
+  { "/Settings/Cursor normal",    NULL,      do_cursor_visible_changed,  1, "<RadioItem>" },
+  { "/Settings/Cursor not visible", NULL,      do_cursor_visible_changed,  0, "/Settings/Cursor normal" },
+  { "/Settings/Cursor colored", NULL,      do_cursor_visible_changed,  2, "/Settings/Cursor normal" },
+  { "/Settings/sep1",        NULL,      NULL,          0, "<Separator>" },
   
   { "/Settings/Left-to-Right", NULL,    do_direction_changed,  GTK_TEXT_DIR_LTR, "<RadioItem>" },
   { "/Settings/Right-to-Left", NULL,    do_direction_changed,  GTK_TEXT_DIR_RTL, "/Settings/Left-to-Right" },
-  { "/_Attributes",      NULL,         0,                0, "<Branch>" },
+
+  { "/Settings/sep1",        NULL,      NULL,                0, "<Separator>" },
+  { "/Settings/Sane spacing", NULL,    do_spacing_changed,  FALSE, "<RadioItem>" },
+  { "/Settings/Funky spacing", NULL,    do_spacing_changed,  TRUE, "/Settings/Sane spacing" },
+  { "/Settings/sep1",        NULL,      NULL,                0, "<Separator>" },
+  { "/Settings/Don't cycle color tags", NULL,    do_color_cycle_changed,  FALSE, "<RadioItem>" },
+  { "/Settings/Cycle colors", NULL,    do_color_cycle_changed,  TRUE, "/Settings/Don't cycle color tags" },
+  { "/_Attributes",      NULL,         NULL,                0, "<Branch>" },
   { "/Attributes/Editable",      NULL,         do_apply_editable, TRUE, NULL },
   { "/Attributes/Not editable",          NULL,         do_apply_editable, FALSE, NULL },
-  { "/_Test",           NULL,         0,           0, "<Branch>" },
+  { "/Attributes/Invisible",             NULL,         do_apply_invisible, FALSE, NULL },
+  { "/Attributes/Visible",       NULL,         do_apply_invisible, TRUE, NULL },
+  { "/Attributes/Rise",          NULL,         do_apply_rise, FALSE, NULL },
+  { "/Attributes/Large",         NULL,         do_apply_large, FALSE, NULL },
+  { "/Attributes/Indent",        NULL,         do_apply_indent, FALSE, NULL },
+  { "/Attributes/Margins",       NULL,         do_apply_margin, FALSE, NULL },
+  { "/Attributes/Custom tabs",           NULL,         do_apply_tabs, FALSE, NULL },
+  { "/Attributes/Default tabs",          NULL,         do_apply_tabs, TRUE, NULL },
+  { "/Attributes/Color cycles",          NULL,         do_apply_colors, TRUE, NULL },
+  { "/Attributes/No colors",                     NULL,         do_apply_colors, FALSE, NULL },
+  { "/Attributes/Remove all tags",        NULL, do_remove_tags, 0, NULL },
+  { "/Attributes/Properties",             NULL, do_properties, 0, NULL },
+  { "/Attributes/Rich Text copy & drag",  NULL, do_rich_text, 0, NULL },
+  { "/Attributes/Rich Text paste & drop", NULL, do_rich_text, 1, NULL },
+  { "/_Test",           NULL,         NULL,           0, "<Branch>" },
   { "/Test/_Example",           NULL,         do_example,  0, NULL },
+  { "/Test/_Insert and scroll", NULL,         do_insert_and_scroll,  0, NULL },
+  { "/Test/_Add fixed children", NULL,         do_add_children,  0, NULL },
+  { "/Test/A_dd focusable children", NULL,    do_add_focus_children,  0, NULL },
 };
 
 static gboolean
@@ -1059,9 +2030,8 @@ save_buffer (Buffer *buffer)
                                        buffer->filename, bak_filename, g_strerror (errno));
          msgbox_run (NULL, err, "OK", NULL, NULL, 0);
          g_free (err);
-       }
-      
-      return FALSE;
+          return FALSE;
+       }
     }
   else
     have_backup = TRUE;
@@ -1076,7 +2046,7 @@ save_buffer (Buffer *buffer)
   else
     {
       gtk_text_buffer_get_iter_at_offset (buffer->buffer, &start, 0);
-      gtk_text_buffer_get_last_iter (buffer->buffer, &end);
+      gtk_text_buffer_get_end_iter (buffer->buffer, &end);
   
       chars = gtk_text_buffer_get_slice (buffer->buffer, &start, &end, FALSE);
 
@@ -1161,7 +2131,7 @@ save_as_buffer (Buffer *buffer)
 static gboolean
 check_buffer_saved (Buffer *buffer)
 {
-  if (gtk_text_buffer_modified (buffer->buffer))
+  if (gtk_text_buffer_get_modified (buffer->buffer))
     {
       char *pretty_name = buffer_pretty_name (buffer);
       char *msg = g_strdup_printf ("Save changes to '%s'?", pretty_name);
@@ -1183,29 +2153,76 @@ check_buffer_saved (Buffer *buffer)
     return TRUE;
 }
 
+#define N_COLORS 16
+
 static Buffer *
 create_buffer (void)
 {
   Buffer *buffer;
-
+  PangoTabArray *tabs;
+  gint i;
+  
   buffer = g_new (Buffer, 1);
 
   buffer->buffer = gtk_text_buffer_new (NULL);
-  gtk_object_ref (GTK_OBJECT (buffer->buffer));
-  gtk_object_sink (GTK_OBJECT (buffer->buffer));
   
   buffer->refcount = 1;
   buffer->filename = NULL;
   buffer->untitled_serial = -1;
 
-  buffer->not_editable_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  gtk_object_set (GTK_OBJECT (buffer->not_editable_tag),
-                  "editable", FALSE,
-                  "foreground", "purple", NULL);
+  buffer->color_tags = NULL;
+  buffer->color_cycle_timeout = 0;
+  buffer->start_hue = 0.0;
+  
+  i = 0;
+  while (i < N_COLORS)
+    {
+      GtkTextTag *tag;
+
+      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL, NULL);
+      
+      buffer->color_tags = g_slist_prepend (buffer->color_tags, tag);
+      
+      ++i;
+    }
+
+#if 1  
+  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                      "invisible", TRUE, NULL);
+#endif  
+  
+  buffer->not_editable_tag =
+    gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                "editable", FALSE,
+                                "foreground", "purple", NULL);
+
+  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                       "foreground", "red", NULL);
+
+  buffer->rise_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                "rise", 10 * PANGO_SCALE, NULL);
 
-  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  gtk_object_set (GTK_OBJECT (buffer->found_text_tag),
-                  "foreground", "red", NULL);
+  buffer->large_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                "scale", PANGO_SCALE_X_LARGE, NULL);
+
+  buffer->indent_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                  "indent", 20, NULL);
+
+  buffer->margin_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                  "left_margin", 20, "right_margin", 20, NULL);
+
+  tabs = pango_tab_array_new_with_positions (4,
+                                             TRUE,
+                                             PANGO_TAB_LEFT, 10,
+                                             PANGO_TAB_LEFT, 30,
+                                             PANGO_TAB_LEFT, 60,
+                                             PANGO_TAB_LEFT, 120);
+  
+  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                        "tabs", tabs,
+                                                        "foreground", "green", NULL);
+
+  pango_tab_array_free (tabs);
   
   buffers = g_slist_prepend (buffers, buffer);
   
@@ -1254,14 +2271,15 @@ buffer_filename_set (Buffer *buffer)
 }
 
 static void
-buffer_search_forward (Buffer *buffer, const char *str,
-                       View *view)
+buffer_search (Buffer     *buffer,
+               const char *str,
+               View       *view,
+               gboolean forward)
 {
   GtkTextIter iter;
   GtkTextIter start, end;
-  gint char_len;
-  int i = 0;
   GtkWidget *dialog;
+  int i;
   
   /* remove tag from whole buffer */
   gtk_text_buffer_get_bounds (buffer->buffer, &start, &end);
@@ -1272,41 +2290,69 @@ buffer_search_forward (Buffer *buffer, const char *str,
                                     gtk_text_buffer_get_mark (buffer->buffer,
                                                               "insert"));
 
-
-  char_len = g_utf8_strlen (str, -1);
-
-  if (char_len > 0)
+  i = 0;
+  if (*str != '\0')
     {
-      while (gtk_text_iter_forward_search (&iter, str, TRUE, FALSE))
-        {
-          GtkTextIter end = iter;
-          
-          gtk_text_iter_forward_chars (&end, char_len);
-          
-          gtk_text_buffer_apply_tag (buffer->buffer, buffer->found_text_tag,
-                                     &iter, &end);
+      GtkTextIter match_start, match_end;
 
-          iter = end;
-          
-          ++i;
+      if (forward)
+        {
+          while (gtk_text_iter_forward_search (&iter, str,
+                                               GTK_TEXT_SEARCH_VISIBLE_ONLY |
+                                               GTK_TEXT_SEARCH_TEXT_ONLY,
+                                               &match_start, &match_end,
+                                               NULL))
+            {
+              ++i;
+              gtk_text_buffer_apply_tag (buffer->buffer, buffer->found_text_tag,
+                                         &match_start, &match_end);
+              
+              iter = match_end;
+            }
+        }
+      else
+        {
+          while (gtk_text_iter_backward_search (&iter, str,
+                                                GTK_TEXT_SEARCH_VISIBLE_ONLY |
+                                                GTK_TEXT_SEARCH_TEXT_ONLY,
+                                                &match_start, &match_end,
+                                                NULL))
+            {
+              ++i;
+              gtk_text_buffer_apply_tag (buffer->buffer, buffer->found_text_tag,
+                                         &match_start, &match_end);
+              
+              iter = match_start;
+            }
         }
     }
 
-#if 0  
   dialog = gtk_message_dialog_new (GTK_WINDOW (view->window),
+                                  GTK_DIALOG_DESTROY_WITH_PARENT,
                                    GTK_MESSAGE_INFO,
                                    GTK_BUTTONS_OK,
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
                                    "%d strings found and marked in red",
                                    i);
 
-  gtk_signal_connect_object (GTK_OBJECT (dialog),
-                             "response",
-                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                             GTK_OBJECT (dialog));
+  g_signal_connect_swapped (dialog,
+                            "response",
+                            G_CALLBACK (gtk_widget_destroy), dialog);
   
   gtk_widget_show (dialog);
-#endif
+}
+
+static void
+buffer_search_forward (Buffer *buffer, const char *str,
+                       View *view)
+{
+  buffer_search (buffer, str, view, TRUE);
+}
+
+static void
+buffer_search_backward (Buffer *buffer, const char *str,
+                        View *view)
+{
+  buffer_search (buffer, str, view, FALSE);
 }
 
 static void
@@ -1321,20 +2367,191 @@ buffer_unref (Buffer *buffer)
   buffer->refcount--;
   if (buffer->refcount == 0)
     {
+      buffer_set_colors (buffer, FALSE);
       buffers = g_slist_remove (buffers, buffer);
-      gtk_object_unref (GTK_OBJECT (buffer->buffer));
+      g_object_unref (buffer->buffer);
       g_free (buffer->filename);
       g_free (buffer);
     }
 }
 
+static void
+hsv_to_rgb (gdouble *h,
+           gdouble *s,
+           gdouble *v)
+{
+  gdouble hue, saturation, value;
+  gdouble f, p, q, t;
+
+  if (*s == 0.0)
+    {
+      *h = *v;
+      *s = *v;
+      *v = *v; /* heh */
+    }
+  else
+    {
+      hue = *h * 6.0;
+      saturation = *s;
+      value = *v;
+      
+      if (hue >= 6.0)
+       hue = 0.0;
+      
+      f = hue - (int) hue;
+      p = value * (1.0 - saturation);
+      q = value * (1.0 - saturation * f);
+      t = value * (1.0 - saturation * (1.0 - f));
+      
+      switch ((int) hue)
+       {
+       case 0:
+         *h = value;
+         *s = t;
+         *v = p;
+         break;
+         
+       case 1:
+         *h = q;
+         *s = value;
+         *v = p;
+         break;
+         
+       case 2:
+         *h = p;
+         *s = value;
+         *v = t;
+         break;
+         
+       case 3:
+         *h = p;
+         *s = q;
+         *v = value;
+         break;
+         
+       case 4:
+         *h = t;
+         *s = p;
+         *v = value;
+         break;
+         
+       case 5:
+         *h = value;
+         *s = p;
+         *v = q;
+         break;
+         
+       default:
+         g_assert_not_reached ();
+       }
+    }
+}
+
+static void
+hue_to_color (gdouble   hue,
+              GdkColor *color)
+{
+  gdouble h, s, v;
+
+  h = hue;
+  s = 1.0;
+  v = 1.0;
+
+  g_return_if_fail (hue <= 1.0);
+  
+  hsv_to_rgb (&h, &s, &v);
+
+  color->red = h * 65535;
+  color->green = s * 65535;
+  color->blue = v * 65535;
+}
+
+
+static gint
+color_cycle_timeout (gpointer data)
+{
+  Buffer *buffer = data;
+
+  buffer_cycle_colors (buffer);
+
+  return TRUE;
+}
+
+static void
+buffer_set_colors (Buffer  *buffer,
+                   gboolean enabled)
+{
+  GSList *tmp;
+  gdouble hue = 0.0;
+
+  if (enabled && buffer->color_cycle_timeout == 0)
+    buffer->color_cycle_timeout = gdk_threads_add_timeout (200, color_cycle_timeout, buffer);
+  else if (!enabled && buffer->color_cycle_timeout != 0)
+    {
+      g_source_remove (buffer->color_cycle_timeout);
+      buffer->color_cycle_timeout = 0;
+    }
+    
+  tmp = buffer->color_tags;
+  while (tmp != NULL)
+    {
+      if (enabled)
+        {
+          GdkColor color;
+          
+          hue_to_color (hue, &color);
+
+          g_object_set (tmp->data,
+                        "foreground_gdk", &color,
+                        NULL);
+        }
+      else
+        g_object_set (tmp->data,
+                      "foreground_set", FALSE,
+                      NULL);
+
+      hue += 1.0 / N_COLORS;
+      
+      tmp = g_slist_next (tmp);
+    }
+}
+
+static void
+buffer_cycle_colors (Buffer *buffer)
+{
+  GSList *tmp;
+  gdouble hue = buffer->start_hue;
+  
+  tmp = buffer->color_tags;
+  while (tmp != NULL)
+    {
+      GdkColor color;
+      
+      hue_to_color (hue, &color);
+      
+      g_object_set (tmp->data,
+                    "foreground_gdk", &color,
+                    NULL);
+
+      hue += 1.0 / N_COLORS;
+      if (hue > 1.0)
+        hue = 0.0;
+      
+      tmp = g_slist_next (tmp);
+    }
+
+  buffer->start_hue += 1.0 / N_COLORS;
+  if (buffer->start_hue > 1.0)
+    buffer->start_hue = 0.0;
+}
+
 static void
 close_view (View *view)
 {
   views = g_slist_remove (views, view);
   buffer_unref (view->buffer);
   gtk_widget_destroy (view->window);
-  g_object_unref (G_OBJECT (view->item_factory));
+  g_object_unref (view->item_factory);
   
   g_free (view);
   
@@ -1362,14 +2579,327 @@ view_set_title (View *view)
   g_free (title);
 }
 
+static void
+cursor_set_callback (GtkTextBuffer     *buffer,
+                     const GtkTextIter *location,
+                     GtkTextMark       *mark,
+                     gpointer           user_data)
+{
+  GtkTextView *text_view;
+
+  /* Redraw tab windows if the cursor moves
+   * on the mapped widget (windows may not exist before realization...
+   */
+  
+  text_view = GTK_TEXT_VIEW (user_data);
+  
+  if (gtk_widget_get_mapped (GTK_WIDGET (text_view)) &&
+      mark == gtk_text_buffer_get_insert (buffer))
+    {
+      GdkWindow *tab_window;
+
+      tab_window = gtk_text_view_get_window (text_view,
+                                             GTK_TEXT_WINDOW_TOP);
+
+      gdk_window_invalidate_rect (tab_window, NULL, FALSE);
+      
+      tab_window = gtk_text_view_get_window (text_view,
+                                             GTK_TEXT_WINDOW_BOTTOM);
+
+      gdk_window_invalidate_rect (tab_window, NULL, FALSE);
+    }
+}
+
+static gint
+tab_stops_expose (GtkWidget      *widget,
+                  GdkEventExpose *event,
+                  gpointer        user_data)
+{
+  gint first_x;
+  gint last_x;
+  gint i;
+  GdkWindow *top_win;
+  GdkWindow *bottom_win;
+  GtkTextView *text_view;
+  GtkTextWindowType type;
+  GdkDrawable *target;
+  gint *positions = NULL;
+  gint size;
+  GtkTextAttributes *attrs;
+  GtkTextIter insert;
+  GtkTextBuffer *buffer;
+  gboolean in_pixels;
+  
+  text_view = GTK_TEXT_VIEW (widget);
+  
+  /* See if this expose is on the tab stop window */
+  top_win = gtk_text_view_get_window (text_view,
+                                      GTK_TEXT_WINDOW_TOP);
+
+  bottom_win = gtk_text_view_get_window (text_view,
+                                         GTK_TEXT_WINDOW_BOTTOM);
+
+  if (event->window == top_win)
+    {
+      type = GTK_TEXT_WINDOW_TOP;
+      target = top_win;
+    }
+  else if (event->window == bottom_win)
+    {
+      type = GTK_TEXT_WINDOW_BOTTOM;
+      target = bottom_win;
+    }
+  else
+    return FALSE;
+  
+  first_x = event->area.x;
+  last_x = first_x + event->area.width;
+
+  gtk_text_view_window_to_buffer_coords (text_view,
+                                         type,
+                                         first_x,
+                                         0,
+                                         &first_x,
+                                         NULL);
+
+  gtk_text_view_window_to_buffer_coords (text_view,
+                                         type,
+                                         last_x,
+                                         0,
+                                         &last_x,
+                                         NULL);
+
+  buffer = gtk_text_view_get_buffer (text_view);
+
+  gtk_text_buffer_get_iter_at_mark (buffer,
+                                    &insert,
+                                    gtk_text_buffer_get_mark (buffer,
+                                                              "insert"));
+  
+  attrs = gtk_text_attributes_new ();
+
+  gtk_text_iter_get_attributes (&insert, attrs);
+
+  if (attrs->tabs)
+    {
+      size = pango_tab_array_get_size (attrs->tabs);
+      
+      pango_tab_array_get_tabs (attrs->tabs,
+                                NULL,
+                                &positions);
+
+      in_pixels = pango_tab_array_get_positions_in_pixels (attrs->tabs);
+    }
+  else
+    {
+      size = 0;
+      in_pixels = FALSE;
+    }
+      
+  gtk_text_attributes_unref (attrs);
+  
+  i = 0;
+  while (i < size)
+    {
+      gint pos;
+
+      if (!in_pixels)
+        positions[i] = PANGO_PIXELS (positions[i]);
+      
+      gtk_text_view_buffer_to_window_coords (text_view,
+                                             type,
+                                             positions[i],
+                                             0,
+                                             &pos,
+                                             NULL);
+      
+      gdk_draw_line (target, 
+                     widget->style->fg_gc [widget->state],
+                     pos, 0,
+                     pos, 15); 
+      
+      ++i;
+    }
+
+  g_free (positions);
+
+  return TRUE;
+}
+
+static void
+get_lines (GtkTextView  *text_view,
+           gint          first_y,
+           gint          last_y,
+           GArray       *buffer_coords,
+           GArray       *numbers,
+           gint         *countp)
+{
+  GtkTextIter iter;
+  gint count;
+  gint size;  
+
+  g_array_set_size (buffer_coords, 0);
+  g_array_set_size (numbers, 0);
+  
+  /* Get iter at first y */
+  gtk_text_view_get_line_at_y (text_view, &iter, first_y, NULL);
+
+  /* For each iter, get its location and add it to the arrays.
+   * Stop when we pass last_y
+   */
+  count = 0;
+  size = 0;
+
+  while (!gtk_text_iter_is_end (&iter))
+    {
+      gint y, height;
+      gint line_num;
+      
+      gtk_text_view_get_line_yrange (text_view, &iter, &y, &height);
+
+      g_array_append_val (buffer_coords, y);
+      line_num = gtk_text_iter_get_line (&iter);
+      g_array_append_val (numbers, line_num);
+      
+      ++count;
+
+      if ((y + height) >= last_y)
+        break;
+      
+      gtk_text_iter_forward_line (&iter);
+    }
+
+  *countp = count;
+}
+
+static gint
+line_numbers_expose (GtkWidget      *widget,
+                     GdkEventExpose *event,
+                     gpointer        user_data)
+{
+  gint count;
+  GArray *numbers;
+  GArray *pixels;
+  gint first_y;
+  gint last_y;
+  gint i;
+  GdkWindow *left_win;
+  GdkWindow *right_win;
+  PangoLayout *layout;
+  GtkTextView *text_view;
+  GtkTextWindowType type;
+  GdkDrawable *target;
+  
+  text_view = GTK_TEXT_VIEW (widget);
+  
+  /* See if this expose is on the line numbers window */
+  left_win = gtk_text_view_get_window (text_view,
+                                       GTK_TEXT_WINDOW_LEFT);
+
+  right_win = gtk_text_view_get_window (text_view,
+                                        GTK_TEXT_WINDOW_RIGHT);
+
+  if (event->window == left_win)
+    {
+      type = GTK_TEXT_WINDOW_LEFT;
+      target = left_win;
+    }
+  else if (event->window == right_win)
+    {
+      type = GTK_TEXT_WINDOW_RIGHT;
+      target = right_win;
+    }
+  else
+    return FALSE;
+  
+  first_y = event->area.y;
+  last_y = first_y + event->area.height;
+
+  gtk_text_view_window_to_buffer_coords (text_view,
+                                         type,
+                                         0,
+                                         first_y,
+                                         NULL,
+                                         &first_y);
+
+  gtk_text_view_window_to_buffer_coords (text_view,
+                                         type,
+                                         0,
+                                         last_y,
+                                         NULL,
+                                         &last_y);
+
+  numbers = g_array_new (FALSE, FALSE, sizeof (gint));
+  pixels = g_array_new (FALSE, FALSE, sizeof (gint));
+  
+  get_lines (text_view,
+             first_y,
+             last_y,
+             pixels,
+             numbers,
+             &count);
+  
+  /* Draw fully internationalized numbers! */
+  
+  layout = gtk_widget_create_pango_layout (widget, "");
+  
+  i = 0;
+  while (i < count)
+    {
+      gint pos;
+      gchar *str;
+      
+      gtk_text_view_buffer_to_window_coords (text_view,
+                                             type,
+                                             0,
+                                             g_array_index (pixels, gint, i),
+                                             NULL,
+                                             &pos);
+
+      str = g_strdup_printf ("%d", g_array_index (numbers, gint, i));
+
+      pango_layout_set_text (layout, str, -1);
+
+      gtk_paint_layout (widget->style,
+                        target,
+                        gtk_widget_get_state (widget),
+                        FALSE,
+                        NULL,
+                        widget,
+                        NULL,
+                        2, pos + 2,
+                        layout);
+
+      g_free (str);
+      
+      ++i;
+    }
+
+  g_array_free (pixels, TRUE);
+  g_array_free (numbers, TRUE);
+  
+  g_object_unref (layout);
+
+  /* don't stop emission, need to draw children */
+  return FALSE;
+}
+
+static void
+selection_changed (GtkTextBuffer *buffer,
+                  GParamSpec    *pspec,
+                  GtkWidget     *copy_menu)
+{
+  gtk_widget_set_sensitive (copy_menu, gtk_text_buffer_get_has_selection (buffer));
+}
+
 static View *
 create_view (Buffer *buffer)
 {
   View *view;
-  
+  GtkWidget *copy_menu;
   GtkWidget *sw;
   GtkWidget *vbox;
-
+  
   view = g_new0 (View, 1);
   views = g_slist_prepend (views, view);
 
@@ -1377,20 +2907,28 @@ create_view (Buffer *buffer)
   buffer_ref (buffer);
   
   view->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_object_set_data (GTK_OBJECT (view->window), "view", view);
+  g_object_set_data (G_OBJECT (view->window), "view", view);
   
-  gtk_signal_connect (GTK_OBJECT (view->window), "delete_event",
-                     GTK_SIGNAL_FUNC (delete_event_cb), NULL);
+  g_signal_connect (view->window, "delete_event",
+                   G_CALLBACK (delete_event_cb), NULL);
 
   view->accel_group = gtk_accel_group_new ();
   view->item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", view->accel_group);
-  gtk_object_set_data (GTK_OBJECT (view->item_factory), "view", view);
+  g_object_set_data (G_OBJECT (view->item_factory), "view", view);
   
   gtk_item_factory_create_items (view->item_factory, G_N_ELEMENTS (menu_items), menu_items, view);
 
+  /* make the Copy menu item sensitivity update according to the selection */
+  copy_menu = gtk_item_factory_get_item (view->item_factory, "<main>/Edit/Copy");
+  gtk_widget_set_sensitive (copy_menu, gtk_text_buffer_get_has_selection (view->buffer->buffer));
+  g_signal_connect (view->buffer->buffer,
+                   "notify::has-selection",
+                   G_CALLBACK (selection_changed),
+                   copy_menu);
+
   gtk_window_add_accel_group (GTK_WINDOW (view->window), view->accel_group);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
   gtk_container_add (GTK_CONTAINER (view->window), vbox);
 
   gtk_box_pack_start (GTK_BOX (vbox),
@@ -1403,8 +2941,49 @@ create_view (Buffer *buffer)
                                  GTK_POLICY_AUTOMATIC);
 
   view->text_view = gtk_text_view_new_with_buffer (buffer->buffer);
-  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view), GTK_WRAPMODE_WORD);
+  gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view->text_view),
+                               GTK_WRAP_WORD);
 
+  /* Make sure border width works, no real reason to do this other than testing */
+  gtk_container_set_border_width (GTK_CONTAINER (view->text_view),
+                                  10);
+  
+  /* Draw tab stops in the top and bottom windows. */
+  
+  gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (view->text_view),
+                                        GTK_TEXT_WINDOW_TOP,
+                                        15);
+
+  gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (view->text_view),
+                                        GTK_TEXT_WINDOW_BOTTOM,
+                                        15);
+
+  g_signal_connect (view->text_view,
+                    "expose_event",
+                    G_CALLBACK (tab_stops_expose),
+                    NULL);  
+
+  g_signal_connect (view->buffer->buffer,
+                   "mark_set",
+                   G_CALLBACK (cursor_set_callback),
+                   view->text_view);
+  
+  /* Draw line numbers in the side windows; we should really be
+   * more scientific about what width we set them to.
+   */
+  gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (view->text_view),
+                                        GTK_TEXT_WINDOW_RIGHT,
+                                        30);
+  
+  gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (view->text_view),
+                                        GTK_TEXT_WINDOW_LEFT,
+                                        30);
+  
+  g_signal_connect (view->text_view,
+                    "expose_event",
+                    G_CALLBACK (line_numbers_expose),
+                    NULL);
+  
   gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
   gtk_container_add (GTK_CONTAINER (sw), view->text_view);
 
@@ -1414,20 +2993,58 @@ create_view (Buffer *buffer)
 
   view_set_title (view);
   view_init_menus (view);
+
+  view_add_example_widgets (view);
   
   gtk_widget_show_all (view->window);
   return view;
 }
 
+static void
+view_add_example_widgets (View *view)
+{
+  GtkTextChildAnchor *anchor;
+  Buffer *buffer;
+
+  buffer = view->buffer;
+  
+  anchor = g_object_get_data (G_OBJECT (buffer->buffer),
+                              "anchor");
+
+  if (anchor && !gtk_text_child_anchor_get_deleted (anchor))
+    {
+      GtkWidget *widget;
+
+      widget = gtk_button_new_with_label ("Foo");
+      
+      gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (view->text_view),
+                                         widget,
+                                         anchor);
+
+      gtk_widget_show (widget);
+    }
+}
+
+void
+test_init (void)
+{
+  if (g_file_test ("../gdk-pixbuf/libpixbufloader-pnm.la",
+                  G_FILE_TEST_EXISTS))
+    {
+      g_setenv ("GDK_PIXBUF_MODULE_FILE", "../gdk-pixbuf/loaders.cache", TRUE);
+      g_setenv ("GTK_IM_MODULE_FILE", "../modules/input/immodules.cache", TRUE);
+    }
+}
+
 int
 main (int argc, char** argv)
 {
   Buffer *buffer;
   View *view;
   int i;
-  
+
+  test_init ();
   gtk_init (&argc, &argv);
-  gdk_rgb_init (); /* FIXME remove this */
   
   buffer = create_buffer ();
   view = create_view (buffer);