The R Project SVN – R – Diff – /trunk/src/gnuwin32/dataentry.c

     clearwindow();
     gfillrect(de, bbg, rect(0, 0, windowWidth, box_h));
     gfillrect(de, bbg, rect(0, 0, boxw[0], windowHeight));
     for (i = 1; i < nhigh; i++)
 	drawrectangle(0, hwidth + i * box_h, boxw[0], box_h, 1, 1);
      /* so row 0 and col 0 are reserved for labels */
     colmax = colmin + (nwide - 2);
     rowmax = rowmin + (nhigh - 2);
     if (inputlist != R_NilValue)
 	for (i = colmin; i <= colmax; i++) drawcol(i);
     /* row/col 1 = pos 0 */
     gchangescrollbar(de, VWINSB, rowmin-1, ymaxused, nhigh, 0);
     gchangescrollbar(de, HWINSB, colmin-1, xmaxused, nwide, 0);
-/*    Rprintf("rowmin %d colmin %d nwide %d nhigh %d xmax %d ymax %d\n",
-      rowmin, colmin, nwide, nhigh, xmaxused, ymaxused);*/
     highlightrect();
-    show(de);
+}
 void doHscroll(int oldcol)
+{
     int i, w, dw;
 	cleararea(dw, hwidth, WIDTH-dw, HEIGHT, p->bg);
 	drawcol(colmin);
+    }
     gchangescrollbar(de, HWINSB, colmin-1, xmaxused, nwide, 0);
     highlightrect();
-    show(de);
+}
 /* find_coords finds the coordinates of the upper left corner of the
    given cell on the screen: row and col are on-screen coords */
 	    len = min(rowmax, LEVELS(CAR(tmp)) );
 	    for (i = (rowmin - 1); i < len; i++)
 		printelt(CAR(tmp), i, i - rowmin + 2, col);
+	}
+    }
-    show(de);
+}
 /* whichrow is absolute row no */
 void drawrow(int whichrow)
 	tvec = CAR(nthcdr(inputlist, i - 1));
 	if (tvec != R_NilValue)
 	    if (whichrow <= (int)LEVELS(tvec))
 	    printelt(tvec, whichrow - 1, row, i - colmin + 1);
+    }
-    show(de);
+}
 /* printelt: print the correct value from vector[vrow] into the
    spreadsheet in row ssrow and col sscol */
 		(i = rowmin + whichrow - 2) < (int)LEVELS(CAR(tmp)) )
 		printelt(CAR(tmp), i, whichrow, whichcol);
 	} else
 	printstring("", 0, whichrow,  whichcol, 0);
+    }
-    show(de);
+}
 void jumppage(int dir)
+{
     int i, w, oldcol, wcol;
     int x, y;
     find_coords(crow, ccol, &x, &y);
     drawrectangle(x + lwd - 1, y + lwd -1,
 		  BOXW(ccol+colmin-1) - lwd + 1,
 		  box_h - lwd + 1, lwd, fore);
-    show(de);
+}
 void downlightrect()
+{
     printrect(2, 0);
 	    *(pc + fw - 1) = '>';
 	    *(pc + fw) = '\0';
+	}
+    }
     de_drawtext(x_pos + text_xoffset, y_pos - text_yoffset, pc);
-    show(de);
+}
 void clearrect()
+{
     int x_pos, y_pos;
     find_coords(crow, ccol, &x_pos, &y_pos);
     cleararea(x_pos, y_pos, BOXW(ccol+colmin-1), box_h, p->bg);
-    show(de);
+}
 /* handlechar has to be able to parse decimal numbers and strings,
    depending on the current column type, only printing characters
    should get this far */
+}
 static void de_drawtext(int xpos, int ypos, char *text)
+{
     gdrawstr(de, p->f, p->fg, pt(xpos, ypos), text);
-    show(de);
+}
 /* Keypress callbacks */
 void de_normalkeyin(control c, int k)
 	return;
+    }
     switch (key) {
     case HOME:
 	jumpwin(1, 1);
+	downlightrect();
+	crow = ccol = 1;
+	highlightrect();
 	break;
     case END:
 	i = ymaxused - nhigh + 2;
-	crow = ymaxused;
 	jumpwin(xmaxused, max(i, 1));
+	downlightrect();
+	crow = ymaxused - rowmin + 1;
+	ccol = 1;
+	highlightrect();
 	break;
     case PGUP:
 	i = rowmin - nhigh + 2;
-	jumpwin(xmaxused, max(i, 1));
+	jumpwin(colmin, max(i, 1));
 	break;
     case PGDN:
 	jumpwin(colmin, rowmax);
 	break;
     case LEFT:
     deredraw();
+}
 static void deredraw()
+{
-    int i;
+    int i, w, dw;
     if (WIDTH != oldWIDTH || HEIGHT != oldHEIGHT) {
 	drawwindow();
 	return;
+    }
+    windowWidth = w = 2*bwidth + boxw[0] + BOXW(colmin);
+    nwide = 2;
+    for (i = 2; i < 100; i++) { /* 100 on-screen columns cannot occur */
+	dw = BOXW(i + colmin - 1);
+	if((w += dw) > WIDTH) {
+	    nwide = i;
+	    windowWidth = w - dw;
+	    break;
+	}
+    }
     gfillrect(de, bbg, rect(0, 0, windowWidth, box_h));
     gfillrect(de, bbg, rect(0, 0, boxw[0], windowHeight));
     for (i = 1; i < nhigh; i++)
 	drawrectangle(0, hwidth + i * box_h, boxw[0], box_h, 1, 1);
+    colmax = colmin + (nwide - 2);
+    rowmax = rowmin + (nhigh - 2);
     printlabs();
     if (inputlist != R_NilValue)
 	for (i = colmin; i <= colmax; i++) drawcol(i);
+    gfillrect(de, p->bg, rect(windowWidth+1, 0, WIDTH-windowWidth-1, HEIGHT));
     highlightrect();
-    show(de);
+}
 void de_closewin()
+{
     closerect();

The R Project SVN R

(root)/trunk/src/gnuwin32/dataentry.c @ 9155 – Rev 9095 → 9124