diff --git a/nomadnet/ui/textui/Browser.py b/nomadnet/ui/textui/Browser.py index f1b28ca..4ff35d8 100644 --- a/nomadnet/ui/textui/Browser.py +++ b/nomadnet/ui/textui/Browser.py @@ -799,7 +799,7 @@ class Browser: self.page_background_color = None bgpos = self.markup.find("#!bg=") - if bgpos: + if bgpos >= 0: endpos = self.markup.find("\n", bgpos) if endpos-(bgpos+5) == 3: bg = self.markup[bgpos+5:endpos] @@ -807,7 +807,7 @@ class Browser: self.page_foreground_color = None fgpos = self.markup.find("#!fg=") - if fgpos: + if fgpos >= 0: endpos = self.markup.find("\n", fgpos) if endpos-(fgpos+5) == 3: fg = self.markup[fgpos+5:endpos] @@ -866,7 +866,7 @@ class Browser: self.page_background_color = None bgpos = self.markup.find("#!bg=") - if bgpos: + if bgpos >= 0: endpos = self.markup.find("\n", bgpos) if endpos-(bgpos+5) == 3: bg = self.markup[bgpos+5:endpos] @@ -874,7 +874,7 @@ class Browser: self.page_foreground_color = None fgpos = self.markup.find("#!fg=") - if fgpos: + if fgpos >= 0: endpos = self.markup.find("\n", fgpos) if endpos-(fgpos+5) == 3: fg = self.markup[fgpos+5:endpos] @@ -1018,7 +1018,7 @@ class Browser: self.page_background_color = None bgpos = self.markup.find("#!bg=") - if bgpos: + if bgpos >= 0: endpos = self.markup.find("\n", bgpos) if endpos-(bgpos+5) == 3: bg = self.markup[bgpos+5:endpos] @@ -1026,7 +1026,7 @@ class Browser: self.page_foreground_color = None fgpos = self.markup.find("#!fg=") - if fgpos: + if fgpos >= 0: endpos = self.markup.find("\n", fgpos) if endpos-(fgpos+5) == 3: fg = self.markup[fgpos+5:endpos] diff --git a/nomadnet/ui/textui/MicronParser.py b/nomadnet/ui/textui/MicronParser.py index 00507a7..34915a5 100644 --- a/nomadnet/ui/textui/MicronParser.py +++ b/nomadnet/ui/textui/MicronParser.py @@ -649,7 +649,7 @@ def make_output(state, line, url_delegate, pre_escape=False): orig_spec = speclist[4] if url_delegate != None: - linkspec = LinkSpec(link_url, orig_spec) + linkspec = LinkSpec(link_url, orig_spec, cm=cm) if link_fields != "": lf = link_fields.split("|") if len(lf) > 0: @@ -696,11 +696,11 @@ def make_output(state, line, url_delegate, pre_escape=False): class LinkSpec(urwid.AttrSpec): - def __init__(self, link_target, orig_spec): + def __init__(self, link_target, orig_spec, cm=256): self.link_target = link_target self.link_fields = None - super().__init__(orig_spec.foreground, orig_spec.background) + super().__init__(orig_spec.foreground, orig_spec.background, colors=cm) class LinkableText(urwid.Text):