Changeset e5d4294 in mainline

Timestamp:

2009-09-16T21:31:46Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

57688fe2

Parents:

8c73012 (diff), 743e17b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge editor improvements from ~jsvoboda/helenos/edit.

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;
 
@@ -130 +136 @@
 
         pane.rows = scr_rows - 1;
+        pane.columns = scr_columns;
         pane.sh_row = 1;
+        pane.sh_column = 1;
 
         /* Start with an empty sheet. */
@@ -139 +147 @@
         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) {
@@ -206 +215 @@
         case KC_ENTER:
                 insert_char('\n');
-                pane.rflags |= REDRAW_TEXT;
                 caret_update();
                 break;
@@ -235 +243 @@
         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;
@@ -246 +252 @@
                 if (ev->c >= 32 || ev->c == '\t') {
                         insert_char(ev->c);
-                        pane.rflags |= REDRAW_ROW;
                         caret_update();
                 }
@@ -402 +407 @@
 static void pane_row_range_display(int r0, int r1)
 {
-        int width;
         int i, j, fill;
         spt_t rb, re, dep;
@@ -415 +419 @@
         console_goto(con, 0, 0);
         for (i = r0; i < r1; ++i) {
-                sheet_get_row_width(&doc.sh, pane.sh_row + i, &width);
-
-                /* Determine row starting point. */
-                rbc.row = pane.sh_row + i; rbc.column = 1;
+                /* Starting point for row display */
+                rbc.row = pane.sh_row + i;
+                rbc.column = pane.sh_column;
                 sheet_get_cell_pt(&doc.sh, &rbc, dir_before, &rb);
 
-                /* Determine row ending point. */
-                rec.row = pane.sh_row + i; rec.column = width + 1;
+                /* Ending point for row display */
+                rec.row = pane.sh_row + i;
+                rec.column = pane.sh_column + pane.columns;
                 sheet_get_cell_pt(&doc.sh, &rec, dir_before, &re);
 
@@ -494 +498 @@
 
         spt_get_coord(&caret_pt, &coord);
-        console_goto(con, coord.column - 1, coord.row - pane.sh_row);
+        console_goto(con, coord.column - pane.sh_column,
+            coord.row - pane.sh_row);
 }
 
@@ -511 +516 @@
 
         (void) sheet_insert(&doc.sh, &pt, dir_before, cbuf);
+
+        pane.rflags |= REDRAW_ROW;
+        if (c == '\n')
+                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -526 +535 @@
 
         (void) sheet_delete(&doc.sh, &sp, &ep);
+
+        pane.rflags |= REDRAW_ROW;
+        if (coord.column < 1)
+                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -532 +545 @@
 {
         spt_t sp, ep;
-        coord_t coord;
+        coord_t sc, ec;
 
         tag_get_pt(&pane.caret_pos, &sp);
-        spt_get_coord(&sp, &coord);
-
-        sheet_get_cell_pt(&doc.sh, &coord, dir_after, &ep);
+        spt_get_coord(&sp, &sc);
+
+        sheet_get_cell_pt(&doc.sh, &sc, dir_after, &ep);
+        spt_get_coord(&ep, &ec);
 
         (void) sheet_delete(&doc.sh, &sp, &ep);
+
+        pane.rflags |= REDRAW_ROW;
+        if (ec.row != sc.row)
+                pane.rflags |= REDRAW_TEXT;
 }
 
@@ -555 +573 @@
         spt_get_coord(&pt, &coord);
 
-        /* Scroll pane as necessary. */
+        /* Scroll pane vertically. */
 
         if (coord.row < pane.sh_row) {
@@ -561 +579 @@
                 pane.rflags |= REDRAW_TEXT;
         }
+
         if (coord.row > pane.sh_row + pane.rows - 1) {
                 pane.sh_row = coord.row - pane.rows + 1;
@@ -566 +585 @@
         }
 
+        /* 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);
-
 }
 
@@ -582 +612 @@
         coord_t coord;
         int num_rows;
+        bool pure_vertical;
 
         tag_get_pt(&pane.caret_pos, &pt);
@@ -594 +625 @@
                 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;
 
         /*
@@ -603 +639 @@
         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
+        TAB_WIDTH       = 8,
+
+        /** Initial  of dat buffer in bytes */
+        INITIAL_SIZE    = 32
 };
 
@@ -64 +68 @@
 int sheet_init(sheet_t *sh)
 {
-        sh->dbuf_size = 65536;
+        sh->dbuf_size = INITIAL_SIZE;
         sh->text_size = 0;
 
@@ -95 +99 @@
         link_t *link;
         tag_t *tag;
+        char *newp;
 
         sz = str_size(str);
-        if (sh->text_size + sz > sh->dbuf_size)
-                return ELIMIT;
+        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;
+        }
 
         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;
@@ -139 +152 @@
         link_t *link;
         tag_t *tag;
+        char *newp;
+        size_t shrink_size;
 
         spp = sh->data + spos->b_off;
@@ -146 +161 @@
         sh->text_size -= sz;
 
-        /* Adjust tags */
+        /* Adjust tags. */
         link = sh->tags_head.next;
         while (link != &sh->tags_head) {
@@ -158 +173 @@
                 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;
 }