improved cursor handling in text editor

data/en.mse-locale/locale

@@ -195,15 +195,20 @@ button:
 	# Card select
 	select all:			Select &All
 	select none:		Select &None
+	
+	# Update checker
+	close:				&Close
 
 ############################################################## Titles in the GUI
 title:
 	magic set editor:	Magic Set Editor
 	about:				About Magic Set Editor
+	symbol editor:		Symbol Editor
 	# dialogs
 	open set:			Open Set
 	save set:			Save Set As
 	save image:			Save Image
+	updates availible:	Updates Availible
 	#preferences
 	preferences:		Preferences
 	display:				Display

src/gui/set/window.cpp

@@ -94,11 +94,11 @@ SetWindow::SetWindow(Window* parent, const SetP& set)
 	menuBar->Append(menuHelp, _MENU_("help"));
 	
 	SetMenuBar(menuBar);
-		
+	
 	// status bar
 	CreateStatusBar();
 	SetStatusText(_("Welcome to Magic Set Editor"));
-			
+	
 	// tool bar
 	wxToolBar* tb = CreateToolBar(wxTB_FLAT | wxNO_BORDER | wxTB_HORIZONTAL);
 	tb->SetToolBitmapSize(wxSize(18,18));

src/gui/symbol/window.cpp

@@ -48,7 +48,7 @@ SymbolWindow::SymbolWindow(Window* parent, const SymbolValueP& value, const SetP
 }
 
 void SymbolWindow::init(Window* parent, SymbolP symbol) {
-	Create(parent, wxID_ANY, _("Symbol Editor"), wxDefaultPosition, wxSize(600,600), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
+	Create(parent, wxID_ANY, _TITLE_("symbol editor"), wxDefaultPosition, wxSize(600,600), wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE);
 	inSelectionEvent = false;
 	
 	// Menu bar

src/gui/update_checker.cpp

@@ -120,11 +120,11 @@ struct HtmlWindowToBrowser : public wxHtmlWindow {
 void show_update_dialog(Window* parent) {
 	if (!update_available()) return; // we already have the latest version
 	// Show update dialog
-	wxDialog* dlg = new wxDialog(parent, wxID_ANY, _("Updates availible"), wxDefaultPosition);
+	wxDialog* dlg = new wxDialog(parent, wxID_ANY, _TITLE_("updates availible"), wxDefaultPosition);
 	// controls
 	wxHtmlWindow* html = new HtmlWindowToBrowser(dlg, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO | wxSUNKEN_BORDER);
 	html->SetPage(update_version_data->description);
-	wxButton* close = new wxButton(dlg, wxID_OK, _("&Close"));
+	wxButton* close = new wxButton(dlg, wxID_OK, _BUTTON_("close"));
 	close->SetDefault();
 	// layout
 	wxSizer* s = new wxBoxSizer(wxVERTICAL);

src/gui/value/text.hpp

@@ -10,6 +10,7 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
+#include <util/tagged_string.hpp> // for Movement
 #include <gui/value/editor.hpp>
 #include <render/value/text.hpp>
 
@@ -17,11 +18,9 @@ class TextValueEditorScrollBar;
 
 // ----------------------------------------------------------------------------- : TextValueEditor
 
-/// Directions of cursor movement
-enum Movement
-{	MOVE_LEFT	///< Always move the cursor to the left
-,	MOVE_MID	///< Move in whichever direction the distance to move is shorter (TODO: define shorter)
-,	MOVE_RIGHT	///< Always move the cursor to the right
+enum IndexType
+{	TYPE_CURSOR	///< Positions are cursor positions
+,	TYPE_INDEX	///< Positions are character indices
 };
 
 /// An editor 'control' for editing TextValues
@@ -83,16 +82,19 @@ class TextValueEditor : public TextValueViewer, public ValueEditor {
 	
 	// --------------------------------------------------- : Data
   private:
-	size_t selection_start, selection_end; ///< Cursor position/selection (if any)
+	size_t selection_start,   selection_end;   ///< Cursor position/selection (if any), cursor positions
+	size_t selection_start_i, selection_end_i; ///< Cursor position/selection, character indices
 	TextValueEditorScrollBar* scrollbar;   ///< Scrollbar for multiline fields in native look
 	bool select_words;                     ///< Select whole words when dragging the mouse?
 	
 	// --------------------------------------------------- : Selection / movement
 	
-	/// Move the selection to a new location, clears the previously drawn selection
-	void moveSelection(size_t new_end, bool also_move_start=true, Movement dir = MOVE_MID);
-	/// Move the selection to a new location, but does not redraw
-	void moveSelectionNoRedraw(size_t new_end, bool also_move_start=true, Movement dir = MOVE_MID);
+	/// Move the selection to a new location, clears the previously drawn selection.
+	/** t specifies what kind of position new_end is */
+	void moveSelection(IndexType t, size_t new_end, bool also_move_start=true, Movement dir = MOVE_MID);
+	/// Move the selection to a new location, but does not redraw.
+	/** t specifies what kind of position new_end is */
+	void moveSelectionNoRedraw(IndexType t, size_t new_end, bool also_move_start=true, Movement dir = MOVE_MID);
 	
 	/// Replace the current selection with 'replacement', name the action
 	void replaceSelection(const String& replacement, const String& name);
@@ -104,7 +106,7 @@ class TextValueEditor : public TextValueViewer, public ValueEditor {
 	 *
 	 *  When correcting the selection, move in the given direction
 	 */
-	void fixSelection(Movement dir = MOVE_MID);
+	void fixSelection(IndexType t = TYPE_CURSOR, Movement dir = MOVE_MID);
 	
 	/// Return a position resulting from moving pos outside the range [start...end), in the direction dir
 	static size_t move(size_t pos, size_t start, size_t end, Movement dir);
@@ -113,11 +115,13 @@ class TextValueEditor : public TextValueViewer, public ValueEditor {
 	void showCaret();
 	
 	/// Position of previous visible & selectable character
+	/** Uses cursor positions */
 	size_t prevCharBoundry(size_t pos) const;
 	size_t nextCharBoundry(size_t pos) const;
 	/// Front of previous word, used witch Ctrl+Left/right
-	size_t prevWordBoundry(size_t pos) const;
-	size_t nextWordBoundry(size_t pos) const;
+	/** Uses character indices */
+	size_t prevWordBoundry(size_t pos_i) const;
+	size_t nextWordBoundry(size_t pos_i) const;
 	
 	// --------------------------------------------------- : Scrolling
 	

src/gui/welcome_window.cpp

@@ -64,7 +64,7 @@ void WelcomeWindow::draw(DC& dc) {
 }
 
 void WelcomeWindow::onOpenSet(wxCommandEvent&) {
-	wxFileDialog dlg(this, _("Open a set"), wxEmptyString, wxEmptyString, import_formats(), wxOPEN);
+	wxFileDialog dlg(this, _TITLE_("open set"), wxEmptyString, wxEmptyString, import_formats(), wxOPEN);
 	if (dlg.ShowModal() == wxID_OK) {
 		close(import_set(dlg.GetPath()));
 	}

src/render/text/element.hpp

@@ -130,7 +130,7 @@ class FontTextElement : public SimpleTextElement {
 		: SimpleTextElement(text, start, end)
 		, font(font)
 	{}
-
+	
 	virtual void draw       (RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const;
 	virtual void getCharInfo(RotatedDC& dc, double scale, vector<CharInfo>& out) const;
 	virtual double minScale() const;
@@ -146,7 +146,7 @@ class SymbolTextElement : public SimpleTextElement {
 		: SimpleTextElement(text, start, end)
 		, font(font), ctx(*ctx)
 	{}
-
+	
 	virtual void draw       (RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const;
 	virtual void getCharInfo(RotatedDC& dc, double scale, vector<CharInfo>& out) const;
 	virtual double minScale() const;
@@ -162,9 +162,22 @@ class CompoundTextElement : public TextElement {
   public:
 	CompoundTextElement(const String& text, size_t start ,size_t end) : TextElement(text, start, end) {}
 	
+	virtual void draw       (RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const;
+	virtual void getCharInfo(RotatedDC& dc, double scale, vector<CharInfo>& out) const;
+	virtual double minScale() const;
+	
 	TextElements elements; ///< the elements
 };
 
+/// A TextElement drawn using a grey background
+class AtomTextElement : public CompoundTextElement {
+  public:
+	AtomTextElement(const String& text, size_t start ,size_t end) : CompoundTextElement(text, start, end) {}
+	
+	virtual void draw(RotatedDC& dc, double scale, const RealRect& rect, const double* xs, DrawWhat what, size_t start, size_t end) const;
+};
+
+
 // ----------------------------------------------------------------------------- : Other text elements
 
 /// A text element that displays a horizontal separator line

src/render/text/viewer.hpp

@@ -81,7 +81,7 @@ class TextViewer {
 	/// Is the character at the given index visible?
 	bool isVisible(size_t index) const;
 	/// Find the first character index that is at/before/after the given index, and which has a nonzero width
-	/** More precisely: it returns a position so that no character after it has zero width
+	/** More precisely: it returns a position so that the character after it in the direction delta has nonzero width
 	 */
 	size_t firstVisibleChar(size_t index, int delta) const;
 	

src/util/tagged_string.cpp

@@ -159,6 +159,80 @@ String anti_tag(const String& tag) {
 	else                                          return _("</") + tag           + _(">");
 }
 
+// ----------------------------------------------------------------------------- : Cursor position
+
+size_t index_to_cursor(const String& str, size_t index, Movement dir) {
+	size_t cursor = 0;
+	size_t start = 0, end = 0;
+	index = min(index, str.size());
+	// find the range [start...end) with the same cursor value, that contains index
+	// after the loop, cursor corresponds to index end
+	for (size_t i = 0 ; i < str.size() ; ) {
+		Char c = str.GetChar(i);
+		if (c == _('<')) {
+			// a tag
+			if (is_substr(str, i, _("<atom")) || is_substr(str, i, _("<sep"))) {
+				// skip tag contents, tag counts as a single 'character'
+				i = skip_tag(str, match_close_tag(str, i));
+				cursor++;
+				start = end;
+				end   = i;
+				if (end > index) break;
+			} else {
+				i = skip_tag(str, i);
+				end = i;
+			}
+		} else {
+			cursor++;
+			i++;
+			start = end;
+			end   = i;
+			if (end > index) break;
+		}
+	}
+	if (cursor == 0)       return 0;
+	if (i == str.size())   return cursor;
+	if (dir == MOVE_LEFT)  return cursor - 1;
+	if (dir == MOVE_RIGHT) return cursor - (start == index);
+	// which is nearer? start or end?
+	return cursor - ((int)(index - start) <= (int)(end - index));
+}
+
+void cursor_to_index_range(const String& str, size_t cursor, size_t& start, size_t& end) {
+	start = end = 0;
+	size_t cur = 0;
+	size_t i = 0;
+	while (cur <= cursor && i < str.size()) {
+		Char c = str.GetChar(i);
+		if (c == _('<')) {
+			// a tag
+			if (is_substr(str, i, _("<atom")) || is_substr(str, i, _("<sep"))) {
+				// skip tag contents, tag counts as a single 'character'
+				i = skip_tag(str, match_close_tag(str, i));
+				cur++;
+				if (cur == cursor) start = i;
+			} else {
+				i = skip_tag(str, i);
+			}
+		} else {
+			cur++;
+			i++;
+			if (cur == cursor) start = i;
+		}
+	}
+	end = min(i, str.size());
+	if (cur < cursor) start = end = str.size();
+}
+
+size_t cursor_to_index(const String& str, size_t cursor) {
+	size_t start, end;
+	cursor_to_index_range(str, cursor, start, end);
+	// TODO: If at i there is <tag></tag> return a position inside the tags
+	// This allows formating to be enabled without a selection
+	return start;
+}
+
+
 // ----------------------------------------------------------------------------- : Global operations
 
 String remove_tag(const String& str, const String& tag) {

src/util/tagged_string.hpp

@@ -80,6 +80,29 @@ String close_tag(const String& tag);
 /// The matching close tag for an open tag and vice versa
 String anti_tag(const String& tag);
 
+// ----------------------------------------------------------------------------- : Cursor position
+
+/// Directions of cursor movement
+enum Movement
+{	MOVE_LEFT  = -1	///< Always move the cursor to the left
+,	MOVE_MID   =  0	///< Move in whichever direction the distance to move is shorter (TODO: define shorter)
+,	MOVE_RIGHT =  1	///< Always move the cursor to the right
+};
+
+/// Find the cursor position corresponding to the given character index.
+/** A cursor position always corresponds to a valid place to type text.
+ *  The cursor position is rounded to the direction dir.
+ */
+size_t index_to_cursor(const String& str, size_t index, Movement dir = MOVE_MID);
+
+/// Find the range of character indeces corresponding to the given cursor position
+/** The output parameters will correspond to the range [start...end) which are all valid character indices.
+ */
+void cursor_to_index_range(const String& str, size_t cursor, size_t& begin, size_t& end);
+
+/// Find the character index corresponding to the given cursor position
+size_t cursor_to_index(const String& str, size_t cursor);
+
 // ----------------------------------------------------------------------------- : Global operations
 
 /// Remove all instances of a tag and its close tag, but keep the contents.