aboutsummaryrefslogtreecommitdiffstats
path: root/src/css
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/css
parent19893250105fe4b438828342041c6f5a16c9eaa7 (diff)
downloadchawan-e77c7104c1dc6ec0b2ca8c6c839233107ff9cb32.tar.gz
dom: add support for @import
only the most basic form; no media queries yet
Diffstat (limited to 'src/css')
-rw-r--r--src/css/cssvalues.nim12
-rw-r--r--src/css/sheet.nim63
2 files changed, 49 insertions, 26 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