Changeset 089d746 in mainline

Timestamp:

2009-12-01T21:53:40Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

84b14e2

Parents:

4a2aa91 (diff), 3041fef1 (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 small shell ui adjustment.

File:

• uspace/app/bdsh/input.c (modified) (2 diffs)

uspace/app/bdsh/input.c

@@ -39 +39 @@
 #include <errno.h>
 #include <assert.h>
-#include <macros.h>
 #include <bool.h>
 
@@ -264 +263 @@
 static void tinput_seek_vertical(tinput_t *ti, seek_dir_t dir)
 {
-        if (dir == seek_forward)
-                ti->pos = min(ti->pos + ti->con_cols, ti->nc);
-        else 
-                ti->pos = max(0, ti->pos - ti->con_cols);
+        if (dir == seek_forward) {
+                if (ti->pos + ti->con_cols <= ti->nc)
+                        ti->pos = ti->pos + ti->con_cols;
+        } else {
+                if (ti->pos - ti->con_cols >= 0)
+                        ti->pos = ti->pos - ti->con_cols;
+        }
 
         tinput_position_caret(ti);