Changeset 7bdcc45 in mainline for uspace/lib/clui/tinput.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/lib/clui/tinput.c (modified) (3 diffs)

uspace/lib/clui/tinput.c

@@ -140 +140 @@
 static void tinput_update_origin(tinput_t *ti)
 {
-        ipcarg_t width = ti->col0 + ti->nc;
-        ipcarg_t rows = (width / ti->con_cols) + 1;
+        sysarg_t width = ti->col0 + ti->nc;
+        sysarg_t rows = (width / ti->con_cols) + 1;
         
         /* Update row0 if the screen scrolled. */
@@ -153 +153 @@
                 return;
         
-        ipcarg_t new_width = ti->col0 + ti->nc + 1;
+        sysarg_t new_width = ti->col0 + ti->nc + 1;
         if (new_width % ti->con_cols == 0) {
                 /* Advancing to new line. */
-                ipcarg_t new_height = (new_width / ti->con_cols) + 1;
+                sysarg_t new_height = (new_width / ti->con_cols) + 1;
                 if (new_height >= ti->con_rows) {
                         /* Disallow text longer than 1 page for now. */
@@ -184 +184 @@
                 return;
         
-        ipcarg_t new_width = ti->col0 + ti->nc + ilen;
-        ipcarg_t new_height = (new_width / ti->con_cols) + 1;
+        sysarg_t new_width = ti->col0 + ti->nc + ilen;
+        sysarg_t new_height = (new_width / ti->con_cols) + 1;
         if (new_height >= ti->con_rows) {
                 /* Disallow text longer than 1 page for now. */