Changes in / [e5d4294:8c73012] in mainline

Location:

uspace/app/edit

Files:

• edit.c (modified) (18 diffs)
• sheet.c (modified) (6 diffs)

uspace/app/edit/edit.c

@@ -72 +72 @@
         /** Current position of the caret */
         tag_t caret_pos;
-
-        /** 
-         * Ideal column where the caret should try to get. This is used
-         * for maintaining the same column during vertical movement.
-         */
-        int ideal_column;
 } pane_t;
 
@@ -136 +130 @@
 
         pane.rows = scr_rows - 1;
-        pane.columns = scr_columns;
         pane.sh_row = 1;
-        pane.sh_column = 1;
 
         /* Start with an empty sheet. */
@@ -147 +139 @@
         sheet_get_cell_pt(&doc.sh, &coord, dir_before, &pt);
         sheet_place_tag(&doc.sh, &pt, &pane.caret_pos);
-        pane.ideal_column = coord.column;
 
         if (argc == 2) {
@@ -215 +206 @@
         case KC_ENTER:
                 insert_char('\n');
+                pane.rflags |= REDRAW_TEXT;
                 caret_update();
                 break;
@@ -243 +235 @@
         case KC_BACKSPACE:
                 delete_char_before();
+                pane.rflags |= REDRAW_TEXT;
                 caret_update();
                 break;
         case KC_DELETE:
                 delete_char_after();
+                pane.rflags |= REDRAW_TEXT;
                 caret_update();
                 break;
@@ -252 +246 @@
                 if (ev->c >= 32 || ev->c == '\t') {
                         insert_char(ev->c);
+                        pane.rflags |= REDRAW_ROW;
                         caret_update();
                 }
@@ -407 +402 @@
 static void pane_row_range_display(int r0, int r1)
 {
+        int width;
         int i, j, fill;
         spt_t rb, re, dep;
@@ -419 +415 @@
         console_goto(con, 0, 0);
         for (i = r0; i < r1; ++i) {
-                /* Starting point for row display */
-                rbc.row = pane.sh_row + i;
-                rbc.column = pane.sh_column;
+                sheet_get_row_width(&doc.sh, pane.sh_row + i, &width);
+
+                /* Determine row starting point. */
+                rbc.row = pane.sh_row + i; rbc.column = 1;
                 sheet_get_cell_pt(&doc.sh, &rbc, dir_before, &rb);
 
-                /* Ending point for row display */
-                rec.row = pane.sh_row + i;
-                rec.column = pane.sh_column + pane.columns;
+                /* Determine row ending point. */
+                rec.row = pane.sh_row + i; rec.column = width + 1;
                 sheet_get_cell_pt(&doc.sh, &rec, dir_before, &re);
 
@@ -498 +494 @@
 
         spt_get_coord(&caret_pt, &coord);
-        console_goto(con, coord.column - pane.sh_column,
-            coord.row - pane.sh_row);
+        console_goto(con, coord.column - 1, coord.row - pane.sh_row);
 }
 
@@ -516 +511 @@
 
         (void) sheet_insert(&doc.sh, &pt, dir_before, cbuf);
-
-        pane.rflags |= REDRAW_ROW;
-        if (c == '\n')
-                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -535 +526 @@
 
         (void) sheet_delete(&doc.sh, &sp, &ep);
-
-        pane.rflags |= REDRAW_ROW;
-        if (coord.column < 1)
-                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -545 +532 @@
 {
         spt_t sp, ep;
-        coord_t sc, ec;
+        coord_t coord;
 
         tag_get_pt(&pane.caret_pos, &sp);
-        spt_get_coord(&sp, &sc);
-
-        sheet_get_cell_pt(&doc.sh, &sc, dir_after, &ep);
-        spt_get_coord(&ep, &ec);
+        spt_get_coord(&sp, &coord);
+
+        sheet_get_cell_pt(&doc.sh, &coord, dir_after, &ep);
 
         (void) sheet_delete(&doc.sh, &sp, &ep);
-
-        pane.rflags |= REDRAW_ROW;
-        if (ec.row != sc.row)
-                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -573 +555 @@
         spt_get_coord(&pt, &coord);
 
-        /* Scroll pane vertically. */
+        /* Scroll pane as necessary. */
 
         if (coord.row < pane.sh_row) {
@@ -579 +561 @@
                 pane.rflags |= REDRAW_TEXT;
         }
-
         if (coord.row > pane.sh_row + pane.rows - 1) {
                 pane.sh_row = coord.row - pane.rows + 1;
@@ -585 +566 @@
         }
 
-        /* Scroll pane horizontally. */
-
-        if (coord.column < pane.sh_column) {
-                pane.sh_column = coord.column;
-                pane.rflags |= REDRAW_TEXT;
-        }
-
-        if (coord.column > pane.sh_column + pane.columns - 1) {
-                pane.sh_column = coord.column - pane.columns + 1;
-                pane.rflags |= REDRAW_TEXT;
-        }
-
         pane.rflags |= (REDRAW_CARET | REDRAW_STATUS);
+
 }
 
@@ -612 +582 @@
         coord_t coord;
         int num_rows;
-        bool pure_vertical;
 
         tag_get_pt(&pane.caret_pos, &pt);
@@ -625 +594 @@
                 if (coord.row > num_rows) coord.row = num_rows;
         }
-
-        /* For purely vertical movement try attaining @c ideal_column. */
-        pure_vertical = (dcolumn == 0 && align_dir == dir_before);
-        if (pure_vertical)
-                coord.column = pane.ideal_column;
 
         /*
@@ -639 +603 @@
         sheet_place_tag(&doc.sh, &pt, &pane.caret_pos);
 
-        /* For non-vertical movement set the new value for @c ideal_column. */
-        if (!pure_vertical) {
-                spt_get_coord(&pt, &coord);
-                pane.ideal_column = coord.column;
-        }
-
         caret_update();
 }

uspace/app/edit/sheet.c

@@ -54 +54 @@
 #include <adt/list.h>
 #include <align.h>
-#include <macros.h>
 
 #include "sheet.h"
 
 enum {
-        TAB_WIDTH       = 8,
-
-        /** Initial  of dat buffer in bytes */
-        INITIAL_SIZE    = 32
+        TAB_WIDTH = 8
 };
 
@@ -68 +64 @@
 int sheet_init(sheet_t *sh)
 {
-        sh->dbuf_size = INITIAL_SIZE;
+        sh->dbuf_size = 65536;
         sh->text_size = 0;
 
@@ -99 +95 @@
         link_t *link;
         tag_t *tag;
-        char *newp;
 
         sz = str_size(str);
-        if (sh->text_size + sz > sh->dbuf_size) {
-                /* Enlarge data buffer. */
-                newp = realloc(sh->data, sh->dbuf_size * 2);
-                if (newp == NULL)
-                        return ELIMIT;
-
-                sh->data = newp;
-                sh->dbuf_size = sh->dbuf_size * 2;
-        }
+        if (sh->text_size + sz > sh->dbuf_size)
+                return ELIMIT;
 
         ipp = sh->data + pos->b_off;
 
-        /* Copy data. */
         memmove(ipp + sz, ipp, sh->text_size - pos->b_off);
         memcpy(ipp, str, sz);
         sh->text_size += sz;
 
-        /* Adjust tags. */
+        /* Adjust tags */
 
         link = sh->tags_head.next;
@@ -152 +139 @@
         link_t *link;
         tag_t *tag;
-        char *newp;
-        size_t shrink_size;
 
         spp = sh->data + spos->b_off;
@@ -161 +146 @@
         sh->text_size -= sz;
 
-        /* Adjust tags. */
+        /* Adjust tags */
         link = sh->tags_head.next;
         while (link != &sh->tags_head) {
@@ -173 +158 @@
                 link = link->next;
         }
-
-        /* See if we should free up some memory. */
-        shrink_size = max(sh->dbuf_size / 4, INITIAL_SIZE);
-        if (sh->text_size <= shrink_size && sh->dbuf_size > INITIAL_SIZE) {
-                /* Shrink data buffer. */
-                newp = realloc(sh->data, shrink_size);
-                if (newp == NULL) {
-                        /* Failed to shrink buffer... no matter. */
-                        return EOK;
-                }
-
-                sh->data = newp;
-                sh->dbuf_size = shrink_size;
-        }
-
+        
         return EOK;
 }