New (read-only) TextEdit widget from suhr.

5 files changed, 300 insertions, 1 deletions

diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index b4baccd..e337ed6 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -16,6 +16,7 @@ PLUGIN_GUI_SOURCES = \
 	$(top_srcdir)/plugingui/checkbox.cc \
 	$(top_srcdir)/plugingui/slider.cc \
 	$(top_srcdir)/plugingui/scrollbar.cc \
+	$(top_srcdir)/plugingui/textedit.cc \
 	$(top_srcdir)/plugingui/layout.cc \
 	$(top_srcdir)/plugingui/listbox.cc \
 	$(top_srcdir)/plugingui/listboxthin.cc \
diff --git a/plugingui/Makefile.mingw32 b/plugingui/Makefile.mingw32
index 98f2408..e039cd5 100644
--- a/plugingui/Makefile.mingw32
+++ b/plugingui/Makefile.mingw32
@@ -9,6 +9,8 @@ DG_SRC = \
 DG_CFLAGS = -I.. -I../include -I../src -DSSE -msse -msse2 -DDISABLE_HUGIN
 
 GUI_SRC = \
+	testmain.cc \
+	dgwindow.cc \
 	nativewindow_win32.cc \
 	plugingui.cc \
 	pluginconfig.cc \
@@ -27,6 +29,7 @@ GUI_SRC = \
 	checkbox.cc \
 	slider.cc \
 	scrollbar.cc \
+	textedit.cc \
 	listbox.cc \
 	listboxthin.cc \
 	listboxbasic.cc \
@@ -53,7 +56,8 @@ DBG_CFLAGS=-I../hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX -DDISABLE_HUGIN
 all:
 	gcc $(DBG_CFLAGS) ../hugin/hugin.c -c
 	gcc $(DBG_CFLAGS) ../hugin/hugin_syslog.c -c
-	g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) hugin.o hugin_syslog.o $(DG_SRC) ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) -o plugingui.exe
+	gcc LooplessSizeMove.c -c
+	g++ -std=c++11 -static -static-libgcc -O2 -g -Wall $(DBG_CFLAGS) $(DG_CFLAGS) $(DG_LIBS) hugin.o hugin_syslog.o LooplessSizeMove.o $(DG_SRC) ${GUI_SRC} ${GUI_CFLAGS} $(GUI_LIBS) -o plugingui.exe
 
 clean:
 	del -f drumgizmo_vst.dll libdrumgizmo_vst.a
diff --git a/plugingui/textedit.cc b/plugingui/textedit.cc
new file mode 100644
index 0000000..36258e9
--- /dev/null
+++ b/plugingui/textedit.cc
@@ -0,0 +1,214 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            lineedit.cc
+ *
+ *  Tue Oct 21 11:25:26 CEST 2014
+ *  Copyright 2014 Jonas Suhr Christensen
+ *  jsc@umbraculum.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo 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.
+ *
+ *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#include "textedit.h"
+
+#include "window.h"
+
+#include <assert.h>
+#include <list>
+#include <hugin.hpp>
+#include <stdio.h>
+
+#define BORDER 10
+
+namespace GUI {
+
+TextEdit::TextEdit(Widget *parent)
+	: Widget(parent)
+	, scroll(this)
+{
+	setReadOnly(true);
+
+	scroll.move(width() - 5, 1);
+	scroll.resize(20, 100);
+	CONNECT(&scroll, valueChangeNotifier, this, &TextEdit::scrolled);
+
+	box.topLeft     = new Image(":widget_tl.png");
+	box.top         = new Image(":widget_t.png");
+	box.topRight    = new Image(":widget_tr.png");
+	box.left        = new Image(":widget_l.png");
+	box.right       = new Image(":widget_r.png");
+	box.bottomLeft  = new Image(":widget_bl.png");
+	box.bottom      = new Image(":widget_b.png");
+	box.bottomRight = new Image(":widget_br.png");
+	box.center      = new Image(":widget_c.png");
+}
+
+TextEdit::~TextEdit()
+{
+	delete box.topLeft;
+	delete box.top;
+	delete box.topRight;
+	delete box.left;
+	delete box.right;
+	delete box.bottomLeft;
+	delete box.bottom;
+	delete box.bottomRight;
+	delete box.center;
+}
+
+void TextEdit::resize(int height, int width)
+{
+	Widget::resize(height, width);
+	scroll.resize(scroll.width(), height-10);
+	scroll.move(width-30,7);
+}
+
+void TextEdit::setReadOnly(bool readonly)
+{
+	this->readonly = readonly;
+}
+
+bool TextEdit::readOnly()
+{
+	return readonly;
+}
+
+void TextEdit::setText(const std::string& text)
+{
+	_text = text;
+
+	preprocessText();
+
+	int ran = height() / font.textHeight();
+
+	DEBUG(textedit, "Setting range and max of scrollbar to '%d' and '%d'\n",
+	      ran, preprocessedtext.size());
+
+	scroll.setRange(ran);
+	scroll.setMaximum(preprocessedtext.size());
+
+	repaintEvent(nullptr);
+
+	textChangedNotifier();
+}
+
+std::string TextEdit::text()
+{
+	return _text;
+}
+
+void TextEdit::preprocessText()
+{
+	preprocessedtext.clear();
+	std::string text = _text;
+
+	{ // Handle tab characters
+		for(size_t i = 0; i < text.length(); ++i)
+		{
+			char ch = text.at(i);
+			if(ch == '\t')
+			{
+				text.erase(i, 1);
+				text.insert(i, 4, ' ');
+			}
+		}
+	}
+
+	std::list<std::string> lines;
+	{ // Handle new line characters
+		size_t pos = 0;
+		do
+		{
+			pos = text.find("\n");
+			lines.push_back(text.substr(0, pos));
+			text = text.substr(pos+1);
+		}
+		while(pos != std::string::npos);
+	}
+
+	{ // Wrap long lines
+		std::list<std::string>::iterator it;
+		for(it = lines.begin(); it != lines.end(); ++it)
+		{
+			std::string line = *it;
+
+			for(size_t i = 0; i < line.length(); ++i)
+			{
+				size_t linewidth = font.textWidth(line.substr(0, i));
+				if(linewidth >= width() - BORDER - 4 + 3 - 10 - scroll.width()) {
+					preprocessedtext.push_back(line.substr(0, i));
+					line = line.substr(i);
+					i = 0;
+				}
+			}
+			preprocessedtext.push_back(line);
+		}
+	}
+}
+
+void TextEdit::repaintEvent(RepaintEvent* repaintEvent)
+{
+	Painter p(*this);
+
+	p.clear();
+
+	int w = width();
+	int h = height();
+	if((w == 0) || (h == 0))
+	{
+		return;
+	}
+
+	p.drawBox(0, 0, box, w, h);
+
+	p.setColour(Colour(183.0 / 255.0, 219.0 / 255.0 , 255.0 / 255.0, 1));
+
+	int skip = scroll.value();
+
+	int ypos = font.textHeight() + 5 + 1 + 1 + 1;
+	std::list<std::string>::iterator it;
+	it = preprocessedtext.begin();
+
+	int c = 0;
+	for( ; c < skip; c++)
+	{
+		++it;
+	}
+
+	c = 0;
+	for( ; it != preprocessedtext.end(); it++)
+	{
+		if((c * font.textHeight()) >= (height() - 8 - font.textHeight()))
+		{
+			break;
+		}
+
+		std::string line = *it;
+		p.drawText(BORDER - 4 + 3, ypos, font, line);
+		ypos += font.textHeight();
+		++c;
+	}
+}
+
+void TextEdit::scrolled(int value)
+{
+	(void)value;
+	repaintEvent(nullptr);
+}
+
+} // GUI::
diff --git a/plugingui/textedit.h b/plugingui/textedit.h
new file mode 100644
index 0000000..d1b4a01
--- /dev/null
+++ b/plugingui/textedit.h
@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/***************************************************************************
+ *            textedit.h
+ *
+ *  Tue Oct 21 11:23:58 CEST 2014
+ *  Copyright 2014 Jonas Suhr Christensen
+ *  jsc@umbraculum.org
+ ****************************************************************************/
+
+/*
+ *  This file is part of DrumGizmo.
+ *
+ *  DrumGizmo 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.
+ *
+ *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ */
+#pragma once
+
+#include <string>
+#include <list>
+
+#include "widget.h"
+#include "font.h"
+#include "painter.h"
+#include "scrollbar.h"
+
+#include "notifier.h"
+
+namespace GUI {
+
+class TextEdit : public Widget {
+public:
+	TextEdit(Widget *parent);
+	~TextEdit();
+
+	// From Widget
+	bool isFocusable() override { return true; }
+	void resize(int width, int height) override;
+
+	std::string text();
+	void setText(const std::string& text);
+
+	void setReadOnly(bool readonly);
+	bool readOnly();
+
+	void preprocessText();
+
+	Notifier<> textChangedNotifier;
+
+protected:
+	// From Widget
+	virtual void repaintEvent(RepaintEvent* repaintEvent) override;
+
+private:
+	void scrolled(int value);
+
+	Painter::Box box;
+	ScrollBar scroll;
+	Font font;
+
+	std::string _text;
+	size_t pos{0};
+
+	bool readonly{true};
+
+	std::list< std::string > preprocessedtext;
+};
+
+} // GUI::
diff --git a/vst/Makefile.mingw32.in b/vst/Makefile.mingw32.in
index 10dc792..f96e071 100644
--- a/vst/Makefile.mingw32.in
+++ b/vst/Makefile.mingw32.in
@@ -56,6 +56,7 @@ GUI_SRC = \
 	@top_srcdir@/plugingui/checkbox.cc \
 	@top_srcdir@/plugingui/slider.cc \
 	@top_srcdir@/plugingui/scrollbar.cc \
+	@top_srcdir@/plugingui/textedit.cc \
 	@top_srcdir@/plugingui/listbox.cc \
 	@top_srcdir@/plugingui/listboxthin.cc \
 	@top_srcdir@/plugingui/listboxbasic.cc \