diff --git a/data/themes/default.edc b/data/themes/default.edc index 62b94bff..1b4b413e 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -17,16 +17,6 @@ collections { image: "pm_fill.png" COMP; } parts { -// other signals sent not handled here -// program { name: "focus_in"; -// signal: "focus,in"; -// source: "terminology"; -// } -// program { name: "focus_out"; -// signal: "focus,out"; -// source: "terminology"; -// } - //////////////////////////////////////////////////////////////////// // background handling part { name: "shadow"; @@ -44,7 +34,7 @@ collections { part { name: "base"; type: RECT; mouse_events: 1; description { state: "default" 0.0; - color: 48 48 48 255; + color: 0 43 54 255; } description { state: "translucent" 0.0; inherit: "default" 0.0; @@ -179,8 +169,27 @@ collections { align: 0.5 0.0; aspect: (255/120) (255/120); aspect_preference: HORIZONTAL; + color: 141 148 150 128; + visible: 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + visible: 1; } } + program { name: "focus_in"; + signal: "focus,in"; + source: "terminology"; + action: STATE_SET "focused" 0.0; + target: "shine"; + } + program { name: "focus_out"; + signal: "focus,out"; + source: "terminology"; + action: STATE_SET "default" 0.0; + target: "shine"; + } + //////////////////////////////////////////////////////////////////// // a place terminology will place an entry box for internal commands diff --git a/src/bin/col.c b/src/bin/col.c index a08e1b94..e6388102 100644 --- a/src/bin/col.c +++ b/src/bin/col.c @@ -4,29 +4,29 @@ const Color colors[2][2][12] = { { // normal { // normal - { 0xaa, 0xaa, 0xaa, 0xff }, // COL_DEF - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x33, 0x33, 0xff }, // COL_RED - { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN - { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW - { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA - { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE + { 0x83, 0x94, 0x96, 0xff }, // COL_DEF + { 0x07, 0x36, 0x42, 0xff }, // COL_BLACK + { 0xdc, 0x32, 0x2f, 0xff }, // COL_RED + { 0x85, 0x99, 0x00, 0xff }, // COL_GREEN + { 0xb5, 0x89, 0x00, 0xff }, // COL_YELLOW + { 0x26, 0x8b, 0xd2, 0xff }, // COL_BLUE + { 0xd3, 0x36, 0x82, 0xff }, // COL_MAGENTA + { 0x2a, 0xa1, 0x98, 0xff }, // COL_CYAN + { 0xee, 0xe8, 0xd5, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x22, 0x22, 0x22, 0xff }, // COL_INVERSE - { 0xaa, 0xaa, 0xaa, 0xff }, // COL_INVERSEBG + { 0x83, 0x94, 0x96, 0xff }, // COL_INVERSEBG }, { // bright/bold { 0xee, 0xee, 0xee, 0xff }, // COL_DEF - { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK - { 0xff, 0x66, 0x66, 0xff }, // COL_RED - { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN - { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW - { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE - { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA - { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN - { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE + { 0x00, 0x2b, 0x36, 0xff }, // COL_BLACK + { 0xcb, 0x4b, 0x16, 0xff }, // COL_RED + { 0x58, 0x6e, 0x75, 0xff }, // COL_GREEN + { 0x65, 0x7b, 0x83, 0xff }, // COL_YELLOW + { 0x83, 0x94, 0x96, 0xff }, // COL_BLUE + { 0x6c, 0x71, 0xc4, 0xff }, // COL_MAGENTA + { 0x93, 0xa1, 0xa1, 0xff }, // COL_CYAN + { 0xfd, 0xf6, 0xe3, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE { 0xee, 0xee, 0xee, 0xff }, // COL_INVERSEBG @@ -34,18 +34,18 @@ const Color colors[2][2][12] = }, { // intense { // normal - { 0xdd, 0xdd, 0xdd, 0xff }, // COL_DEF - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x88, 0x88, 0xff }, // COL_RED - { 0x88, 0xcc, 0x88, 0xff }, // COL_GREEN - { 0xcc, 0xaa, 0x88, 0xff }, // COL_YELLOW - { 0x88, 0x88, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x88, 0xcc, 0xff }, // COL_MAGENTA - { 0x88, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE + { 0xee, 0xee, 0xee, 0xff }, // COL_DEF + { 0x00, 0x2b, 0x36, 0xff }, // COL_BLACK + { 0xcb, 0x4b, 0x16, 0xff }, // COL_RED + { 0x58, 0x6e, 0x75, 0xff }, // COL_GREEN + { 0x65, 0x7b, 0x83, 0xff }, // COL_YELLOW + { 0x83, 0x94, 0x96, 0xff }, // COL_BLUE + { 0x6c, 0x71, 0xc4, 0xff }, // COL_MAGENTA + { 0x93, 0xa1, 0xa1, 0xff }, // COL_CYAN + { 0xfd, 0xf6, 0xe3, 0xff }, // COL_WHITE { 0x00, 0x00, 0x00, 0x00 }, // COL_INVIS { 0x11, 0x11, 0x11, 0xff }, // COL_INVERSE - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_INVERSEBG + { 0xee, 0xee, 0xee, 0xff }, // COL_INVERSEBG }, { // bright/bold { 0xff, 0xff, 0xff, 0xff }, // COL_DEF @@ -67,42 +67,23 @@ const Color colors[2][2][12] = const Color colors256[256] = { // basic 16 repeated -/* - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xcc, 0x33, 0x33, 0xff }, // COL_RED - { 0x33, 0xcc, 0x33, 0xff }, // COL_GREEN - { 0xcc, 0x88, 0x33, 0xff }, // COL_YELLOW - { 0x33, 0x33, 0xcc, 0xff }, // COL_BLUE - { 0xcc, 0x33, 0xcc, 0xff }, // COL_MAGENTA - { 0x33, 0xcc, 0xcc, 0xff }, // COL_CYAN - { 0xcc, 0xcc, 0xcc, 0xff }, // COL_WHITE - - { 0x66, 0x66, 0x66, 0xff }, // COL_BLACK - { 0xff, 0x66, 0x66, 0xff }, // COL_RED - { 0x66, 0xff, 0x66, 0xff }, // COL_GREEN - { 0xff, 0xff, 0x66, 0xff }, // COL_YELLOW - { 0x66, 0x66, 0xff, 0xff }, // COL_BLUE - { 0xff, 0x66, 0xff, 0xff }, // COL_MAGENTA - { 0x66, 0xff, 0xff, 0xff }, // COL_CYAN - { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE - */ - { 0x00, 0x00, 0x00, 0xff }, // COL_BLACK - { 0xc0, 0x00, 0x00, 0xff }, // COL_RED - { 0x00, 0xc0, 0x00, 0xff }, // COL_GREEN - { 0xc0, 0xc0, 0x00, 0xff }, // COL_YELLOW - { 0x00, 0x00, 0xc0, 0xff }, // COL_BLUE - { 0xc0, 0x00, 0xc0, 0xff }, // COL_MAGENTA - { 0x00, 0xc0, 0xc0, 0xff }, // COL_CYAN - { 0xc0, 0xc0, 0xc0, 0xff }, // COL_WHITE - - { 0x80, 0x80, 0x80, 0xff }, // COL_BLACK - { 0xff, 0x80, 0x80, 0xff }, // COL_RED - { 0x80, 0xff, 0x80, 0xff }, // COL_GREEN - { 0xff, 0xff, 0x80, 0xff }, // COL_YELLOW - { 0x80, 0x80, 0xff, 0xff }, // COL_BLUE - { 0xff, 0x80, 0xff, 0xff }, // COL_MAGENTA - { 0x80, 0xff, 0xff, 0xff }, // COL_CYAN - { 0xff, 0xff, 0xff, 0xff }, // COL_WHITE + { 0x07, 0x36, 0x42, 0xff }, // COL_BLACK + { 0xdc, 0x32, 0x2f, 0xff }, // COL_RED + { 0x85, 0x99, 0x00, 0xff }, // COL_GREEN + { 0xb5, 0x89, 0x00, 0xff }, // COL_YELLOW + { 0x26, 0x8b, 0xd2, 0xff }, // COL_BLUE + { 0xd3, 0x36, 0x82, 0xff }, // COL_MAGENTA + { 0x2a, 0xa1, 0x98, 0xff }, // COL_CYAN + { 0xee, 0xe8, 0xd5, 0xff }, // COL_WHITE + + { 0x00, 0x2b, 0x36, 0xff }, // COL_BLACK + { 0xcb, 0x4b, 0x16, 0xff }, // COL_RED + { 0x58, 0x6e, 0x75, 0xff }, // COL_GREEN + { 0x65, 0x7b, 0x83, 0xff }, // COL_YELLOW + { 0x83, 0x94, 0x96, 0xff }, // COL_BLUE + { 0x6c, 0x71, 0xc4, 0xff }, // COL_MAGENTA + { 0x93, 0xa1, 0xa1, 0xff }, // COL_CYAN + { 0xfd, 0xf6, 0xe3, 0xff }, // COL_WHITE // pure 6x6x6 colorcube { 0x00, 0x00, 0x00, 0xff }, @@ -111,245 +92,245 @@ const Color colors256[256] = { 0x00, 0x00, 0xaf, 0xff }, { 0x00, 0x00, 0xd7, 0xff }, { 0x00, 0x00, 0xff, 0xff }, - + { 0x00, 0x5f, 0x00, 0xff }, { 0x00, 0x5f, 0x5f, 0xff }, { 0x00, 0x5f, 0x87, 0xff }, { 0x00, 0x5f, 0xaf, 0xff }, { 0x00, 0x5f, 0xd7, 0xff }, { 0x00, 0x5f, 0xff, 0xff }, - + { 0x00, 0x87, 0x00, 0xff }, { 0x00, 0x87, 0x5f, 0xff }, { 0x00, 0x87, 0x87, 0xff }, { 0x00, 0x87, 0xaf, 0xff }, { 0x00, 0x87, 0xd7, 0xff }, { 0x00, 0x87, 0xff, 0xff }, - + { 0x00, 0xaf, 0x00, 0xff }, { 0x00, 0xaf, 0x5f, 0xff }, { 0x00, 0xaf, 0x87, 0xff }, { 0x00, 0xaf, 0xaf, 0xff }, { 0x00, 0xaf, 0xd7, 0xff }, { 0x00, 0xaf, 0xff, 0xff }, - + { 0x00, 0xd7, 0x00, 0xff }, { 0x00, 0xd7, 0x5f, 0xff }, { 0x00, 0xd7, 0x87, 0xff }, { 0x00, 0xd7, 0xaf, 0xff }, { 0x00, 0xd7, 0xd7, 0xff }, { 0x00, 0xd7, 0xff, 0xff }, - + { 0x00, 0xff, 0x00, 0xff }, { 0x00, 0xff, 0x5f, 0xff }, { 0x00, 0xff, 0x87, 0xff }, { 0x00, 0xff, 0xaf, 0xff }, { 0x00, 0xff, 0xd7, 0xff }, { 0x00, 0xff, 0xff, 0xff }, - + { 0x5f, 0x00, 0x00, 0xff }, { 0x5f, 0x00, 0x5f, 0xff }, { 0x5f, 0x00, 0x87, 0xff }, { 0x5f, 0x00, 0xaf, 0xff }, { 0x5f, 0x00, 0xd7, 0xff }, { 0x5f, 0x00, 0xff, 0xff }, - + { 0x5f, 0x5f, 0x00, 0xff }, { 0x5f, 0x5f, 0x5f, 0xff }, { 0x5f, 0x5f, 0x87, 0xff }, { 0x5f, 0x5f, 0xaf, 0xff }, { 0x5f, 0x5f, 0xd7, 0xff }, { 0x5f, 0x5f, 0xff, 0xff }, - + { 0x5f, 0x87, 0x00, 0xff }, { 0x5f, 0x87, 0x5f, 0xff }, { 0x5f, 0x87, 0x87, 0xff }, { 0x5f, 0x87, 0xaf, 0xff }, { 0x5f, 0x87, 0xd7, 0xff }, { 0x5f, 0x87, 0xff, 0xff }, - + { 0x5f, 0xaf, 0x00, 0xff }, { 0x5f, 0xaf, 0x5f, 0xff }, { 0x5f, 0xaf, 0x87, 0xff }, { 0x5f, 0xaf, 0xaf, 0xff }, { 0x5f, 0xaf, 0xd7, 0xff }, { 0x5f, 0xaf, 0xff, 0xff }, - + { 0x5f, 0xd7, 0x00, 0xff }, { 0x5f, 0xd7, 0x5f, 0xff }, { 0x5f, 0xd7, 0x87, 0xff }, { 0x5f, 0xd7, 0xaf, 0xff }, { 0x5f, 0xd7, 0xd7, 0xff }, { 0x5f, 0xd7, 0xff, 0xff }, - + { 0x5f, 0xff, 0x00, 0xff }, { 0x5f, 0xff, 0x5f, 0xff }, { 0x5f, 0xff, 0x87, 0xff }, { 0x5f, 0xff, 0xaf, 0xff }, { 0x5f, 0xff, 0xd7, 0xff }, { 0x5f, 0xff, 0xff, 0xff }, - + { 0x87, 0x00, 0x00, 0xff }, { 0x87, 0x00, 0x5f, 0xff }, { 0x87, 0x00, 0x87, 0xff }, { 0x87, 0x00, 0xaf, 0xff }, { 0x87, 0x00, 0xd7, 0xff }, { 0x87, 0x00, 0xff, 0xff }, - + { 0x87, 0x5f, 0x00, 0xff }, { 0x87, 0x5f, 0x5f, 0xff }, { 0x87, 0x5f, 0x87, 0xff }, { 0x87, 0x5f, 0xaf, 0xff }, { 0x87, 0x5f, 0xd7, 0xff }, { 0x87, 0x5f, 0xff, 0xff }, - + { 0x87, 0x87, 0x00, 0xff }, { 0x87, 0x87, 0x5f, 0xff }, { 0x87, 0x87, 0x87, 0xff }, { 0x87, 0x87, 0xaf, 0xff }, { 0x87, 0x87, 0xd7, 0xff }, { 0x87, 0x87, 0xff, 0xff }, - + { 0x87, 0xaf, 0x00, 0xff }, { 0x87, 0xaf, 0x5f, 0xff }, { 0x87, 0xaf, 0x87, 0xff }, { 0x87, 0xaf, 0xaf, 0xff }, { 0x87, 0xaf, 0xd7, 0xff }, { 0x87, 0xaf, 0xff, 0xff }, - + { 0x87, 0xd7, 0x00, 0xff }, { 0x87, 0xd7, 0x5f, 0xff }, { 0x87, 0xd7, 0x87, 0xff }, { 0x87, 0xd7, 0xaf, 0xff }, { 0x87, 0xd7, 0xd7, 0xff }, { 0x87, 0xd7, 0xff, 0xff }, - + { 0x87, 0xff, 0x00, 0xff }, { 0x87, 0xff, 0x5f, 0xff }, { 0x87, 0xff, 0x87, 0xff }, { 0x87, 0xff, 0xaf, 0xff }, { 0x87, 0xff, 0xd7, 0xff }, { 0x87, 0xff, 0xff, 0xff }, - + { 0xaf, 0x00, 0x00, 0xff }, { 0xaf, 0x00, 0x5f, 0xff }, { 0xaf, 0x00, 0x87, 0xff }, { 0xaf, 0x00, 0xaf, 0xff }, { 0xaf, 0x00, 0xd7, 0xff }, { 0xaf, 0x00, 0xff, 0xff }, - + { 0xaf, 0x5f, 0x00, 0xff }, { 0xaf, 0x5f, 0x5f, 0xff }, { 0xaf, 0x5f, 0x87, 0xff }, { 0xaf, 0x5f, 0xaf, 0xff }, { 0xaf, 0x5f, 0xd7, 0xff }, { 0xaf, 0x5f, 0xff, 0xff }, - + { 0xaf, 0x87, 0x00, 0xff }, { 0xaf, 0x87, 0x5f, 0xff }, { 0xaf, 0x87, 0x87, 0xff }, { 0xaf, 0x87, 0xaf, 0xff }, { 0xaf, 0x87, 0xd7, 0xff }, { 0xaf, 0x87, 0xff, 0xff }, - + { 0xaf, 0xaf, 0x00, 0xff }, { 0xaf, 0xaf, 0x5f, 0xff }, { 0xaf, 0xaf, 0x87, 0xff }, { 0xaf, 0xaf, 0xaf, 0xff }, { 0xaf, 0xaf, 0xd7, 0xff }, { 0xaf, 0xaf, 0xff, 0xff }, - + { 0xaf, 0xd7, 0x00, 0xff }, { 0xaf, 0xd7, 0x5f, 0xff }, { 0xaf, 0xd7, 0x87, 0xff }, { 0xaf, 0xd7, 0xaf, 0xff }, { 0xaf, 0xd7, 0xd7, 0xff }, { 0xaf, 0xd7, 0xff, 0xff }, - + { 0xaf, 0xff, 0x00, 0xff }, { 0xaf, 0xff, 0x5f, 0xff }, { 0xaf, 0xff, 0x87, 0xff }, { 0xaf, 0xff, 0xaf, 0xff }, { 0xaf, 0xff, 0xd7, 0xff }, { 0xaf, 0xff, 0xff, 0xff }, - + { 0xd7, 0x00, 0x00, 0xff }, { 0xd7, 0x00, 0x5f, 0xff }, { 0xd7, 0x00, 0x87, 0xff }, { 0xd7, 0x00, 0xaf, 0xff }, { 0xd7, 0x00, 0xd7, 0xff }, { 0xd7, 0x00, 0xff, 0xff }, - + { 0xd7, 0x5f, 0x00, 0xff }, { 0xd7, 0x5f, 0x5f, 0xff }, { 0xd7, 0x5f, 0x87, 0xff }, { 0xd7, 0x5f, 0xaf, 0xff }, { 0xd7, 0x5f, 0xd7, 0xff }, { 0xd7, 0x5f, 0xff, 0xff }, - + { 0xd7, 0x87, 0x00, 0xff }, { 0xd7, 0x87, 0x5f, 0xff }, { 0xd7, 0x87, 0x87, 0xff }, { 0xd7, 0x87, 0xaf, 0xff }, { 0xd7, 0x87, 0xd7, 0xff }, { 0xd7, 0x87, 0xff, 0xff }, - + { 0xd7, 0xaf, 0x00, 0xff }, { 0xd7, 0xaf, 0x5f, 0xff }, { 0xd7, 0xaf, 0x87, 0xff }, { 0xd7, 0xaf, 0xaf, 0xff }, { 0xd7, 0xaf, 0xd7, 0xff }, { 0xd7, 0xaf, 0xff, 0xff }, - + { 0xd7, 0xd7, 0x00, 0xff }, { 0xd7, 0xd7, 0x5f, 0xff }, { 0xd7, 0xd7, 0x87, 0xff }, { 0xd7, 0xd7, 0xaf, 0xff }, { 0xd7, 0xd7, 0xd7, 0xff }, { 0xd7, 0xd7, 0xff, 0xff }, - + { 0xd7, 0xff, 0x00, 0xff }, { 0xd7, 0xff, 0x5f, 0xff }, { 0xd7, 0xff, 0x87, 0xff }, { 0xd7, 0xff, 0xaf, 0xff }, { 0xd7, 0xff, 0xd7, 0xff }, { 0xd7, 0xff, 0xff, 0xff }, - + { 0xff, 0x00, 0x00, 0xff }, { 0xff, 0x00, 0x5f, 0xff }, { 0xff, 0x00, 0x87, 0xff }, { 0xff, 0x00, 0xaf, 0xff }, { 0xff, 0x00, 0xd7, 0xff }, { 0xff, 0x00, 0xff, 0xff }, - + { 0xff, 0x5f, 0x00, 0xff }, { 0xff, 0x5f, 0x5f, 0xff }, { 0xff, 0x5f, 0x87, 0xff }, { 0xff, 0x5f, 0xaf, 0xff }, { 0xff, 0x5f, 0xd7, 0xff }, { 0xff, 0x5f, 0xff, 0xff }, - + { 0xff, 0x87, 0x00, 0xff }, { 0xff, 0x87, 0x5f, 0xff }, { 0xff, 0x87, 0x87, 0xff }, { 0xff, 0x87, 0xaf, 0xff }, { 0xff, 0x87, 0xd7, 0xff }, { 0xff, 0x87, 0xff, 0xff }, - + { 0xff, 0xaf, 0x00, 0xff }, { 0xff, 0xaf, 0x5f, 0xff }, { 0xff, 0xaf, 0x87, 0xff }, { 0xff, 0xaf, 0xaf, 0xff }, { 0xff, 0xaf, 0xd7, 0xff }, { 0xff, 0xaf, 0xff, 0xff }, - + { 0xff, 0xd7, 0x00, 0xff }, { 0xff, 0xd7, 0x5f, 0xff }, { 0xff, 0xd7, 0x87, 0xff }, { 0xff, 0xd7, 0xaf, 0xff }, { 0xff, 0xd7, 0xd7, 0xff }, { 0xff, 0xd7, 0xff, 0xff }, - + { 0xff, 0xff, 0x00, 0xff }, { 0xff, 0xff, 0x5f, 0xff }, { 0xff, 0xff, 0x87, 0xff },