Changes in uspace/app/edit/edit.c [9f1362d4:8190e63] in mainline

File:

• uspace/app/edit/edit.c (modified) (16 diffs)

uspace/app/edit/edit.c

@@ -40 +40 @@
 #include <vfs/vfs.h>
 #include <io/console.h>
-#include <io/style.h>
+#include <io/color.h>
 #include <io/keycode.h>
 #include <errno.h>
@@ -100 +100 @@
 static bool cursor_visible;
 
-static ipcarg_t scr_rows;
-static ipcarg_t scr_columns;
+static int scr_rows, scr_columns;
 
 #define ROW_BUF_SIZE 4096
@@ -476 +475 @@
 static void file_save_as(void)
 {
-        const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
-        char *fname;
-        
+        char *old_fname, *fname;
+        int rc;
+
+        old_fname = (doc.file_name != NULL) ? doc.file_name : "";
         fname = filename_prompt("Save As", old_fname);
         if (fname == NULL) {
@@ -485 +485 @@
         }
 
-        int rc = file_save(fname);
+        rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -506 +506 @@
         asprintf(&str, "%s: %s", prompt, init_value);
         status_display(str);
-        console_set_pos(con, 1 + str_length(str), scr_rows - 1);
+        console_goto(con, 1 + str_length(str), scr_rows - 1);
         free(str);
 
-        console_set_style(con, STYLE_INVERTED);
+        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
 
         max_len = min(INFNAME_MAX_LEN, scr_columns - 4 - str_length(prompt));
@@ -553 +553 @@
         str = wstr_to_astr(buffer);
 
-        console_set_style(con, STYLE_NORMAL);
+        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
 
         return str;
@@ -672 +672 @@
 {
         int sh_rows, rows;
+        int i, j;
 
         sheet_get_num_rows(&doc.sh, &sh_rows);
@@ -678 +679 @@
         /* Draw rows from the sheet. */
 
-        console_set_pos(con, 0, 0);
+        console_goto(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_set_pos(con, 0, i);
+                console_goto(con, 0, i);
                 for (j = 0; j < scr_columns; ++j)
                         putchar(' ');
@@ -719 +718 @@
         wchar_t c;
         size_t pos, size;
-        int s_column;
+        unsigned s_column;
         coord_t csel_start, csel_end, ctmp;
 
@@ -738 +737 @@
         /* Draw rows from the sheet. */
 
-        console_set_pos(con, 0, 0);
+        console_goto(con, 0, 0);
         for (i = r0; i < r1; ++i) {
                 /* Starting point for row display */
@@ -758 +757 @@
                     coord_cmp(&rbc, &csel_end) < 0) {
                         fflush(stdout);
-                        console_set_style(con, STYLE_SELECTED);
+                        console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
                         fflush(stdout);
                 }
 
-                console_set_pos(con, 0, i);
+                console_goto(con, 0, i);
                 size = str_size(row_buf);
                 pos = 0;
                 s_column = pane.sh_column;
                 while (pos < size) {
-                        if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
+                        if (csel_start.row == rbc.row && csel_start.column == s_column) {
                                 fflush(stdout);
-                                console_set_style(con, STYLE_SELECTED);
+                                console_set_color(con, COLOR_BLACK, COLOR_RED, 0);
                                 fflush(stdout);
                         }
         
-                        if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
+                        if (csel_end.row == rbc.row && csel_end.column == s_column) {
                                 fflush(stdout);
-                                console_set_style(con, STYLE_NORMAL);
+                                console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
                                 fflush(stdout);
                         }
@@ -793 +792 @@
                 }
 
-                if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
+                if (csel_end.row == rbc.row && csel_end.column == s_column) {
                         fflush(stdout);
-                        console_set_style(con, STYLE_NORMAL);
+                        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
                         fflush(stdout);
                 }
@@ -809 +808 @@
                         putchar(' ');
                 fflush(stdout);
-                console_set_style(con, STYLE_NORMAL);
+                console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
         }
 
@@ -820 +819 @@
         spt_t caret_pt;
         coord_t coord;
+        char *fname;
+        int n;
 
         tag_get_pt(&pane.caret_pos, &caret_pt);
         spt_get_coord(&caret_pt, &coord);
 
-        const char *fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
-
-        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  "
+        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);
+        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_style(con, STYLE_NORMAL);
+        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
 
         pane.rflags |= REDRAW_CARET;
@@ -846 +847 @@
 
         spt_get_coord(&caret_pt, &coord);
-        console_set_pos(con, coord.column - pane.sh_column,
+        console_goto(con, coord.column - pane.sh_column,
             coord.row - pane.sh_row);
 }
@@ -1151 +1152 @@
 static void status_display(char const *str)
 {
-        console_set_pos(con, 0, scr_rows - 1);
-        console_set_style(con, STYLE_INVERTED);
+        console_goto(con, 0, scr_rows - 1);
+        console_set_color(con, COLOR_WHITE, COLOR_BLACK, 0);
         printf(" %*s ", -(scr_columns - 3), str);
         fflush(stdout);
-        console_set_style(con, STYLE_NORMAL);
+        console_set_color(con, COLOR_BLACK, COLOR_WHITE, 0);
 
         pane.rflags |= REDRAW_CARET;