Changeset 8e7c9fe in mainline for uspace/dist/src/c/demos/edit/sheet.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

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 {
@@ -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;
 }
@@ -97 +105 @@
         char *ipp;
         size_t sz;
-        tag_t *tag;
         char *newp;
 
@@ -120 +127 @@
         /* Adjust tags. */
 
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off > pos->b_off)
                         tag->b_off += sz;
@@ -146 +151 @@
         char *spp;
         size_t sz;
-        tag_t *tag;
         char *newp;
         size_t shrink_size;
@@ -157 +161 @@
 
         /* Adjust tags. */
-        list_foreach(sh->tags, link) {
-                tag = list_get_instance(link, tag_t, link);
-
+        list_foreach(sh->tags, link, tag_t, tag) {
                 if (tag->b_off >= epos->b_off)
                         tag->b_off -= sz;
@@ -264 +266 @@
         sheet_get_cell_pt(sh, &coord, dir_before, &pt);
         spt_get_coord(&pt, &coord);
-        *length = coord.column - 1;
+        *length = coord.column;
 }
 
@@ -315 +317 @@
 }
 
+/** 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)