Move between multiple search results on the same line

README.md

@@ -213,6 +213,7 @@ Have a look at the provided [settings file](./settings.json) to get a better und
 * 2.3 (planned)
 	* [x] More advanced program help, supports keywords
 	* [x] Version info
+	* [x] Lets move between multiple search results on the same line
 	* [ ] Advanced theming support, load themes from separate files
 	* [ ] Advanced undo/redo, choose which way to redo
 

src/fCommon.h

@@ -71,7 +71,7 @@ typedef unsigned char uchar;
 
 #define FEMTO_UNTITLED_NAME L"untitled"
 
-#define MAX_STATUS 256
+#define MAX_STATUS 512
 
 #define FEMTO_SHIFT_DEL     0xE000
 #define FEMTO_MOVELINE_UP   0xE001

src/fData.c

@@ -24,6 +24,7 @@ bool fData_reset(fData_t * restrict self)
 		.fileIdx     = -1,
 		.searchBuf   = { [0] = L'\0' },
 		.psearchTerm = NULL,
+		.searchOpts  = fsrchFIRST,
 		.bDirBack    = false
 	};
 

src/fData.h

@@ -41,6 +41,7 @@ typedef struct fData
 
 	wchar searchBuf[MAX_STATUS];
 	const wchar * psearchTerm;
+	fSearch_e searchOpts;
 	bool bDirBack;
 
 } fData_t;

src/fLine.c

@@ -392,6 +392,58 @@ usize fLine_find(const fLine_t * restrict node, usize startIdx, const wchar * re
 
 	return UINT32_MAX;
 }
+usize fLine_rfind(const fLine_t * restrict node, usize startIdx, const wchar * restrict string, usize maxString)
+{
+	assert(node      != NULL);
+	assert(string    != NULL);
+	assert(maxString > 0);
+
+	// Clamp startIdx
+	const usize cur2 = node->curx + node->freeSpaceLen;
+	startIdx = ((startIdx >= node->curx) && (startIdx < cur2)) ? cur2 : startIdx;
+
+	for (usize i = startIdx; 1;)
+	{
+		if ((i == (cur2 - 1)) && (node->freeSpaceLen > 0))
+		{
+			i -= node->freeSpaceLen;
+			continue;
+		}
+		else if (node->line[i] == string[0])
+		{
+			const wchar * str = string;
+			usize k = 0;
+			for (usize j = i; (j < node->lineEndx) && (k < maxString);)
+			{
+				if ((j == node->curx) && (node->freeSpaceLen > 0))
+				{
+					j = cur2;
+					continue;
+				}
+				else if ((*str == L'\0') || (node->line[j] != *str))
+				{
+					break;
+				}
+				++str;
+				++k;
+				++j;
+			}
+
+			if ((k == maxString) || (*str == L'\0'))
+			{
+				return i;
+			}
+		}
+		if (i == 0)
+		{
+			break;
+		}
+
+		--i;
+	}
+
+	return UINT32_MAX;
+}
 
 bool fLine_mergeNext(fLine_t * restrict self, fLine_t ** restrict ppcury, u8 * restrict noLen)
 {
@@ -589,7 +641,7 @@ void fLine_updateLineNumbers(fLine_t * restrict startnode, usize startLno, u8 *
 
 bool fLine_updateSyntax(
 	fLine_t * restrict node, fStx_e fs, const WORD * colors,
-	const wchar * restrict searchTerm, const struct fFileHighLight * restrict hl,
+	const wchar * restrict searchTerm, fSearch_e searchOpts, const struct fFileHighLight * restrict hl,
 	usize curLineNum, u8 tabWidth
 )
 {
@@ -661,9 +713,29 @@ bool fLine_updateSyntax(
 			{
 				break;
 			}
-
-			firstidx = first ? idx : firstidx;
-			first = false;
+
+			switch (searchOpts)
+			{
+			case fsrchFIRST:
+				firstidx = first ? idx : firstidx;
+				first = false;
+				break;
+			case fsrchLAST:
+				firstidx = idx;
+				first = false;
+				break;
+			case fsrchPREV:
+				firstidx = (idx < node->curx) ? idx : firstidx;
+				first = false;
+				break;
+			case fsrchNEXT:
+				if (first && (idx > (node->curx + node->freeSpaceLen)))
+				{
+					firstidx = idx;
+					first = false;
+				}
+				break;
+			}
 			// Found
 			node->userValue.bits.b8 = true;
 

src/fLine.h

@@ -38,6 +38,14 @@ typedef struct fLine
 
 } fLine_t;
 
+typedef enum fSearch
+{
+	fsrchFIRST,
+	fsrchLAST,
+	fsrchPREV,
+	fsrchNEXT
+} fSearch_e;
+
 
 /**
  * @brief Initialises already pre-allocated memory of fLine_t structure
@@ -138,7 +146,7 @@ bool fLine_addChar(fLine_t * restrict self, wchar ch, u8 tabWidth);
  */
 bool fLine_checkAt(const fLine_t * restrict node, isize maxdelta, const wchar * restrict string, usize maxString);
 /**
- * @brief Finds the string location on current line
+ * @brief Finds the string location on current line iterating forwards
  * 
  * @param node Pointer to line node
  * @param startIdx Starting index, value is clamped
@@ -147,6 +155,17 @@ bool fLine_checkAt(const fLine_t * restrict node, isize maxdelta, const wchar *
  * @return usize Index location of string, UINT32_MAX on failure
  */
 usize fLine_find(const fLine_t * restrict node, usize startIdx, const wchar * restrict string, usize maxString);
+/**
+ * @brief Finds the string location on current line iterating backwards from the starting point
+ * 
+ * @param node Pointer to line node
+ * @param startIdx Starting index, value is clamped
+ * @param string Matchable string
+ * @param maxString Absolute maximum number of character to check, stops anyway on null-terminator
+ * @return usize Index location of string, UINT32_MAX on failure
+ */
+usize fLine_rfind(const fLine_t * restrict node, usize startIdx, const wchar * restrict string, usize maxString);
+
 
 /**
  * @brief Merges current line node with next line node, adjusts current
@@ -223,6 +242,7 @@ void fLine_updateLineNumbers(fLine_t * restrict startnode, usize startLno, u8 *
  * @param fs Syntax identifier
  * @param colors Syntax token coloring palette
  * @param searchTerm Phrase to be searched, can be NULL
+ * @param searchOpts Search options
  * @param hl Highlighting data
  * @param curLineNum Current active line number
  * @param tabWidth Tab width in characters
@@ -231,7 +251,7 @@ void fLine_updateLineNumbers(fLine_t * restrict startnode, usize startLno, u8 *
  */
 bool fLine_updateSyntax(
 	fLine_t * restrict node, fStx_e fs, const WORD * colors,
-	const wchar * restrict searchTerm, const struct fFileHighLight * restrict hl,
+	const wchar * restrict searchTerm, fSearch_e searchOpts, const struct fFileHighLight * restrict hl,
 	usize curLineNum, u8 tabWidth
 );
 

src/femto.c

@@ -692,9 +692,33 @@ static inline void s_femto_inner_searchTerm(fData_t * restrict peditor, wchar *
 			wcscpy_s(tempstr, MAX_STATUS, L"No lines to be searched");
 			return;
 		}
-		//
-		node = first ? node : ((peditor->bDirBack) ? node->prevNode : node->nextNode);
-		isize deltaLines = first ? 0 : delta;
+
+		// try finding another term on the same line
+		bool foundOnSameLine = false;
+		if (peditor->bDirBack)
+		{
+			// search backwards
+			foundOnSameLine = (node->curx > 0) && (fLine_rfind(node, node->curx - 1, peditor->psearchTerm, wcslen(peditor->psearchTerm)) != UINT32_MAX);
+		}
+		else
+		{
+			// search forwards
+			foundOnSameLine = fLine_find(node, node->curx + node->freeSpaceLen + 1, peditor->psearchTerm, wcslen(peditor->psearchTerm)) != UINT32_MAX;
+		}
+
+
+		// that didn't work, multiple search terms weren't found
+		isize deltaLines = 0;
+		if (!foundOnSameLine)
+		{
+			node = first ? node : ((peditor->bDirBack) ? node->prevNode : node->nextNode);
+			deltaLines = first ? 0 : delta;
+			peditor->searchOpts = (peditor->bDirBack) ? fsrchLAST : fsrchFIRST;
+		}
+		else
+		{
+			peditor->searchOpts = (peditor->bDirBack) ? fsrchPREV : fsrchNEXT;
+		}
 
 		if (first)
 		{
@@ -1568,7 +1592,7 @@ bool femto_updateScrbuf(fData_t * restrict peditor, u32 * restrict curline)
 		{
 			fLine_updateSyntax(
 				node, pfile->syntax, peditor->settings.syntaxColors,
-				peditor->psearchTerm, &pfile->data.hl,
+				peditor->psearchTerm, peditor->searchOpts, &pfile->data.hl,
 				pfile->data.currentNode->lineNumber, peditor->settings.tabWidth
 			);
 
@@ -1708,7 +1732,7 @@ bool femto_updateScrbufLine(fData_t * restrict peditor, fLine_t * restrict node,
 
 	if (!fLine_updateSyntax(
 		node, pfile->syntax, peditor->settings.syntaxColors,
-		peditor->psearchTerm, &pfile->data.hl,
+		peditor->psearchTerm, peditor->searchOpts, &pfile->data.hl,
 		pfile->data.currentNode->lineNumber, peditor->settings.tabWidth
 	))
 	{