Changes in uspace/dist/src/c/demos/edit/sheet.c [70b570c:9d58539] in mainline

File:

• uspace/dist/src/c/demos/edit/sheet.c (modified) (9 diffs)

uspace/dist/src/c/demos/edit/sheet.c

@@ -57 +57 @@
 
 #include "sheet.h"
-#include "sheet_impl.h"
 
 enum {
@@ -67 +66 @@
 
 /** Initialize an empty sheet. */
-int sheet_create(sheet_t **rsh)
-{
-        sheet_t *sh;
-
-        sh = calloc(1, sizeof(sheet_t));
-        if (sh == NULL)
-                return ENOMEM;
-
+int sheet_init(sheet_t *sh)
+{
         sh->dbuf_size = INITIAL_SIZE;
         sh->text_size = 0;
@@ -84 +77 @@
         list_initialize(&sh->tags);
 
-        *rsh = sh;
         return EOK;
 }
@@ -105 +97 @@
         char *ipp;
         size_t sz;
+        tag_t *tag;
         char *newp;
 
@@ -127 +120 @@
         /* Adjust tags. */
 
-        list_foreach(sh->tags, link, tag_t, tag) {
+        list_foreach(sh->tags, link) {
+                tag = list_get_instance(link, tag_t, link);
+
                 if (tag->b_off > pos->b_off)
                         tag->b_off += sz;
@@ -151 +146 @@
         char *spp;
         size_t sz;
+        tag_t *tag;
         char *newp;
         size_t shrink_size;
@@ -161 +157 @@
 
         /* Adjust tags. */
-        list_foreach(sh->tags, link, tag_t, tag) {
+        list_foreach(sh->tags, link) {
+                tag = list_get_instance(link, tag_t, link);
+
                 if (tag->b_off >= epos->b_off)
                         tag->b_off -= sz;
@@ -266 +264 @@
         sheet_get_cell_pt(sh, &coord, dir_before, &pt);
         spt_get_coord(&pt, &coord);
-        *length = coord.column;
+        *length = coord.column - 1;
 }
 
@@ -317 +315 @@
 }
 
-/** 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)