Changeset 41811af in mainline for uspace/app/bdsh/cmds/modules/cat/cat.c

Timestamp:

2011-06-10T10:14:26Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

ab547063

Parents:

9536e6e (diff), 390d80d (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

File:

• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -64 +64 @@
 static sysarg_t console_rows = 0;
 static bool should_quit = false;
+
+static console_ctrl_t *console = NULL;
 
 static struct option const long_options[] = {
@@ -102 +104 @@
 static void waitprompt()
 {
-        console_set_pos(fphone(stdout), 0, console_rows-1);
-        console_set_color(fphone(stdout), COLOR_BLUE, COLOR_WHITE, 0);
+        console_set_pos(console, 0, console_rows-1);
+        console_set_color(console, COLOR_BLUE, COLOR_WHITE, 0);
+        
         printf("ENTER/SPACE/PAGE DOWN - next page, "
                "ESC/Q - quit, C - continue unpaged");
         fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        
+        console_set_style(console, STYLE_NORMAL);
 }
 
 static void waitkey()
 {
-        console_event_t ev;
+        kbd_event_t ev;
         
         while (true) {
-                if (!console_get_event(fphone(stdin), &ev)) {
+                if (!console_get_kbd_event(console, &ev)) {
                         return;
                 }
@@ -138 +142 @@
 static void newpage()
 {
-        console_clear(fphone(stdout));
+        console_clear(console);
         chars_remaining = console_cols;
-        lines_remaining = console_rows-1;
+        lines_remaining = console_rows - 1;
 }
 
@@ -238 +242 @@
         console_rows = 0;
         should_quit = false;
+        console = console_init(stdin, stdout);
 
         argc = cli_count_args(argv);
@@ -280 +285 @@
         
         if (more) {
-                rc = console_get_size(fphone(stdout), &cols, &rows);
+                rc = console_get_size(console, &cols, &rows);
                 if (rc != EOK) {
                         printf("%s - cannot get console size\n", cmdname);