Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : proto

Dir     : e17/proto/enterminus/src/bin


Modified Files:
        term.c ui.c 


Log Message:
added scroll back, we have a bug that doesnt allow us to be on the current
line at the end of the buffer. ie: the last line as always hidden. clear /
crtl-l is currently broken but will get fixed soon.

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/term.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- term.c      27 Jan 2005 23:06:59 -0000      1.2
+++ term.c      28 Jan 2005 12:59:26 -0000      1.3
@@ -34,6 +34,8 @@
       term->tcanvas->cur_row++;
    }
    
+   return;
+   
    if(term->tcanvas->cur_row > term->tcanvas->scroll_region_end) {
 
       printf("Scrolling: cur_row=%d, scr_end=%d\n", 
term->tcanvas->cur_row,term->tcanvas->scroll_region_end);
@@ -47,12 +49,20 @@
       } else {
         /* we're simply at the end of the display, we have scrollback */
         printf("Reached end of display buffer\n");
+#if 0   
         term_clear_area(term, 1, 1, 80, 24);
         term->tcanvas->scroll_region_start = 0;
         term->tcanvas->scroll_region_end = 23;      
         term->tcanvas->cur_row = term->tcanvas->scroll_region_end;
         term->tcanvas->cur_row = 0;
         term->tcanvas->cur_col = 0;
+#endif
+        printf("Current start line: %d\n",term->tcanvas->scroll_region_start);
+        term->tcanvas->scroll_region_start++;
+        printf("New start line: %d\n",term->tcanvas->scroll_region_start);
+        printf("Current end line: %d\n",term->tcanvas->scroll_region_end);
+        term->tcanvas->scroll_region_end++;
+        printf("New end line: %d\n",term->tcanvas->scroll_region_end);
        }
       
       if(term->tcanvas->scroll_region_start > 
@@ -61,7 +71,7 @@
       }
        {
           int i, j = term->tcanvas->scroll_region_start;
-          for(i = 0; i < term->tcanvas->rows; i++)
+          for(i = 0; i <= term->tcanvas->scroll_region_end; i++)
             term->tcanvas->changed_rows[j++] = 1;
        }
    }
@@ -100,9 +110,9 @@
          case '\n': /* newline */
            term->tcanvas->cur_col = 0;
            term->tcanvas->cur_row++;
-           break;
+
            /* TODO: Remember to scroll */
-           if(term->tcanvas->cur_row > term->tcanvas->scroll_region_end) {
+           if(term->tcanvas->cur_row >= term->tcanvas->scroll_region_end) {
               term_scroll_up(term, term->tcanvas->cur_row - 
term->tcanvas->scroll_region_end);
               term->tcanvas->cur_row = term->tcanvas->scroll_region_end;
            }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/ui.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ui.c        28 Jan 2005 08:52:50 -0000      1.2
+++ ui.c        28 Jan 2005 12:59:27 -0000      1.3
@@ -56,6 +56,7 @@
         continue;
       }
       //printf("I is %d\n",i);
+      //printf("Rendering c-row %d  g-row %d\n",i+ 
term->tcanvas->scroll_region_start,i);
       ig++;
       for(j = 0; j < term->tcanvas->cols; j++) {
         tgl = &term->tcanvas->grid[j + 
@@ -63,8 +64,9 @@
                                     (i+ term->tcanvas->scroll_region_start)
                                     )];
         //printf("Rendering row %d col %d\n",i+ 
term->tcanvas->scroll_region_start,j);
-        if(tgl->changed != 1)
+        if(tgl->changed != 1) {
           continue;
+        }
         if(tgl->c == '\033') {
            printf("Got escape in term_redraw()!\n");
            continue;
@@ -221,16 +223,42 @@
    for(i = y1; i <= y2; i++) {      
       for(j = x1; j <= x2; j++) {
         tgl = &term->tcanvas->grid[j + (term->tcanvas->cols * i)];
-        if(tgl->c != ' ' && tgl->c != '\0') {
+        //if(tgl->c != ' ' && tgl->c != '\0') {
            tgl->c = '\0';
            tgl->changed = 1;
            term->tcanvas->changed_rows[i] = 1;
-        }
+        //}
       }   
    }
 }
 
 void term_scroll_up(Term *term, int rows) {
+
+   
+   int i, j = term->tcanvas->scroll_region_start;
+   int x,y;
+   Term_TGlyph *gl;   
+   
+   printf("Scrolling\n");
+   
+   term->tcanvas->scroll_region_start+= rows;
+   term->tcanvas->scroll_region_end+=rows;   
+   
+   
+   /* fix this and make it set changed flags properly */
+   
+   for(i = 0;
+       i <= term->tcanvas->scroll_size*term->tcanvas->rows;
+       i++) {
+      term->tcanvas->changed_rows[i] = 1;
+   }
+        
+   for(x = 0; x < 
term->tcanvas->cols*term->tcanvas->rows*term->tcanvas->scroll_size; x++) {      
  
+      gl = &term->tcanvas->grid[x];
+      gl->changed = 1;
+   }
+   
+   
    if(term->tcanvas->scroll_in_region) {
       
    } else {




-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to