Enlightenment CVS committal

Author  : codewarrior
Project : e17
Module  : proto

Dir     : e17/proto/enterminus/src/bin


Modified Files:
        term.c ui.c 


Log Message:
comments + fixes. for some reason the last line, after it scrolls, doesnt
echo user input any more. need to find out why.

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/term.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- term.c      28 Jan 2005 12:59:26 -0000      1.3
+++ term.c      4 Feb 2005 18:39:45 -0000       1.4
@@ -29,52 +29,13 @@
    gl->bg = term->tcanvas->cur_bg;   
    term->tcanvas->changed_rows[term->tcanvas->cur_row] = 1;
    term->tcanvas->cur_col++;
+   
    if(term->tcanvas->cur_col > term->tcanvas->cols) {
       term->tcanvas->cur_col = 0;
       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);
-      /* we're exhausting the entire scrollback */
-      if(term->tcanvas->cur_row > 
-        (term->tcanvas->rows-1) * term->tcanvas->scroll_size) {
-        printf("Reached end of scroll buffer\n");       
-        term->tcanvas->scroll_region_start++;
-        term->tcanvas->cur_row = 0;
-        term->tcanvas->scroll_region_end = 1;   
-      } 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 > 
-        (term->tcanvas->rows-1) * term->tcanvas->scroll_size) {
-        term->tcanvas->scroll_region_start = 0;
-      }
-       {
-          int i, j = term->tcanvas->scroll_region_start;
-          for(i = 0; i <= term->tcanvas->scroll_region_end; i++)
-            term->tcanvas->changed_rows[j++] = 1;
-       }
-   }
+   return;   
 }
 
 char term_tcanvas_data_pop(Term *term) {
@@ -140,7 +101,7 @@
    canvas->canvas_id = 1; /* change later */
    canvas->rows = 24; /* multiply by a number or scrollback */  
    canvas->cols = 80;
-   canvas->scroll_size = 3; /* this means rows * 3 total rows */
+   canvas->scroll_size = 50; /* this means rows * 3 total rows */
    canvas->cur_row = 0;   /* between 0 and rows-1 */
    canvas->cur_col = 0;
    canvas->grid = calloc(canvas->cols * 
@@ -150,7 +111,7 @@
                                 sizeof(int));
    
    canvas->scroll_region_start = 0;
-   canvas->scroll_region_end = canvas->rows;
+   canvas->scroll_region_end = canvas->rows -1;
    
    for(i = 0; i < canvas->rows * canvas->scroll_size; i++)
      canvas->changed_rows[i] = 0;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/enterminus/src/bin/ui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ui.c        31 Jan 2005 23:04:54 -0000      1.4
+++ ui.c        4 Feb 2005 18:39:46 -0000       1.5
@@ -51,48 +51,37 @@
    Term_EGlyph *gl;
    Term_TGlyph *tgl;   
    
-   for(i = 0; i < term->tcanvas->rows; i++) {
-      
+   for(i = 0; i < term->tcanvas->rows; i++) {      
       if(term->tcanvas->changed_rows[i] != 1) {
         continue;
       }
-      //printf("I is %d\n",i);
       //printf("Rendering c-row %d  g-row %d\n",i+ 
term->tcanvas->scroll_region_start,i);
-
-      for(j = 0; j < term->tcanvas->cols; j++) {
-        
+      for(j = 0; j < term->tcanvas->cols; j++) {        
         tgl = &term->tcanvas->grid[j + 
                                    (term->tcanvas->cols * 
                                     (i+ term->tcanvas->scroll_region_start)
-                                    )];
-        
-        //printf("Rendering row %d col %d\n",i+ 
term->tcanvas->scroll_region_start-ig,j);
+                                    )];         
         if(tgl->changed != 1) {
-          continue;
+           continue;
         }
         if(tgl->c == '\033') {
            printf("Got escape in term_redraw()!\n");
            continue;
         }
+        
+        //printf("i=%d term->tcanvas->scroll_region_start=%d 
term->tcanvas->rows=%d 
term->tcanvas->scroll_size=%d\n",i,term->tcanvas->scroll_region_start,term->tcanvas->rows,term->tcanvas->scroll_size);
 
-        if(i + term->tcanvas->scroll_region_start < (term->tcanvas->rows - 
1)*term->tcanvas->scroll_size) {
+        if(i + term->tcanvas->scroll_region_start + 1 < (term->tcanvas->rows - 
1)*term->tcanvas->scroll_size) {
            gl = &term->grid[j + (term->tcanvas->cols * i)];
-        } else {
-           printf("DETECTED OVERFLOW!!! [s: %d, e: %d] [ig=%d]\n",
-                  term->tcanvas->scroll_region_start,
-                  term->tcanvas->scroll_region_end,
-                  ig
-                  );
+        } else {           
            gl = &term->grid[j + (term->tcanvas->cols * ig)];
         }
-
-        //printf("Current location: [%d, %d]\n",j,i);
+        
         evas_object_text_font_set(gl->text, term->font.face, term->font.size);
         c[0] = tgl->c;
         c[1] = '\0';
         evas_object_text_text_set(gl->text, c);
-        
-        
+                
         switch(tgl->fg) {
          case 0:
            evas_object_color_set(gl->text, COLOR0, 255);
@@ -123,18 +112,16 @@
            break;
 
         }
-        
-        
+               
         evas_object_layer_set(gl->text,1);
-        evas_object_move(gl->text,
-                         j*term->font.width,
-                         i*term->font.height);
+        evas_object_move(gl->text, j*term->font.width, i*term->font.height);
         evas_object_show(gl->text);
-        //printf("showing %c\n",tgl->c);
         tgl->changed = 0;
       }
-      if(i + term->tcanvas->scroll_region_start < (term->tcanvas->rows - 
1)*term->tcanvas->scroll_size)
-       ig++;
+      if(i + term->tcanvas->scroll_region_start +1 > (term->tcanvas->rows - 
1)*term->tcanvas->scroll_size) {
+        printf("Overflowing: [cur_row=%d] [start: %d, end: %d] 
[ig=%d]\n",term->tcanvas->cur_row,term->tcanvas->scroll_region_start,term->tcanvas->scroll_region_end,ig);
+        ig++;
+      }
       term->tcanvas->changed_rows[i] = 0;
    }
 }
@@ -233,7 +220,11 @@
    Term_TGlyph *tgl;
    /* TODO: Finalize this shit before shipping code out */
    x1--;y1--;x2--;y2--;
-   printf("Clearing: %d %d, %d 
%d\n",x1,y1+term->tcanvas->scroll_region_start,x2,y2+term->tcanvas->scroll_region_start);
+   if(x1 < 0) x1 = 0;
+   if(y2 < 0) x1 = 0;
+   if(x1 < 0) x1 = 0;
+   if(y2 < 0) x1 = 0;   
+   //printf("Clearing: %d %d, %d 
%d\n",x1,y1+term->tcanvas->scroll_region_start,x2,y2+term->tcanvas->scroll_region_start);
    for(i = y1; i <= y2; i++) {      
       for(j = x1; j <= x2; j++) {
         tgl = &term->tcanvas->grid[j + (term->tcanvas->cols * (i + 
term->tcanvas->scroll_region_start))];
@@ -252,14 +243,11 @@
    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;
    
    /* TODO: check for boundaries */
-   /* This stops the segfault, but makes no sense at all */
    if(term->tcanvas->cur_row >
       (term->tcanvas->rows-1) * term->tcanvas->scroll_size) {
       printf("Gone past scroll area max, going back to start\n");




-------------------------------------------------------
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