From 5553a0d7930a037e27b4a80fa5cb7479de543b1a Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Sat, 14 Aug 2021 11:37:54 +0200 Subject: Fix colorscheme st cursor is white --- README | 1 + Xresources | 9 +++---- config.def.h | 77 ++++++++++++++++++++++++++++++----------------------------- config.h | 63 ++++++++++++++++++++++++------------------------ st | Bin 105632 -> 105664 bytes x.o | Bin 79656 -> 79736 bytes 6 files changed, 77 insertions(+), 73 deletions(-) diff --git a/README b/README index 6a846ed..0bbf64e 100644 --- a/README +++ b/README @@ -32,3 +32,4 @@ Credits ------- Based on Aurélien APTEL bt source code. +FIX COLORSCHEME!!! diff --git a/Xresources b/Xresources index adf387d..147db04 100644 --- a/Xresources +++ b/Xresources @@ -1,5 +1,5 @@ -/* xterm*selectToClipboard: true */ -/* xterm*disallowedWindowOps: 20,21,SetXProp */ +xterm*selectToClipboard: true +xterm*disallowedWindowOps: 20,21,SetXProp /* *.font: Monospace:pixelsize=25:antialias=true:autohint=true; */ /* *.fontalt0:Braille:pixelsize=24:antialias=true:autohint=true; */ /* *.fontalt1:JoyPixels:pixelsize=24:antialias=true:autohint=true; */ @@ -8,13 +8,14 @@ ! special *.foreground: #F5F5F5 -*.background: #0A0A0A +/* background set the cursor apperently */ +*.background: #D0D0D0 /* *.cursorColor: #D0D0D0 */ *.revCursorColor: #151515 ! black *.color0: #0A0A0A -*.color8: #0A0A0A +*.color8: #353535 ! red *.color1: #AC4142 diff --git a/config.def.h b/config.def.h index 224c236..6ce5a91 100644 --- a/config.def.h +++ b/config.def.h @@ -102,14 +102,14 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - "black", - "red3", - "green3", - "yellow3", - "blue2", - "magenta3", - "cyan3", - "gray90", + "#0A0A0A", + "#AC4142", + "#A1B56C", + "#F4BF75", + "#A5D6FF", + "#AA759F", + "#75B5AA", + "#D0D0D0", /* 8 bright colors */ "gray50", @@ -178,36 +178,37 @@ static uint forcemousemod = ShiftMask; * Xresources preferences to load at startup */ ResourcePref resources[] = { - { "font", STRING, &font }, - { "color0", STRING, &colorname[0] }, - { "color1", STRING, &colorname[1] }, - { "color2", STRING, &colorname[2] }, - { "color3", STRING, &colorname[3] }, - { "color4", STRING, &colorname[4] }, - { "color5", STRING, &colorname[5] }, - { "color6", STRING, &colorname[6] }, - { "color7", STRING, &colorname[7] }, - { "color8", STRING, &colorname[8] }, - { "color9", STRING, &colorname[9] }, - { "color10", STRING, &colorname[10] }, - { "color11", STRING, &colorname[11] }, - { "color12", STRING, &colorname[12] }, - { "color13", STRING, &colorname[13] }, - { "color14", STRING, &colorname[14] }, - { "color15", STRING, &colorname[15] }, - { "background", STRING, &colorname[256] }, - { "foreground", STRING, &colorname[257] }, - { "cursorColor", STRING, &colorname[258] }, - { "termname", STRING, &termname }, - { "shell", STRING, &shell }, - { "minlatency", INTEGER, &minlatency }, - { "maxlatency", INTEGER, &maxlatency }, - { "blinktimeout", INTEGER, &blinktimeout }, - { "bellvolume", INTEGER, &bellvolume }, - { "tabspaces", INTEGER, &tabspaces }, - { "borderpx", INTEGER, &borderpx }, - { "cwscale", FLOAT, &cwscale }, - { "chscale", FLOAT, &chscale }, + { "font", STRING, &font }, + { "color0", STRING, &colorname[0] }, + { "color1", STRING, &colorname[1] }, + { "color2", STRING, &colorname[2] }, + { "color3", STRING, &colorname[3] }, + { "color4", STRING, &colorname[4] }, + { "color5", STRING, &colorname[5] }, + { "color6", STRING, &colorname[6] }, + { "color7", STRING, &colorname[7] }, + { "color8", STRING, &colorname[8] }, + { "color9", STRING, &colorname[9] }, + { "color10", STRING, &colorname[10] }, + { "color11", STRING, &colorname[11] }, + { "color12", STRING, &colorname[12] }, + { "color13", STRING, &colorname[13] }, + { "color14", STRING, &colorname[14] }, + { "color15", STRING, &colorname[15] }, + { "background", STRING, &colorname[256] }, + { "foreground", STRING, &colorname[257] }, + { "cursorColor", STRING, &colorname[258] }, + { "revCursorColor", STRING, &colorname[259] }, + { "termname", STRING, &termname }, + { "shell", STRING, &shell }, + { "minlatency", INTEGER, &minlatency }, + { "maxlatency", INTEGER, &maxlatency }, + { "blinktimeout", INTEGER, &blinktimeout }, + { "bellvolume", INTEGER, &bellvolume }, + { "tabspaces", INTEGER, &tabspaces }, + { "borderpx", INTEGER, &borderpx }, + { "cwscale", FLOAT, &cwscale }, + { "chscale", FLOAT, &chscale }, }; /* diff --git a/config.h b/config.h index 224c236..8ae6f65 100644 --- a/config.h +++ b/config.h @@ -102,7 +102,7 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { /* 8 normal colors */ - "black", + "#0A0A0A", "red3", "green3", "yellow3", @@ -178,36 +178,37 @@ static uint forcemousemod = ShiftMask; * Xresources preferences to load at startup */ ResourcePref resources[] = { - { "font", STRING, &font }, - { "color0", STRING, &colorname[0] }, - { "color1", STRING, &colorname[1] }, - { "color2", STRING, &colorname[2] }, - { "color3", STRING, &colorname[3] }, - { "color4", STRING, &colorname[4] }, - { "color5", STRING, &colorname[5] }, - { "color6", STRING, &colorname[6] }, - { "color7", STRING, &colorname[7] }, - { "color8", STRING, &colorname[8] }, - { "color9", STRING, &colorname[9] }, - { "color10", STRING, &colorname[10] }, - { "color11", STRING, &colorname[11] }, - { "color12", STRING, &colorname[12] }, - { "color13", STRING, &colorname[13] }, - { "color14", STRING, &colorname[14] }, - { "color15", STRING, &colorname[15] }, - { "background", STRING, &colorname[256] }, - { "foreground", STRING, &colorname[257] }, - { "cursorColor", STRING, &colorname[258] }, - { "termname", STRING, &termname }, - { "shell", STRING, &shell }, - { "minlatency", INTEGER, &minlatency }, - { "maxlatency", INTEGER, &maxlatency }, - { "blinktimeout", INTEGER, &blinktimeout }, - { "bellvolume", INTEGER, &bellvolume }, - { "tabspaces", INTEGER, &tabspaces }, - { "borderpx", INTEGER, &borderpx }, - { "cwscale", FLOAT, &cwscale }, - { "chscale", FLOAT, &chscale }, + { "font", STRING, &font }, + { "color0", STRING, &colorname[0] }, + { "color1", STRING, &colorname[1] }, + { "color2", STRING, &colorname[2] }, + { "color3", STRING, &colorname[3] }, + { "color4", STRING, &colorname[4] }, + { "color5", STRING, &colorname[5] }, + { "color6", STRING, &colorname[6] }, + { "color7", STRING, &colorname[7] }, + { "color8", STRING, &colorname[8] }, + { "color9", STRING, &colorname[9] }, + { "color10", STRING, &colorname[10] }, + { "color11", STRING, &colorname[11] }, + { "color12", STRING, &colorname[12] }, + { "color13", STRING, &colorname[13] }, + { "color14", STRING, &colorname[14] }, + { "color15", STRING, &colorname[15] }, + { "background", STRING, &colorname[256] }, + { "foreground", STRING, &colorname[257] }, + { "cursorColor", STRING, &colorname[258] }, + { "revCursorColor", STRING, &colorname[259] }, + { "termname", STRING, &termname }, + { "shell", STRING, &shell }, + { "minlatency", INTEGER, &minlatency }, + { "maxlatency", INTEGER, &maxlatency }, + { "blinktimeout", INTEGER, &blinktimeout }, + { "bellvolume", INTEGER, &bellvolume }, + { "tabspaces", INTEGER, &tabspaces }, + { "borderpx", INTEGER, &borderpx }, + { "cwscale", FLOAT, &cwscale }, + { "chscale", FLOAT, &chscale }, }; /* diff --git a/st b/st index 56f2686..fda69b1 100755 Binary files a/st and b/st differ diff --git a/x.o b/x.o index 4947bbd..04484ac 100644 Binary files a/x.o and b/x.o differ -- cgit v1.2.3-70-g09d2