diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-02-18 19:35:05 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-02-18 19:41:40 +0100 |
| commit | a1154392ac6d012302031fbbda574d2da059c745 (patch) | |
| tree | ef47d1bb8e41dd0760cab75a825d858e1a7beb74 | |
| parent | 4f785b483c92ef9755258e49de4a40a14ae4faf6 (diff) | |
| download | chawan-a1154392ac6d012302031fbbda574d2da059c745.tar.gz | |
Add mark-links feature
ref. https://todo.sr.ht/~bptato/chawan/43
| -rw-r--r-- | doc/config.md | 15 | ||||
| -rw-r--r-- | doc/css.md | 3 | ||||
| -rw-r--r-- | res/config.toml | 1 | ||||
| -rw-r--r-- | res/ua.css | 7 | ||||
| -rw-r--r-- | src/config/config.nim | 10 | ||||
| -rw-r--r-- | src/css/cascade.nim | 2 | ||||
| -rw-r--r-- | src/css/csstree.nim | 15 | ||||
| -rw-r--r-- | src/css/selectorparser.nim | 9 | ||||
| -rw-r--r-- | src/html/dom.nim | 16 | ||||
| -rw-r--r-- | src/local/container.nim | 24 | ||||
| -rw-r--r-- | src/local/pager.nim | 5 | ||||
| -rw-r--r-- | src/server/buffer.nim | 25 |
12 files changed, 107 insertions, 25 deletions
diff --git a/doc/config.md b/doc/config.md index 9981c712..b4707043 100644 --- a/doc/config.md +++ b/doc/config.md @@ -225,6 +225,14 @@ brings up a pop-up menu.</td> <td>Whether or not browsing history should be saved to the disk.</td> </tr> +<tr> +<td>mark-links</td> +<td>boolean</td> +<td>false</td> +<td>Add numeric markers before links. In headless/dump mode, this also +prints a list of URLs after the page.</td> +</tr> + </table> ## Search @@ -1000,6 +1008,13 @@ brings up a pop-up menu. URL.</td> </tr> +<tr> +<td>mark-links</td> +<td>boolean</td> +<td>`buffer.history`</td> +<td>Add numeric markers before links.</td> +</tr> + </table> ## Stylesheets @@ -128,6 +128,9 @@ function. element node or a text node with non-whitespace contents. (Modeled after `-moz-first-node` and `-moz-last-node`.) +* If `buffer.mark-links` is set, the `::-cha-link-marker` pseudo-element + will be generated on all anchor elements. + ## Rendering quirks These are willful violations of the standard, usually made to better fit diff --git a/res/config.toml b/res/config.toml index d12b1c03..e43ffeeb 100644 --- a/res/config.toml +++ b/res/config.toml @@ -21,6 +21,7 @@ referer-from = false cookie = false meta-refresh = "ask" history = true +mark-links = false [search] wrap = true @@ -1,4 +1,4 @@ -:root { display: block !important } +:root { display: block !important; counter-reset: -cha-link-counter } area, base, basefont, datalist, head, link, meta, noembed, param, rp, script, style, template, title, noframes { display: none } @@ -120,6 +120,11 @@ a[href] { color: -cha-ansi(blue) } a[href] { color: -cha-ansi(yellow) } } +a[href]::-cha-link-marker { + counter-increment: -cha-link-counter; + content: '[' counter(-cha-link-counter) ']' +} + video, audio, iframe, frame { color: -cha-ansi(red) } :is(a[href], video, audio, iframe, frame):hover { text-decoration: underline } diff --git a/src/config/config.nim b/src/config/config.nim index 7e683a0c..8f49bc80 100644 --- a/src/config/config.nim +++ b/src/config/config.nim @@ -70,20 +70,21 @@ type url*: Option[Regex] host*: Option[Regex] rewriteUrl*: Option[JSValueFunction] - cookie*: Option[CookieMode] shareCookieJar*: Option[string] + stylesheet*: Option[string] + proxy*: Option[URL] + defaultHeaders*: TableRef[string, string] + cookie*: Option[CookieMode] refererFrom*: Option[bool] scripting*: Option[ScriptingMode] documentCharset*: seq[Charset] images*: Option[bool] styling*: Option[bool] - stylesheet*: Option[string] - proxy*: Option[URL] - defaultHeaders*: TableRef[string, string] insecureSslNoVerify*: Option[bool] autofocus*: Option[bool] metaRefresh*: Option[MetaRefresh] history*: Option[bool] + markLinks*: Option[bool] OmniRule* = ref object match*: Regex @@ -177,6 +178,7 @@ type autofocus* {.jsgetset.}: bool metaRefresh* {.jsgetset.}: MetaRefresh history* {.jsgetset.}: bool + markLinks* {.jsgetset.}: bool Config* = ref object jsctx*: JSContext diff --git a/src/css/cascade.nim b/src/css/cascade.nim index bb20ce16..bd6027d1 100644 --- a/src/css/cascade.nim +++ b/src/css/cascade.nim @@ -381,7 +381,7 @@ proc applyStyle*(element: Element) = element.computed = map[peNone].applyDeclarations(element.parentElement, element, window) assert element.computedMap.len == 0 - for pseudo in peBefore..peAfter: + for pseudo in peBefore .. PseudoElement.high: if map[pseudo].hasValues() or window.settings.scripting == smApp: let computed = map[pseudo].applyDeclarations(element, nil, window) element.computedMap.add((pseudo, computed)) diff --git a/src/css/csstree.nim b/src/css/csstree.nim index 4dcdf0d0..80d73758 100644 --- a/src/css/csstree.nim +++ b/src/css/csstree.nim @@ -69,6 +69,7 @@ type n: int32 TreeContext = object + markLinks: bool quoteLevel: int counters: seq[CSSCounter] rootProperties: CSSValues @@ -409,6 +410,11 @@ proc addOptionChildren(frame: var TreeFrame; option: HTMLOptionElement) = frame.addText("]") frame.addElementChildren() +proc addAnchorChildren(frame: var TreeFrame) = + if frame.ctx.markLinks: + frame.addPseudo(peLinkMarker) + frame.addElementChildren() + proc addChildren(frame: var TreeFrame) = case frame.parent.tagType of TAG_INPUT: @@ -428,6 +434,8 @@ proc addChildren(frame: var TreeFrame) = of TAG_OPTION: let option = HTMLOptionElement(frame.parent) frame.addOptionChildren(option) + of TAG_A: + frame.addAnchorChildren() elif frame.parent.tagType(Namespace.SVG) == TAG_SVG: frame.addImage(SVGSVGElement(frame.parent).bitmap) else: @@ -549,7 +557,7 @@ proc build(ctx: var TreeContext; cached: CSSBox; styledNode: StyledNode): ) # Root -proc buildTree*(element: Element; cached: CSSBox): BlockBox = +proc buildTree*(element: Element; cached: CSSBox; markLinks: bool): BlockBox = if element.computed == nil: element.applyStyle() let styledNode = StyledNode( @@ -557,5 +565,8 @@ proc buildTree*(element: Element; cached: CSSBox): BlockBox = element: element, computed: element.computed ) - var ctx = TreeContext(rootProperties: rootProperties()) + var ctx = TreeContext( + rootProperties: rootProperties(), + markLinks: markLinks + ) return BlockBox(ctx.build(cached, styledNode)) diff --git a/src/css/selectorparser.nim b/src/css/selectorparser.nim index 59dd322a..3ce44a91 100644 --- a/src/css/selectorparser.nim +++ b/src/css/selectorparser.nim @@ -3,6 +3,7 @@ import std/strutils import css/cssparser import html/catom +import types/opt import utils/twtstr type @@ -13,6 +14,7 @@ type peNone = "-cha-none" peBefore = "before" peAfter = "after" + peLinkMarker = "-cha-link-marker" PseudoClass* = enum pcFirstChild = "first-child" @@ -363,10 +365,9 @@ proc parsePseudoSelector(state: var SelectorParser): Selector = if not state.has(): fail let tok = get_tok state.consume() if tok.t != cttIdent: fail - case tok.value.toLowerAscii() - of "before": add_pseudo_element peBefore - of "after": add_pseudo_element peAfter - else: fail + let x = parseEnumNoCase[PseudoElement](tok.value) + if x.isNone: fail + add_pseudo_element x.get else: fail elif cval of CSSFunction: return state.parseSelectorFunction(CSSFunction(cval)) diff --git a/src/html/dom.nim b/src/html/dom.nim index 63553a74..93278cec 100644 --- a/src/html/dom.nim +++ b/src/html/dom.nim @@ -1261,6 +1261,22 @@ iterator elements*(node: Node; tag: set[TagType]): Element {.inline.} = if desc.tagType in tag: yield desc +iterator displayedElements*(window: Window; tag: TagType): Element + {.inline.} = + let node = window.document + var stack: seq[Node] = @[] + for i in countdown(node.childList.high, 0): + stack.add(node.childList[i]) + while stack.len > 0: + let node = stack.pop() + if node of Element: + let element = Element(node) + window.maybeRestyle(element) + if element.computed{"display"} != DisplayNone: + yield element + for i in countdown(node.childList.high, 0): + stack.add(node.childList[i]) + iterator inputs(form: HTMLFormElement): HTMLInputElement {.inline.} = for control in form.controls: if control of HTMLInputElement: diff --git a/src/local/container.nim b/src/local/container.nim index a6670498..d52d4159 100644 --- a/src/local/container.nim +++ b/src/local/container.nim @@ -1736,25 +1736,37 @@ proc setCloneStream*(container: Container; stream: BufStream) = # Maybe we have to resume loading. Let's try. container.startLoad() -proc onreadline(container: Container; w: Slice[int]; - handle: (proc(line: SimpleFlexibleLine)); res: GetLinesResult) = +proc onReadLine(container: Container; w: Slice[int]; + handle: (proc(line: SimpleFlexibleLine)); res: GetLinesResult): + EmptyPromise = for line in res.lines: handle(line) if res.numLines > w.b + 1: var w = w w.a += 24 w.b += 24 - container.iface.getLines(w).then(proc(res: GetLinesResult) = - container.onreadline(w, handle, res)) + return container.iface.getLines(w).then(proc(res: GetLinesResult): + EmptyPromise = + return container.onReadLine(w, handle, res) + ) else: container.numLines = res.numLines + return newResolvedPromise() # Synchronously read all lines in the buffer. proc readLines*(container: Container; handle: proc(line: SimpleFlexibleLine)) = # load succeded let w = 0 .. 23 - container.iface.getLines(w).then(proc(res: GetLinesResult) = - container.onreadline(w, handle, res)) + container.iface.getLines(w).then(proc(res: GetLinesResult): EmptyPromise = + return container.onReadLine(w, handle, res) + ).then(proc() = + if container.config.markLinks: + container.iface.getLinks.then(proc(res: seq[string]) = + handle(SimpleFlexibleLine()) + for i, link in res.mypairs: + handle(SimpleFlexibleLine(str: "[" & $(i + 1) & "] " & link)) + ) + ) while container.iface.hasPromises: # fulfill all promises container.handleCommand() diff --git a/src/local/pager.nim b/src/local/pager.nim index 0315eebf..0da33a65 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -1753,7 +1753,8 @@ proc applySiteconf(pager: Pager; url: URL; charsetOverride: Charset; charsetOverride: charsetOverride, protocol: pager.config.protocol, metaRefresh: pager.config.buffer.metaRefresh, - cookieMode: pager.config.buffer.cookie + cookieMode: pager.config.buffer.cookie, + markLinks: pager.config.buffer.markLinks ) loaderConfig = LoaderClientConfig( originURL: url, @@ -1823,6 +1824,8 @@ proc applySiteconf(pager: Pager; url: URL; charsetOverride: Charset; result.metaRefresh = sc.metaRefresh.get if sc.history.isSome: result.history = sc.history.get + if sc.markLinks.isSome: + result.markLinks = sc.markLinks.get loaderConfig.filter.allowschemes .add(pager.config.external.urimethodmap.imageProtos) if result.images: diff --git a/src/server/buffer.nim b/src/server/buffer.nim index db955743..e7770f08 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -59,7 +59,8 @@ type bcClick, bcFindNextLink, bcFindPrevLink, bcFindNthLink, bcFindRevNthLink, bcFindNextMatch, bcFindPrevMatch, bcGetLines, bcUpdateHover, bcGotoAnchor, bcCancel, bcGetTitle, bcSelect, bcClone, bcFindPrevParagraph, - bcFindNextParagraph, bcMarkURL, bcToggleImages, bcCheckRefresh, bcOnReshape + bcFindNextParagraph, bcMarkURL, bcToggleImages, bcCheckRefresh, bcOnReshape, + bcGetLinks BufferState = enum bsLoadingPage, bsLoadingResources, bsLoaded @@ -130,6 +131,7 @@ type headless*: HeadlessMode autofocus*: bool history*: bool + markLinks*: bool charsetOverride*: Charset metaRefresh*: MetaRefresh cookieMode*: CookieMode @@ -771,7 +773,8 @@ proc maybeReshape(buffer: Buffer) = if document == nil or document.documentElement == nil: return # not parsed yet, nothing to render if document.invalid: - buffer.rootBox = document.documentElement.buildTree(buffer.rootBox) + buffer.rootBox = document.documentElement.buildTree(buffer.rootBox, + buffer.config.markLinks) let stack = buffer.rootBox.layout(addr buffer.attrs) buffer.lines.render(buffer.bgcolor, stack, addr buffer.attrs, buffer.images) document.invalid = false @@ -1661,6 +1664,17 @@ proc getLines*(buffer: Buffer; w: Slice[int]): GetLinesResult {.proxy.} = if image.y <= w.b and ey >= w.a: result.images.add(image) +proc getLinks*(buffer: Buffer): seq[string] {.proxy.} = + result = @[] + if buffer.document != nil: + for element in buffer.window.displayedElements(TAG_A): + if element.attrb(satHref): + let x = HTMLAnchorElement(element).reinitURL() + if x.isSome: + result.add($x.get) + else: + result.add(element.attr(satHref)) + proc onReshape*(buffer: Buffer) {.proxy, task.} = if buffer.onReshapeImmediately: # We got a reshape before the container even asked us for the event. @@ -1958,10 +1972,9 @@ proc launchBuffer*(config: BufferConfig; url: URL; attrs: WindowAttributes; ) if buffer.config.scripting != smFalse: buffer.window.navigate = proc(url: URL) = buffer.navigate(url) - if buffer.config.scripting == smApp: - buffer.window.maybeRestyle = proc(element: Element) = - if element.computed == nil: - element.applyStyle() + buffer.window.maybeRestyle = proc(element: Element) = + if element.computed == nil: + element.applyStyle() buffer.charset = buffer.charsetStack.pop() istream.setBlocking(false) buffer.loader.put(InputData(stream: istream)) |