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

+}
 /* console */
+rgb guiColors[numGuiColors] = {
-rgb consolebg = White, consolefg = Black, consoleuser = gaRed,
+	White, Black, gaRed, /* consolebg, consolefg, consoleuser, */
-    pagerhighlight = gaRed;
+	White, Black, gaRed, /* pagerbg, pagerfg, pagerhighlight,  */
+	White, Black, gaRed, /* dataeditbg, dataeditfg, dataedituser */
+	White, Black         /* editorbg, editorfg                 */
+};
 extern int R_HistorySize;  /* from Defn.h */
 ConsoleData
 newconsoledata(font f, int rows, int cols, int bufbytes, int buflines,
-	       rgb fg, rgb ufg, rgb bg, int kind, int buffered)
+	       rgb *guiColors, int kind, int buffered)
+{
     ConsoleData p;
     initapp(0, 0);
     p = (ConsoleData) malloc(sizeof(struct structConsoleData));
 	p->kbuf = NULL;
+    }
     p->bm = NULL;
     p->rows = rows;
     p->cols = cols;
-    p->fg = fg;
-    p->bg = bg;
+    for (int i=0; i<numGuiColors; i++)
-    p->ufg = ufg;
+    	p->guiColors[i] = guiColors[i];
     p->f = f;
     FH = fontheight(f);
     FW = fontwidth(f);
     WIDTH = (COLS + 1) * FW;
     HEIGHT = (ROWS + 1) * FH + 1; /* +1 avoids size problems in MDI */
+{
     wchar_t *s, *stmp, *p0;
     int   insel, len, col1, d;
     int   c1, c2, c3, x0, y0, x1, y1;
     rect r;
+    int   bg, fg, highlight, base;
+    if (p->kind == CONSOLE) base = consolebg;
+    else if (p->kind == PAGER) base = pagerbg;
+    else base = dataeditbg;
+    bg = p->guiColors[base];
+    fg = p->guiColors[base+1];
+    highlight = p->guiColors[base+2];
     if ((i < 0) || (i >= NUMLINES)) return 0;
     stmp = s = LINE(i);
     len = wcswidth(stmp);
     /* If there is a \r in the line, we need to preprocess it */
 	len = l; /* for redraw that uses len */
+    }
     col1 = COLS - 1;
     insel = p->sel ? ((i - p->my0) * (i - p->my1)) : 1;
     if (insel < 0) {
-	WLHELPER(0, col1, White, DarkBlue);
+	WLHELPER(0, col1, bg, fg);
 	return len;
+    }
     if ((USER(i) >= 0) && (USER(i) < FC + COLS)) {
 	if (USER(i) <= FC)
-	    WLHELPER(0, col1, p->ufg, p->bg);
+	    WLHELPER(0, col1, highlight, bg);
 	else {
 	    d = USER(i) - FC;
-	    WLHELPER(0, d - 1, p->fg, p->bg);
+	    WLHELPER(0, d - 1, fg, bg);
-	    WLHELPER(d, col1, p->ufg, p->bg);
+	    WLHELPER(d, col1, highlight, bg);
+	}
     } else if (USER(i) == -2) {
-	WLHELPER(0, col1, pagerhighlight, p->bg);
+	WLHELPER(0, col1, highlight, bg);
     } else
-	WLHELPER(0, col1, p->fg, p->bg);
+	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) {
 	    r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH, FW/4, FH);
-	    gfillrect(p->bm, p->ufg, 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;
 	    /* term string '\0' box width = 1 fix */
 	    w0 = wc ? Ri18n_wcwidth(wc) : 1;
 	    nn[0] = wc;
 	    r = rect(BORDERX + (CURCOL - FC) * FW, BORDERY + j * FH,
 		     w0 * FW, FH);
-	    gfillrect(p->bm, p->ufg, r);
+	    gfillrect(p->bm, highlight, r);
-	    gdrawwcs(p->bm, p->f, p->bg, pt(r.x, r.y), nn);
+	    gdrawwcs(p->bm, p->f, bg, pt(r.x, r.y), nn);
 	} else
-	    WLHELPER(CURCOL - FC, CURCOL - FC, p->bg, p->ufg);
+	    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);
 	    x1 = w0 - 1;
+	}
 	c2 = (x1 > FC + COLS) ? (COLS - 1) : (x1 - FC);
     } else
 	c2 = COLS - 1;
-    WLHELPER(c1, c2, White, DarkBlue);
+    WLHELPER(c1, c2, bg, fg);
     return len;
+}
 void drawconsole(control c, rect r) /* r is unused here */
+{
     int i, ll, wd, maxwd = 0;
     ll = min(NUMLINES, ROWS);
     if(!BM) return;;     /* This is a workaround for PR#1711.
 			    BM should never be null here */
+    if (p->kind == PAGER)
-    gfillrect(BM, p->bg, getrect(BM));
+    	gfillrect(BM, p->guiColors[pagerbg], getrect(BM));
+    else
+    	gfillrect(BM, p->guiColors[consolebg], getrect(BM));
     if(!ll) return;;
     for (i = 0; i < ll; i++) {
 	wd = WRITELINE(NEWFV + i, i);
 	if(wd > maxwd) maxwd = wd;
+    }
 	    return;;
+	}
+    }
     if (ds == 1) {
 	gscroll(BM, pt(0, -FH), RMLINES(0, ROWS - 1));
+	if (p->kind == PAGER)
-	gfillrect(BM, p->bg, RLINE(ROWS - 1));
+	    gfillrect(BM, p->guiColors[pagerbg], RLINE(ROWS - 1));
+	else
+	    gfillrect(BM, p->guiColors[consolebg], RLINE(ROWS - 1));
 	WRITELINE(fv + ROWS - 1, ROWS - 1);
+    }
     else if (ds == -1) {
 	gscroll(BM, pt(0, FH), RMLINES(0, ROWS - 1));
+	if (p->kind == PAGER)
-	gfillrect(BM, p->bg, RLINE(0));
+	    gfillrect(BM, p->guiColors[pagerbg], RLINE(0));
+	else
+	    gfillrect(BM, p->guiColors[consolebg], RLINE(0));
 	WRITELINE(fv, 0);
+    }
     RSHOW(getrect(c));
     FV = fv;
     NEWFV = fv;
 int consolebufb = DIMLBUF, consolebufl = MLBUF, consolebuffered = 1;
 void
 setconsoleoptions(const char *fnname,int fnsty, int fnpoints,
 		  int rows, int cols, int consx, int consy,
-		  rgb nfg, rgb nufg, rgb nbg, rgb high,
+		  rgb *nguiColors,
 		  int pgr, int pgc, int multiplewindows, int widthonresize,
 		  int bufbytes, int buflines, int buffered)
+{
     char msg[LF_FACESIZE + 128];
     strncpy(fontname, fnname, LF_FACESIZE);
        } */
     consoler = rows;
     consolec = cols;
     consolex = consx;
     consoley = consy;
-    consolefg = nfg;
+    for (int i=0; i<numGuiColors; i++)
-    consoleuser = nufg;
+    	guiColors[i] = nguiColors[i];
-    consolebg = nbg;
-    pagerhighlight = high;
     pagerrow = pgr;
     pagercol = pgc;
     pagerMultiple = multiplewindows;
     setWidthOnResize = widthonresize;
     consolebufb = bufbytes;
     console c;
     ConsoleData p;
     p = newconsoledata((consolefn) ? consolefn : FixedFont,
 		       consoler, consolec, consolebufb, consolebufl,
-		       consolefg, consoleuser, consolebg,
+		       guiColors,
 		       CONSOLE, consolebuffered);
     if (!p) return NULL;
     c = (console) newwindow(name, rect(consolex, consoley, WIDTH, HEIGHT),
 			    flags | TrackMouse | VScrollbar | HScrollbar);
     HEIGHT = getheight(c);
     gsetcursor(c, ArrowCursor);
     gchangescrollbar(c, VWINSB, 0, 0, ROWS, 1);
     gchangescrollbar(c, HWINSB, 0, COLS-1, COLS, 1);
     BORDERX = (WIDTH - COLS*FW) / 2;
     BORDERY = (HEIGHT - ROWS*FH) / 2;
-    setbackground(c, consolebg);
+    setbackground(c, guiColors[consolebg]);
     BM = newbitmap(WIDTH, HEIGHT, 2);
     if (!c || !BM ) {
 	freeConsoleData(p);
 	del(c);
 	return NULL;

The R Project SVN R

(root)/branches/R-classInheritance/src/gnuwin32/console.c @ 63243 – Rev 46677 → 46784