Changes in uspace/app/edit/edit.c [a000878c:cd82bb1] in mainline

File:

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

uspace/app/edit/edit.c

@@ -98 +98 @@
 static bool done;
 static pane_t pane;
-static bool cursor_visible;
 
 static int scr_rows, scr_columns;
@@ -109 +108 @@
 /** Maximum filename length that can be entered. */
 #define INFNAME_MAX_LEN 128
-
-static void cursor_show(void);
-static void cursor_hide(void);
-static void cursor_setvis(bool visible);
 
 static void key_handle_unmod(console_event_t const *ev);
@@ -204 +199 @@
 
         /* Initial display */
-        cursor_visible = true;
-
-        cursor_hide();
         console_clear(con);
         pane_text_display();
@@ -213 +205 @@
                 status_display("File not found. Starting empty file.");
         pane_caret_display();
-        cursor_show();
+
 
         done = false;
@@ -238 +230 @@
                 /* Redraw as necessary. */
 
-                cursor_hide();
-
                 if (pane.rflags & REDRAW_TEXT)
                         pane_text_display();
@@ -248 +238 @@
                 if (pane.rflags & REDRAW_CARET)
                         pane_caret_display();
-
-                cursor_show();
         }
 
@@ -255 +243 @@
 
         return 0;
-}
-
-static void cursor_show(void)
-{
-        cursor_setvis(true);
-}
-
-static void cursor_hide(void)
-{
-        cursor_setvis(false);
-}
-
-static void cursor_setvis(bool visible)
-{
-        if (cursor_visible != visible) {
-                console_cursor_visibility(con, visible);
-                cursor_visible = visible;
-        }
 }
 
@@ -475 +445 @@
 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) {
@@ -484 +455 @@
         }
 
-        int rc = file_save(fname);
+        rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -717 +688 @@
         wchar_t c;
         size_t pos, size;
-        int s_column;
+        unsigned s_column;
         coord_t csel_start, csel_end, ctmp;
 
@@ -765 +736 @@
                 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_color(con, COLOR_BLACK, COLOR_RED, 0);
@@ -771 +742 @@
                         }
         
-                        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_color(con, COLOR_BLACK, COLOR_WHITE, 0);
@@ -791 +762 @@
                 }
 
-                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_color(con, COLOR_BLACK, COLOR_WHITE, 0);
@@ -818 +789 @@
         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>";
+        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);
-        int n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+        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, "");