summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/App.cpp16
-rw-r--r--src/gui/MessagesWindow.cpp93
-rw-r--r--src/gui/MessagesWindow.hpp23
-rw-r--r--src/gui/ingen_gui.ui4
4 files changed, 117 insertions, 19 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 2624d1e9..fad2f195 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -1,6 +1,6 @@
/*
This file is part of Ingen.
- Copyright 2007-2015 David Robillard <http://drobilla.net/>
+ Copyright 2007-2016 David Robillard <http://drobilla.net/>
Ingen is free software: you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free
@@ -91,6 +91,9 @@ App::App(Ingen::World* world)
PluginModel::set_rdf_world(*world->rdf_world());
PluginModel::set_lilv_world(world->lilv_world());
+
+ using namespace std::placeholders;
+ world->log().set_sink(std::bind(&MessagesWindow::log, _messages_window, _1, _2, _3));
}
App::~App()
@@ -214,12 +217,7 @@ App::response(int32_t id, Status status, const std::string& subject)
void
App::error_message(const string& str)
{
- _messages_window->post(str);
-
- if (!_messages_window->is_visible())
- _messages_window->present();
-
- _messages_window->set_urgency_hint(true);
+ _messages_window->post_error(str);
}
void
@@ -321,6 +319,10 @@ App::gtk_main_iteration()
if (!_client)
return false;
+ if (_messages_window) {
+ _messages_window->flush();
+ }
+
if (_world->engine()) {
if (!_world->engine()->main_iteration()) {
Gtk::Main::quit();
diff --git a/src/gui/MessagesWindow.cpp b/src/gui/MessagesWindow.cpp
index 262cb817..fb29716c 100644
--- a/src/gui/MessagesWindow.cpp
+++ b/src/gui/MessagesWindow.cpp
@@ -1,6 +1,6 @@
/*
This file is part of Ingen.
- Copyright 2007-2015 David Robillard <http://drobilla.net/>
+ Copyright 2007-2016 David Robillard <http://drobilla.net/>
Ingen is free software: you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free
@@ -14,9 +14,13 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "MessagesWindow.hpp"
#include <string>
+#include "ingen/URIs.hpp"
+
+#include "App.hpp"
+#include "MessagesWindow.hpp"
+
namespace Ingen {
namespace GUI {
using std::string;
@@ -31,17 +35,96 @@ MessagesWindow::MessagesWindow(BaseObjectType* cobject,
_clear_button->signal_clicked().connect(sigc::mem_fun(this, &MessagesWindow::clear_clicked));
_close_button->signal_clicked().connect(sigc::mem_fun(this, &Window::hide));
+
+ for (int s = Gtk::STATE_NORMAL; s <= Gtk::STATE_INSENSITIVE; ++s) {
+ _textview->modify_base((Gtk::StateType)s, Gdk::Color("#000000"));
+ _textview->modify_text((Gtk::StateType)s, Gdk::Color("#EEEEEC"));
+ }
+}
+
+void
+MessagesWindow::init_window(App& app)
+{
+ Glib::RefPtr<Gtk::TextTag> tag = Gtk::TextTag::create();
+ tag->property_foreground() = "#EF2929";
+ _tags.emplace(app.uris().log_Error, tag);
+ _error_tag = tag;
+
+ tag = Gtk::TextTag::create();
+ tag->property_foreground() = "#FCAF3E";
+ _tags.emplace(app.uris().log_Warning, tag);
+
+ tag = Gtk::TextTag::create();
+ tag->property_foreground() = "#8AE234";
+ _tags.emplace(app.uris().log_Trace, tag);
+
+ for (const auto& t : _tags) {
+ _textview->get_buffer()->get_tag_table()->add(t.second);
+ }
}
void
-MessagesWindow::post(const string& msg)
+MessagesWindow::post_error(const string& msg)
{
Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
- text_buf->insert(text_buf->end(), msg);
+ text_buf->insert_with_tag(text_buf->end(), msg, _error_tag);
text_buf->insert(text_buf->end(), "\n");
- if (!_clear_button->is_sensitive())
+ if (!_clear_button->is_sensitive()) {
+ _clear_button->set_sensitive(true);
+ }
+
+ set_urgency_hint(true);
+ if (!is_visible()) {
+ present();
+ }
+}
+
+int
+MessagesWindow::log(LV2_URID type, const char* fmt, va_list args)
+{
+ std::lock_guard<std::mutex> lock(_mutex);
+
+#ifdef HAVE_VASPRINTF
+ char* buf = NULL;
+ const int len = vasprintf(&buf, fmt, args);
+#else
+ char* buf = g_strdup_vprintf(fmt, args);
+ const int len = strlen(buf);
+#endif
+
+ _stream << type << ' ' << buf << '\0';
+ free(buf);
+
+ return len;
+}
+
+void
+MessagesWindow::flush()
+{
+ LV2_URID type;
+ std::string line;
+ {
+ std::lock_guard<std::mutex> lock(_mutex);
+ if (!_stream.rdbuf()->in_avail()) {
+ return;
+ }
+ _stream >> type;
+ std::getline(_stream, line, '\0');
+ }
+
+ Glib::RefPtr<Gtk::TextBuffer> text_buf = _textview->get_buffer();
+
+ auto t = _tags.find(type);
+ if (t != _tags.end()) {
+ text_buf->insert_with_tag(text_buf->end(), line, t->second);
+ } else {
+ text_buf->insert(text_buf->end(), line);
+ }
+
+ if (!_clear_button->is_sensitive()) {
_clear_button->set_sensitive(true);
+ }
}
void
diff --git a/src/gui/MessagesWindow.hpp b/src/gui/MessagesWindow.hpp
index f3215daf..193ef18d 100644
--- a/src/gui/MessagesWindow.hpp
+++ b/src/gui/MessagesWindow.hpp
@@ -1,6 +1,6 @@
/*
This file is part of Ingen.
- Copyright 2007-2015 David Robillard <http://drobilla.net/>
+ Copyright 2007-2016 David Robillard <http://drobilla.net/>
Ingen is free software: you can redistribute it and/or modify it under the
terms of the GNU Affero General Public License as published by the Free
@@ -17,11 +17,14 @@
#ifndef INGEN_GUI_MESSAGESWINDOW_HPP
#define INGEN_GUI_MESSAGESWINDOW_HPP
+#include <mutex>
+#include <sstream>
#include <string>
#include <gtkmm/builder.h>
#include <gtkmm/button.h>
#include <gtkmm/textview.h>
+#include "lv2/lv2plug.in/ns/ext/log/log.h"
#include "Window.hpp"
@@ -41,14 +44,24 @@ public:
MessagesWindow(BaseObjectType* cobject,
const Glib::RefPtr<Gtk::Builder>& xml);
- void post(const std::string& str);
+ void init_window(App& app);
+
+ int log(LV2_URID type, const char* fmt, va_list args);
+ void flush();
+
+ void post_error(const std::string& str);
private:
void clear_clicked();
- Gtk::TextView* _textview;
- Gtk::Button* _clear_button;
- Gtk::Button* _close_button;
+ std::mutex _mutex;
+ std::stringstream _stream;
+ Gtk::TextView* _textview;
+ Gtk::Button* _clear_button;
+ Gtk::Button* _close_button;
+
+ Glib::RefPtr<Gtk::TextTag> _error_tag;
+ std::map< LV2_URID, Glib::RefPtr<Gtk::TextTag> > _tags;
};
} // namespace GUI
diff --git a/src/gui/ingen_gui.ui b/src/gui/ingen_gui.ui
index 646cd34d..7d250e69 100644
--- a/src/gui/ingen_gui.ui
+++ b/src/gui/ingen_gui.ui
@@ -1876,8 +1876,8 @@ See COPYING file included with this distribution, or http://www.gnu.org/licenses
<object class="GtkTextView" id="messages_textview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="pixels_above_lines">5</property>
- <property name="pixels_below_lines">5</property>
+ <property name="pixels_above_lines">1</property>
+ <property name="pixels_below_lines">1</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="left_margin">5</property>
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 05:01:20 +0000