ref: 85c312ad110aa6979e672b4951ebbf6e58c9c881
parent: ef88bf19c7f048b4bcf188a3d4767375d759edbc
author: jgstratt <jgstratt@shithub>
date: Wed Jun 7 18:11:44 EDT 2023
"Some
--- a/acme-themes.patch
+++ b/acme-themes.patch
@@ -1,6 +1,6 @@
+diff -u /sys/src/cmd/acme/acme.c acme/acme.c
--- /sys/src/cmd/acme/acme.c
+++ acme/acme.c
-diff -u /sys/src/cmd/acme/acme.c acme/acme.c
@@ -20,6 +20,7 @@
void xfidallocthread(void*);
void newwindowthread(void*);
@@ -9,7 +9,7 @@
Reffont **fontcache;
int nfontcache;
-@@ -869,6 +870,32 @@
+@@ -866,6 +867,32 @@
0x7F, 0xFE, 0x7F, 0xFE, 0x7F, 0xFE, 0x00, 0x00}
};
@@ -42,7 +42,7 @@
void
iconinit(void)
{-@@ -875,20 +902,44 @@
+@@ -872,20 +899,44 @@
Rectangle r;
Image *tmp;
@@ -99,7 +99,7 @@
if(button){freeimage(button);
freeimage(modbutton);
-@@ -961,4 +1012,56 @@
+@@ -958,4 +1009,56 @@
seek(snarffd, 0, 0);
bufreset(&snarfbuf);
bufload(&snarfbuf, 0, snarffd, &nulls);
@@ -156,16 +156,94 @@
+
+ return t;
}
---- /sys/src/cmd/acme/addr.c
-+++ acme/addr.c
---- /sys/src/cmd/acme/buff.c
-+++ acme/buff.c
+diff -u /sys/src/cmd/acme/cols.c acme/cols.c
--- /sys/src/cmd/acme/cols.c
+++ acme/cols.c
+@@ -30,7 +30,7 @@
+ t->what = Columntag;
+ r1.min.y = r1.max.y;
+ r1.max.y += Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ textinsert(t, 0, L"New Cut Paste Snarf Sort Zerox Delcol ", 38, TRUE);
+ textsetselect(t, t->file->nc, t->file->nc);
+ draw(screen, t->scrollr, colbutton, nil, colbutton->r.min);
+@@ -79,7 +79,7 @@
+ r1.max.y = min(y, v->body.r.min.y+v->body.nlines*v->body.font->height);
+ r1.min.y = winresize(v, r1, FALSE, FALSE);
+ r1.max.y = r1.min.y+Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ r.min.y = r1.max.y;
+ }
+ if(w == nil){+@@ -197,7 +197,7 @@
+ draw(screen, c->tag.scrollr, colbutton, nil, colbutton->r.min);
+ r1.min.y = r1.max.y;
+ r1.max.y += Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ r1.max.y = r.max.y;
+ new = Dy(r) - c->nw*(Border + font->height);
+ old = Dy(c->r) - c->nw*(Border + font->height);
+@@ -214,7 +214,7 @@
+ r1.max.y = max(r1.max.y, r1.min.y + Border+font->height);
+ r2 = r1;
+ r2.max.y = r2.min.y+Border;
+- draw(screen, r2, display->black, nil, ZP);
++ draw(screen, r2, textcols[BORD], nil, ZP);
+ r1.min.y = r2.max.y;
+ r1.min.y = winresize(w, r1, FALSE, i==c->nw-1);
+ }
+@@ -270,7 +270,7 @@
+ r.max.y = r.min.y+Dy(w->r)+Border;
+ r1 = r;
+ r1.max.y = r1.min.y+Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ r.min.y = r1.max.y;
+ y = winresize(w, r, FALSE, i==c->nw-1);
+ }
+@@ -372,7 +372,7 @@
+ }else
+ r.min.y = v->r.max.y;
+ r.max.y += Border;
+- draw(screen, r, display->black, nil, ZP);
++ draw(screen, r, textcols[BORD], nil, ZP);
+ y1 = r.max.y;
+ }
+ /* scan to see new size of everyone below */
+@@ -400,7 +400,7 @@
+ if(i < c->nw-1){+ r.min.y = r.max.y;
+ r.max.y += Border;
+- draw(screen, r, display->black, nil, ZP);
++ draw(screen, r, textcols[BORD], nil, ZP);
+ for(j=i+1; j<c->nw; j++)
+ ny[j] -= (y2-r.max.y);
+ }
+@@ -418,7 +418,7 @@
+ if(j < c->nw-1){ /* no border on last window */+ r.min.y = y1;
+ r.max.y += Border;
+- draw(screen, r, display->black, nil, ZP);
++ draw(screen, r, textcols[BORD], nil, ZP);
+ y1 = r.max.y;
+ }
+ }
+@@ -501,7 +501,7 @@
+ draw(screen, r, textcols[BACK], nil, ZP);
+ r.min.y = winresize(v, r, c->safe, FALSE);
+ r.max.y = r.min.y+Border;
+- draw(screen, r, display->black, nil, ZP);
++ draw(screen, r, textcols[BORD], nil, ZP);
+ r.min.y = r.max.y;
+ if(i == c->nw-1)
+ r.max.y = c->r.max.y;
+diff -u /sys/src/cmd/acme/dat.h acme/dat.h
--- /sys/src/cmd/acme/dat.h
+++ acme/dat.h
-diff -u /sys/src/cmd/acme/dat.h acme/dat.h
-@@ -569,3 +569,67 @@
+@@ -568,3 +568,67 @@
Channel *cwarn; /* chan(void*)[1] (really chan(unit)[1]) */
#define STACK 8192
@@ -233,31 +311,9 @@
+};
+
+Image *col[Numcolors];
---- /sys/src/cmd/acme/disk.c
-+++ acme/disk.c
---- /sys/src/cmd/acme/ecmd.c
-+++ acme/ecmd.c
---- /sys/src/cmd/acme/edit.c
-+++ acme/edit.c
---- /sys/src/cmd/acme/edit.h
-+++ acme/edit.h
---- /sys/src/cmd/acme/elog.c
-+++ acme/elog.c
---- /sys/src/cmd/acme/exec.c
-+++ acme/exec.c
---- /sys/src/cmd/acme/file.c
-+++ acme/file.c
---- /sys/src/cmd/acme/fns.h
-+++ acme/fns.h
---- /sys/src/cmd/acme/fsys.c
-+++ acme/fsys.c
---- /sys/src/cmd/acme/logf.c
-+++ acme/logf.c
---- /sys/src/cmd/acme/look.c
-+++ acme/look.c
+diff -u /sys/src/cmd/acme/mkfile acme/mkfile
--- /sys/src/cmd/acme/mkfile
+++ acme/mkfile
-diff -u /sys/src/cmd/acme/mkfile acme/mkfile
@@ -1,7 +1,7 @@
</$objtype/mkfile
BIN=/$objtype/bin
@@ -267,19 +323,60 @@
OFILES=\
acme.$O\
---- /sys/src/cmd/acme/regx.c
-+++ acme/regx.c
+diff -u /sys/src/cmd/acme/rows.c acme/rows.c
--- /sys/src/cmd/acme/rows.c
+++ acme/rows.c
---- /sys/src/cmd/acme/scrl.c
-+++ acme/scrl.c
---- /sys/src/cmd/acme/text.c
-+++ acme/text.c
---- /sys/src/cmd/acme/time.c
-+++ acme/time.c
---- /sys/src/cmd/acme/util.c
-+++ acme/util.c
---- /sys/src/cmd/acme/wind.c
-+++ acme/wind.c
---- /sys/src/cmd/acme/xfid.c
-+++ acme/xfid.c
+@@ -32,7 +32,7 @@
+ t->col = nil;
+ r1.min.y = r1.max.y;
+ r1.max.y += Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ textinsert(t, 0, L"Newcol Kill Putall Dump Exit ", 29, TRUE);
+ textsetselect(t, t->file->nc, t->file->nc);
+ }
+@@ -71,7 +71,7 @@
+ colresize(d, r1);
+ r1.min.x = r1.max.x;
+ r1.max.x = r1.min.x+Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ r.min.x = r1.max.x;
+ }
+ if(c == nil){+@@ -105,7 +105,7 @@
+ textresize(&row->tag, r1, TRUE);
+ r1.min.y = r1.max.y;
+ r1.max.y += Border;
+- draw(screen, r1, display->black, nil, ZP);
++ draw(screen, r1, textcols[BORD], nil, ZP);
+ r.min.y = r1.max.y;
+ r1 = r;
+ r1.max.x = r1.min.x;
+@@ -119,7 +119,7 @@
+ if(i > 0){+ r2 = r1;
+ r2.max.x = r2.min.x+Border;
+- draw(screen, r2, display->black, nil, ZP);
++ draw(screen, r2, textcols[BORD], nil, ZP);
+ r1.min.x = r2.max.x;
+ }
+ colresize(c, r1);
+@@ -185,7 +185,7 @@
+ r.min.x = p.x;
+ r.max.x = r.min.x;
+ r.max.x += Border;
+- draw(screen, r, display->black, nil, ZP);
++ draw(screen, r, textcols[BORD], nil, ZP);
+ r.min.x = r.max.x;
+ r.max.x = c->r.max.x;
+ colresize(c, r);
+@@ -555,7 +555,7 @@
+ colresize(c2, r2);
+ r2.min.x = x;
+ r2.max.x = x+Border;
+- draw(screen, r2, display->black, nil, ZP);
++ draw(screen, r2, textcols[BORD], nil, ZP);
+ }
+ if(i >= row->ncol)
+ rowadd(row, nil, x);