brrowser 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8db3fcfbe72fe0a1f0ef54a5b99b9e7c1b3bd4030f4cc37639aa623ca492f17d
-  data.tar.gz: 19079bf7bf6ab1b632b193bf6847a81530524aac6d526864b9467eb2e1020e37
+  metadata.gz: 031bfa105348853d72db747c32797041f5661fe4ca66547f25a3dacb9a4b211a
+  data.tar.gz: f89cca0ebc7e8c7e48537ea62865a869df55d0d6213d6b6d574f2e60c5c8dd7c
 SHA512:
-  metadata.gz: 2151be2c0a51f2b207594c4b86b9f79b4c9c8507dee66ddc9b52e8b7da149a56ad44db2f33fad762342687fae74d5699beee0f83cca4b3b354342caefbc17823
-  data.tar.gz: 21df370567d8d3e33cf0826ad240f6ddff96aab5252c671172596fadf9d6b5645673f631e74883e9af74ff6dcaef51a1e9cb6dfc515bbe382fc8a7578d51a134
+  metadata.gz: 45309f7af0f927a1fcfd20614826875d3fa7cbb78f8103f43f0ca2c5092a8df5bea05e654d2645fc541e40f5047a259ec7d2416e623727b42eaebabee56e08bd
+  data.tar.gz: ea797828fd0810a4086f884e8c3f6cc1c734ec63030e0fcc7fc7b329c71e899c9c7c469f5c0baa6307f3ddabf2e994c44f2da94a09dfc06905c6807a9058e8ff

data/bin/brrowser

@@ -25,7 +25,7 @@ end
 
 # brrowser {{{1
 module Brrowser
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
   HOMEPAGE = "https://github.com/isene/brrowser"
   CONFIG_DIR  = File.join(Dir.home, ".brrowser")
   CONFIG_FILE = File.join(CONFIG_DIR, "config.yml")
@@ -50,6 +50,7 @@ module Brrowser
     "heading_h1"   => 220,
     "heading_h2"   => 214,
     "heading_h3"   => 208,
+    "match_site_colors" => false,
   }
 
   HELP_HTML = <<~HTML
@@ -246,6 +247,15 @@ module Brrowser
     # Navigation {{{2
     def navigate(url)
       url = resolve_search(url)
+      # Handle about: URLs internally
+      if url == "about:blank"
+        current_tab.navigate(url)
+        current_tab.url = url
+        current_tab.title = ""; current_tab.content = ""
+        current_tab.links = []; current_tab.images = []; current_tab.forms = []
+        refresh_all
+        return
+      end
       @status_msg = "Loading #{url}..."
       refresh_cmd
 
@@ -307,6 +317,13 @@ module Brrowser
         current_tab.links   = page[:links]
         current_tab.images  = page[:images]
         current_tab.forms   = page[:forms]
+        colors = page[:colors]
+        # If no colors found in HTML, try first external stylesheet
+        if @conf["match_site_colors"] && !colors[:bg] && !colors[:fg]
+          colors = fetch_external_css_colors(result[:body], result[:url])
+        end
+        current_tab.instance_variable_set(:@site_colors, colors)
+        apply_site_colors(colors)
         check_autofill
       else
         current_tab.title   = result[:url]
@@ -314,6 +331,8 @@ module Brrowser
         current_tab.links   = []
         current_tab.images  = []
         current_tab.forms   = []
+        @pMain.fg = @conf["content_fg"]
+        @pMain.bg = @conf["content_bg"]
       end
       current_tab.ix = 0
       @pMain.ix = 0
@@ -1494,8 +1513,95 @@ module Brrowser
       refresh_all
     end
 
+    def apply_site_colors(colors = nil)
+      colors ||= current_tab.instance_variable_get(:@site_colors) rescue nil
+      if colors && @conf["match_site_colors"]
+        bg = colors[:bg] || @conf["content_bg"]
+        fg = colors[:fg] || @conf["content_fg"]
+        # Ensure high contrast: if bg and fg are too close, pick white or black
+        fg = high_contrast_fg(bg, fg)
+        @pMain.bg = bg
+        @pMain.fg = fg
+      else
+        @pMain.bg = @conf["content_bg"]
+        @pMain.fg = @conf["content_fg"]
+      end
+    end
+
+    # Map xterm-256 color to approximate luminance (0.0 dark, 1.0 bright)
+    def color_luminance(c)
+      r, g, b = xterm256_to_rgb(c)
+      (0.299 * r + 0.587 * g + 0.114 * b) / 255.0
+    end
+
+    def xterm256_to_rgb(c)
+      if c < 16
+        # Standard colors: approximate
+        basic = [
+          [0,0,0],[128,0,0],[0,128,0],[128,128,0],[0,0,128],[128,0,128],[0,128,128],[192,192,192],
+          [128,128,128],[255,0,0],[0,255,0],[255,255,0],[0,0,255],[255,0,255],[0,255,255],[255,255,255]
+        ]
+        basic[c]
+      elsif c < 232
+        # 6x6x6 color cube
+        c -= 16
+        b = (c % 6) * 51
+        g = ((c / 6) % 6) * 51
+        r = (c / 36) * 51
+        [r, g, b]
+      else
+        # Grayscale ramp
+        v = (c - 232) * 10 + 8
+        [v, v, v]
+      end
+    end
+
+    def high_contrast_fg(bg, fg)
+      bg_lum = color_luminance(bg)
+      fg_lum = color_luminance(fg)
+      contrast = (bg_lum - fg_lum).abs
+      if contrast < 0.3
+        # Not enough contrast: use white for dark bg, black for light bg
+        bg_lum < 0.5 ? 255 : 0
+      else
+        fg
+      end
+    end
+
+    def fetch_external_css_colors(html, base_url)
+      doc = Nokogiri::HTML(html)
+      # Find first local stylesheet
+      doc.css("link[rel=stylesheet]").each do |link|
+        href = link["href"].to_s
+        next if href.empty?
+        next if href.match?(/fonts\.googleapis|font-awesome|calendly|bootstrap/i)
+        href = "https:#{href}" if href.start_with?("//")
+        href = URI.join(base_url, href).to_s unless href.match?(%r{^https?://})
+        begin
+          css_result = @fetcher.fetch(href)
+          next unless css_result[:status] == 200
+          css = css_result[:body].to_s.force_encoding("UTF-8").scrub("")
+          bg = nil; fg = nil
+          # Check body { } rule
+          if css.match(/body\s*\{([^}]+)\}/m)
+            block = $1
+            bg_match = block[/background(?:-color)?\s*:\s*([^;]+)/, 1]
+            fg_match = block[/(?<!background-)color\s*:\s*([^;]+)/, 1]
+            r = Renderer.new(80)
+            bg = r.send(:parse_css_color, bg_match.strip) if bg_match
+            fg = r.send(:parse_css_color, fg_match.strip) if fg_match
+          end
+          return { bg: bg, fg: fg } if bg || fg
+        rescue
+          next
+        end
+      end
+      { bg: nil, fg: nil }
+    end
+
     # Preferences {{{2
     PREF_SETTINGS = [
+      ["Match site colors", "match_site_colors", [true, false]],
       ["Image mode",     "image_mode",   %w[auto termpix ascii off]],
       ["Show images",    "show_images",  [true, false]],
       ["Homepage",       "homepage",     :text],
@@ -1518,12 +1624,13 @@ module Brrowser
     ]
 
     def show_preferences
-      pw = 44
-      ph = PREF_SETTINGS.length + 4
+      pw = 56
+      ph = [PREF_SETTINGS.length + 4, @h - 4].min
       px = (@w - pw) / 2
       py = (@h - ph) / 2
       popup = Pane.new(px, py, pw, ph, 252, 234)
       popup.border = true
+      popup.scroll = true
       sel = 0
 
       build = lambda do
@@ -1544,6 +1651,11 @@ module Brrowser
         lines << ""
         lines << " h/l:change  Enter:edit  q:save & close".fg(245)
         popup.text = lines.join("\n")
+        # Keep selected item visible
+        visible = ph - 3  # account for border
+        line_pos = sel + 2  # offset for header lines
+        popup.ix = [line_pos - visible + 1, 0].max if line_pos >= popup.ix + visible
+        popup.ix = line_pos if line_pos < popup.ix
         popup.refresh
       end
 
@@ -1555,6 +1667,7 @@ module Brrowser
         when "ESC"
           save_config
           apply_colors
+          apply_site_colors
           break
         when "j", "DOWN"
           sel = (sel + 1) % PREF_SETTINGS.length

data/lib/brrowser/fetcher.rb

@@ -15,6 +15,13 @@ module Brrowser
     end
 
     def fetch(url, method: :get, params: nil)
+      # Handle local files
+      if url.match?(%r{^file://})
+        path = url.sub(%r{^file://}, "")
+        body = File.exist?(path) ? File.read(path) : "File not found: #{path}"
+        ct = path.match?(/\.html?$/i) ? "text/html" : "text/plain"
+        return { body: body, url: url, content_type: ct, status: 200 }
+      end
       url = "https://#{url}" unless url.match?(%r{^https?://})
       uri = URI.parse(url)
       redirects = 0

data/lib/brrowser/renderer.rb

@@ -45,7 +45,8 @@ module Brrowser
       walk(body)
       flush_line
 
-      { text: @output.join("\n"), links: @links, images: @images, forms: @forms, title: title }
+      site_colors = extract_site_colors(doc)
+      { text: @output.join("\n"), links: @links, images: @images, forms: @forms, title: title, colors: site_colors }
     end
 
     private
@@ -281,7 +282,11 @@ module Brrowser
           ensure_blank_line
         end
       when "table"
-        render_table(node)
+        if layout_table?(node)
+          walk(node)  # Treat layout tables as normal content
+        else
+          render_table(node)
+        end
       when "form"
         ensure_blank_line
         action = node["action"] || ""
@@ -335,6 +340,16 @@ module Brrowser
         walk(node)
       when "span"
         walk(node)
+      when "td", "th"
+        # Reached here from layout table walk
+        flush_line if @col > 0
+        walk(node)
+        flush_line if @col > 0
+      when "tr"
+        walk(node)
+        flush_line if @col > 0
+      when "tbody", "thead", "tfoot", "caption"
+        walk(node)
       else
         walk(node)
       end
@@ -384,6 +399,22 @@ module Brrowser
       end
     end
 
+    def layout_table?(node)
+      # Nested tables = layout
+      return true if node.css("table").any?
+      # Single-column tables = layout
+      first_row = node.at_css("tr")
+      return true if first_row && first_row.css("td, th").length <= 1
+      # Tables containing block elements in cells = layout
+      node.css("td, th").first(4).each do |cell|
+        return true if cell.at_css("p, div, h1, h2, h3, h4, ul, ol, table, blockquote")
+      end
+      # Width 100% = layout
+      style = node["style"].to_s + " " + (node["width"].to_s)
+      return true if style.match?(/100%/)
+      false
+    end
+
     def render_table(table_node)
       ensure_blank_line
       rows = []
@@ -437,9 +468,7 @@ module Brrowser
     end
 
     def render_table_vertical(rows, table_node)
-      # Render each row as a block with label: value pairs
       headers = table_node.css("th").any? ? rows.shift : nil
-
       rows.each do |row|
         row.each_with_index do |cell, ci|
           next if cell.strip.empty?
@@ -449,5 +478,117 @@ module Brrowser
         @output << (" " * @indent) + ("\u2500" * 20).fg(240)
       end
     end
+
+    # Site color extraction {{{
+    def extract_site_colors(doc)
+      bg = nil; fg = nil
+
+      # 1. HTML attributes (old-school)
+      body = doc.at_css("body")
+      if body
+        bg = parse_css_color(body["bgcolor"]) if body["bgcolor"]
+        fg = parse_css_color(body["text"]) if body["text"]
+      end
+
+      # 2. Inline styles on body/html
+      [body, doc.at_css("html")].compact.each do |node|
+        style = node["style"].to_s
+        next if style.empty?
+        bg ||= extract_css_color(style, /background(?:-color)?\s*:\s*([^;]+)/)
+        fg ||= extract_css_color(style, /(?<!background-)color\s*:\s*([^;]+)/)
+      end
+
+      # 3. Embedded <style> blocks - check body, html, :root rules
+      unless bg && fg
+        doc.css("style").each do |style_node|
+          css = style_node.text
+          %w[body html :root .page .site .wrapper #page #wrapper #content].each do |sel|
+            pattern = /#{Regexp.escape(sel)}\s*\{([^}]+)\}/m
+            if css.match(pattern)
+              block = $1
+              bg ||= extract_css_color(block, /background(?:-color)?\s*:\s*([^;]+)/)
+              fg ||= extract_css_color(block, /(?<!background-)color\s*:\s*([^;]+)/)
+            end
+          end
+          # CSS variables: --bg-color, --background, --text-color, etc.
+          css.scan(/--(bg|background|main-bg|site-bg|page-bg)[^:]*:\s*([^;}\n]+)/) do |_, val|
+            bg ||= parse_css_color(val.strip)
+          end
+          css.scan(/--(fg|text|color|main-color|text-color|font-color)[^:]*:\s*([^;}\n]+)/) do |_, val|
+            fg ||= parse_css_color(val.strip)
+          end
+        end
+      end
+
+      # 4. Meta theme-color
+      unless bg
+        meta = doc.at_css('meta[name="theme-color"]')
+        bg = parse_css_color(meta["content"]) if meta && meta["content"]
+      end
+
+      { bg: bg, fg: fg }
+    end
+
+    def extract_css_color(css_text, regex)
+      return nil unless css_text.match?(regex)
+      val = css_text[regex, 1]&.strip
+      parse_css_color(val)
+    end
+
+    def parse_css_color(val)
+      return nil unless val
+      val = val.strip.downcase
+
+      # Hex colors
+      if val.match?(/^#[0-9a-f]{6}$/)
+        return hex_to_256(val)
+      elsif val.match?(/^#[0-9a-f]{3}$/)
+        expanded = "##{val[1]*2}#{val[2]*2}#{val[3]*2}"
+        return hex_to_256(expanded)
+      end
+
+      # rgb(r, g, b)
+      if val.match(/rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/)
+        r, g, b = $1.to_i, $2.to_i, $3.to_i
+        return rgb_to_256(r, g, b)
+      end
+
+      # Named colors (common ones)
+      named = {
+        "white" => 15, "black" => 0, "red" => 1, "green" => 2,
+        "blue" => 4, "yellow" => 3, "cyan" => 6, "magenta" => 5,
+        "gray" => 245, "grey" => 245, "silver" => 250,
+        "darkgray" => 238, "darkgrey" => 238,
+        "lightgray" => 252, "lightgrey" => 252,
+        "navy" => 17, "teal" => 30, "maroon" => 1,
+        "olive" => 3, "purple" => 5, "aqua" => 14,
+        "orange" => 208, "pink" => 218,
+        "whitesmoke" => 255, "ghostwhite" => 255,
+        "aliceblue" => 153, "ivory" => 255,
+      }
+      named[val.gsub(/\s/, "")]
+    end
+
+    def hex_to_256(hex)
+      r = hex[1..2].to_i(16)
+      g = hex[3..4].to_i(16)
+      b = hex[5..6].to_i(16)
+      rgb_to_256(r, g, b)
+    end
+
+    def rgb_to_256(r, g, b)
+      # Check grayscale ramp (232-255) first
+      if r == g && g == b
+        return 16 if r < 8
+        return 231 if r > 248
+        return (((r - 8).to_f / 247 * 24).round + 232)
+      end
+      # Map to 6x6x6 color cube (16-231)
+      ri = ((r.to_f / 255) * 5).round
+      gi = ((g.to_f / 255) * 5).round
+      bi = ((b.to_f / 255) * 5).round
+      16 + (36 * ri) + (6 * gi) + bi
+    end
+    # }}}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brrowser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Geir Isene