Changeset 371bd7d in mainline for uspace/app/edit

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

uspace/app/edit

Files:

• Makefile (modified) (1 diff)
• edit.c (modified) (14 diffs)
• sheet.c (modified) (1 diff)

uspace/app/edit/Makefile

@@ -28 +28 @@
 #
 
-include Makefile.common
+USPACE_PREFIX = ../..
+BINARY = edit
 
-.PHONY: all clean
+SOURCES = \
+        edit.c \
+        sheet.c
 
-all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
-        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
-        $(MAKE) -f Makefile.build
-
-clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
-        find . -name '*.o' -follow -exec rm \{\} \;
+include $(USPACE_PREFIX)/Makefile.common

uspace/app/edit/edit.c

@@ -98 +98 @@
 static bool done;
 static pane_t pane;
+static bool cursor_visible;
 
 static int scr_rows, scr_columns;
@@ -108 +109 @@
 /** 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);
@@ -199 +204 @@
 
         /* Initial display */
+        cursor_visible = true;
+
+        cursor_hide();
         console_clear(con);
         pane_text_display();
@@ -205 +213 @@
                 status_display("File not found. Starting empty file.");
         pane_caret_display();
-
+        cursor_show();
 
         done = false;
@@ -230 +238 @@
                 /* Redraw as necessary. */
 
+                cursor_hide();
+
                 if (pane.rflags & REDRAW_TEXT)
                         pane_text_display();
@@ -238 +248 @@
                 if (pane.rflags & REDRAW_CARET)
                         pane_caret_display();
+
+                cursor_show();
         }
 
@@ -243 +255 @@
 
         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;
+        }
 }
 
@@ -445 +475 @@
 static void file_save_as(void)
 {
-        char *old_fname, *fname;
-        int rc;
-
-        old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        const char *old_fname = (doc.file_name != NULL) ? doc.file_name : "";
+        char *fname;
+        
         fname = filename_prompt("Save As", old_fname);
         if (fname == NULL) {
@@ -455 +484 @@
         }
 
-        rc = file_save(fname);
+        int rc = file_save(fname);
         if (rc != EOK)
                 return;
@@ -688 +717 @@
         wchar_t c;
         size_t pos, size;
-        unsigned s_column;
+        int s_column;
         coord_t csel_start, csel_end, ctmp;
 
@@ -736 +765 @@
                 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);
@@ -742 +771 @@
                         }
         
-                        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);
@@ -762 +791 @@
                 }
 
-                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);
@@ -789 +818 @@
         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);
 
-        fname = (doc.file_name != NULL) ? doc.file_name : "<unnamed>";
+        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);
-        n = printf(" %d, %d: File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+        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, "");

uspace/app/edit/sheet.c

@@ -50 +50 @@
 
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <adt/list.h>