Skip to content
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

added support for original pastel colors by conditionally enabling colormixing, and providing a color file … #11

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

added support for original pastel colors by conditionally enabling colormixing, and providing a color file … #11

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
19 changes: 19 additions & 0 deletions colors/original
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#define ENABLE_PASTELS
#define C_MIX DWhite
#define C_TAGBG DPalebluegreen
#define C_TAGFG 0x000000FF
#define C_TAGHLBG DPalegreygreen
#define C_TAGHLFG 0x000000FF

#define C_TXTBG DPaleyellow
#define C_TXTFG 0x000000FF
#define C_TXTHLBG DDarkyellow
#define C_TXTHLFG 0x000000FF

#define C_WINBUTTON DPurpleblue
#define C_COLBUTTON DPurpleblue
#define C_TMPBUTTON DMedblue
#define C_SCROLLBG DYellowgreen

#define C_BUTTON2HL 0xAA0000FF
#define C_BUTTON3HL 0x006600FF
11 changes: 9 additions & 2 deletions src/cmd/acme/acme.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,14 +979,21 @@ iconinit(void)
Image *tmp;

if(tagcols[BACK] == nil) {

#ifndef ENABLE_PASTELS
tagcols[BACK] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TAGBG);
#else
tagcols[BACK] = allocimagemix(display, C_TAGBG, C_MIX);
#endif

tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TAGHLBG);
tagcols[BORD] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_COLBUTTON);
tagcols[TEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TAGFG);
tagcols[HTEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TAGHLFG);

#ifndef ENABLE_PASTELS
textcols[BACK] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TXTBG);
#else
textcols[BACK] = allocimagemix(display, C_TXTBG, C_MIX);
#endif
textcols[HIGH] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TXTHLBG);
textcols[BORD] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_SCROLLBG);
textcols[TEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, C_TXTFG);
Expand Down