UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[code] Avoid init/deinit-ing uPy in each editor redraw

Browse Source
This commit is contained in:
Romain Goyet
2018-06-04 14:57:10 +02:00
committed by EmilieNumworks
parent b52590e2f7
commit caff93cda0
4 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/code/python_text_area.cpp
View File

@@ -58,15 +58,19 @@ static inline int TokenLength(mp_lexer_t * lex) {
}
}
PythonTextArea::ContentView::ContentView(KDText::FontSize fontSize) :
TextArea::ContentView(fontSize)
{
void PythonTextArea::ContentView::loadSyntaxHighlighter() {
assert(m_pythonHeap == nullptr);
m_pythonHeap = static_cast<char *>(malloc(k_pythonHeapSize));
if (m_pythonHeap != nullptr) {
MicroPython::init(m_pythonHeap, m_pythonHeap + k_pythonHeapSize);
}
}
PythonTextArea::ContentView::~ContentView() {
if (m_pythonHeap) {
void PythonTextArea::ContentView::unloadSyntaxHighlighter() {
if (m_pythonHeap != nullptr) {
MicroPython::deinit();
free(m_pythonHeap);
m_pythonHeap = nullptr;
}
}
@@ -85,7 +89,7 @@ void PythonTextArea::ContentView::clearRect(KDContext * ctx, KDRect rect) const
void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char * text, size_t length, int fromColumn, int toColumn) const {
LOG_DRAW("Drawing \"%.*s\"\n", length, text);
if (!m_pythonHeap) {
if (m_pythonHeap == nullptr) {
drawStringAt(
ctx,
line,
@@ -98,8 +102,6 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
return;
}
MicroPython::init(m_pythonHeap, m_pythonHeap + k_pythonHeapSize);
nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) {
/* We're using the MicroPython lexer to do syntax highlighting on a per-line
@@ -151,8 +153,6 @@ void PythonTextArea::ContentView::drawLine(KDContext * ctx, int line, const char
mp_lexer_free(lex);
nlr_pop();
}
MicroPython::deinit();
}
KDRect PythonTextArea::ContentView::dirtyRectFromCursorPosition(size_t index, bool lineBreak) const {