improved editor widget

CMakeLists.txt

@@ -73,6 +73,7 @@ add_executable (${PROJECT_NAME} ${PLATFORM}
   datablock.cpp
   datafile.cpp
   exportdlg.cpp
+  FXEditor.cpp
   FXFileDialogEx.cpp
   fxhelper.cpp
   FXMenuSeparatorEx.cpp

FXEditor.cpp

@@ -0,0 +1,22 @@
+#include "FXEditor.h"
+
+FXDEFMAP(FXEditor) MessageMap[]=
+{
+    FXMAPFUNC(SEL_KEYPRESS, 0, FXEditor::onKeyPress)
+};
+
+FXIMPLEMENT(FXEditor, FXText, MessageMap, ARRAYNUMBER(MessageMap))
+
+FXEditor::FXEditor(FXComposite *p, FXObject * tgt, FXSelector sel,
+            FXuint opts, FXint x, FXint y, FXint w, FXint h) :
+    FXText(p, tgt, sel, opts, x, y, w, h)
+{
+};
+
+long FXEditor::onKeyPress(FXObject *sender, FXSelector sel, void *ptr)
+{
+	if (isEnabled()) {
+        FXEvent* event=(FXEvent*)ptr;
+    }
+    return FXText::onKeyPress(sender, sel, ptr);
+}

FXEditor.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <fx.h>
+#include <FXText.h>
+
+class FXEditor: public FXText {
+
+    FXDECLARE(FXEditor)
+
+    public:
+        FXEditor(FXComposite *p, FXObject * tgt=NULL, FXSelector sel=0,
+            FXuint opts = 0, FXint x = 0, FXint y = 0, FXint w = 0, FXint h = 0);
+        virtual ~FXEditor() {}
+
+        virtual long onKeyPress(FXObject *sender, FXSelector sel, void *ptr);
+    protected:
+        FXEditor() {};
+        FXEditor(const FXEditor&) {};
+};
+

commands.cpp

@@ -20,10 +20,10 @@ FXDEFMAP(FXCommands) MessageMap[]=
     FXMAPFUNC(SEL_UPDATE,			FXCommands::ID_ROWCOL,			FXCommands::updRowCol),
 };
 
-FXIMPLEMENT(FXCommands,FXText,MessageMap, ARRAYNUMBER(MessageMap))
+FXIMPLEMENT(FXCommands,FXEditor,MessageMap, ARRAYNUMBER(MessageMap))
 
 FXCommands::FXCommands(FXComposite* p, FXObject* tgt,FXSelector sel, FXuint opts, FXint x,FXint y,FXint w,FXint h)
-		: FXText(p, tgt,sel, opts, x,y,w,h)
+		: FXEditor(p, tgt,sel, opts, x,y,w,h)
 {
 	// initial visible rows & tab stop
 	setVisibleRows(6);
@@ -42,7 +42,7 @@ FXCommands::FXCommands(FXComposite* p, FXObject* tgt,FXSelector sel, FXuint opts
 		textStyles[i].selectForeColor = getApp()->getSelforeColor();
 		textStyles[i].selectBackColor = getApp()->getSelbackColor();
 		textStyles[i].hiliteForeColor = getApp()->getHiliteColor();
-		textStyles[i].hiliteBackColor = FXRGB(255, 128, 128); // from FXText.cpp
+		textStyles[i].hiliteBackColor = FXRGB(255, 128, 128); // from FXEditor.cpp
 		textStyles[i].activeBackColor = getApp()->getBackColor();
 		textStyles[i].style = 0; // no underline, italic, bold
 	}
@@ -79,7 +79,7 @@ FXCommands::FXCommands(FXComposite* p, FXObject* tgt,FXSelector sel, FXuint opts
 
 void FXCommands::create()
 {
-	FXText::create();
+	FXEditor::create();
 	disable();
 	setBackColor(getApp()->getBaseColor());
 }
@@ -234,7 +234,28 @@ long FXCommands::onKeyPress(FXObject* sender,FXSelector sel,void* ptr)
 {
 	FXEvent* event=(FXEvent*)ptr;
 	if (!isEnabled())
-		return FXText::onKeyPress(sender, sel, ptr);
+		return FXEditor::onKeyPress(sender, sel, ptr);
+	else if (event->code == KEY_Return || event->code == KEY_KP_Enter)
+	{
+		// Keeps the indentation level, when you go to the next line
+		int curs = getCursorPos();
+		int begin = lineStart(curs);
+
+		FXString line;
+		extractText(line, begin, curs-begin);
+
+		int pos = line.find_first_not_of(" \t");
+		if (pos != -1)
+			line.erase(pos, line.length() - pos);
+
+		if (!line.empty())
+		{
+			long res = FXEditor::onKeyPress(sender, sel, ptr);
+			if (res)
+				insertText(lineStart(getCursorPos()), line);
+			return res;
+		}
+	}
 	else if (event->code == KEY_Tab || event->code == KEY_KP_Tab)
 	{
 		int curs = getCursorPos();
@@ -255,7 +276,7 @@ long FXCommands::onKeyPress(FXObject* sender,FXSelector sel,void* ptr)
             return 1;
         }
     }
-	return FXText::onKeyPress(sender, sel, ptr);
+	return FXEditor::onKeyPress(sender, sel, ptr);
 }
 
 long FXCommands::onUpdate(FXObject* sender,FXSelector sel,void* ptr)
@@ -266,7 +287,7 @@ long FXCommands::onUpdate(FXObject* sender,FXSelector sel,void* ptr)
 		saveCommands();
 	}
 	mapShowRoute();
-	return FXText::onUpdate(sender, sel, ptr);
+	return FXEditor::onUpdate(sender, sel, ptr);
 }
 
 long FXCommands::updConfirmed(FXObject* sender, FXSelector, void*) {

commands.h

@@ -6,9 +6,11 @@
 
 #include <fx.h>
 
+#include "FXEditor.h"
+
 #include <vector>
 
-class FXCommands : public FXText
+class FXCommands : public FXEditor
 {
 	FXDECLARE(FXCommands)
 
@@ -42,7 +44,7 @@ class FXCommands : public FXText
 public: 
 	enum
 	{
-		ID_ROWCOL = FXText::ID_LAST,
+		ID_ROWCOL = FXEditor::ID_LAST,
         ID_UNIT_CONFIRM,
         ID_UNIT_ADD,
         ID_LAST