Skip to content

Change all the missing colors to match the CPK colors used in jmol #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iribirii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change all the missing colors to match the CPK colors used in jmol #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 101 additions & 16 deletions src/v/x.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,38 +33,123 @@ static void setcolors(){
col[NCOLORS]={
[ 0] .red = 0x9999, [ 0] .green = 0x9999, [ 0] .blue = 0x9999,
[ 1] .red = 0xBFFF, [ 1] .green = 0xBFFF, [ 1] .blue = 0xBFFF, /* H */
[ 2] .red = 0xAAAA, [ 2] .green = 0xFFFF, [ 2] .blue = 0xFFFF, /* He */
[ 2] .red = 0xD9D9, [ 2] .green = 0xFFFF, [ 2] .blue = 0xFFFF, /* He */
[3] .red = 0xCCCC, [ 3] .green = 0x8080, [ 3] .blue = 0xFFFF, /* Li */
[4] .red = 0xC2C2, [ 4] .green = 0xFFFF, [ 4] .blue = 0x0000, /* Be */
[5] .red = 0xFFFF, [ 5] .green = 0xB5B5, [ 5] .blue = 0xB5B5, /* B */
[ 6] .red = 0x5FFF, [ 6] .green = 0x5FFF, [ 6] .blue = 0x5FFF, /* C */
[ 5] .red = 0xFFFF, [ 5] .green = 0xDDDD, [ 5] .blue = 0xFFFF, /* P */
[ 7] .red = 0x1FFF, [ 7] .green = 0x1FFF, [ 7] .blue = 0xBFFF, /* N */
[ 8] .red = 0xBFFF, [ 8] .green = 0x1FFF, [ 8] .blue = 0x1FFF, /* O */
[ 9] .red = 0xF500, [ 9] .green = 0xFFFF, [ 9] .blue = 0x8500, /* F */
[ 10] .red = 0xAAAA, [ 10] .green = 0xFFFF, [ 10] .blue = 0xFFFF, /* Ne */
[11] .red = 0xABAB, [ 11] .green = 0x5C5C, [ 11] .blue = 0xF2F2, /* Na */
[12] .red = 0x8A8A, [ 12] .green = 0xFFFF, [ 12] .blue = 0x0000, /* Mg */
[13] .red = 0xBFBF, [ 13] .green = 0xA6A6, [ 13] .blue = 0xA6A6, /* Al */
[ 14] .red = 0x5FFF, [ 14] .green = 0x5FFF, [ 14] .blue = 0x5FFF, /* Si */
[ 15] .red = 0xFFFF, [ 15] .green = 0xCCCC, [ 15] .blue = 0x9999, /* P */
[ 16] .red = 0xFFFF, [ 16] .green = 0xEEEE, [ 16] .blue = 0x1111, /* S */
[ 17] .red = 0xCCCC, [ 17] .green = 0xFFFF, [ 17] .blue = 0x9999, /* Cl */
[ 18] .red = 0xAAAA, [ 18] .green = 0xFFFF, [ 18] .blue = 0xFFFF, /* Ar */
[ 28] .red = 0x9999, [ 28] .green = 0x5555, [ 28] .blue = 0xFFFF, /* Ni */
[19] .red = 0x8F8F, [ 19] .green = 0x4040, [ 19] .blue = 0xD4D4, /* K */
[20] .red = 0x3D3D, [ 20] .green = 0xFFFF, [ 20] .blue = 0x0000, /* Ca */
[21] .red = 0xE6E6, [ 21] .green = 0xE6E6, [ 21] .blue = 0xE6E6, /* Sc */
[22] .red = 0xBFBF, [ 22] .green = 0xC2C2, [ 22] .blue = 0xC7C7, /* Ti */
[23] .red = 0xA6A6, [ 23] .green = 0xA6A6, [ 23] .blue = 0xABAB, /* V */
[24] .red = 0x8A8A, [ 24] .green = 0x9999, [ 24] .blue = 0xC7C7, /* Cr */
[25] .red = 0x9C9C, [ 25] .green = 0x7A7A, [ 25] .blue = 0xC7C7, /* Mn */
[ 26] .red = 0xDDDD, [ 26] .green = 0x6666, [ 26] .blue = 0x3333, /* Fe */
[ 27] .red = 0xEEEE, [ 27] .green = 0x8888, [ 27] .blue = 0x9999, /* Co */
[ 28] .red = 0x5050, [ 28] .green = 0xD0D0, [ 28] .blue = 0x5050, /* Ni */
[ 29] .red = 0xBBBB, [ 29] .green = 0x7777, [ 29] .blue = 0x3333, /* Cu */
[30] .red = 0x7D7D, [ 30] .green = 0x8080, [ 30] .blue = 0xB0B0, /* Zn */
[31] .red = 0xC2C2, [ 31] .green = 0x8F8F, [ 31] .blue = 0x8F8F, /* Ga */
[32] .red = 0x6666, [ 32] .green = 0x8F8F, [ 32] .blue = 0x8F8F, /* Ge */
[33] .red = 0xBDBD, [ 33] .green = 0x8080, [ 33] .blue = 0xE3E3, /* As */
[ 34] .red = 0xFFFF, [ 34] .green = 0xAAAA, [ 34] .blue = 0x1111, /* Se */
[ 35] .red = 0xAAAA, [ 35] .green = 0x4444, [ 35] .blue = 0x0000, /* Br */
[ 36] .red = 0xAAAA, [ 36] .green = 0xFFFF, [ 36] .blue = 0xFFFF, /* Kr */
[ 46] .red = 0x0000, [ 46] .green = 0x6666, [ 46] .blue = 0x7777, /* Pd */
[ 47] .red = 0xAAAA, [ 47] .green = 0xAAAA, [ 47] .blue = 0xAAAA, /* Ag */
[ 53] .red = 0xAAAA, [ 53] .green = 0x0000, [ 53] .blue = 0xFFFF, /* I */
[ 54] .red = 0xAAAA, [ 54] .green = 0xFFFF, [ 54] .blue = 0xFFFF, /* Xe */
[ 78] .red = 0x3333, [ 78] .green = 0x9999, [ 78] .blue = 0xDDDD, /* Pt */
[ 79] .red = 0xFFFF, [ 79] .green = 0xCCCC, [ 79] .blue = 0x0000, /* Au */
[37] .red = 0x7070, [ 37] .green = 0x2E2E, [ 37] .blue = 0xB0B0, /* Rb */
[38] .red = 0x0000, [ 38] .green = 0xFFFF, [ 38] .blue = 0x0000, /* Sr */
[39] .red = 0x9494, [ 39] .green = 0xFFFF, [ 39] .blue = 0xFFFF, /* Y */
[40] .red = 0x9494, [ 40] .green = 0xE0E0, [ 40] .blue = 0xE0E0, /* Zr */
[41] .red = 0x7373, [ 41] .green = 0xC2C2, [ 41] .blue = 0xC9C9, /* Nb */
[42] .red = 0x5454, [ 42] .green = 0xB5B5, [ 42] .blue = 0xB5B5, /* Mo */
[43] .red = 0x3B3B, [ 43] .green = 0x9E9E, [ 43] .blue = 0x9E9E, /* Tc */
[44] .red = 0x2424, [ 44] .green = 0x8F8F, [ 44] .blue = 0x8F8F, /* Ru */
[45] .red = 0x0A0A, [ 45] .green = 0x7D7D, [ 45] .blue = 0x8C8C, /* Rh */
[46] .red = 0x0000, [ 46] .green = 0x6969, [ 46] .blue = 0x8585, /* Pd */
[47] .red = 0xC0C0, [ 47] .green = 0xC0C0, [ 47] .blue = 0xC0C0, /* Ag */
[48] .red = 0xFFFF, [ 48] .green = 0xD9D9, [ 48] .blue = 0x8F8F, /* Cd */
[49] .red = 0xA6A6, [ 49] .green = 0x7575, [ 49] .blue = 0x7373, /* In */
[50] .red = 0x6666, [ 50] .green = 0x8080, [ 50] .blue = 0x8080, /* Sn */
[51] .red = 0x9E9E, [ 51] .green = 0x6363, [ 51] .blue = 0xB5B5, /* Sb */
[52] .red = 0xD4D4, [ 52] .green = 0x7A7A, [ 52] .blue = 0x0000, /* Te */
[53] .red = 0x9494, [ 53] .green = 0x0000, [ 53] .blue = 0x9494, /* I */
[54] .red = 0x4242, [ 54] .green = 0x9E9E, [ 54] .blue = 0xB0B0, /* Xe */
[55] .red = 0x5757, [ 55] .green = 0x1717, [ 55] .blue = 0x8F8F, /* Cs */
[56] .red = 0x0000, [ 56] .green = 0xC9C9, [ 56] .blue = 0x0000, /* Ba */
[57] .red = 0x7070, [ 57] .green = 0xD4D4, [ 57] .blue = 0xFFFF, /* La */
[58] .red = 0xFFFF, [ 58] .green = 0xFFFF, [ 58] .blue = 0xC7C7, /* Ce */
[59] .red = 0xD9D9, [ 59] .green = 0xFFFF, [ 59] .blue = 0xC7C7, /* Pr */
[60] .red = 0xC7C7, [ 60] .green = 0xFFFF, [ 60] .blue = 0xC7C7, /* Nd */
[61] .red = 0xA3A3, [ 61] .green = 0xFFFF, [ 61] .blue = 0xC7C7, /* Pm */
[62] .red = 0x8F8F, [ 62] .green = 0xFFFF, [ 62] .blue = 0xC7C7, /* Sm */
[63] .red = 0x6161, [ 63] .green = 0xFFFF, [ 63] .blue = 0xC7C7, /* Eu */
[64] .red = 0x4545, [ 64] .green = 0xFFFF, [ 64] .blue = 0xC7C7, /* Gd */
[65] .red = 0x3030, [ 65] .green = 0xFFFF, [ 65] .blue = 0xC7C7, /* Tb */
[66] .red = 0x1F1F, [ 66] .green = 0xFFFF, [ 66] .blue = 0xC7C7, /* Dy */
[67] .red = 0x0000, [ 67] .green = 0xFFFF, [ 67] .blue = 0x9C9C, /* Ho */
[68] .red = 0x0000, [ 68] .green = 0xE6E6, [ 68] .blue = 0x7575, /* Er */
[69] .red = 0x0000, [ 69] .green = 0xD4D4, [ 69] .blue = 0x5252, /* Tm */
[70] .red = 0x0000, [ 70] .green = 0xBFBF, [ 70] .blue = 0x3838, /* Yb */
[71] .red = 0x0000, [ 71] .green = 0xABAB, [ 71] .blue = 0x2424, /* Lu */
[72] .red = 0x4D4D, [ 72] .green = 0xC2C2, [ 72] .blue = 0xFFFF, /* Hf */
[73] .red = 0x4D4D, [ 73] .green = 0xA6A6, [ 73] .blue = 0xFFFF, /* Ta */
[74] .red = 0x2121, [ 74] .green = 0x9494, [ 74] .blue = 0xD6D6, /* W */
[75] .red = 0x2626, [ 75] .green = 0x7D7D, [ 75] .blue = 0xABAB, /* Re */
[76] .red = 0x2626, [ 76] .green = 0x6666, [ 76] .blue = 0x9696, /* Os */
[77] .red = 0x1717, [ 77] .green = 0x5454, [ 77] .blue = 0x8787, /* Ir */
[78] .red = 0xD0D0, [ 78] .green = 0xD0D0, [ 78] .blue = 0xE0E0, /* Pt */
[79] .red = 0xFFFF, [ 79] .green = 0xD1D1, [ 79] .blue = 0x2323, /* Au */
[80] .red = 0xB8B8, [ 80] .green = 0xB8B8, [ 80] .blue = 0xD0D0, /* Hg */
[81] .red = 0xA6A6, [ 81] .green = 0x5454, [ 81] .blue = 0x4D4D, /* Tl */
[82] .red = 0x5757, [ 82] .green = 0x5959, [ 82] .blue = 0x6161, /* Pb */
[83] .red = 0x9E9E, [ 83] .green = 0x4F4F, [ 83] .blue = 0xB5B5, /* Bi */
[84] .red = 0xABAB, [ 84] .green = 0x5C5C, [ 84] .blue = 0x0000, /* Po */
[85] .red = 0x7575, [ 85] .green = 0x4F4F, [ 85] .blue = 0x4545, /* At */
[86] .red = 0x4242, [ 86] .green = 0x8282, [ 86] .blue = 0x9696, /* Rn */
[87] .red = 0x4242, [ 87] .green = 0x0000, [ 87] .blue = 0x6666, /* Fr */
[88] .red = 0x0000, [ 88] .green = 0x7D7D, [ 88] .blue = 0x0000, /* Ra */
[89] .red = 0x7070, [ 89] .green = 0xABAB, [ 89] .blue = 0xFAFA, /* Ac */
[90] .red = 0x0000, [ 90] .green = 0xBABA, [ 90] .blue = 0xFFFF, /* Th */
[91] .red = 0x0000, [ 91] .green = 0xA1A1, [ 91] .blue = 0xFFFF, /* Pa */
[92] .red = 0x0000, [ 92] .green = 0x8F8F, [ 92] .blue = 0xFFFF, /* U */
[93] .red = 0x0000, [ 93] .green = 0x8080, [ 93] .blue = 0xFFFF, /* Np */
[94] .red = 0x0000, [ 94] .green = 0x6B6B, [ 94] .blue = 0xFFFF, /* Pu */
[95] .red = 0x5454, [ 95] .green = 0x5C5C, [ 95] .blue = 0xF2F2, /* Am */
[96] .red = 0x7878, [ 96] .green = 0x5C5C, [ 96] .blue = 0xE3E3, /* Cm */
[97] .red = 0x8A8A, [ 97] .green = 0x4F4F, [ 97] .blue = 0xE3E3, /* Bk */
[98] .red = 0xA1A1, [ 98] .green = 0x3636, [ 98] .blue = 0xD4D4, /* Cf */
[99] .red = 0xB3B3, [ 99] .green = 0x1F1F, [ 99] .blue = 0xD4D4, /* Es */
[100] .red = 0xB3B3, [100] .green = 0x1F1F, [100] .blue = 0xBABA, /* Fm */
[101] .red = 0xB3B3, [101] .green = 0x0D0D, [101] .blue = 0xA6A6, /* Md */
[102] .red = 0xBDBD, [102] .green = 0x0D0D, [102] .blue = 0x8787, /* No */
[103] .red = 0xC7C7, [103] .green = 0x0000, [103] .blue = 0x6666, /* Lr */
[104] .red = 0xCCCC, [104] .green = 0x0000, [104] .blue = 0x5959, /* Rf */
[105] .red = 0xD1D1, [105] .green = 0x0000, [105] .blue = 0x4F4F, /* Db */
[106] .red = 0xD9D9, [106] .green = 0x0000, [106] .blue = 0x4545, /* Sg */
[107] .red = 0xE0E0, [107] .green = 0x0000, [107] .blue = 0x3838, /* Bh */
[108] .red = 0xE6E6, [108] .green = 0x0000, [108] .blue = 0x2E2E, /* Hs */
// [109] .red = 0xEBEB, [109] .green = 0x0000, [109] .blue = 0x2626, /* Mt */
};

for(int i=3; i<5; i++){ col[i] = col[0]; }
for(int i=11; i<14; i++){ col[i] = col[0]; }
for(int i=19; i<28; i++){ col[i] = col[0]; }
for(int i=30; i<34; i++){ col[i] = col[0]; }
for(int i=37; i<46; i++){ col[i] = col[0]; }
for(int i=48; i<53; i++){ col[i] = col[0]; }
for(int i=55; i<78; i++){ col[i] = col[0]; }
// for(int i=3; i<5; i++){ col[i] = col[0]; }
// for(int i=11; i<14; i++){ col[i] = col[0]; }
// for(int i=19; i<26; i++){ col[i] = col[0]; }
// for(int i=30; i<34; i++){ col[i] = col[0]; }
// for(int i=37; i<46; i++){ col[i] = col[0]; }
// for(int i=48; i<53; i++){ col[i] = col[0]; }
// for(int i=55; i<78; i++){ col[i] = col[0]; }

Colormap colmap = DefaultColormap(dis, DefaultScreen(dis));
for(int i=0; i<NCOLORS; i++){
Expand Down
2 changes: 1 addition & 1 deletion src/v/x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <X11/xpm.h>
#include <X11/keysymdef.h>

#define NCOLORS 80
#define NCOLORS 109

#define CLEARCANV \
if(canv == px){\
Expand Down