Re-Implemented scrolling with the cursor using view module

diff --git a/Makefile b/Makefile
index 34d6c54b0e90501a727c11b3de68730e586ab6d1..31d3567c307cac2e0e387e7ed8e138d28e8c0da4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ TEST_OBJS =     \
 
 include config.mk
 
-all: xedit xpick test
+all: xedit
 
 clean:
        $(RM) *.o lib*/*.o test/*.o *.a xpick xedit unittests

diff --git a/inc/edit.h b/inc/edit.h
index 21f93739fd39168494a89ccc46a0be0163f495fa..14ea1a070c40b05e343e53651ff3bb120615d23a 100644 (file)
--- a/inc/edit.h
+++ b/inc/edit.h
@@ -154,6 +154,7 @@ void view_update(View* view, size_t* csrx, size_t* csry);
 Row* view_getrow(View* view, size_t row);
 void view_byrune(View* view, int move);
 void view_byline(View* view, int move);
+void view_setcursor(View* view, size_t row, size_t col);
 
 //size_t view_getoff(View* view, size_t pos, size_t row, size_t col);
 //void view_getsize(View* view, size_t* nrows, size_t* ncols);

diff --git a/libedit/view.c b/libedit/view.c
index 570ced15c42c82091017747b4648f6f7f6451a61..9ddd0b79a32b99295b8ea46e42f798abd96de706 100644 (file)
--- a/libedit/view.c
+++ b/libedit/view.c
@@ -63,6 +63,57 @@ static void reflow(View* view) {
         pos = fill_row(view, y, pos);
 }
 
+static unsigned prev_screen_line(View* view, unsigned bol, unsigned off) {
+    unsigned pos = bol;
+    while (true) {
+        unsigned x;
+        for (x = 0; x < view->ncols && (pos + x) < off; x++)
+            x += runewidth(x, buf_get(&(view->buffer), pos+x));
+        if ((pos + x) >= off) break;
+        pos += x;
+    }
+    return pos;
+}
+
+static void scroll_up(View* view, unsigned csr, unsigned first) {
+    while (csr < first) {
+        unsigned bol    = buf_bol(&(view->buffer), first);
+        unsigned prevln = (first == bol ? buf_byline(&(view->buffer), bol, -1) : bol);
+        prevln = prev_screen_line(view, prevln, first);
+        /* delete the last row and shift the others */
+        free(view->rows[view->nrows - 1]);
+        memmove(&view->rows[1], &view->rows[0], sizeof(Row*) * (view->nrows-1));
+        view->rows[0] = calloc(1, sizeof(Row) + (view->ncols * sizeof(UGlyph)));
+        view->rows[0]->off = prevln;
+        /* fill in row content */
+        fill_row(view, 0, view->rows[0]->off);
+        first = view->rows[0]->off;
+    }
+}
+
+static void scroll_dn(View* view, unsigned csr, unsigned last) {
+    while (csr > last) {
+        /* delete the first row and shift the others */
+        free(view->rows[0]);
+        memmove(&view->rows[0], &view->rows[1], sizeof(Row*) * (view->nrows-1));
+        view->rows[view->nrows-1] = calloc(1, sizeof(Row) + (view->ncols * sizeof(UGlyph)));
+        view->rows[view->nrows-1]->off = (view->rows[view->nrows-2]->off + view->rows[view->nrows-2]->rlen);
+        /* fill in row content */
+        fill_row(view, view->nrows-1, view->rows[view->nrows-1]->off);
+        last = view->rows[view->nrows-1]->off + view->rows[view->nrows-1]->rlen - 1;
+    }
+}
+
+static void sync_view(View* view, size_t csr) {
+    unsigned first = view->rows[0]->off;
+    unsigned last  = view->rows[view->nrows-1]->off + view->rows[view->nrows-1]->rlen - 1;
+    if (csr < first) {
+        scroll_up(view, csr, first);
+    } else if (csr > last) {
+        scroll_dn(view, csr, last);
+    }
+}
+
 void view_init(View* view, char* file) {
     memset(view, 0, sizeof(View));
     buf_init(&(view->buffer));
@@ -90,9 +141,9 @@ void view_resize(View* view, size_t nrows, size_t ncols) {
 }
 
 void view_update(View* view, size_t* csrx, size_t* csry) {
-    size_t csr = view->selection.beg;
+    size_t csr = view->selection.end;
     /* scroll the view and reflow the screen lines */
-    //sync_view(buf, csr);
+    sync_view(view, csr);
     reflow(view);
     /* find the cursor on the new screen */
     for (size_t y = 0; y < view->nrows; y++) {
@@ -130,31 +181,32 @@ void view_byline(View* view, int move) {
     view->selection = sel;
 }
 
+void view_setcursor(View* view, size_t x, size_t y) {
+    //Row* scrrow = screen_getrow(row);
+    //if (!scrrow) return pos;
+    //pos = scrrow->off;
+    //if (col > scrrow->len) {
+    //    pos = (scrrow->off + scrrow->rlen - 1);
+    //} else {
+    //    /* multi column runes are followed by \0 slots so if we clicked on a \0
+    //       slot, slide backwards to the real rune. */
+    //    for (; !scrrow->cols[col].rune && col > 0; col--);
+    //    /* now lets count the number of runes up to the one we clicked on */
+    //    for (unsigned i = 0; i < col; i++)
+    //        if (scrrow->cols[i].rune)
+    //            pos++;
+    //}
+    //if (pos >= buf_end(buf))
+    //    return buf_end(buf)-1;
+    //return pos;
+}
+
+
 
-//void view_update(View* view, size_t crsr, size_t* csrx, size_t* csry) {
-//
-//}
-//
 //size_t view_getoff(View* view, size_t pos, size_t row, size_t col) {
 //    return 0;
 //}
 //
-//void view_setsize(View* view, size_t nrows, size_t ncols) {
-//
-//}
-//
-//void view_getsize(View* view, size_t* nrows, size_t* ncols) {
-//
-//}
-//
-//void view_clearrow(View* view, size_t row) {
-//
-//}
-//
-//size_t view_setcell(View* view, size_t row, size_t col, uint32_t attr, Rune r) {
-//    return 0;
-//}
-//
 //UGlyph* view_getglyph(View* view, size_t row, size_t col, size_t* scrwidth) {
 //    return NULL;
 //}

diff --git a/libx/x11.c b/libx/x11.c
index 3739f999a245914c00afc35c3372a8d5b4effd77..87babf4cc280f8cfe9f5cb9ede593364e5a31c24 100644 (file)
--- a/libx/x11.c
+++ b/libx/x11.c
@@ -1,8 +1,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xft/Xft.h>
-#include <x11.h>
 #include <stdc.h>
+#include <x11.h>
 #include <utf.h>
 #include <locale.h>