Offset history

libr/cons/dietline.c

@@ -313,6 +313,19 @@ static int r_line_hist_up() {
 	if (!I.history.data) {
 		inithist ();
 	}
+    if (I.offset_prompt) {
+        RCore *core = I.user;
+        RIOUndo *undo = &core->io->undo;
+        char line[R_LINE_BUFSIZE - 1];
+        if (I.offset_index <= -undo->undos) {
+            return false;
+        }
+        I.offset_index--;
+        sprintf(line, "0x%"PFMT64x, undo->seek[undo->idx + I.offset_index]);
+        strncpy(I.buffer.data, line, R_LINE_BUFSIZE - 1);
+		I.buffer.index = I.buffer.length = strlen (I.buffer.data);
+		return true;
+	}
 	if (I.history.index > 0) {
 		strncpy (I.buffer.data, I.history.data[--I.history.index], R_LINE_BUFSIZE - 1);
 		I.buffer.index = I.buffer.length = strlen (I.buffer.data);
@@ -325,6 +338,24 @@ static int r_line_hist_down() {
 	if (I.hist_down) {
 		return I.hist_down (I.user);
 	}
+    if (I.offset_prompt) {
+        RCore *core = I.user;
+        RIOUndo *undo = &core->io->undo;
+        if (I.offset_index >= undo->redos) {
+            return false;
+        }
+        I.offset_index++;
+        if (I.offset_index == undo->redos) {
+            I.buffer.data[0] = '\0';
+            I.buffer.index = I.buffer.length = 0;
+            return false;
+        }
+        char line[R_LINE_BUFSIZE - 1];
+        sprintf(line, "0x%"PFMT64x, undo->seek[undo->idx + I.offset_index]);
+        strncpy(I.buffer.data, line, R_LINE_BUFSIZE - 1);
+        I.buffer.index = I.buffer.length = strlen (I.buffer.data);
+        return true;
+    }
 	I.buffer.index = 0;
 	if (!I.history.data) {
 		inithist ();

libr/core/core.c

@@ -1230,9 +1230,11 @@ static int autocomplete(RLine *line) {
 		|| !strncmp (line->buffer.data, "agfl ", 5)
 		|| !strncmp (line->buffer.data, "aecu ", 5)
 		|| !strncmp (line->buffer.data, "aesu ", 5)
-		|| !strncmp (line->buffer.data, "aeim ", 5)) {
+		|| !strncmp (line->buffer.data, "aeim ", 5)
+		|| line->offset_prompt) {
 			int n, i = 0;
-			int sdelta = (line->buffer.data[1] == ' ')
+			int sdelta = line->offset_prompt 
+				? 0 : (line->buffer.data[1] == ' ')
 				? 2 : (line->buffer.data[2] == ' ')
 				? 3 : (line->buffer.data[3] == ' ')
 				? 4 : 5;

libr/core/visual.c

@@ -845,13 +845,16 @@ static void reset_print_cur(RPrint *p) {
 static void visual_offset(RCore *core) {
 	char buf[256];
 	r_line_set_prompt ("[offset]> ");
+	core->cons->line->offset_prompt = true;
+	core->cons->line->offset_index = 0;
 	strcpy (buf, "s ");
 	if (r_cons_fgets (buf + 2, sizeof (buf) - 3, 0, NULL) > 0) {
 		if (buf[2] == '.') {
 			buf[1] = '.';
 		}
 		r_core_cmd0 (core, buf);
 		reset_print_cur (core->print);
+		core->cons->line->offset_prompt = false;
 	}
 }
 

libr/include/r_cons.h

@@ -796,6 +796,8 @@ struct r_line_t {
 	int (*hist_down)(void *user);
 	char *contents;
 	bool zerosep;
+	bool offset_prompt;
+	int offset_index;
 }; /* RLine */
 
 #ifdef R_API