Changes in uspace/app/edit/sheet.c [b72efe8:7feb86e6] in mainline

File:

• uspace/app/edit/sheet.c (modified) (5 diffs)

uspace/app/edit/sheet.c

@@ -57 +57 @@
 
 #include "sheet.h"
+#include "sheet_impl.h"
 
 enum {
@@ -66 +67 @@
 
 /** Initialize an empty sheet. */
-int sheet_init(sheet_t *sh)
-{
+int sheet_create(sheet_t **rsh)
+{
+        sheet_t *sh;
+
+        sh = calloc(1, sizeof(sheet_t));
+        if (sh == NULL)
+                return ENOMEM;
+
         sh->dbuf_size = INITIAL_SIZE;
         sh->text_size = 0;
@@ -77 +84 @@
         list_initialize(&sh->tags);
 
+        *rsh = sh;
         return EOK;
 }
@@ -264 +272 @@
         sheet_get_cell_pt(sh, &coord, dir_before, &pt);
         spt_get_coord(&pt, &coord);
-        *length = coord.column - 1;
+        *length = coord.column;
 }
 
@@ -315 +323 @@
 }
 
+/** Get a character at spt and return next spt */
+wchar_t spt_next_char(spt_t spt, spt_t *next)
+{
+        wchar_t ch = str_decode(spt.sh->data, &spt.b_off, spt.sh->text_size);
+        if (next)
+                *next = spt;
+        return ch;
+}
+
+wchar_t spt_prev_char(spt_t spt, spt_t *prev)
+{
+        wchar_t ch = str_decode_reverse(spt.sh->data, &spt.b_off, spt.sh->text_size);
+        if (prev)
+                *prev = spt;
+        return ch;
+}
+
 /** Place a tag on the specified s-point. */
 void sheet_place_tag(sheet_t *sh, spt_t const *pt, tag_t *tag)