86 lines
3.2 KiB
Diff
86 lines
3.2 KiB
Diff
diff -r b31369df5d7d sys/src/cmd/samterm/flayer.c
|
|
--- a/sys/src/cmd/samterm/flayer.c Sun Apr 18 16:20:04 2021 +0200
|
|
+++ b/sys/src/cmd/samterm/flayer.c Sun Apr 18 15:24:19 2021 -0700
|
|
@@ -29,18 +29,22 @@
|
|
lDrect = r;
|
|
|
|
/* Main text is yellowish */
|
|
- maincols[BACK] = allocimagemix(display, DPaleyellow, DWhite);
|
|
- maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);
|
|
- maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DYellowgreen);
|
|
- maincols[TEXT] = display->black;
|
|
- maincols[HTEXT] = display->black;
|
|
+ maincols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
|
|
+ maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCD664DFF);
|
|
+ maincols[BORD] = allocimage(display, Rect(0,0,2,2), CMAP8, 1, 0xA79375FF);
|
|
+ draw(maincols[BORD], Rect(1,1,2,2), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
|
|
+ draw(maincols[BORD], Rect(0,0,1,1), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
|
|
+ maincols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x54524BFF);
|
|
+ maincols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
|
|
|
|
/* Command text is blueish */
|
|
- cmdcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite);
|
|
- cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);
|
|
- cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DPurpleblue);
|
|
- cmdcols[TEXT] = display->black;
|
|
- cmdcols[HTEXT] = display->black;
|
|
+ cmdcols[BACK] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x54524BFF);
|
|
+ cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
|
|
+ cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), CMAP8, 1, 0xA79375FF);
|
|
+ draw(cmdcols[BORD], Rect(1,1,2,2), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
|
|
+ draw(cmdcols[BORD], Rect(0,0,1,1), allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF), nil, ZP);
|
|
+ cmdcols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xE8E7E6FF);
|
|
+ cmdcols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCD664DFF);
|
|
}
|
|
|
|
void
|
|
diff -r b31369df5d7d sys/src/cmd/samterm/menu.c
|
|
--- a/sys/src/cmd/samterm/menu.c Sun Apr 18 16:20:04 2021 +0200
|
|
+++ b/sys/src/cmd/samterm/menu.c Sun Apr 18 15:24:19 2021 -0700
|
|
@@ -45,21 +45,21 @@
|
|
};
|
|
|
|
char *menu2str[] = {
|
|
- "cut",
|
|
- "paste",
|
|
- "snarf",
|
|
- "plumb",
|
|
- "look",
|
|
+ "Cut",
|
|
+ "Paste",
|
|
+ "Snarf",
|
|
+ "Plumb",
|
|
+ "Look",
|
|
"<rio>",
|
|
0, /* storage for last pattern */
|
|
};
|
|
|
|
char *menu3str[] = {
|
|
- "new",
|
|
- "zerox",
|
|
- "resize",
|
|
- "close",
|
|
- "write",
|
|
+ "New",
|
|
+ "Zerox",
|
|
+ "Resize",
|
|
+ "Close",
|
|
+ "Write",
|
|
};
|
|
|
|
Menu menu2 = {0, genmenu2};
|
|
diff -r b31369df5d7d sys/src/cmd/samterm/scroll.c
|
|
--- a/sys/src/cmd/samterm/scroll.c Sun Apr 18 16:20:04 2021 +0200
|
|
+++ b/sys/src/cmd/samterm/scroll.c Sun Apr 18 15:24:19 2021 -0700
|
|
@@ -93,8 +93,9 @@
|
|
if(!eqrect(r2, l->lastsr)){
|
|
l->lastsr = r2;
|
|
draw(b, r1, l->f.cols[BORD], nil, ZP);
|
|
- draw(b, r2, l->f.cols[BACK], nil, r2.min);
|
|
+ draw(b, r2, allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0xA79375FF), nil, r2.min);
|
|
r2 = r1;
|
|
+ r2.max.x = r2.max.x+1;
|
|
r2.min.x = r2.max.x-1;
|
|
draw(b, r2, l->f.cols[BORD], nil, ZP);
|
|
if(b!=l->f.b)
|