Changeset ab936440 in mainline for uspace/lib/clui/tinput.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/lib/clui/tinput.c (modified) (5 diffs)

uspace/lib/clui/tinput.c

@@ -56 +56 @@
 } seek_dir_t;
 
+static void tinput_update_origin(tinput_t *);
 static void tinput_init(tinput_t *);
 static void tinput_insert_string(tinput_t *, const char *);
@@ -71 +72 @@
 static void tinput_console_set_lpos(tinput_t *ti, unsigned lpos)
 {
-        console_set_pos(ti->console, LIN_TO_COL(ti, lpos),
-            LIN_TO_ROW(ti, lpos));
+        unsigned col = LIN_TO_COL(ti, lpos);
+        unsigned row = LIN_TO_ROW(ti, lpos);
+
+        assert(col < ti->con_cols);
+        assert(row < ti->con_rows);
+        console_set_pos(ti->console, col, row);
 }
 
@@ -163 +168 @@
 static void tinput_position_caret(tinput_t *ti)
 {
+        tinput_update_origin(ti);
         tinput_console_set_lpos(ti, ti->text_coord + ti->pos);
 }
@@ -232 +238 @@
 
         tinput_display_tail(ti, ti->pos - 1, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }
@@ -276 +281 @@
 
         tinput_display_tail(ti, ti->pos - ilen, 0);
-        tinput_update_origin(ti);
         tinput_position_caret(ti);
 }