Add a log window that shows normal and debug messages. For now, it was added to Help...

diff --git a/src/Makefile.am b/src/Makefile.am
index 1ad116e..f6538bd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,6 +142,8 @@ geeqie_SOURCES = \
        layout_util.h   \
        lirc.c          \
        lirc.h          \
+       logwindow.c     \
+       logwindow.h     \
        main.c          \
        main.h          \
        md5-util.c      \

diff --git a/src/debug.c b/src/debug.c
index dc4b1db..689f823 100644 (file)
--- a/src/debug.c
+++ b/src/debug.c
@@ -10,7 +10,9 @@
  */
 
 #include "main.h"
+#include "debug.h"
 
+#include "logwindow.h"
 
 /*
  * Logging functions
@@ -26,7 +28,11 @@ gint log_domain_printf(const char *domain, const gchar *format, ...)
        ret = vsnprintf(buf, sizeof(buf), format, ap);
        va_end(ap);
 
-       puts(buf);
+       printf("%s", buf);
+       if (strcmp(domain, DOMAIN_INFO) == 0)
+               log_window_append(buf, LOG_NORMAL);
+       else
+               log_window_append(buf, LOG_MSG);
 
        return ret;
 }

diff --git a/src/layout_util.c b/src/layout_util.c
index 37f78fd..25e4425 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -28,6 +28,7 @@
 #include "img-view.h"
 #include "info.h"
 #include "layout_image.h"
+#include "logwindow.h"
 #include "pan-view.h"
 #include "pixbuf_util.h"
 #include "preferences.h"
@@ -697,6 +698,14 @@ static void layout_menu_about_cb(GtkAction *action, gpointer data)
        show_about_window();
 }
 
+static void layout_menu_log_window_cb(GtkAction *action, gpointer data)
+{
+       LayoutWindow *lw = data;
+       if (lw->full_screen)
+               layout_image_full_screen_stop(lw);
+       log_window_new();
+}
+
 
 /*
  *-----------------------------------------------------------------------------
@@ -1138,7 +1147,8 @@ static GtkActionEntry menu_entries[] = {
   { "HelpContents",    GTK_STOCK_HELP, N_("_Contents"),        "F1",           NULL,   CB(layout_menu_help_cb) },
   { "HelpShortcuts",   NULL,           N_("_Keyboard shortcuts"),NULL,         NULL,   CB(layout_menu_help_keys_cb) },
   { "HelpNotes",       NULL,           N_("_Release notes"),   NULL,           NULL,   CB(layout_menu_notes_cb) },
-  { "About",           NULL,           N_("_About"),           NULL,           NULL,   CB(layout_menu_about_cb) }
+  { "About",           NULL,           N_("_About"),           NULL,           NULL,   CB(layout_menu_about_cb) },
+  { "LogWindow",       NULL,           N_("_Log Window"),      NULL,           NULL,   CB(layout_menu_log_window_cb) }
 };
 
 static GtkToggleActionEntry menu_toggle_entries[] = {
@@ -1296,6 +1306,8 @@ static const char *menu_ui_description =
 "      <menuitem action='HelpNotes'/>"
 "      <separator/>"
 "      <menuitem action='About'/>"
+"      <separator/>"
+"      <menuitem action='LogWindow'/>"
 "    </menu>"
 "  </menubar>"
 "<accelerator action='PrevImageAlt1'/>"

diff --git a/src/logwindow.c b/src/logwindow.c
new file mode 100644 (file)
index 0000000..77841e8
--- /dev/null
+++ b/src/logwindow.c
@@ -0,0 +1,222 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * Author: Vladimir Nadvornik, Laurent Monin
+ * based on logwindow.[ch] from Sylpheed 2.4.7 (C) Hiroyuki Yamamoto
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+#include "main.h"
+#include "logwindow.h"
+
+#include "window.h"
+
+#include <gdk/gdkkeysyms.h>
+
+#define TRIM_LINES     25
+
+
+typedef struct _LogWindow LogWindow;
+
+struct _LogWindow
+{
+       GtkWidget *window;
+       GtkWidget *scrolledwin;
+       GtkWidget *text;
+       
+       GdkColor colors[LOG_COUNT];
+
+       gint lines;
+};
+
+typedef struct _LogDef LogDef;
+struct _LogDef
+{
+       LogType type;
+       const gchar *tag;
+       const gchar *color;
+};
+
+/* Keep LogType order !! */
+static LogDef logdefs[LOG_COUNT] = {
+       { LOG_NORMAL,   "normal",       "black"  },
+       { LOG_MSG,      "message",      "blue"   },
+       { LOG_WARN,     "warning",      "orange" },
+       { LOG_ERROR,    "error",        "red"    },
+};
+
+static LogWindow *logwindow = NULL;
+
+static void hide_cb(GtkWidget *widget, LogWindow *logwin)
+{
+}
+
+static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
+                           LogWindow *logwin)
+{
+       if (event && event->keyval == GDK_Escape)
+               gtk_widget_hide(logwin->window);
+       return FALSE;
+}
+
+static LogWindow *log_window_create(void)
+{
+       LogWindow *logwin;
+       GtkWidget *window;
+       GtkWidget *scrolledwin;
+       GtkWidget *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
+
+       logwin = g_new0(LogWindow, 1);
+
+       window = window_new(GTK_WINDOW_TOPLEVEL, "log", NULL, NULL, _("Log"));
+       gtk_widget_set_size_request(window, 520, 400);
+       g_signal_connect(G_OBJECT(window), "delete_event",
+                        G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+       g_signal_connect(G_OBJECT(window), "key_press_event",
+                        G_CALLBACK(key_pressed), logwin);
+       g_signal_connect(G_OBJECT(window), "hide",
+                        G_CALLBACK(hide_cb), logwin);
+       gtk_widget_realize(window);
+
+       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                                      GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
+       gtk_container_add(GTK_CONTAINER(window), scrolledwin);
+       gtk_widget_show(scrolledwin);
+
+       text = gtk_text_view_new();
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+       gtk_text_buffer_get_start_iter(buffer, &iter);
+       gtk_text_buffer_create_mark(buffer, "end", &iter, FALSE);
+       gtk_container_add(GTK_CONTAINER(scrolledwin), text);
+       gtk_widget_show(text);
+
+       logwin->window = window;
+       logwin->scrolledwin = scrolledwin;
+       logwin->text = text;
+       logwin->lines = 1;
+
+       return logwin;
+}
+
+static void log_window_init(LogWindow *logwin)
+{
+       GtkTextBuffer *buffer;
+       GdkColormap *colormap;
+       gboolean success[LOG_COUNT - 1];
+       gint i;
+
+       g_assert(logwin != NULL);
+       g_assert(logwin->colors != NULL);
+
+       for (i = LOG_NORMAL; i < LOG_COUNT; i++)
+               {
+               gboolean ok = gdk_color_parse(logdefs[i].color, &logwin->colors[i]);
+               if (ok == TRUE) continue;
+
+               if (i == LOG_NORMAL) return;
+               memcpy(&logwin->colors[i], &logwin->colors[LOG_NORMAL], sizeof(GdkColor));
+               }
+
+       colormap = gdk_drawable_get_colormap(logwin->window->window);
+       gdk_colormap_alloc_colors(colormap, logwin->colors, LOG_COUNT, FALSE, TRUE, success);
+
+       for (i = LOG_NORMAL; i < LOG_COUNT; i++)
+               {
+               if (success[i] == FALSE)
+                       {
+                       GtkStyle *style;
+                       gint j;
+
+                       g_warning("LogWindow: color allocation failed\n");
+                       style = gtk_widget_get_style(logwin->window);
+                       for (j = LOG_NORMAL; j < LOG_COUNT; j++)
+                               logwin->colors[j] = style->black;
+                       break;
+                       }
+               }
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(logwin->text));
+       for (i = LOG_NORMAL; i < LOG_COUNT; i++)
+               gtk_text_buffer_create_tag(buffer, logdefs[i].tag,
+                                          "foreground-gdk", &logwin->colors[i],
+                                          NULL);
+}
+
+static void log_window_show(LogWindow *logwin)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(logwin->text);
+       GtkTextBuffer *buffer;
+       GtkTextMark *mark;
+       
+       g_assert(logwin != NULL);
+
+       buffer = gtk_text_view_get_buffer(text);
+       mark = gtk_text_buffer_get_mark(buffer, "end");
+       gtk_text_view_scroll_mark_onscreen(text, mark);
+
+       gtk_window_present(GTK_WINDOW(logwin->window));
+}
+
+
+void log_window_new(void)
+{
+       LogWindow *logwin;
+
+       logwin = log_window_create();
+       log_window_init(logwin);
+       log_window_show(logwin);
+
+       logwindow = logwin;
+}
+
+void log_window_append(const gchar *str, LogType type)
+{
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
+       gint line_limit = 1000; //FIXME: option
+       gchar *str_utf8;
+
+       if (logwindow == NULL) return;
+
+       text = GTK_TEXT_VIEW(logwindow->text);
+       buffer = gtk_text_view_get_buffer(text);
+
+       if (line_limit > 0 && logwindow->lines >= line_limit)
+               {
+               GtkTextIter start, end;
+
+               gtk_text_buffer_get_start_iter(buffer, &start);
+               end = start;
+               gtk_text_iter_forward_lines(&end, TRIM_LINES);
+               gtk_text_buffer_delete(buffer, &start, &end);
+               logwindow->lines = gtk_text_buffer_get_line_count(buffer);
+               }
+
+       gtk_text_buffer_get_end_iter(buffer, &iter);
+
+       str_utf8 = utf8_validate_or_convert((gchar *)str);
+       gtk_text_buffer_insert_with_tags_by_name
+                       (buffer, &iter, str_utf8, -1, logdefs[type].tag, NULL);
+
+       if (GTK_WIDGET_VISIBLE(text))
+               {
+               GtkTextMark *mark;
+               
+               mark = gtk_text_buffer_get_mark(buffer, "end");
+               gtk_text_view_scroll_mark_onscreen(text, mark);
+               }
+
+       logwindow->lines++;
+}

diff --git a/src/logwindow.h b/src/logwindow.h
new file mode 100644 (file)
index 0000000..ea89a17
--- /dev/null
+++ b/src/logwindow.h
@@ -0,0 +1,29 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * Author: Vladimir Nadvornik, Laurent Monin
+ * based on logwindow.[ch] from Sylpheed 2.4.7 (C) Hiroyuki Yamamoto
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+#ifndef LOGWINDOW_H
+#define LOGWINDOW_H
+
+typedef enum
+{
+       LOG_NORMAL = 0,
+       LOG_MSG,
+       LOG_WARN,
+       LOG_ERROR,
+       LOG_COUNT
+} LogType;
+
+void log_window_new(void);
+
+void log_window_append(const gchar *str, LogType type);
+
+#endif /* LOGWINDOW_H */