Changeset 3aae4e8 in mainline for uspace/lib/clui/tinput.c

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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) (6 diffs)

uspace/lib/clui/tinput.c

@@ -513 +513 @@
 }
 
-/** Read in one line of input. */
-char *tinput_read(tinput_t *ti)
+/** Read in one line of input.
+ *
+ * @param ti    Text input.
+ * @param dstr  Place to save pointer to new string.
+ * @return      EOK on success, ENOENT if user requested abort, EIO
+ *              if communication with console failed.
+ */
+int tinput_read(tinput_t *ti, char **dstr)
 {
         console_event_t ev;
@@ -522 +528 @@
 
         if (console_get_size(fphone(stdin), &ti->con_cols, &ti->con_rows) != EOK)
-                return NULL;
+                return EIO;
         if (console_get_pos(fphone(stdin), &ti->col0, &ti->row0) != EOK)
-                return NULL;
+                return EIO;
 
         ti->pos = ti->sel_start = 0;
@@ -530 +536 @@
         ti->buffer[0] = '\0';
         ti->done = false;
+        ti->exit_clui = false;
 
         while (!ti->done) {
                 fflush(stdout);
                 if (!console_get_event(fphone(stdin), &ev))
-                        return NULL;
+                        return EIO;
 
                 if (ev.type != KEY_PRESS)
@@ -565 +572 @@
         }
 
+        if (ti->exit_clui)
+                return ENOENT;
+
         ti->pos = ti->nc;
         tinput_position_caret(ti);
@@ -575 +585 @@
         ti->hpos = 0;
 
-        return str;
+        *dstr = str;
+        return EOK;
 }
 
@@ -606 +617 @@
         case KC_A:
                 tinput_sel_all(ti);
+                break;
+        case KC_Q:
+                /* Signal libary client to quit interactive loop. */
+                ti->done = true;
+                ti->exit_clui = true;
                 break;
         default: