Changeset 99e5526 in mainline

Timestamp:

2009-09-16T20:19:22Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c29f20b

Parents:

b077886e

Message:

Handle long lines properly.

File:

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

uspace/app/edit/edit.c

@@ -130 +130 @@
 
         pane.rows = scr_rows - 1;
+        pane.columns = scr_columns;
         pane.sh_row = 1;
+        pane.sh_column = 1;
 
         /* Start with an empty sheet. */
@@ -402 +404 @@
 static void pane_row_range_display(int r0, int r1)
 {
-        int width;
         int i, j, fill;
         spt_t rb, re, dep;
@@ -415 +416 @@
         console_goto(con, 0, 0);
         for (i = r0; i < r1; ++i) {
-                sheet_get_row_width(&doc.sh, pane.sh_row + i, &width);
-
-                /* Determine row starting point. */
-                rbc.row = pane.sh_row + i; rbc.column = 1;
+                /* Starting point for row display */
+                rbc.row = pane.sh_row + i;
+                rbc.column = pane.sh_column;
                 sheet_get_cell_pt(&doc.sh, &rbc, dir_before, &rb);
 
-                /* Determine row ending point. */
-                rec.row = pane.sh_row + i; rec.column = width + 1;
+                /* Ending point for row display */
+                rec.row = pane.sh_row + i;
+                rec.column = pane.sh_column + pane.columns;
                 sheet_get_cell_pt(&doc.sh, &rec, dir_before, &re);
 
@@ -494 +495 @@
 
         spt_get_coord(&caret_pt, &coord);
-        console_goto(con, coord.column - 1, coord.row - pane.sh_row);
+        console_goto(con, coord.column - pane.sh_column,
+            coord.row - pane.sh_row);
 }
 
@@ -555 +557 @@
         spt_get_coord(&pt, &coord);
 
-        /* Scroll pane as necessary. */
+        /* Scroll pane vertically. */
 
         if (coord.row < pane.sh_row) {
@@ -561 +563 @@
                 pane.rflags |= REDRAW_TEXT;
         }
+
         if (coord.row > pane.sh_row + pane.rows - 1) {
                 pane.sh_row = coord.row - pane.rows + 1;
@@ -566 +569 @@
         }
 
+        /* Scroll pane horizontally. */
+
+        if (coord.column < pane.sh_column) {
+                pane.sh_column = coord.column;
+                pane.rflags |= REDRAW_TEXT;
+        }
+
+        if (coord.column > pane.sh_column + pane.columns - 1) {
+                pane.sh_column = coord.column - pane.columns + 1;
+                pane.rflags |= REDRAW_TEXT;
+        }
+
         pane.rflags |= (REDRAW_CARET | REDRAW_STATUS);
-
 }