ref: c93293e83cc4749b4d6dab5670e720ee67a8a8bb
parent: 6f4c60d633b466c519dd149f4402ed17e37a94c3
author: qwx <qwx@sciops.net>
date: Sun Dec 6 09:48:55 EST 2020
rio, statusbar, statusmsg: update colors for latest changes
--- a/rio-col
+++ b/rio-col
@@ -1,9 +1,7 @@
-rio colors.
-
-diff -r 3cb0cf9ab43a sys/src/cmd/rio/data.c
---- a/sys/src/cmd/rio/data.c Mon Feb 08 20:07:56 2016 -0500
-+++ b/sys/src/cmd/rio/data.c Sun Feb 14 06:53:09 2016 +0100
-@@ -175,27 +175,21 @@
+diff -r c055db14ff2b sys/src/cmd/rio/data.c
+--- a/sys/src/cmd/rio/data.c Sun Dec 06 14:50:50 2020 +0100
++++ b/sys/src/cmd/rio/data.c Sun Dec 06 15:08:42 2020 +0100
+@@ -175,31 +175,20 @@
void
iconinit(void)
{@@ -29,6 +27,12 @@
- paleholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DPalegreyblue);
- paletextcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x666666FF^reverse);
- sizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DRed);
+- badsizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x880000FF);
+-
+- if(reverse == 0)
+- holdcol = dholdcol;
+- else
+- holdcol = paleholdcol;
+ cols[BACK] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DBlack);
+ cols[BORD] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x111111FF);
+ cols[TEXT] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x884400FF);
@@ -41,6 +45,5 @@
+ paleholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x333333FF);
+ paletextcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x550000FF);
+ sizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x550000FF);
-
- if(reverse == 0)
- holdcol = dholdcol;
++ badsizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0xAA0000FF);
+ }
--- a/statusbar-col
+++ b/statusbar-col
@@ -1,6 +1,6 @@
-diff -r b048db97b5ea sys/src/cmd/aux/statusbar.c
---- a/sys/src/cmd/aux/statusbar.c Fri Jan 04 02:51:29 2019 +0100
-+++ b/sys/src/cmd/aux/statusbar.c Mon Jan 07 13:56:09 2019 +0100
+diff -r c055db14ff2b sys/src/cmd/aux/statusbar.c
+--- a/sys/src/cmd/aux/statusbar.c Sun Dec 06 14:50:50 2020 +0100
++++ b/sys/src/cmd/aux/statusbar.c Sun Dec 06 15:02:12 2020 +0100
@@ -18,9 +18,9 @@
void
initcolor(void)
@@ -11,6 +11,6 @@
+ text = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x440000FF);
+ light = display->black;
+ dark = text;
+ if(light == nil || dark == nil) sysfatal("initcolor: %r");}
- Rectangle rbar;
--- a/statusmsg-col
+++ b/statusmsg-col
@@ -1,7 +1,7 @@
-diff -r c392f6b2122c sys/src/cmd/aux/statusmsg.c
---- a/sys/src/cmd/aux/statusmsg.c Mon Feb 15 17:30:56 2016 +0100
-+++ b/sys/src/cmd/aux/statusmsg.c Thu Feb 18 06:06:21 2016 +0100
-@@ -19,8 +19,8 @@
+diff -r c055db14ff2b sys/src/cmd/aux/statusmsg.c
+--- a/sys/src/cmd/aux/statusmsg.c Sun Dec 06 14:50:50 2020 +0100
++++ b/sys/src/cmd/aux/statusmsg.c Sun Dec 06 15:02:20 2020 +0100
+@@ -20,8 +20,8 @@
void
initcolor(void)
{@@ -9,6 +9,6 @@
- light = allocimagemix(display, DPalegreen, DWhite);
+ text = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x440000FF);
+ light = display->black;
+ if(light == nil) sysfatal("initcolor: %r");}
- void