This commit is contained in:
glenda 2021-02-28 22:33:03 +00:00
parent 05e86b0d7e
commit 8c625bce2a
1 changed files with 50 additions and 6 deletions

View File

@ -1,6 +1,6 @@
diff -r cad89138e0ac sys/src/cmd/abaco/exec.c
--- a/sys/src/cmd/abaco/exec.c Wed Dec 23 13:10:30 2020 +0100
+++ b/sys/src/cmd/abaco/exec.c Thu Dec 31 15:31:13 2020 -0800
diff -r 4bafb394707a sys/src/cmd/abaco/exec.c
--- a/sys/src/cmd/abaco/exec.c Sun Feb 28 13:31:49 2021 +0100
+++ b/sys/src/cmd/abaco/exec.c Sun Feb 28 14:26:31 2021 -0800
@@ -18,7 +18,7 @@
void exit(Text *, Text *, int, int, Rune *, int);
void get(Text *, Text *, int, int, Rune *, int);
@ -35,9 +35,53 @@ diff -r cad89138e0ac sys/src/cmd/abaco/exec.c
rs.nr = runestrlen(rs.r);
openpage(nil, &rs);
free(s);
diff -r cad89138e0ac sys/src/cmd/abaco/rows.c
--- a/sys/src/cmd/abaco/rows.c Wed Dec 23 13:10:30 2020 +0100
+++ b/sys/src/cmd/abaco/rows.c Thu Dec 31 15:31:13 2020 -0800
diff -r 4bafb394707a sys/src/cmd/abaco/main.c
--- a/sys/src/cmd/abaco/main.c Sun Feb 28 13:31:49 2021 +0100
+++ b/sys/src/cmd/abaco/main.c Sun Feb 28 14:26:31 2021 -0800
@@ -347,19 +347,17 @@
Rectangle r;
/* Green */
- tagcols[BACK] = allocimagemix(display, DPalegreen, DWhite);
- if(tagcols[BACK] == nil)
- error("allocimagemix");
- tagcols[HIGH] = eallocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkgreen);
- tagcols[BORD] = eallocimage(display, Rect(0,0,1,1), screen->chan, 1, DMedgreen);
+ tagcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
+ tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
+ tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x404040FF);
tagcols[TEXT] = display->black;
tagcols[HTEXT] = display->black;
/* Grey */
- textcols[BACK] = display->white;
- textcols[HIGH] = eallocimage(display, Rect(0,0,1,1), CMAP8,1, 0xCCCCCCFF);
- textcols[BORD] = display->black;
- textcols[TEXT] = display->black;
+ textcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9a9a9aFF);
+ textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
+ textcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xddddddFF);
+ textcols[TEXT] = display->white;
textcols[HTEXT] = display->black;
r = Rect(0, 0, Scrollsize+2, font->height+1);
@@ -369,10 +367,10 @@
border(button, r, 2, tagcols[BORD], ZP);
r = button->r;
- colbutton = eallocimage(display, r, screen->chan, 0, 0x00994CFF);
+ colbutton = allocimage(display, r, screen->chan, 0, 0x404040FF);
- but2col = eallocimage(display, Rect(0,0,1,2), screen->chan, 1, 0xAA0000FF);
- but3col = eallocimage(display, Rect(0,0,1,2), screen->chan, 1, 0x444488FF);
+ but2col = allocimage(display, r, screen->chan, 1, 0xAA0000FF);
+ but3col = allocimage(display, r, screen->chan, 1, 0x006600FF);
passfont = openfont(display, fontnames[1]);
if(passfont == nil)
diff -r 4bafb394707a sys/src/cmd/abaco/rows.c
--- a/sys/src/cmd/abaco/rows.c Sun Feb 28 13:31:49 2021 +0100
+++ b/sys/src/cmd/abaco/rows.c Sun Feb 28 14:26:31 2021 -0800
@@ -33,7 +33,7 @@
r1.min.y = r1.max.y;
r1.max.y += Border;