[DEV] start rework buffer display
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
#include <MainWindows.h>
|
||||
#include <CodeView.h>
|
||||
#include <BufferView.h>
|
||||
#include <TextViewer.h>
|
||||
#include <Search.h>
|
||||
|
||||
#include <ewol/widget/Button.h>
|
||||
@@ -120,6 +121,7 @@ MainWindows::MainWindows(void)
|
||||
widget::Sizer * mySizerHori = NULL;
|
||||
//ewol::Button * myButton = NULL;
|
||||
CodeView * myCodeView = NULL;
|
||||
appl::TextViewer * myTextView = NULL;
|
||||
BufferView * myBufferView = NULL;
|
||||
widget::Menu * myMenu = NULL;
|
||||
|
||||
@@ -137,11 +139,16 @@ MainWindows::MainWindows(void)
|
||||
mySizerHori->SubWidgetAdd(mySizerVert2);
|
||||
|
||||
// main buffer Area :
|
||||
myTextView = new appl::TextViewer("FreeMono;DejaVuSansMono", 11);
|
||||
myTextView->SetExpand(bvec2(true,true));
|
||||
myTextView->SetFill(bvec2(true,true));
|
||||
mySizerVert2->SubWidgetAdd(myTextView);
|
||||
/*
|
||||
myCodeView = new CodeView("FreeMono;DejaVuSansMono", 11);
|
||||
myCodeView->SetExpand(bvec2(true,true));
|
||||
myCodeView->SetFill(bvec2(true,true));
|
||||
mySizerVert2->SubWidgetAdd(myCodeView);
|
||||
|
||||
*/
|
||||
// search area :
|
||||
Search * mySearch = new Search();
|
||||
mySizerVert2->SubWidgetAdd(mySearch);
|
||||
|
||||
243
sources/appl/Gui/TextViewer.cpp
Normal file
243
sources/appl/Gui/TextViewer.cpp
Normal file
@@ -0,0 +1,243 @@
|
||||
/**
|
||||
* @author Edouard DUPIN
|
||||
*
|
||||
* @copyright 2010, Edouard DUPIN, all right reserved
|
||||
*
|
||||
* @license GPL v3 (see license file)
|
||||
*/
|
||||
|
||||
#include <CodeView.h>
|
||||
|
||||
#include <appl/Debug.h>
|
||||
#include <appl/global.h>
|
||||
#include <TextViewer.h>
|
||||
#include <BufferManager.h>
|
||||
#include <ColorizeManager.h>
|
||||
#include <ewol/clipBoard.h>
|
||||
#include <SearchData.h>
|
||||
|
||||
#include <ewol/widget/WidgetManager.h>
|
||||
#include <ewol/renderer/EObject.h>
|
||||
|
||||
#undef __class__
|
||||
#define __class__ "TextViewer"
|
||||
|
||||
appl::TextViewer::TextViewer(const etk::UString& _fontName, int32_t _fontSize) :
|
||||
m_buffer(NULL),
|
||||
m_displayText(_fontName, _fontSize)
|
||||
{
|
||||
SetCanHaveFocus(true);
|
||||
RegisterMultiCast(ednMsgBufferId);
|
||||
RegisterMultiCast(ednMsgGuiCopy);
|
||||
RegisterMultiCast(ednMsgGuiPaste);
|
||||
RegisterMultiCast(ednMsgGuiCut);
|
||||
RegisterMultiCast(ednMsgGuiRedo);
|
||||
RegisterMultiCast(ednMsgGuiUndo);
|
||||
RegisterMultiCast(ednMsgGuiRm);
|
||||
RegisterMultiCast(ednMsgGuiSelect);
|
||||
RegisterMultiCast(ednMsgGuiChangeCharset);
|
||||
RegisterMultiCast(ednMsgGuiFind);
|
||||
RegisterMultiCast(ednMsgGuiReplace);
|
||||
RegisterMultiCast(ednMsgGuiGotoLine);
|
||||
SetLimitScrolling(0.2);
|
||||
|
||||
ShortCutAdd("ctrl+w", ednMsgGuiRm, "Line");
|
||||
ShortCutAdd("ctrl+shift+w", ednMsgGuiRm, "Paragraph");
|
||||
ShortCutAdd("ctrl+x", ednMsgGuiCut, "STD");
|
||||
ShortCutAdd("ctrl+c", ednMsgGuiCopy, "STD");
|
||||
ShortCutAdd("ctrl+v", ednMsgGuiPaste, "STD");
|
||||
ShortCutAdd("ctrl+a", ednMsgGuiSelect, "ALL");
|
||||
ShortCutAdd("ctrl+shift+a", ednMsgGuiSelect, "NONE");
|
||||
|
||||
// by default we load an example object:
|
||||
|
||||
m_buffer = new appl::Buffer();
|
||||
if (m_buffer == NULL) {
|
||||
APPL_ERROR("can not create buffer ... ");
|
||||
return;
|
||||
}
|
||||
m_buffer->LoadFile("./example.txt");
|
||||
|
||||
}
|
||||
|
||||
appl::TextViewer::~TextViewer(void)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
bool appl::TextViewer::CalculateMinSize(void)
|
||||
{
|
||||
m_minSize.setValue(50,50);
|
||||
return true;
|
||||
}
|
||||
|
||||
void appl::TextViewer::CalculateMaxSize(void)
|
||||
{
|
||||
m_maxSize.setX(256);
|
||||
m_maxSize.setY(256);
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::OnDraw(void)
|
||||
{
|
||||
m_displayDrawing.Draw();
|
||||
m_displayText.Draw();
|
||||
WidgetScrooled::OnDraw();
|
||||
}
|
||||
|
||||
|
||||
esize_t appl::TextViewer::Get(esize_t _pos, UniChar& _value, charset_te _charset) const
|
||||
{
|
||||
_value = '\0';
|
||||
if (_charset == unicode::EDN_CHARSET_UTF8) {
|
||||
char tmpVal[8];
|
||||
tmpVal[0] = m_buffer[_pos];
|
||||
tmpVal[1] = m_buffer[_pos+1];
|
||||
tmpVal[2] = m_buffer[_pos+2];
|
||||
tmpVal[3] = m_buffer[_pos+3];
|
||||
tmpVal[4] = m_buffer[_pos+4];
|
||||
tmpVal[5] = m_buffer[_pos+5];
|
||||
tmpVal[6] = m_buffer[_pos+6];
|
||||
tmpVal[7] = '\0';
|
||||
// transform ...
|
||||
|
||||
}
|
||||
// TODO :: need to trancode iso ==> UNICODE ...
|
||||
_value = m_buffer[_pos];
|
||||
return _pos+1;
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::OnRegenerateDisplay(void)
|
||||
{
|
||||
if (true == NeedRedraw()) {
|
||||
// For the scrooling windows
|
||||
CalculateMaxSize();
|
||||
m_displayDrawing.Clear();
|
||||
m_displayText.Clear();
|
||||
|
||||
// Reset the background :
|
||||
m_displayDrawing.SetPos(vec3(0, 0, 0));
|
||||
m_displayDrawing.SetColor(etk::Color<>(220, 220, 220, 256));
|
||||
m_displayDrawing.RectangleWidth(m_size);
|
||||
|
||||
if (m_buffer == NULL) {
|
||||
m_displayText.SetTextAlignement(10, m_size.x()-20, ewol::Text::alignLeft);
|
||||
m_displayText.SetRelPos(vec3(10, 0, 0));
|
||||
etk::UString tmpString("<br/>\n"
|
||||
"<font color=\"red\">\n"
|
||||
" <b>\n"
|
||||
" edn - Editeur De N'ours\n"
|
||||
" </b>\n"
|
||||
"</font>\n"
|
||||
"<br/>\n"
|
||||
"<br/>\n"
|
||||
"<font color=\"indigo\">\n"
|
||||
" <i>\n"
|
||||
" No Buffer Availlable to display\n"
|
||||
" </i>\n"
|
||||
"</font>\n");
|
||||
m_displayText.SetPos(vec3(0.0f, m_size.y(), 0.0f) );
|
||||
m_displayText.ForceLineReturn();
|
||||
m_displayText.PrintDecorated(tmpString);
|
||||
} else {
|
||||
// real display ...
|
||||
etk::Buffer& buf = m_buffer->GetData();
|
||||
m_displayText.SetColor(etk::Color<>(0, 0, 0, 256));
|
||||
float countNbLine = 1;
|
||||
float countColomn = 0;
|
||||
vec3 tmpLetterSize = m_displayText.CalculateSize((uniChar_t)'A');
|
||||
|
||||
for (int32_t iii=0; iii<buf.Size(); ++iii) {
|
||||
char c = buf.Get(iii);
|
||||
etk::UniChar myChar(c);
|
||||
if (myChar == etk::UniChar('\n')) {
|
||||
countNbLine += 1;
|
||||
countColomn = 0;
|
||||
continue;
|
||||
}
|
||||
countColomn += 1;
|
||||
m_displayText.SetPos(vec3(countColomn*tmpLetterSize.x(),
|
||||
m_size.y() - countNbLine*tmpLetterSize.y(),
|
||||
0.0f) );
|
||||
m_displayText.Print(myChar);
|
||||
//tmpLetterSize.x();
|
||||
}
|
||||
}
|
||||
// call the herited class...
|
||||
WidgetScrooled::OnRegenerateDisplay();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
bool appl::TextViewer::OnEventEntry(const ewol::EventEntry& _event)
|
||||
{
|
||||
if (_event.GetType() == ewol::keyEvent::keyboardChar) {
|
||||
//APPL_DEBUG("KB EVENT : \"" << UTF8_data << "\" size=" << strlen(UTF8_data) << "type=" << (int32_t)typeEvent);
|
||||
if (_event.GetStatus() == ewol::keyEvent::statusDown) {
|
||||
if (m_buffer != NULL) {
|
||||
//tmpBuffer->AddChar(_event.GetChar());
|
||||
}
|
||||
MarkToRedraw();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
// move events ...
|
||||
if (_event.GetStatus() == ewol::keyEvent::statusDown) {
|
||||
if (m_buffer != NULL) {
|
||||
//tmpBuffer->cursorMove(_event.GetType());
|
||||
}
|
||||
MarkToRedraw();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void appl::TextViewer::OnEventClipboard(ewol::clipBoard::clipboardListe_te _clipboardID)
|
||||
{
|
||||
if (m_buffer != NULL) {
|
||||
//tmpBuffer->Paste(_clipboardID);
|
||||
}
|
||||
MarkToRedraw();
|
||||
}
|
||||
|
||||
bool appl::TextViewer::OnEventInput(const ewol::EventInput& _event)
|
||||
{
|
||||
vec2 relativePos = RelativePosition(_event.GetPos());
|
||||
if (m_buffer != NULL) {
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void appl::TextViewer::OnReceiveMessage(const ewol::EMessage& _msg)
|
||||
{
|
||||
// Force redraw of the widget
|
||||
MarkToRedraw();
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::OnGetFocus(void)
|
||||
{
|
||||
ShowKeyboard();
|
||||
APPL_INFO("Focus - In");
|
||||
}
|
||||
|
||||
|
||||
void appl::TextViewer::OnLostFocus(void)
|
||||
{
|
||||
HideKeyboard();
|
||||
APPL_INFO("Focus - out");
|
||||
}
|
||||
|
||||
void appl::TextViewer::SetFontSize(int32_t _size)
|
||||
{
|
||||
m_displayText.SetFontSize(_size);
|
||||
SetScrollingSize(_size*3.0*1.46); // 1.46 is a magic number ...
|
||||
}
|
||||
|
||||
void appl::TextViewer::SetFontName(const etk::UString& _fontName)
|
||||
{
|
||||
m_displayText.SetFontName(_fontName);
|
||||
}
|
||||
|
||||
54
sources/appl/Gui/TextViewer.h
Normal file
54
sources/appl/Gui/TextViewer.h
Normal file
@@ -0,0 +1,54 @@
|
||||
/**
|
||||
* @author Edouard DUPIN
|
||||
*
|
||||
* @copyright 2010, Edouard DUPIN, all right reserved
|
||||
*
|
||||
* @license GPL v3 (see license file)
|
||||
*/
|
||||
|
||||
#ifndef __APPL_TEXT_VIEWER_H__
|
||||
#define __APPL_TEXT_VIEWER_H__
|
||||
|
||||
#include <appl/Debug.h>
|
||||
#include <CodeView.h>
|
||||
#include <appl/Buffer/Buffer.h>
|
||||
#include <appl/globalMsg.h>
|
||||
|
||||
#include <ewol/widget/WidgetScrolled.h>
|
||||
#include <ewol/compositing/Text.h>
|
||||
#include <ewol/compositing/Drawing.h>
|
||||
|
||||
namespace appl
|
||||
{
|
||||
class TextViewer : public widget::WidgetScrooled
|
||||
{
|
||||
public:
|
||||
TextViewer(const etk::UString& _fontName="", int32_t _fontSize=-1);
|
||||
virtual ~TextViewer(void);
|
||||
private:
|
||||
appl::Buffer* m_buffer;
|
||||
// drawing elements :
|
||||
ewol::Text m_displayText;
|
||||
ewol::Drawing m_displayDrawing;
|
||||
public:
|
||||
void SetFontSize(int32_t _size);
|
||||
void SetFontName(const etk::UString& _fontName);
|
||||
private:
|
||||
void CalculateMaxSize(void);
|
||||
protected: // derived function
|
||||
virtual void OnDraw(void);
|
||||
public: // Derived function
|
||||
const char * const GetObjectType(void) { return "ApplCodeView"; };
|
||||
virtual bool CalculateMinSize(void);
|
||||
virtual void OnRegenerateDisplay(void);
|
||||
virtual void OnReceiveMessage(const ewol::EMessage& _msg);
|
||||
virtual bool OnEventInput(const ewol::EventInput& _event);
|
||||
virtual bool OnEventEntry(const ewol::EventEntry& _event);
|
||||
virtual void OnEventClipboard(ewol::clipBoard::clipboardListe_te clipboardID);
|
||||
virtual void OnGetFocus(void);
|
||||
virtual void OnLostFocus(void);
|
||||
};
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user