removed old undo/redo code

diff --git a/inc/edit.h b/inc/edit.h
index 8191bd1f510e98bb3c8072ea5f354114db62f5b8..9c9c5e3ef6c94893ea0583b87b99bb803bb6ce59 100644 (file)
--- a/inc/edit.h
+++ b/inc/edit.h
@@ -55,11 +55,19 @@ void buf_reload(Buf* buf);
 void buf_save(Buf* buf);
 size_t buf_end(Buf* buf);
 
-void buf_chomp(Buf* buf);
+int buf_getrat(Buf* buf, size_t off);
+void buf_putc(Buf* buf, int c, Sel* sel);
+void buf_puts(Buf* buf, char* s, Sel* sel);
+int buf_getc(Buf* buf, Sel* sel);
+char* buf_gets(Buf* buf, Sel* sel);
+void buf_del(Buf* buf, Sel* sel);
+
 void buf_undo(Buf* buf, Sel* sel);
 void buf_redo(Buf* buf, Sel* sel);
 void buf_loglock(Buf* buf);
 void buf_logclear(Buf* buf);
+void buf_lastins(Buf* buf, Sel* p_sel);
+
 bool buf_iseol(Buf* buf, size_t pos);
 size_t buf_bol(Buf* buf, size_t pos);
 size_t buf_eol(Buf* buf, size_t pos);
@@ -73,19 +81,12 @@ size_t buf_byrune(Buf* buf, size_t pos, int count);
 size_t buf_byword(Buf* buf, size_t pos, int count);
 size_t buf_byline(Buf* buf, size_t pos, int count);
 void buf_findstr(Buf* buf, int dir, char* str, size_t* beg, size_t* end);
-void buf_lastins(Buf* buf, size_t* beg, size_t* end);
+
 size_t buf_setln(Buf* buf, size_t line);
 size_t buf_getln(Buf* buf, size_t off);
 size_t buf_getcol(Buf* buf, size_t pos);
 size_t buf_setcol(Buf* buf, size_t pos, size_t col);
 
-int buf_getrat(Buf* buf, size_t off);
-void buf_putc(Buf* buf, int c, Sel* sel);
-void buf_puts(Buf* buf, char* s, Sel* sel);
-int buf_getc(Buf* buf, Sel* sel);
-char* buf_gets(Buf* buf, Sel* sel);
-void buf_del(Buf* buf, Sel* sel);
-
 /* Screen management functions
  *****************************************************************************/
 typedef struct {

diff --git a/lib/buf.c b/lib/buf.c
index a6ce3dc1cb7eae837e810cfc4e05336939bdd00c..4710f4fc8e5e633676e5866296bafc5176bfa149 100644 (file)
--- a/lib/buf.c
+++ b/lib/buf.c
@@ -234,23 +234,12 @@ void buf_del(Buf* buf, Sel* p_sel) {
 /******************************************************************************/
 
 void buf_undo(Buf* buf, Sel* sel) {
-    if (!buf->undo) return;
-    uint transid = buf->undo->transid;
-    while (buf->undo && (buf->undo->transid == transid))
-        swaplog(buf, &(buf->undo), &(buf->redo), sel);
 }
 
 void buf_redo(Buf* buf, Sel* sel) {
-    if (!buf->redo) return;
-    uint transid = buf->redo->transid;
-    while (buf->redo && (buf->redo->transid == transid))
-        swaplog(buf, &(buf->redo), &(buf->undo), sel);
 }
 
 void buf_loglock(Buf* buf) {
-    Log* log = buf->undo;
-    if (log && log->transid == buf->transid)
-        buf->transid++;
 }
 
 void buf_logclear(Buf* buf) {
@@ -258,6 +247,12 @@ void buf_logclear(Buf* buf) {
     log_clear(&(buf->undo));
 }
 
+void buf_lastins(Buf* buf, Sel* p_sel) {
+    Sel sel = getsel(buf, p_sel);
+    // Set selection to last inserted text
+    setsel(buf, p_sel, &sel);
+}
+
 static void log_clear(Log** list) {
     while (*list) {
         Log* deadite = *list;
@@ -268,97 +263,6 @@ static void log_clear(Log** list) {
     }
 }
 
-static void log_insert(Buf* buf, Log** list, size_t beg, size_t end) {
-    Log* log = *list;
-    bool locked = (!log || log->transid != buf->transid);
-    if (locked || !log->insert || (end != log->data.ins.end+1)) {
-        buf_loglock(buf);
-        Log* newlog  = (Log*)calloc(sizeof(Log), 1);
-        newlog->transid = buf->transid;
-        newlog->insert = true;
-        newlog->data.ins.beg = beg;
-        newlog->data.ins.end = end;
-        newlog->next = *list;
-        *list = newlog;
-    } else if (beg < log->data.ins.beg) {
-        log->data.ins.beg--;
-    } else {
-        log->data.ins.end++;
-    }
-}
-
-static void log_delete(Buf* buf, Log** list, size_t off, char* r, size_t len) {
-    Log* log = *list;
-    bool locked = (!log || log->transid != buf->transid);
-    if (locked || log->insert || ((off != log->data.del.off) && (off+1 != log->data.del.off))) {
-        buf_loglock(buf);
-        Log* newlog = (Log*)calloc(sizeof(Log), 1);
-        newlog->transid = buf->transid;
-        newlog->insert = false;
-        newlog->data.del.off = off;
-        newlog->data.del.len = len;
-        newlog->data.del.runes = (char*)malloc(len);
-        for (size_t i = 0; i < len; i++)
-            newlog->data.del.runes[i] = r[i];
-        newlog->next = *list;
-        *list = newlog;
-    } else if (off == log->data.del.off) {
-        log->data.del.len++;
-        log->data.del.runes = (char*)realloc(log->data.del.runes, log->data.del.len);
-        log->data.del.runes[log->data.del.len-1] = *r;
-    } else {
-        size_t bytes = sizeof(Rune) * log->data.del.len;
-        log->data.del.len++;
-        log->data.del.off--;
-        log->data.del.runes = (char*)realloc(log->data.del.runes, bytes);
-        memmove(log->data.del.runes+1, log->data.del.runes, bytes);
-        log->data.del.runes[0] = *r;
-    }
-}
-
-static void swaplog(Buf* buf, Log** from, Log** to, Sel* sel) {
-    /* pop the last action */
-    Log* log = *from;
-    if (!log) return;
-    *from = log->next;
-    /* invert the log type and move it to the destination */
-    Log* newlog = (Log*)calloc(sizeof(Log), 1);
-    newlog->transid = log->transid;
-    if (log->insert) {
-        sel->beg = sel->end = log->data.ins.beg;
-        newlog->insert = false;
-        size_t n = (log->data.ins.end - log->data.ins.beg);
-        newlog->data.del.off   = log->data.ins.beg;
-        newlog->data.del.len   = n;
-        newlog->data.del.runes = (char*)malloc(n);
-        for (size_t i = 0; i < n; i++) {
-            newlog->data.del.runes[i] = buf_getrat(buf, log->data.ins.beg);
-            delete(buf, log->data.ins.beg);
-        }
-    } else {
-        newlog->insert = true;
-        sel->beg = newlog->data.ins.beg = log->data.del.off;
-        newlog->data.ins.end = newlog->data.ins.beg;
-        for (size_t i = log->data.del.len; i > 0; i--) {
-            newlog->data.ins.end += insert(buf, newlog->data.ins.beg, log->data.del.runes[i-1]);
-        }
-        sel->end = newlog->data.ins.end;
-    }
-    newlog->next = *to;
-    *to = newlog;
-}
-
-static void delete(Buf* buf, size_t off) {
-    syncgap(buf, off);
-    buf->gapend++;
-}
-
-static size_t insert(Buf* buf, size_t off, Rune rune) {
-    syncgap(buf, off);
-    *(buf->gapstart++) = rune;
-    return 1;
-}
-
 /******************************************************************************/
 
 bool buf_iseol(Buf* buf, size_t off) {
@@ -506,29 +410,6 @@ void buf_findstr(Buf* buf, int dir, char* str, size_t* beg, size_t* end) {
     free(runes);
 }
 
-void buf_lastins(Buf* buf, size_t* beg, size_t* end) {
-    Log* log = buf->undo;
-    size_t opbeg = *end, opend = *end;
-    if (log && log->insert)
-        opbeg = log->data.ins.end, opend = log->data.ins.end;
-
-    size_t delsize = 0;
-    for (; log; log = log->next) {
-        if (log->insert) {
-            size_t ibeg = log->data.ins.beg,
-                     iend = log->data.ins.end - delsize;
-            if (iend < ibeg || ibeg > opbeg || iend < opbeg) break;
-            if (ibeg < opbeg && iend > opend) break;
-            opbeg = ibeg, delsize = 0;
-        } else {
-            /* bail if the delete doesnt overlap */
-            if(log->data.del.off != opbeg) break;
-            delsize = log->data.del.len;
-        }
-    }
-    *beg = opbeg, *end = opend;
-}
-
 size_t buf_setln(Buf* buf, size_t line) {
     size_t curr = 0, end = buf_end(buf);
     while (line > 1 && curr < end) {
@@ -550,18 +431,15 @@ size_t buf_getln(Buf* buf, size_t off) {
 }
 
 size_t buf_getcol(Buf* buf, size_t pos) {
-    size_t curr = buf_bol(buf, pos);
-    size_t col = 0;
+    size_t col = 0, curr = buf_bol(buf, pos);
     for (; curr < pos; curr = buf_byrune(buf, curr, 1))
         col += runewidth(col, buf_getrat(buf, curr));
     return col;
 }
 
 size_t buf_setcol(Buf* buf, size_t pos, size_t col) {
-    size_t bol  = buf_bol(buf, pos);
-    size_t curr = bol;
-    size_t len  = 0;
-    size_t i    = 0;
+    size_t bol = buf_bol(buf, pos);
+    size_t curr = bol, len = 0, i = 0;
     /* determine the length of the line in columns */
     for (; !buf_iseol(buf, curr); curr++)
         len += runewidth(len, buf_getrat(buf, curr));

diff --git a/lib/view.c b/lib/view.c
index 2555e10b25c620b5f70606976b22b840f7fdb917..b67e0b4fa8ca4595e0aceffded910b019f4aeec7 100644 (file)
--- a/lib/view.c
+++ b/lib/view.c
@@ -123,7 +123,6 @@ void view_setcursor(View* view, size_t row, size_t col, bool extsel) {
 }
 
 void view_selword(View* view, size_t row, size_t col) {
-    buf_loglock(&(view->buffer));
     if (row != SIZE_MAX && col != SIZE_MAX)
         view_setcursor(view, row, col, false);
     Sel sel = view->selection;
@@ -133,18 +132,13 @@ void view_selword(View* view, size_t row, size_t col) {
 }
 
 void view_selprev(View* view) {
-    if (!num_selected(view->selection)) {
-        buf_loglock(&(view->buffer));
-        Sel sel = view->selection;
-        buf_lastins(&(view->buffer), &sel.beg, &sel.end);
-        view->selection = sel;
-    } else {
+    if (!num_selected(view->selection))
+        buf_lastins(&(view->buffer), &(view->selection));
+    else
         view->selection.beg = view->selection.end;
-    }
 }
 
 void view_select(View* view, size_t row, size_t col) {
-    buf_loglock(&(view->buffer));
     view_setcursor(view, row, col, false);
     Sel sel = view->selection;
     select_context(view, risword, &sel);
@@ -247,14 +241,12 @@ void view_redo(View* view) {
 void view_putstr(View* view, char* str) {
     selswap(&(view->selection));
     unsigned beg = view->selection.beg;
-    buf_loglock(&(view->buffer));
     while (*str) {
         Rune rune = 0;
         size_t length = 0;
         while (!utf8decode(&rune, &length, *str++));
         view_insert(view, false, rune);
     }
-    buf_loglock(&(view->buffer));
     view->selection.beg = beg;
 }