Changeset 41811af in mainline for uspace/app/edit/edit.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/edit/edit.c (modified) (19 diffs)

uspace/app/edit/edit.c

@@ -94 +94 @@
 } doc_t;
 
-static int con;
+static console_ctrl_t *con;
 static doc_t doc;
 static bool done;
@@ -115 +115 @@
 static void cursor_setvis(bool visible);
 
-static void key_handle_unmod(console_event_t const *ev);
-static void key_handle_ctrl(console_event_t const *ev);
-static void key_handle_shift(console_event_t const *ev);
+static void key_handle_unmod(kbd_event_t const *ev);
+static void key_handle_ctrl(kbd_event_t const *ev);
+static void key_handle_shift(kbd_event_t const *ev);
 static void key_handle_movement(unsigned int key, bool shift);
 
@@ -158 +158 @@
 int main(int argc, char *argv[])
 {
-        console_event_t ev;
+        kbd_event_t ev;
         coord_t coord;
         bool new_file;
@@ -164 +164 @@
         spt_t pt;
 
-        con = fphone(stdout);
+        con = console_init(stdin, stdout);
         console_clear(con);
 
@@ -219 +219 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                console_get_kbd_event(con, &ev);
                 pane.rflags = 0;
 
@@ -277 +277 @@
 
 /** Handle key without modifier. */
-static void key_handle_unmod(console_event_t const *ev)
+static void key_handle_unmod(kbd_event_t const *ev)
 {
         switch (ev->key) {
@@ -320 +320 @@
 
 /** Handle Shift-key combination. */
-static void key_handle_shift(console_event_t const *ev)
+static void key_handle_shift(kbd_event_t const *ev)
 {
         switch (ev->key) {
@@ -344 +344 @@
 
 /** Handle Ctrl-key combination. */
-static void key_handle_ctrl(console_event_t const *ev)
+static void key_handle_ctrl(kbd_event_t const *ev)
 {
         switch (ev->key) {
@@ -497 +497 @@
 static char *filename_prompt(char const *prompt, char const *init_value)
 {
-        console_event_t ev;
+        kbd_event_t ev;
         char *str;
         wchar_t buffer[INFNAME_MAX_LEN + 1];
@@ -517 +517 @@
 
         while (!done) {
-                console_get_event(con, &ev);
+                console_get_kbd_event(con, &ev);
 
                 if (ev.type == KEY_PRESS) {
@@ -531 +531 @@
                                         if (nc > 0) {
                                                 putchar('\b');
-                                                fflush(stdout);
+                                                console_flush(con);
                                                 --nc;
                                         }
@@ -541 +541 @@
                                         if (ev.c >= 32 && nc < max_len) {
                                                 putchar(ev.c);
-                                                fflush(stdout);
+                                                console_flush(con);
                                                 buffer[nc++] = ev.c;
                                         }
@@ -689 +689 @@
                 for (j = 0; j < scr_columns; ++j)
                         putchar(' ');
-                fflush(stdout);
+                console_flush(con);
         }
 
@@ -757 +757 @@
                 if (coord_cmp(&csel_start, &rbc) <= 0 &&
                     coord_cmp(&rbc, &csel_end) < 0) {
-                        fflush(stdout);
+                        console_flush(con);
                         console_set_style(con, STYLE_SELECTED);
-                        fflush(stdout);
+                        console_flush(con);
                 }
 
@@ -768 +768 @@
                 while (pos < size) {
                         if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
-                                fflush(stdout);
+                                console_flush(con);
                                 console_set_style(con, STYLE_SELECTED);
-                                fflush(stdout);
+                                console_flush(con);
                         }
         
                         if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
-                                fflush(stdout);
+                                console_flush(con);
                                 console_set_style(con, STYLE_NORMAL);
-                                fflush(stdout);
+                                console_flush(con);
                         }
         
@@ -794 +794 @@
 
                 if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
-                        fflush(stdout);
+                        console_flush(con);
                         console_set_style(con, STYLE_NORMAL);
-                        fflush(stdout);
+                        console_flush(con);
                 }
 
@@ -808 +808 @@
                 for (j = 0; j < fill; ++j)
                         putchar(' ');
-                fflush(stdout);
+                console_flush(con);
                 console_set_style(con, STYLE_NORMAL);
         }
@@ -833 +833 @@
         int pos = scr_columns - 1 - n;
         printf("%*s", pos, "");
-        fflush(stdout);
+        console_flush(con);
         console_set_style(con, STYLE_NORMAL);
 
@@ -1158 +1158 @@
         int pos = -(scr_columns - 3);
         printf(" %*s ", pos, str);
-        fflush(stdout);
+        console_flush(con);
         console_set_style(con, STYLE_NORMAL);