/*
- * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Authors: Vladimir Nadvornik, Laurent Monin
*
- * 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!
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "main.h"
#include "logwindow.h"
#include "ui_fileops.h"
+#include <glib/gprintf.h>
+#include <regex.h>
+
/*
* Logging functions
*/
+static gchar *regexp = NULL;
+
+static gboolean log_msg_cb(gpointer data)
+{
+ gchar *buf = data;
+ log_window_append(buf, LOG_MSG);
+ g_free(buf);
+ return FALSE;
+}
+
+static gboolean log_normal_cb(gpointer data)
+{
+ gchar *buf = data;
+ log_window_append(buf, LOG_NORMAL);
+ g_free(buf);
+ return FALSE;
+}
+
+void log_domain_print_message(const gchar *domain, gchar *buf)
+{
+ gchar *buf_nl;
+ regex_t regex;
+ gint ret_comp, ret_exec;
+
+ buf_nl = g_strconcat(buf, "\n", NULL);
+
+ if (regexp && command_line)
+ {
+ ret_comp = regcomp(®ex, regexp, 0);
+ if (!ret_comp)
+ {
+ ret_exec = regexec(®ex, buf_nl, 0, NULL, 0);
+
+ if (!ret_exec)
+ {
+ print_term(buf_nl);
+ if (strcmp(domain, DOMAIN_INFO) == 0)
+ g_idle_add(log_normal_cb, buf_nl);
+ else
+ g_idle_add(log_msg_cb, buf_nl);
+ }
+ regfree(®ex);
+ }
+ }
+ else
+ {
+ print_term(buf_nl);
+ if (strcmp(domain, DOMAIN_INFO) == 0)
+ g_idle_add(log_normal_cb, buf_nl);
+ else
+ g_idle_add(log_msg_cb, buf_nl);
+ }
+ g_free(buf);
+}
-gint log_domain_printf(const char *domain, const gchar *format, ...)
+void log_domain_print_debug(const gchar *domain, const gchar *file_name,
+ int line_number, const gchar *format, ...)
{
va_list ap;
- gchar buf[4096];
- gint ret;
+ gchar *message;
+ gchar *location;
+ gchar *buf;
va_start(ap, format);
- ret = vsnprintf(buf, sizeof(buf), format, ap);
+ message = g_strdup_vprintf(format, ap);
va_end(ap);
- print_term(buf);
- if (strcmp(domain, DOMAIN_INFO) == 0)
- log_window_append(buf, LOG_NORMAL);
- else
- log_window_append(buf, LOG_MSG);
-
- return ret;
+ location = g_strdup_printf("%s:%d:", file_name, line_number);
+ buf = g_strconcat(location, message, NULL);
+ log_domain_print_message(domain,buf);
+ g_free(location);
+ g_free(message);
}
+void log_domain_printf(const gchar *domain, const gchar *format, ...)
+{
+ va_list ap;
+ gchar *buf;
+
+ va_start(ap, format);
+ buf = g_strdup_vprintf(format, ap);
+ va_end(ap);
+
+ log_domain_print_message(domain, buf);
+}
/*
* Debugging only functions
void set_debug_level(gint new_level)
{
- debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);
+ debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);
}
void debug_level_add(gint delta)
previous = tv;
started = 1;
- g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (int)tv.tv_sec, (int)tv.tv_usec, (int)delta.tv_sec, (int)delta.tv_usec);
+ g_snprintf(timestr, sizeof(timestr), "%5d.%06d (+%05d.%06d)", (gint)tv.tv_sec, (gint)tv.tv_usec, (gint)delta.tv_sec, (gint)delta.tv_usec);
return timestr;
}
get_exec_time();
}
+void set_regexp(gchar *cmd_regexp)
+{
+ regexp = g_strdup(cmd_regexp);
+}
+
+gchar *get_regexp(void)
+{
+ return g_strdup(regexp);
+}
+
#endif /* DEBUG */
+/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */