2006-12-25 [colin] 2.6.1cvs69

[claws.git] / src / gtk / logwindow.c

diff --git a/src/gtk/logwindow.c b/src/gtk/logwindow.c
index d22d951544cdc70ca9988dd1fa5d37e8f5e30b05..286c495291c1b647a880213fe55a649c765b5329 100644 (file)
--- a/src/gtk/logwindow.c
+++ b/src/gtk/logwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,8 +107,13 @@ LogWindow *log_window_create(void)
        gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
        logwin->buffer = buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
 
+       g_object_ref(G_OBJECT(logwin->buffer));
+       gtk_text_view_set_buffer(GTK_TEXT_VIEW(text), NULL);
+       logwin->hidden = TRUE;
+
        gtk_text_buffer_get_start_iter(buffer, &iter);
-       gtk_text_buffer_create_mark(buffer, "end", &iter, FALSE);
+       logwin->end_mark = gtk_text_buffer_create_mark(buffer, "end", &iter, FALSE);
+
        g_signal_connect(G_OBJECT(text), "populate-popup",
                         G_CALLBACK(log_window_popup_menu_extend), logwin);
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
@@ -132,6 +137,8 @@ LogWindow *log_window_create(void)
        logwin->text = text;
        logwin->hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, log_window_append, logwin);
 
+       gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(text), logwin->end_mark);
+
        return logwin;
 }
 
@@ -187,10 +194,6 @@ void log_window_init(LogWindow *logwin)
        gtk_text_buffer_create_tag(buffer, "output",
                                   "foreground-gdk", &logwin->out_color,
                                   NULL);
-
-       g_object_ref(G_OBJECT(logwin->buffer));
-       gtk_text_view_set_buffer(GTK_TEXT_VIEW(logwin->text), NULL);
-       logwin->hidden = TRUE;
 }
 
 void log_window_show(LogWindow *logwin)
@@ -290,18 +293,28 @@ static gboolean log_window_append(gpointer source, gpointer data)
        if (head)
                gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, head, -1,
                                                         tag, NULL);
-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, logtext->text, -1,
-                                                tag, NULL);
 
+       if (!g_utf8_validate(logtext->text, -1, NULL)) {
+               gchar * mybuf = g_malloc(strlen(logtext->text)*2 +1);
+               conv_localetodisp(mybuf, strlen(logtext->text)*2 +1, logtext->text);
+               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, mybuf, -1,
+                                                        tag, NULL);
+               g_free(mybuf);
+       } else {
+               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, logtext->text, -1,
+                                                        tag, NULL);
+       }
        gtk_text_buffer_get_start_iter(buffer, &iter);
 
        if (logwindow->clip)
               log_window_clip (logwindow, logwindow->clip_length);
 
-       gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
        if (!logwindow->hidden) {
-               gtk_text_view_scroll_to_iter(text, &iter, 0, TRUE, 0, 0);
-               gtk_text_buffer_place_cursor(buffer, &iter);
+               GtkAdjustment *vadj = text->vadjustment;
+               gfloat upper = vadj->upper - vadj->page_size;
+               if (vadj->value == upper || 
+                   (upper - vadj->value < 16 && vadj->value < 8))
+                       gtk_text_view_scroll_mark_onscreen(text, logwindow->end_mark);
        }
 
        return FALSE;