Verified Commit 73291f62 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Rename black-colors in dark-mode

parent 4f86cdd3

ansi.fs

+3 −3
Changes for ansi.fs: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -165,13 +165,13 @@ $0 Value default-bg 
: auto-color ( -- )

    is-terminal? is-color-terminal? and 0= if

        \ TODO: no terminal - switch to other output class

	no-colors  EXIT

	default-mode  EXIT

    then

    is-xterm? if term-bg? else default-bg then

    rgb-split + + $17F u> IF

	white-colors

	light-mode

    ELSE

	black-colors

	dark-mode

    THEN ;



:noname auto-color defers 'cold ; is 'cold

kernel/errore.fs

+3 −3
Changes for kernel/errore.fs: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ has? OS [IF] 
    \G color mod for error highlight inverse

    true Value white?

    \G reset to current colors

    : white-colors ( -- ) \ gforth

    : light-mode ( -- ) \ gforth

	\G color theme for white background

	true to white?

	$6600 to default-color
@@ -110,7 +110,7 @@ has? OS [IF] 
	$6601 to input-color

	2 to error-hl-ul

	8 to error-hl-inv ;

    : black-colors ( -- ) \ gforth

    : dark-mode ( -- ) \ gforth

	\G color theme for black background

	false to white?

	$6600 to default-color
@@ -121,7 +121,7 @@ has? OS [IF] 
	$6601 to input-color

	2 to error-hl-ul

	8 to error-hl-inv ;

    : no-colors ( -- ) \ gforth

    : default-mode ( -- ) \ gforth

	\G use the default color

	false to white?

	$6600 to default-color \ reset colors even in no-color mode

minos2/gl-helper.fs

+2 −2
Changes for minos2/gl-helper.fs: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -837,9 +837,9 @@ color-w color-h * sfloats allocate throw to color-pal 
    Saturate  1 saturate% glUniform1fv

    LightPos  1 lightpos-xyz glUniform3fv ;



: day-mode    ( -- )  0 to color-theme 0.5e ColorMode! ;

: light-gui    ( -- )  0 to color-theme 0.5e ColorMode! ;

color-h 1 > [IF]

    : night-mode  ( -- )  1 to color-theme 1.5e ColorMode! ;

    : dark-gui  ( -- )  1 to color-theme 1.5e ColorMode! ;

[THEN]



tex: palette-tex

minos2/gl-terminal.fs

+4 −4
Changes for minos2/gl-terminal.fs: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -169,13 +169,13 @@ $8F00 Value gl-default-color \ real default color 
: std-bg! ( index -- )  dup bg! dup std-bg ! bg>clear ;

Black White white? [IF] swap [THEN] fg! bg!



: >white white-colors White std-bg! White err-bg! Black fg! Red err-fg!

: >light light-mode White std-bg! White err-bg! Black fg! Red err-fg!

    White >bg Black >fg or to gl-default-color

    $70004000 dup color-index ! error-color-index ! ;

: >black black-colors Black std-bg! Black err-bg! White fg! Red err-fg!

: >dark dark-mode Black std-bg! Black err-bg! White fg! Red err-fg!

    Black >bg White >fg or to gl-default-color

    $704000 dup color-index ! error-color-index ! ;

[IFDEF] android >black [THEN]

[IFDEF] android >dark [THEN]



256 Value videocols

0   Value videorows
@@ -545,7 +545,7 @@ default-out op-vector ! 
: >screen ( -- )

    ctx 0= IF  window-init  [IFDEF] map-win map-win [THEN] config-changer  THEN

    err>screen op-vector @ debug-vector ! out>screen

    white? IF  >white  ELSE  >black  THEN ;

    white? IF  >light  ELSE  >dark  THEN ;



\ initialize

minos2/presentation-support.fs

+1 −1
Changes for minos2/presentation-support.fs: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ glue-left @ >o 1glue vglue-c glue! 1glue dglue-c glue! o> 
glue-right @ >o 1glue vglue-c glue! 1glue dglue-c glue! o>



: pres-frame ( colorday colornight -- o1 o2 )

    day-mode new-color, night-mode -1 +to color,# new-color, fdrop day-mode

    light-gui new-color, dark-gui -1 +to color,# new-color, fdrop light-gui

    glue*wh slide-frame dup .button1 simple[] ;



$10 stack: vp-tops