Changeset f4f866c in mainline for uspace/lib/clui/tinput.h

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.h (modified) (5 diffs)

uspace/lib/clui/tinput.h

@@ -29 +29 @@
 /** @addtogroup libclui
  * @{
- */ 
+ */
 /**
  * @file
@@ -37 +37 @@
 #define LIBCLUI_TINPUT_H_
 
-#define HISTORY_LEN 10
-#define INPUT_MAX_SIZE 1024
+#include <ipc/ipc.h>
+
+#define HISTORY_LEN     10
+#define INPUT_MAX_SIZE  1024
 
 /** Text input field (command line).
@@ -47 +49 @@
         /** Buffer holding text currently being edited */
         wchar_t buffer[INPUT_MAX_SIZE + 1];
+        
         /** Screen coordinates of the top-left corner of the text field */
-        int col0, row0;
+        ipcarg_t col0;
+        ipcarg_t row0;
+        
         /** Screen dimensions */
-        int con_cols, con_rows;
+        ipcarg_t con_cols;
+        ipcarg_t con_rows;
+        
         /** Number of characters in @c buffer */
-        int nc;
+        size_t nc;
+        
         /** Caret position within buffer */
-        int pos;
+        size_t pos;
+        
         /** Selection mark position within buffer */
-        int sel_start;
-
+        size_t sel_start;
+        
         /** History (dynamically allocated strings) */
-        char *history[1 + HISTORY_LEN];
+        char *history[HISTORY_LEN + 1];
+        
         /** Number of entries in @c history, not counting [0] */
-        int hnum;
+        size_t hnum;
+        
         /** Current position in history */
-        int hpos;
+        size_t hpos;
+        
         /** @c true if finished with this line (return to caller) */
         bool done;
+        
         /** @c true if user requested to abort interactive loop */
         bool exit_clui;
@@ -71 +84 @@
 
 extern tinput_t *tinput_new(void);
-extern void tinput_destroy(tinput_t *ti);
-extern int tinput_read(tinput_t *ti, char **str);
+extern void tinput_destroy(tinput_t *);
+extern int tinput_read(tinput_t *, char **);
 
 #endif
@@ -78 +91 @@
 /** @}
  */
-