The R Project SVN – R – Diff – /branches/R-exp-R5/src/gnuwin32/console.c

 extern int R_HistorySize;  /* from Defn.h */
 ConsoleData
 newconsoledata(font f, int rows, int cols, int bufbytes, int buflines,
-	       rgb *guiColors, int kind, int buffered)
+	       rgb *guiColors, int kind, int buffered, int cursor_blink)
+{
     ConsoleData p;
     initapp(0, 0);
     p = (ConsoleData) malloc(sizeof(struct structConsoleData));
     p->mx0 = 5;
     p->mx1 = 14;
     p->sel = 0;
     p->input = 0;
     p->lazyupdate = buffered;
+    p->cursor_blink = cursor_blink;
     return (p);
+}
 static int col_to_pos(ConsoleData p, int x)
+{
+}
 #define WLHELPER(a, b, c, d) writelineHelper(p, a, b, c, d, j, len, s)
 /* write line i of the buffer at row j on bitmap */
-static int writeline(ConsoleData p, int i, int j)
+static int writeline(control c, ConsoleData p, int i, int j)
+{
     wchar_t *s, *stmp, *p0;
     int   insel, len, col1, d;
     int   c1, c2, c3, x0, y0, x1, y1;
     rect r;
 	WLHELPER(0, col1, fg, bg);
     /* This is the cursor, and it may need to be variable-width */
     if ((p->r >= 0) && (CURCOL >= FC) && (CURCOL < FC + COLS) &&
 	(i == NUMLINES - 1) && (p->sel == 0 || !intersect_input(p, 0))) {
 	if (!p->overwrite) {
+	    if (p->cursor_blink) {
+	    	setcaret(c, BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
+	    	            p->cursor_blink == 1 ? 1 : FW/4, FH);
+	    	showcaret(c, 1);
+	    } else showcaret(c, 0);
+	    if (p->cursor_blink < 2) {
-	    r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH, FW/4, FH);
+	    	r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH, FW/4, FH);
-	    gfillrect(p->bm, highlight, r);
+	    	gfillrect(p->bm, highlight, r);
+	    }
 	} else if(mbcslocale) { /* determine the width of the current char */
 	    int w0;
 	    wchar_t *P = s, wc = 0, nn[2] = L" ";
 	    for (w0 = 0; w0 <= CURCOL; P++) {
 		wc = *P;
 		w0 += Ri18n_wcwidth(wc);
+	    }
 	    /* term string '\0' box width = 1 fix */
 	    w0 = wc ? Ri18n_wcwidth(wc) : 1;
 	    nn[0] = wc;
+	    if (p->cursor_blink) {
+	    	setcaret(c, BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
+	    		    p->cursor_blink == 1 ? 1 : FW/4, FH);
+	    	showcaret(c, 1);
+	    }
+	    if (p->cursor_blink < 2) {
-	    r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
+	    	r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
-		     w0 * FW, FH);
+		         w0 * FW, FH);
-	    gfillrect(p->bm, highlight, r);
+	    	gfillrect(p->bm, highlight, r);
-	    gdrawwcs(p->bm, p->f, bg, pt(r.x, r.y), nn);
+	    	gdrawwcs(p->bm, p->f, bg, pt(r.x, r.y), nn);
+	    }
-	} else
+	} else {
+	    if (p->cursor_blink) {
+		setcaret(c, BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
+		            p->cursor_blink == 1 ? 1 : FW, FH);
+	    	showcaret(c, 1);
+	    }
+	    if (p->cursor_blink < 2)
-	    WLHELPER(CURCOL - FC, CURCOL - FC, bg, highlight);
+	    	WLHELPER(CURCOL - FC, CURCOL - FC, bg, highlight);
+	}
+    }
     if (insel != 0) return len;
     c1 = (p->my0 < p->my1);
     c2 = (p->my0 == p->my1);
     c3 = (p->mx0 < p->mx1);
 	return;;
+    }
     if (p->needredraw) {
 	ww = min(NUMLINES, ROWS) - 1;
 	rw = FV + ww;
-	writeline(p, rw, ww);
+	writeline(c, p, rw, ww);
 	if (ds == 0) {
 	    RSHOW(RLINE(ww));
 	    return;;
+	}
+    }
 int fontsty, pointsize;
 int consoler = 25, consolec = 80, consolex = 0, consoley = 0;
 int pagerrow = 25, pagercol = 80;
 int pagerMultiple = 1, haveusedapager = 0;
 int consolebufb = DIMLBUF, consolebufl = MLBUF, consolebuffered = 1;
+int consoleblink = 1;
 void
 setconsoleoptions(const char *fnname,int fnsty, int fnpoints,
 		  int rows, int cols, int consx, int consy,
 		  rgb *nguiColors,
 		  int pgr, int pgc, int multiplewindows, int widthonresize,
-		  int bufbytes, int buflines, int buffered)
+		  int bufbytes, int buflines, int buffered, int cursor_blink)
+{
     char msg[LF_FACESIZE + 128];
     strncpy(fontname, fnname, LF_FACESIZE);
     fontname[LF_FACESIZE] = L'\0';
     fontsty =   fnsty;
     pagerMultiple = multiplewindows;
     setWidthOnResize = widthonresize;
     consolebufb = bufbytes;
     consolebufl = buflines;
     consolebuffered = buffered;
+    consoleblink = cursor_blink;
+}
 void consoleprint(console c)
+{
     ConsoleData p = getdata(c);
     ConsoleData p;
     p = newconsoledata((consolefn) ? consolefn : FixedFont,
 		       consoler, consolec, consolebufb, consolebufl,
 		       guiColors,
-		       CONSOLE, consolebuffered);
+		       CONSOLE, consolebuffered, consoleblink);
     if (!p) return NULL;
     c = (console) newwindow(name, rect(consolex, consoley, WIDTH, HEIGHT),
 			    flags | TrackMouse | VScrollbar | HScrollbar);
     HEIGHT = getheight(c);
     WIDTH  = getwidth(c);

The R Project SVN R

(root)/branches/R-exp-R5/src/gnuwin32/console.c @ 63243 – Rev 51627 → 51948