Reorganized code

Author: Rewenix

deb.out

@@ -0,0 +1,38 @@
+#pragma once
+#include <text-editor/app.hpp>
+#include <tvision/tv.h>
+#include <scintilla.h>
+#include <scintilla/tscintilla.h>
+#include <set>
+
+struct EditorObserver{
+public:
+    virtual void editorUpdate() = 0;
+};
+
+struct Editor : turbo::TScintillaParent{
+
+public:
+    Editor();
+    void setSize(const TPoint& size);
+    void paint(TDrawSurface& surface, TRect area);
+    void handleEvent(TEvent &event);
+    //observers
+    void addObserver(EditorObserver* observer);
+    void removeObserver(EditorObserver* observer);
+
+    //interface TScintillaParent
+    virtual TPoint getEditorSize() noexcept;
+    virtual void invalidate(TRect area) noexcept;
+    virtual void handleNotification(const SCNotification &scn);
+    virtual void setVerticalScrollPos(int delta, int limit) noexcept;
+    virtual void setHorizontalScrollPos(int delta, int limit) noexcept;
+
+private:
+    void updateAll();
+
+private:
+    turbo::TScintilla scintilla;
+    TPoint size = {0, 0};
+    std::set<EditorObserver*> observers;
+};

include/text-editor/ScintillaView.hpp

@@ -0,0 +1,20 @@
+#pragma once
+#define Uses_TSurfaceView
+#include <text-editor/app.hpp>
+#include <tvision/tv.h>
+#include <scintilla.h>
+#include <text-editor/editor.hpp>
+
+struct EditorView : TSurfaceView, EditorObserver{
+
+public:
+    EditorView(const TRect& bounds) noexcept;
+    void resize(const TRect& bounds) noexcept;
+    void paint();
+    void attachEditor(Editor* newEditor);
+    virtual void editorUpdate();
+
+private:    
+    TDrawSurface drawSurface;//maybe this should be moved to editor?
+    Editor* editor = nullptr; //non-owning
+};

include/text-editor/editor.hpp

@@ -1,22 +1,23 @@
-
-// Copyright (c) 2025 Piotr Białek
-// Copyright (c) 2025 Mateusz Rajs
-// Copyright (c) 2025 Mikołaj Rams
-// Copyright (c) 2025 Antoni Długosz
-//
-// Licensed under the MIT license
-
+#pragma once
 #include <text-editor/app.hpp>
-#include <tvision/tv.h>
+#include <text-editor/editorView.hpp>
+#include <text-editor/editor.hpp>
 
-struct EditWindow : TEditWindow {
+struct EditorWindow : TWindow{
 
-  EditWindow(const TRect &rect, TStringView view, int val) noexcept;
+public:
+  EditorWindow(const TRect& bounds, TStringView aTitle, short aNumber)noexcept;
 
   void handleEvent(TEvent &event) override;
 
-  private:
-  // last modification this editor made to the file
-  time_t open_time;
-};
+  virtual void changeBounds(const TRect& bounds);
 
+private:
+  TRect viewBounds(const TRect& bounds);
+
+public:
+  time_t open_time;
+private:
+  EditorView view;
+  Editor editor; //potentially multiple editors in the future
+};

include/text-editor/editorView.hpp

@@ -16,7 +16,8 @@
 #include <text-editor/editorWindow.hpp>
 #include <text-editor/explorerWindow.hpp>
 #include <text-editor/terminal.hpp>
-#include <text-editor/scintillaEditorWindow.hpp>
+// #include <text-editor/scintillaEditorWindow.hpp>
+#include <text-editor/editorWindow.hpp>
 #include <tvision/tv.h>
 
 App::App(int argc, char **argv)
@@ -184,7 +185,7 @@ auto App::newEditor(std::optional<char *> path) -> void {
   rect.b.y -= 12;
   rect.a.x += (m_explorer->visible() ? m_explorer->size.x : 0);
   // auto *editor = new EditWindow(rect, path.value_or(nullptr), wnNoNumber);
-  auto *editor = new ScintillaEditWindow(rect, path.value_or(nullptr), wnNoNumber);
+  auto *editor = new EditorWindow(rect, path.value_or(nullptr), wnNoNumber);
   deskTop->insert(editor);
 }
 

include/text-editor/editorWindow.hpp

@@ -0,0 +1,67 @@
+#include <text-editor/editor.hpp>
+#include <iostream>
+
+Editor::Editor(){
+    scintilla.setParent(this);
+    //configure margins
+    turbo::call(scintilla, SCI_SETMARGINS, 0, 0);
+
+    // Indentation
+    turbo::call(scintilla, SCI_SETUSETABS, false, 0U);
+    turbo::call(scintilla, SCI_SETINDENT, 4, 0U);
+    turbo::call(scintilla, SCI_SETTABWIDTH, 4, 0U);
+    turbo::call(scintilla, SCI_SETTABINDENTS, true, 0U);
+    turbo::call(scintilla, SCI_SETBACKSPACEUNINDENTS, true, 0U);
+}
+
+void Editor::setSize(const TPoint& size){
+    this->size = size;
+}
+
+void Editor::paint(TDrawSurface& surface, TRect area){
+    turbo::paint(scintilla, surface, area);
+}
+
+void Editor::handleEvent(TEvent& event){
+    if(event.what == evKeyboard){
+        turbo::handleKeyDown(scintilla, event.keyDown);
+    }
+    //TODO: handle mouse events
+}
+
+void Editor::addObserver(EditorObserver* observer){
+    observers.insert(observer);
+}
+
+void Editor::removeObserver(EditorObserver* observer){
+    observers.erase(observer);
+}
+
+TPoint Editor::getEditorSize(){
+    return size;
+}
+
+void Editor::invalidate(TRect area){
+    // may be useful later for understanding scintilla events
+    std::cerr << "invalidate " << area.a.x << " " << area.a.y << " " << area.b.x << " " << area.b.y << "\n";
+    updateAll();
+}
+
+void Editor::handleNotification(const SCNotification &scn){
+    std::cerr << "handleNotification\n";
+    // updateAll();
+}
+
+void Editor::setVerticalScrollPos(int delta, int limit){
+    std::cerr << "setVerticalScrollPos " << delta << " " << limit << "\n";
+    updateAll();
+}
+
+void Editor::setHorizontalScrollPos(int delta, int limit){
+    std::cerr << "setHorizontalScrollPos " << delta << " " << limit << "\n";
+    updateAll();
+}
+
+void Editor::updateAll(){
+    for(auto observer : observers)observer->editorUpdate();
+}

include/text-editor/scintillaEditorWindow.hpp

@@ -0,0 +1,38 @@
+#include <text-editor/editorView.hpp>
+
+EditorView::EditorView(const TRect& bounds) : TSurfaceView(bounds){
+    surface = &drawSurface;
+    drawSurface.resize(bounds.b - bounds.a);
+}
+
+void EditorView::resize(const TRect& bounds){
+    drawSurface.resize(bounds.b - bounds.a);
+    if(editor){
+        editor->setSize(bounds.b - bounds.a);
+    }
+    TSurfaceView::setBounds(bounds);
+    paint();
+    draw();
+}
+
+void EditorView::paint(){
+    if(editor){
+        editor->paint(drawSurface, TRect({0, 0}, size));
+    }
+}
+
+void EditorView::attachEditor(Editor* newEditor){
+    if(editor){
+        editor->removeObserver(this);
+    }
+    editor = newEditor;
+    editor->setSize(size);
+    editor->addObserver(this);
+    paint();
+    draw();
+}
+
+void EditorView::editorUpdate(){
+    paint();
+    draw();
+}