diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/screen.c | 20 |
2 files changed, 16 insertions, 12 deletions
@@ -161,10 +161,10 @@ void main(void) { bell_type = conf->alert_type; /* TODO: have bell.s read staight from the struct */ OS.shflok = 0; // turn off shift-lock. OS.soundr = 0; // Turn off SIO beeping sound - OS.color2 = conf->colors[0]; - OS.color1 = conf->colors[1]; - OS.color0 = 0xca; /* green for active */ - OS.color3 = 0x48; /* red for highlight (not used yet) */ + OS.color2 = conf->colors[0]; /* text BG, user-selected */ + OS.color1 = (conf->colors[1] & 0x0f) | 0xc0; /* green (at user's brightness) */ + OS.color0 = 0x06; /* grey for inactive */ + OS.color3 = 0x46; /* red for highlight (not used yet) */ OS.noclik = conf->disable_keyclick; hz = (GTIA_READ.pal & 0x0e) ? 60 : 50; diff --git a/src/screen.c b/src/screen.c index 6b12302..f10ac87 100644 --- a/src/screen.c +++ b/src/screen.c @@ -131,28 +131,32 @@ void scr_show_status(char s) { int i; char *p, sc; - p = status_box; - p[0] = s + 177; /* inverse number */ - p[1] = ':'; - strncpy(p + 2, scr_names[s], 32); + status_box[0] = s + 177; /* inverse number */ + status_box[1] = ':'; + strncpy(status_box + 2, scr_names[s], 32); + + p = status_box + 45; - p += 45; *p++ = '<'; + // *p++ = 0xbc; // color2, maybe use? for(i = 0; i < MAX_SCREENS; i++) { sc = i + '1'; switch(scr_status[i]) { - case SCR_ACTIVE: + case SCR_INACTIVE: /* color0 */ break; - case SCR_INACTIVE: + case SCR_ACTIVE: /* color1 */ sc |= 0x40; break; - /* TODO: case SCR_HILITE: sc |= 0c0; break; */ +// case SCR_HILITE: /* color3 */ +// sc |= 0xc0; +// break; default: sc = '.'; } *p++ = sc; } *p++ = '>'; + // *p++ = 0xbe; if(!edbox_visible) { scr_waitvcount(112); |