Changeset 7bdcc45 in mainline for uspace/app/edit/edit.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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) (5 diffs)

uspace/app/edit/edit.c

@@ -100 +100 @@
 static bool cursor_visible;
 
-static ipcarg_t scr_rows;
-static ipcarg_t scr_columns;
+static sysarg_t scr_rows;
+static sysarg_t scr_columns;
 
 #define ROW_BUF_SIZE 4096
@@ -684 +684 @@
         
         int i;
-        ipcarg_t j;
+        sysarg_t j;
         for (i = rows; i < pane.rows; ++i) {
                 console_set_pos(con, 0, i);
@@ -781 +781 @@
                         c = str_decode(row_buf, &pos, size);
                         if (c != '\t') {
-                                printf("%lc", c);
+                                printf("%lc", (wint_t) c);
                                 s_column += 1;
                         } else {
@@ -830 +830 @@
         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, "");
+        
+        int pos = scr_columns - 1 - n;
+        printf("%*s", pos, "");
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);
@@ -1153 +1155 @@
         console_set_pos(con, 0, scr_rows - 1);
         console_set_style(con, STYLE_INVERTED);
-        printf(" %*s ", -(scr_columns - 3), str);
+        
+        int pos = -(scr_columns - 3);
+        printf(" %*s ", pos, str);
         fflush(stdout);
         console_set_style(con, STYLE_NORMAL);