aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2024-12-01 10:51:50 +0100
committerbptato <nincsnevem662@gmail.com>2024-12-01 11:04:49 +0100
commite77c7104c1dc6ec0b2ca8c6c839233107ff9cb32 (patch)
tree37a30a42c0729fbac915cb68ab439d930f0d60e2 /src
parent19893250105fe4b438828342041c6f5a16c9eaa7 (diff)
downloadchawan-e77c7104c1dc6ec0b2ca8c6c839233107ff9cb32.tar.gz
dom: add support for @import
only the most basic form; no media queries yet
Diffstat (limited to 'src')
-rw-r--r--src/css/cssvalues.nim12
-rw-r--r--src/css/sheet.nim63
-rw-r--r--src/html/dom.nim59
-rw-r--r--src/server/buffer.nim16
4 files changed, 92 insertions, 58 deletions
diff --git a/src/css/cssvalues.nim b/src/css/cssvalues.nim
index 7b4e4abf..22176433 100644
--- a/src/css/cssvalues.nim
+++ b/src/css/cssvalues.nim
@@ -827,7 +827,7 @@ func parseDimensionValues*(s: string): Option[CSSLength] =
return some(CSSLength(num: n, u: cuPerc))
return some(CSSLength(num: n, u: cuPx))
-func skipWhitespace(vals: openArray[CSSComponentValue]; i: var int) =
+func skipWhitespace*(vals: openArray[CSSComponentValue]; i: var int) =
while i < vals.len:
if vals[i] != cttWhitespace:
break
@@ -1124,14 +1124,17 @@ func cssMaxMinSize(cval: CSSComponentValue): Opt[CSSLength] =
return err()
#TODO should be URL (parsed with baseurl of document...)
-func cssURL(cval: CSSComponentValue): Option[string] =
+func cssURL*(cval: CSSComponentValue; src = false): Option[string] =
if isToken(cval):
let tok = getToken(cval)
if tok == cttUrl:
return some(tok.value)
+ elif not src and tok == cttString:
+ return some(tok.value)
elif cval of CSSFunction:
let fun = CSSFunction(cval)
- if fun.name.equalsIgnoreCase("url") or fun.name.equalsIgnoreCase("src"):
+ if fun.name.equalsIgnoreCase("url") or
+ src and fun.name.equalsIgnoreCase("src"):
for x in fun.value:
if not isToken(x):
break
@@ -1142,6 +1145,7 @@ func cssURL(cval: CSSComponentValue): Option[string] =
return some(x.value)
else:
break
+ return none(string)
#TODO this should be bg-image, add gradient, etc etc
func cssImage(cval: CSSComponentValue): Opt[CSSContent] =
@@ -1150,7 +1154,7 @@ func cssImage(cval: CSSComponentValue): Opt[CSSContent] =
let tok = getToken(cval)
if tok.tokenType == cttIdent and tok.value.equalsIgnoreCase("none"):
return ok(CSSContent(t: ContentNone))
- let url = cssURL(cval)
+ let url = cssURL(cval, src = true)
if url.isSome:
#TODO do something with the URL
return ok(CSSContent(t: ContentImage))
diff --git a/src/css/sheet.nim b/src/css/sheet.nim
index 789ba889..55b8b092 100644
--- a/src/css/sheet.nim
+++ b/src/css/sheet.nim
@@ -1,3 +1,4 @@
+import std/options
import std/tables
import css/cssparser
@@ -5,6 +6,7 @@ import css/cssvalues
import css/mediaquery
import css/selectorparser
import html/catom
+import types/url
import utils/twtstr
type
@@ -31,6 +33,7 @@ type
classTable*: Table[CAtom, seq[CSSRuleDef]]
attrTable*: Table[CAtom, seq[CSSRuleDef]]
generalList*: seq[CSSRuleDef]
+ importList*: seq[URL]
len: int
factory: CAtomFactory
@@ -193,31 +196,47 @@ proc addRule(stylesheet: CSSStylesheet; rule: CSSQualifiedRule) =
))
inc stylesheet.len
-proc addAtRule(stylesheet: CSSStylesheet; atrule: CSSAtRule) =
- if atrule.oblock == nil: # invalid at-rule
- return
- if atrule.name.equalsIgnoreCase("media"):
- let query = parseMediaQueryList(atrule.prelude)
- let rules = atrule.oblock.value.parseListOfRules()
- if rules.len > 0:
- var media = CSSMediaQueryDef()
- media.children = newStylesheet(rules.len, stylesheet.factory)
- media.children.len = stylesheet.len
- media.query = query
- for rule in rules:
- if rule of CSSAtRule:
- media.children.addAtRule(CSSAtRule(rule))
- else:
- media.children.addRule(CSSQualifiedRule(rule))
- stylesheet.mqList.add(media)
- stylesheet.len = media.children.len
-
-proc parseStylesheet*(ibuf: string; factory: CAtomFactory): CSSStylesheet =
+proc addAtRule(stylesheet: CSSStylesheet; atrule: CSSAtRule; base: URL) =
+ if atrule.name.equalsIgnoreCase("import"):
+ if stylesheet.len == 0 and base != nil:
+ var i = 0
+ atrule.prelude.skipWhitespace(i)
+ # Warning: this is a tracking vector minefield. If you implement
+ # media query based imports, make sure to not filter here, but in
+ # DOM after the sheet has been downloaded. (e.g. importList can
+ # get a "media" field, etc.)
+ if i < atrule.prelude.len:
+ if (let url = cssURL(atrule.prelude[i]); url.isSome):
+ if (let url = parseURL(url.get, some(base)); url.isSome):
+ inc i
+ atrule.prelude.skipWhitespace(i)
+ # check if there are really no media queries/layers/etc
+ if i == atrule.prelude.len:
+ stylesheet.importList.add(url.get)
+ elif atrule.name.equalsIgnoreCase("media"):
+ if atrule.oblock != nil:
+ let query = parseMediaQueryList(atrule.prelude)
+ let rules = atrule.oblock.value.parseListOfRules()
+ if rules.len > 0:
+ var media = CSSMediaQueryDef()
+ media.children = newStylesheet(rules.len, stylesheet.factory)
+ media.children.len = stylesheet.len
+ media.query = query
+ for rule in rules:
+ if rule of CSSAtRule:
+ media.children.addAtRule(CSSAtRule(rule), nil)
+ else:
+ media.children.addRule(CSSQualifiedRule(rule))
+ stylesheet.mqList.add(media)
+ stylesheet.len = media.children.len
+
+proc parseStylesheet*(ibuf: string; factory: CAtomFactory; base: URL):
+ CSSStylesheet =
let raw = parseStylesheet(ibuf)
let sheet = newStylesheet(raw.value.len, factory)
- for v in raw.value:
+ for i, v in raw.value.mypairs:
if v of CSSAtRule:
- sheet.addAtRule(CSSAtRule(v))
+ sheet.addAtRule(CSSAtRule(v), base)
else:
sheet.addRule(CSSQualifiedRule(v))
return sheet
diff --git a/src/html/dom.nim b/src/html/dom.nim
index 3c148952..c865d815 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -97,7 +97,7 @@ type
navigate*: proc(url: URL)
importMapsAllowed*: bool
factory*: CAtomFactory
- loadingResourcePromises*: seq[EmptyPromise]
+ pendingResources*: seq[EmptyPromise]
imageURLCache: Table[string, CachedURLImage]
images*: bool
styling*: bool
@@ -310,7 +310,7 @@ type
sheet: CSSStylesheet
HTMLLinkElement* = ref object of HTMLElement
- sheet*: CSSStylesheet
+ sheets: seq[CSSStylesheet]
relList {.jsget.}: DOMTokenList
fetchStarted: bool
enabled: Option[bool]
@@ -2513,14 +2513,13 @@ proc sheets*(document: Document): seq[CSSStylesheet] =
for elem in document.documentElement.descendants:
if elem of HTMLStyleElement:
let style = HTMLStyleElement(elem)
- style.sheet = parseStylesheet(style.textContent, document.factory)
- if style.sheet != nil:
- document.cachedSheets.add(style.sheet)
+ style.sheet = parseStylesheet(style.textContent, document.factory,
+ document.baseURL)
+ document.cachedSheets.add(style.sheet)
elif elem of HTMLLinkElement:
let link = HTMLLinkElement(elem)
- if link.sheet != nil and
- link.enabled.get(satAlternate notin link.relList):
- document.cachedSheets.add(link.sheet)
+ if link.enabled.get(satAlternate notin link.relList):
+ document.cachedSheets.add(link.sheets)
else: discard
document.cachedSheetsInvalid = false
return document.cachedSheets
@@ -3301,6 +3300,30 @@ proc corsFetch(window: Window; input: Request): FetchPromise =
return newResolvedPromise(JSResult[Response].err(newFetchTypeError()))
return window.loader.fetch(input)
+proc loadSheet(window: Window; link: HTMLLinkElement; url: URL; applies: bool) =
+ let p = window.corsFetch(
+ newRequest(url)
+ ).then(proc(res: JSResult[Response]): Promise[JSResult[string]] =
+ if res.isSome:
+ let res = res.get
+ if res.getContentType() == "text/css":
+ return res.text()
+ res.close()
+ return newResolvedPromise(JSResult[string].err(nil))
+ ).then(proc(s: JSResult[string]) =
+ # Check applies here, to avoid leaking the window size.
+ if s.isSome:
+ let sheet = s.get.parseStylesheet(window.factory, url)
+ if applies:
+ # Note: we intentionally load all sheets to prevent media query
+ # based tracking.
+ link.sheets.add(sheet)
+ window.document.cachedSheetsInvalid = true
+ for url in sheet.importList:
+ window.loadSheet(link, url, true) #TODO media query
+ )
+ window.pendingResources.add(p)
+
# see https://html.spec.whatwg.org/multipage/links.html#link-type-stylesheet
#TODO make this somewhat compliant with ^this
proc loadResource(window: Window; link: HTMLLinkElement) =
@@ -3321,23 +3344,7 @@ proc loadResource(window: Window; link: HTMLLinkElement) =
let cvals = parseComponentValues(media)
let media = parseMediaQueryList(cvals)
applies = media.appliesImpl(window)
- let p = window.corsFetch(
- newRequest(url)
- ).then(proc(res: JSResult[Response]): Promise[JSResult[string]] =
- if res.isSome:
- let res = res.get
- if res.getContentType() == "text/css":
- return res.text()
- res.close()
- return newResolvedPromise(JSResult[string].err(nil))
- ).then(proc(s: JSResult[string]) =
- # Check applies here, to avoid leaking the window size.
- if s.isSome and applies:
- #TODO non-utf-8 css?
- link.sheet = parseStylesheet(s.get, window.factory)
- window.document.cachedSheetsInvalid = true
- )
- window.loadingResourcePromises.add(p)
+ window.loadSheet(link, url, applies)
proc getImageId(window: Window): int =
result = window.imageId
@@ -3440,7 +3447,7 @@ proc loadResource*(window: Window; image: HTMLImageElement) =
image.setInvalid()
)
)
- window.loadingResourcePromises.add(p)
+ window.pendingResources.add(p)
proc reflectEvent(element: Element; target: EventTarget; name, ctype: StaticAtom;
value: string) =
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index d9f50cbd..abdc8cbd 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -924,7 +924,13 @@ proc updateHover*(buffer: Buffer; cursorx, cursory: int): UpdateHoverResult
return UpdateHoverResult(repaint: repaint, hover: hover)
proc loadResources(buffer: Buffer): EmptyPromise =
- return buffer.window.loadingResourcePromises.all()
+ if buffer.window.pendingResources.len > 0:
+ let pendingResources = move(buffer.window.pendingResources)
+ buffer.window.pendingResources.setLen(0)
+ return pendingResources.all().then(proc(): EmptyPromise =
+ return buffer.loadResources()
+ )
+ return newResolvedPromise()
proc rewind(buffer: Buffer; offset: int; unregister = true): bool =
let url = newURL("cache:" & $buffer.cacheId & "?" & $offset).get
@@ -1130,7 +1136,6 @@ proc onload(buffer: Buffer) =
reprocess = false
else: # EOF
buffer.finishLoad().then(proc() =
- buffer.window.loadingResourcePromises = @[]
discard buffer.maybeReshape()
buffer.state = bsLoaded
buffer.document.readyState = rsComplete
@@ -1749,7 +1754,6 @@ proc toggleImages0(buffer: Buffer): bool =
buffer.savetask = false
else:
buffer.resolveTask(bcToggleImages, buffer.config.images)
- buffer.window.loadingResourcePromises = @[]
buffer.prevStyled = nil
buffer.rootBox = nil
buffer.reshape()
@@ -1935,9 +1939,9 @@ proc launchBuffer*(config: BufferConfig; url: URL; attrs: WindowAttributes;
const css = staticRead"res/ua.css"
const quirk = css & staticRead"res/quirk.css"
buffer.initDecoder()
- buffer.uastyle = css.parseStylesheet(factory)
- buffer.quirkstyle = quirk.parseStylesheet(factory)
- buffer.userstyle = parseStylesheet(buffer.config.userstyle, factory)
+ buffer.uastyle = css.parseStylesheet(factory, nil)
+ buffer.quirkstyle = quirk.parseStylesheet(factory, nil)
+ buffer.userstyle = buffer.config.userstyle.parseStylesheet(factory, nil)
buffer.htmlParser = newHTML5ParserWrapper(
buffer.window,
buffer.url,