Changeset f4f866c in mainline for uspace/app/edit/edit.c

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/app/edit/edit.c (modified) (15 diffs)

uspace/app/edit/edit.c

@@ -40 +40 @@
 #include <vfs/vfs.h>
 #include <io/console.h>
-#include <io/color.h>
+#include <io/style.h>
 #include <io/keycode.h>
 #include <errno.h>
@@ -100 +100 @@
 static bool cursor_visible;
 
-static int scr_rows, scr_columns;
+static ipcarg_t scr_rows;
+static ipcarg_t scr_columns;
 
 #define ROW_BUF_SIZE 4096
@@ -505 +506 @@
         asprintf(&str, "%s: %s", prompt, init_value);
         status_display(str);
-        console_goto(con, 1 + str_length(str), scr_rows - 1);
+        console_set_pos(con, 1 + str_length(str), scr_rows - 1);
         free(str);
 
-        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
+        console_set_style(con, STYLE_INVERTED);
 
         max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
@@ -552 +553 @@
         str = wstr_to_astr(buffer);
 
-        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_style(con, STYLE_NORMAL);
 
         return str;
@@ -671 +672 @@
 {
         int sh_rows, rows;
-        int i, j;
 
         sheet_get_num_rows(&doc.sh, &sh_rows);
@@ -678 +678 @@
         /* Draw rows from the sheet. */
 
-        console_goto(con, 0, 0);
+        console_set_pos(con, 0, 0);
         pane_row_range_display(0, rows);
 
         /* Clear the remaining rows if file is short. */
-
+        
+        int i;
+        ipcarg_t j;
         for (i = rows; i < pane.rows; ++i) {
-                console_goto(con, 0, i);
+                console_set_pos(con, 0, i);
                 for (j = 0; j < scr_columns; ++j)
                         putchar(' ');
@@ -736 +738 @@
         /* Draw rows from the sheet. */
 
-        console_goto(con, 0, 0);
+        console_set_pos(con, 0, 0);
         for (i = r0; i < r1; ++i) {
                 /* Starting point for row display */
@@ -756 +758 @@
                     coord_cmp(&rbc, &csel_end) < 0) {
                         fflush(stdout);
-                        console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
+                        console_set_style(con, STYLE_SELECTED);
                         fflush(stdout);
                 }
 
-                console_goto(con, 0, i);
+                console_set_pos(con, 0, i);
                 size = str_size(row_buf);
                 pos = 0;
@@ -767 +769 @@
                         if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
                                 fflush(stdout);
-                                console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
+                                console_set_style(con, STYLE_SELECTED);
                                 fflush(stdout);
                         }
@@ -773 +775 @@
                         if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
                                 fflush(stdout);
-                                console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+                                console_set_style(con, STYLE_NORMAL);
                                 fflush(stdout);
                         }
@@ -793 +795 @@
                 if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
                         fflush(stdout);
-                        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+                        console_set_style(con, STYLE_NORMAL);
                         fflush(stdout);
                 }
@@ -807 +809 @@
                         putchar(' ');
                 fflush(stdout);
-                console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+                console_set_style(con, STYLE_NORMAL);
         }
 
@@ -824 +826 @@
         const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
 
-        console_goto(con, 0, scr_rows - 1);
-        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
+        console_set_pos(con, 0, scr_rows - 1);
+        console_set_style(con, STYLE_INVERTED);
         int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
             "Ctrl-E Save As", coord.row, coord.column, fname);
         printf("%*s", scr_columns - 1 - n, "");
         fflush(stdout);
-        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_style(con, STYLE_NORMAL);
 
         pane.rflags |= REDRAW_CARET;
@@ -844 +846 @@
 
         spt_get_coord(&caret_pt, &coord);
-        console_goto(con, coord.column - pane.sh_column,
+        console_set_pos(con, coord.column - pane.sh_column,
             coord.row - pane.sh_row);
 }
@@ -1149 +1151 @@
 static void status_display(char const *str)
 {
-        console_goto(con, 0, scr_rows - 1);
-        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
+        console_set_pos(con, 0, scr_rows - 1);
+        console_set_style(con, STYLE_INVERTED);
         printf(" %*s ", -(scr_columns - 3), str);
         fflush(stdout);
-        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
+        console_set_style(con, STYLE_NORMAL);
 
         pane.rflags |= REDRAW_CARET;