summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorivanp72022-01-16 21:17:43 +0300
committerivanp72022-01-16 21:17:43 +0300
commitb8ba83949ff1ff96c6e13f5b1696fcded4e05729 (patch)
tree35f458c6674bbda688340916a323f3ef14af1aa6
parentb5887cc3952a23adce427925a993d6916824c805 (diff)
downloadaur-b8ba83949ff1ff96c6e13f5b1696fcded4e05729.tar.gz
refactor(color_palette.patch): use NR_COLORS instead of literals
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--color_palette.patch6
3 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e206971b63a3..e9fa744a3bc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,7 +23,7 @@ pkgbase = fbterm
source = fbtermrc
sha256sums = b98d487e84618503887e3996162354c482e24884bad8bf2219b6776372f306ad
sha256sums = 0d1781e2654d32d5dfd1cbf17680b49aefbb124b7164ca1d70fcf4468563be7c
- sha256sums = dfed22b91dfabc18143f767974764654946cd7d2e2d28558f038654b1134f613
+ sha256sums = 3b83ffe402cdb66f0bf46a05823ec13357cfebb6534d05acf6d1e4a732441cfc
sha256sums = 5cd1c14c640679a40f8a9d9781c2a5af5db7543c2296cda99f2886aa40468735
sha256sums = 8054410ab97da3df03406543c6a471acf3323b9e5712da6455d7c49cad7489ce
sha256sums = 73f0c87aaa5a74631c167fb765c0340dc28626b00d0a3cd065cebf71acc585f7
diff --git a/PKGBUILD b/PKGBUILD
index f1a9c8709384..f2674341fcaa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,7 +18,7 @@ source=("http://deb.debian.org/debian/pool/main/f/fbterm/fbterm_1.7.orig.tar.gz"
'fbtermrc')
sha256sums=('b98d487e84618503887e3996162354c482e24884bad8bf2219b6776372f306ad'
'0d1781e2654d32d5dfd1cbf17680b49aefbb124b7164ca1d70fcf4468563be7c'
- 'dfed22b91dfabc18143f767974764654946cd7d2e2d28558f038654b1134f613'
+ '3b83ffe402cdb66f0bf46a05823ec13357cfebb6534d05acf6d1e4a732441cfc'
'5cd1c14c640679a40f8a9d9781c2a5af5db7543c2296cda99f2886aa40468735'
'8054410ab97da3df03406543c6a471acf3323b9e5712da6455d7c49cad7489ce'
'73f0c87aaa5a74631c167fb765c0340dc28626b00d0a3cd065cebf71acc585f7'
diff --git a/color_palette.patch b/color_palette.patch
index 99f387c17861..e417c75de254 100644
--- a/color_palette.patch
+++ b/color_palette.patch
@@ -24,12 +24,12 @@
color = 7;
Config::instance()->getOption("color-foreground", color);
- if (color > 7) color = 7;
-+ if (color > 255) color = 7;
++ if (color >= NR_COLORS) color = 7;
} else {
color = 0;
Config::instance()->getOption("color-background", color);
- if (color > 7) color = 0;
-+ if (color > 255) color = 0;
++ if (color >= NR_COLORS) color = 0;
}
return color;
@@ -50,7 +50,7 @@
+void FbShell::configColors(){
+ s8 varColor[32], color[7], rgb[3];
+ u32 i,j,k,x;
-+ for(k=0;k<256;k++){
++ for(k=0;k<NR_COLORS;k++){
+ sprintf(varColor,"color-%d",k);
+ Config::instance()->getOption(varColor, color, sizeof(color));
+ for(i=0;i<3;i++){