Changeset 7eaeec1 in mainline for uspace/app/edit/sheet.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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 mainline changes

File:

• uspace/app/edit/sheet.c (modified) (4 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;
 }
@@ -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)