Move to_color into config_utils
This commit is contained in:
parent
8da426039b
commit
c86b34aacd
@ -14,12 +14,11 @@ from collections import namedtuple
|
|||||||
from . import fast_data_types as defines
|
from . import fast_data_types as defines
|
||||||
from .config_utils import (
|
from .config_utils import (
|
||||||
init_config, parse_config_base, positive_float, positive_int, to_bool,
|
init_config, parse_config_base, positive_float, positive_int, to_bool,
|
||||||
unit_float
|
to_color, unit_float
|
||||||
)
|
)
|
||||||
from .constants import config_dir
|
from .constants import config_dir
|
||||||
from .fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE
|
from .fast_data_types import CURSOR_BEAM, CURSOR_BLOCK, CURSOR_UNDERLINE
|
||||||
from .layout import all_layouts
|
from .layout import all_layouts
|
||||||
from .rgb import to_color
|
|
||||||
from .utils import safe_print
|
from .utils import safe_print
|
||||||
|
|
||||||
MINIMUM_FONT_SIZE = 4
|
MINIMUM_FONT_SIZE = 4
|
||||||
@ -288,12 +287,12 @@ for name in (
|
|||||||
'foreground background cursor active_border_color inactive_border_color'
|
'foreground background cursor active_border_color inactive_border_color'
|
||||||
' selection_foreground selection_background url_color'
|
' selection_foreground selection_background url_color'
|
||||||
).split():
|
).split():
|
||||||
type_map[name] = lambda x: to_color(x, validate=True)
|
type_map[name] = to_color
|
||||||
for i in range(16):
|
for i in range(16):
|
||||||
type_map['color%d' % i] = lambda x: to_color(x, validate=True)
|
type_map['color%d' % i] = to_color
|
||||||
for a in ('active', 'inactive'):
|
for a in ('active', 'inactive'):
|
||||||
for b in ('foreground', 'background'):
|
for b in ('foreground', 'background'):
|
||||||
type_map['%s_tab_%s' % (a, b)] = lambda x: to_color(x, validate=True)
|
type_map['%s_tab_%s' % (a, b)] = to_color
|
||||||
|
|
||||||
|
|
||||||
def special_handling(key, val, ans):
|
def special_handling(key, val, ans):
|
||||||
|
|||||||
@ -7,10 +7,15 @@ import sys
|
|||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
from .utils import safe_print
|
from .utils import safe_print
|
||||||
|
from .rgb import to_color as as_color
|
||||||
|
|
||||||
key_pat = re.compile(r'([a-zA-Z][a-zA-Z0-9_-]*)\s+(.+)$')
|
key_pat = re.compile(r'([a-zA-Z][a-zA-Z0-9_-]*)\s+(.+)$')
|
||||||
|
|
||||||
|
|
||||||
|
def to_color(x):
|
||||||
|
return as_color(x, validate=True)
|
||||||
|
|
||||||
|
|
||||||
def positive_int(x):
|
def positive_int(x):
|
||||||
return max(0, int(x))
|
return max(0, int(x))
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user