aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbptato <nincsnevem662@gmail.com>2025-02-15 16:43:28 +0100
committerbptato <nincsnevem662@gmail.com>2025-02-15 16:52:57 +0100
commit5a328d7a1eb89d0939fa2d123a3f43b31f75478b (patch)
treefc9e08741b9826c4e05228466ecf1e0c212af615 /src
parent835826e8fd530203bc68ad9a243f31b138b93b2d (diff)
downloadchawan-5a328d7a1eb89d0939fa2d123a3f43b31f75478b.tar.gz
xhr, event, catom: fix some bugs
Event handler functions can be set twice now.
Diffstat (limited to 'src')
-rw-r--r--src/html/catom.nim76
-rw-r--r--src/html/dom.nim289
-rw-r--r--src/html/env.nim18
-rw-r--r--src/html/event.nim105
-rw-r--r--src/html/script.nim10
-rw-r--r--src/html/xmlhttprequest.nim57
-rw-r--r--src/local/pager.nim2
-rw-r--r--src/server/buffer.nim2
-rw-r--r--src/server/loaderiface.nim5
9 files changed, 297 insertions, 267 deletions
diff --git a/src/html/catom.nim b/src/html/catom.nim
index 33041dd7..d889856c 100644
--- a/src/html/catom.nim
+++ b/src/html/catom.nim
@@ -33,6 +33,7 @@ macro makeStaticAtom =
satChecked = "checked"
satClass = "class"
satClassList = "classList"
+ satClassName = "className"
satClick = "click"
satColor = "color"
satCols = "cols"
@@ -41,6 +42,7 @@ macro makeStaticAtom =
satCrossorigin = "crossorigin"
satCustomevent = "customevent"
satDOMContentLoaded = "DOMContentLoaded"
+ satDefaultSelected = "defaultSelected"
satDefer = "defer"
satDirname = "dirname"
satDisabled = "disabled"
@@ -53,11 +55,16 @@ macro makeStaticAtom =
satFormaction = "formaction"
satFormenctype = "formenctype"
satFormmethod = "formmethod"
+ satHHttpEquiv = "httpEquiv"
+ satHIsMap = "isMap"
+ satHNoValidate = "noValidate"
+ satHUseMap = "useMap"
satHash = "hash"
satHeight = "height"
satHost = "host"
satHostname = "hostname"
satHref = "href"
+ satHtmlFor = "htmlFor"
satId = "id"
satIntegrity = "integrity"
satIsmap = "ismap"
@@ -158,15 +165,10 @@ static:
type
CAtom* = distinct uint32
- CAtomFactoryInit = object
- obj: CAtomFactoryObj
-
CAtomFactoryObj = object
strMap: array[CAtomFactoryStrMapLength, seq[CAtom]]
atomMap: seq[string]
lowerMap: seq[CAtom]
- namespaceMap: array[Namespace, CAtom]
- prefixMap: array[NamespacePrefix, CAtom]
#TODO could be a ptr probably
CAtomFactory* = ref CAtomFactoryObj
@@ -201,40 +203,22 @@ func toAtom(factory: var CAtomFactoryObj; s: sink string;
factory.strMap[i].add(atom)
return atom
-const factoryInit = (func(): CAtomFactoryInit =
- var init = CAtomFactoryInit()
+const factoryInit = (func(): CAtomFactoryObj =
+ result = CAtomFactoryObj()
# Null atom
- init.obj.atomMap.add("")
- init.obj.lowerMap.add(CAtom(0))
+ result.atomMap.add("")
+ result.lowerMap.add(CAtom(0))
# StaticAtom includes TagType too.
for sa in StaticAtom(1) .. StaticAtom.high:
- discard init.obj.toAtom($sa, isInit = true)
+ discard result.toAtom($sa, isInit = true)
for sa in StaticAtom(1) .. StaticAtom.high:
- let atom = init.obj.toAtom(($sa).toLowerAscii(), isInit = true)
- init.obj.lowerMap.add(atom)
+ let atom = result.toAtom(($sa).toLowerAscii(), isInit = true)
+ result.lowerMap.add(atom)
# fill slots of newly added lower mappings
- while init.obj.lowerMap.len < init.obj.atomMap.len:
- init.obj.lowerMap.add(CAtom(init.obj.lowerMap.len))
- let olen = init.obj.atomMap.len
- for it in Namespace:
- if it == NO_NAMESPACE:
- init.obj.namespaceMap[it] = CAtomNull
- else:
- init.obj.namespaceMap[it] = init.obj.toAtom($it)
- for it in NamespacePrefix:
- if it == NO_PREFIX:
- init.obj.prefixMap[it] = CAtomNull
- else:
- init.obj.prefixMap[it] = init.obj.toAtom($it)
- assert init.obj.atomMap.len == olen
- return init
+ while result.lowerMap.len < result.atomMap.len:
+ result.lowerMap.add(CAtom(result.lowerMap.len))
)()
-proc newCAtomFactory(): CAtomFactory =
- let factory = new(CAtomFactory)
- factory[] = factoryInit.obj
- return factory
-
var factory {.global.}: CAtomFactory = nil
func getFactory(): CAtomFactory =
@@ -243,7 +227,8 @@ func getFactory(): CAtomFactory =
proc initCAtomFactory*() =
assert factory == nil
- factory = newCAtomFactory()
+ factory = new(CAtomFactory)
+ factory[] = factoryInit
func toLowerAscii*(a: CAtom): CAtom =
return getFactory().lowerMap[int32(a)]
@@ -294,7 +279,13 @@ func toStaticAtom*(atom: CAtom): StaticAtom =
return atUnknown
proc toStaticAtom*(s: string): StaticAtom =
- return s.toAtom().toStaticAtom()
+ let h = s.hash()
+ let i = h and (factoryInit.strMap.len - 1)
+ for atom in factoryInit.strMap[i]:
+ if factoryInit.atomMap[int(atom)] == s:
+ # Found
+ return atom.toStaticAtom()
+ atUnknown
func toNamespace*(atom: CAtom): Namespace =
case atom.toStaticAtom()
@@ -308,10 +299,23 @@ func toNamespace*(atom: CAtom): Namespace =
else: return NAMESPACE_UNKNOWN
func toAtom*(namespace: Namespace): CAtom =
- return getFactory().namespaceMap[namespace]
+ return (case namespace
+ of NO_NAMESPACE: satUempty
+ of Namespace.HTML: satNamespaceHTML
+ of Namespace.MATHML: satNamespaceMathML
+ of Namespace.SVG: satNamespaceSVG
+ of Namespace.XLINK: satNamespaceXLink
+ of Namespace.XML: satNamespaceXML
+ of Namespace.XMLNS: satNamespaceXMLNS
+ of NAMESPACE_UNKNOWN: satUempty).toAtom()
func toAtom*(prefix: NamespacePrefix): CAtom =
- return getFactory().prefixMap[prefix]
+ return (case prefix
+ of NO_PREFIX: satUempty
+ of PREFIX_XLINK: satXlink
+ of PREFIX_XML: satXml
+ of PREFIX_XMLNS: satXmlns
+ of PREFIX_UNKNOWN: satUempty).toAtom()
proc fromJS*(ctx: JSContext; val: JSValue; res: var CAtom): Opt[void] =
if JS_IsNull(val):
diff --git a/src/html/dom.nim b/src/html/dom.nim
index cdfb0e9a..c389d8a6 100644
--- a/src/html/dom.nim
+++ b/src/html/dom.nim
@@ -546,6 +546,9 @@ proc parseColor(element: Element; s: string): ARGBColor
proc reflectAttr(element: Element; name: CAtom; value: Option[string])
proc remove*(node: Node)
proc replaceAll(parent: Node; s: sink string)
+proc attrl(element: Element; name: StaticAtom; value: int32)
+proc attrul(element: Element; name: StaticAtom; value: uint32)
+proc attrulgz(element: Element; name: StaticAtom; value: uint32)
# Forward declaration hacks
# set in css/match
@@ -959,7 +962,7 @@ type
ReflectEntry = object
attrname: StaticAtom
- funcname: string
+ funcname: StaticAtom
tags: set[TagType]
case t: ReflectType
of rtLong:
@@ -970,47 +973,39 @@ type
ctype: StaticAtom
else: discard
-func attrType0(s: static string): StaticAtom {.compileTime.} =
- return strictParseEnum[StaticAtom](s).get
-
template toset(ts: openArray[TagType]): set[TagType] =
var tags: system.set[TagType] = {}
for tag in ts:
tags.incl(tag)
tags
-func makes(name: static string; ts: set[TagType]): ReflectEntry =
- const attrname = attrType0(name)
+func makes(name: string; ts: set[TagType]): ReflectEntry =
+ let name = name.toStaticAtom()
ReflectEntry(
- attrname: attrname,
+ attrname: name,
funcname: name,
t: rtStr,
tags: ts
)
-func makes(attrname, funcname: static string; ts: set[TagType]):
- ReflectEntry =
- const attrname = attrType0(attrname)
+func makes(attrname, funcname: string; ts: set[TagType]): ReflectEntry =
ReflectEntry(
- attrname: attrname,
- funcname: funcname,
+ attrname: attrname.toStaticAtom(),
+ funcname: funcname.toStaticAtom(),
t: rtStr,
tags: ts
)
-func makes(name: static string; ts: varargs[TagType]): ReflectEntry =
+func makes(name: string; ts: varargs[TagType]): ReflectEntry =
makes(name, toset(ts))
-func makes(attrname, funcname: static string; ts: varargs[TagType]):
- ReflectEntry =
+func makes(attrname, funcname: string; ts: varargs[TagType]): ReflectEntry =
makes(attrname, funcname, toset(ts))
-func makeb(attrname, funcname: static string; ts: varargs[TagType]):
- ReflectEntry =
- const attrname = attrType0(attrname)
+func makeb(attrname, funcname: string; ts: varargs[TagType]): ReflectEntry =
ReflectEntry(
- attrname: attrname,
- funcname: funcname,
+ attrname: attrname.toStaticAtom(),
+ funcname: funcname.toStaticAtom(),
t: rtBool,
tags: toset(ts)
)
@@ -1018,37 +1013,35 @@ func makeb(attrname, funcname: static string; ts: varargs[TagType]):
func makeb(name: static string; ts: varargs[TagType]): ReflectEntry =
makeb(name, name, ts)
-func makeul(name: static string; ts: varargs[TagType]; default = 0u32):
- ReflectEntry =
- const attrname = attrType0(name)
+func makeul(name: string; ts: varargs[TagType]; default = 0u32): ReflectEntry =
+ let name = name.toStaticAtom()
ReflectEntry(
- attrname: attrname,
+ attrname: name,
funcname: name,
t: rtUlong,
tags: toset(ts),
u: default
)
-func makeulgz(name: static string; ts: varargs[TagType]; default = 0u32):
+func makeulgz(name: string; ts: varargs[TagType]; default = 0u32):
ReflectEntry =
- const attrname = attrType0(name)
+ let name = name.toStaticAtom()
ReflectEntry(
- attrname: attrname,
+ attrname: name,
funcname: name,
t: rtUlongGz,
tags: toset(ts),
u: default
)
-func makef(name: static string; ts: set[TagType]; ctype: static string):
- ReflectEntry =
- const attrname = attrType0(name)
+func makef(name: string; ctype: string): ReflectEntry =
+ let name = name.toStaticAtom()
ReflectEntry(
- attrname: attrname,
+ attrname: name,
funcname: name,
t: rtFunction,
- tags: ts,
- ctype: attrType0(ctype)
+ tags: AllTagTypes,
+ ctype: ctype.toStaticAtom()
)
# Note: this table only works for tag types with a registered interface.
@@ -1068,11 +1061,10 @@ const ReflectTable0 = [
makes("media", TAG_META),
makeul("cols", TAG_TEXTAREA, 20u32),
makeul("rows", TAG_TEXTAREA, 1u32),
-# <SELECT>:
-#> For historical reasons, the default value of the size IDL attribute does
-#> not return the actual size used, which, in the absence of the size content
-#> attribute, is either 1 or 4 depending on the presence of the multiple
-#> attribute.
+# > For historical reasons, the default value of the size IDL attribute
+# > does not return the actual size used, which, in the absence of the
+# > size content attribute, is either 1 or 4 depending on the presence
+# > of the multiple attribute.
makeulgz("size", TAG_SELECT, 0u32),
makeulgz("size", TAG_INPUT, 20u32),
makeul("width", TAG_CANVAS, 300u32),
@@ -1085,11 +1077,12 @@ const ReflectTable0 = [
makes("usemap", "useMap", TAG_IMG),
makeb("ismap", "isMap", TAG_IMG),
makeb("disabled", TAG_LINK, TAG_OPTION, TAG_SELECT, TAG_OPTGROUP),
- # "super-global" attributes
+ # super-global attributes
makes("class", "className", AllTagTypes),
- makef("onclick", AllTagTypes, "click"),
- makef("oninput", AllTagTypes, "input"),
- makef("onchange", AllTagTypes, "change"),
+ makef("onclick", "click"),
+ makef("oninput", "input"),
+ makef("onchange", "change"),
+ makef("onload", "load"),
makes("slot", AllTagTypes),
makes("title", AllTagTypes),
]
@@ -4320,6 +4313,97 @@ proc performMicrotaskCheckpoint*(window: Window) =
window.runJSJobs()
window.inMicrotaskCheckpoint = false
+const (ReflectTable, TagReflectMap, ReflectAllStartIndex) = (func(): (
+ seq[ReflectEntry],
+ Table[TagType, seq[int16]],
+ int16) =
+ var i: int16 = 0
+ while i < ReflectTable0.len:
+ let x = ReflectTable0[i]
+ result[0].add(x)
+ if x.tags == AllTagTypes:
+ break
+ for tag in result[0][i].tags:
+ if tag notin result[1]:
+ result[1][tag] = newSeq[int16]()
+ result[1][tag].add(i)
+ assert result[0][i].tags.len != 0
+ inc i
+ result[2] = i
+ while i < ReflectTable0.len:
+ let x = ReflectTable0[i]
+ assert x.tags == AllTagTypes
+ result[0].add(x)
+ inc i
+)()
+
+proc jsReflectGet(ctx: JSContext; this: JSValue; magic: cint): JSValue
+ {.cdecl.} =
+ let entry = ReflectTable[uint16(magic)]
+ let op = this.getOpaque()
+ if unlikely(not ctx.isInstanceOf(this, "Element") or op == nil):
+ return JS_ThrowTypeError(ctx,
+ "Reflected getter called on a value that is not an element")
+ let element = cast[Element](op)
+ if element.tagType notin entry.tags:
+ return JS_ThrowTypeError(ctx, "Invalid tag type %s", element.tagType)
+ case entry.t
+ of rtStr: return ctx.toJS(element.attr(entry.attrname))
+ of rtBool: return ctx.toJS(element.attrb(entry.attrname))
+ of rtLong: return ctx.toJS(element.attrl(entry.attrname).get(entry.i))
+ of rtUlong: return ctx.toJS(element.attrul(entry.attrname).get(entry.u))
+ of rtUlongGz: return ctx.toJS(element.attrulgz(entry.attrname).get(entry.u))
+ of rtFunction: return JS_NULL
+
+proc jsReflectSet(ctx: JSContext; this, val: JSValue; magic: cint): JSValue
+ {.cdecl.} =
+ if unlikely(not ctx.isInstanceOf(this, "Element")):
+ return JS_ThrowTypeError(ctx,
+ "Reflected getter called on a value that is not an element")
+ let entry = ReflectTable[uint16(magic)]
+ let op = this.getOpaque()
+ assert op != nil
+ let element = cast[Element](op)
+ if element.tagType notin entry.tags:
+ return JS_ThrowTypeError(ctx, "Invalid tag type %s", element.tagType)
+ case entry.t
+ of rtStr:
+ var x: string
+ if ctx.fromJS(val, x).isSome:
+ element.attr(entry.attrname, x)
+ of rtBool:
+ var x: bool
+ if ctx.fromJS(val, x).isSome:
+ if x:
+ element.attr(entry.attrname, "")
+ else:
+ let i = element.findAttr(entry.attrname)
+ if i != -1:
+ element.delAttr(i)
+ of rtLong:
+ var x: int32
+ if ctx.fromJS(val, x).isSome:
+ element.attrl(entry.attrname, x)
+ of rtUlong:
+ var x: uint32
+ if ctx.fromJS(val, x).isSome:
+ element.attrul(entry.attrname, x)
+ of rtUlongGz:
+ var x: uint32
+ if ctx.fromJS(val, x).isSome:
+ element.attrulgz(entry.attrname, x)
+ of rtFunction:
+ return ctx.eventReflectSet0(this, val, magic, jsReflectSet, entry.ctype)
+ return JS_DupValue(ctx, val)
+
+func findMagic(ctype: StaticAtom): cint =
+ for i in ReflectAllStartIndex ..< int16(ReflectTable.len):
+ let entry = ReflectTable[i]
+ assert entry.tags == AllTagTypes
+ if ReflectTable[i].t == rtFunction and ReflectTable[i].ctype == ctype:
+ return cint(i)
+ assert false
+
proc reflectEvent(element: Element; target: EventTarget;
name, ctype: StaticAtom; value: string) =
let document = element.document
@@ -4331,15 +4415,12 @@ proc reflectEvent(element: Element; target: EventTarget;
document.window.console.error("Exception in body content attribute of",
urls, ctx.getExceptionMsg())
else:
- let jsTarget = ctx.toJS(target)
- ctx.definePropertyC(jsTarget, $name, JS_DupValue(ctx, fun))
- JS_FreeValue(ctx, jsTarget)
- #TODO this is subtly wrong. In fact, we should not pass `fun'
- # directly here, but a wrapper function that calls fun. Currently
- # you can run removeEventListener with element.onclick, that should
- # not work.
- doAssert ctx.addEventListener(target, ctype.toAtom(), fun).isSome
- JS_FreeValue(ctx, fun)
+ let magic = findMagic(ctype)
+ let this = ctx.toJS(target)
+ JS_FreeValue(ctx, ctx.eventReflectSet0(this, fun, magic, jsReflectSet,
+ ctype))
+ JS_FreeValue(ctx, this)
+ JS_FreeValue(ctx, fun)
proc reflectAttr(element: Element; name: CAtom; value: Option[string]) =
let name = name.toStaticAtom()
@@ -4392,8 +4473,7 @@ proc reflectAttr(element: Element; name: CAtom; value: Option[string]) =
of TAG_INPUT:
let input = HTMLInputElement(element)
if name == satOninput and element.scriptingEnabled:
- input.reflectEvent(input.document.window, name, satInput,
- value.get(""))
+ input.reflectEvent(input.document.window, name, satInput, value.get(""))
input.reflect_str satValue, value
if name == satChecked:
input.setChecked(value.isSome)
@@ -5788,112 +5868,13 @@ proc querySelectorAll(this: DocumentFragment; q: string): DOMResult[NodeList]
{.jsfunc.} =
return this.querySelectorAllImpl(q)
-const (ReflectTable, TagReflectMap, ReflectAllStartIndex) = (func(): (
- seq[ReflectEntry],
- Table[TagType, seq[int16]],
- int16) =
- var i: int16 = 0
- while i < ReflectTable0.len:
- let x = ReflectTable0[i]
- result[0].add(x)
- if x.tags == AllTagTypes:
- break
- for tag in result[0][i].tags:
- if tag notin result[1]:
- result[1][tag] = newSeq[int16]()
- result[1][tag].add(i)
- assert result[0][i].tags.len != 0
- inc i
- result[2] = i
- while i < ReflectTable0.len:
- let x = ReflectTable0[i]
- assert x.tags == AllTagTypes
- result[0].add(x)
- inc i
-)()
-
-proc jsReflectGet(ctx: JSContext; this: JSValue; magic: cint): JSValue
- {.cdecl.} =
- let entry = ReflectTable[uint16(magic)]
- let op = this.getOpaque()
- if unlikely(not ctx.isInstanceOf(this, "Element") or op == nil):
- return JS_ThrowTypeError(ctx,
- "Reflected getter called on a value that is not an element")
- let element = cast[Element](op)
- if element.tagType notin entry.tags:
- return JS_ThrowTypeError(ctx, "Invalid tag type %s", element.tagType)
- case entry.t
- of rtStr: return ctx.toJS(element.attr(entry.attrname))
- of rtBool: return ctx.toJS(element.attrb(entry.attrname))
- of rtLong: return ctx.toJS(element.attrl(entry.attrname).get(entry.i))
- of rtUlong: return ctx.toJS(element.attrul(entry.attrname).get(entry.u))
- of rtUlongGz: return ctx.toJS(element.attrulgz(entry.attrname).get(entry.u))
- of rtFunction:
- let val = ctx.toJS(entry.attrname)
- let atom = JS_ValueToAtom(ctx, val)
- var res = JS_NULL
- var desc: JSPropertyDescriptor
- if JS_GetOwnProperty(ctx, addr desc, this, atom) > 0:
- JS_FreeValue(ctx, desc.setter)
- JS_FreeValue(ctx, desc.getter)
- res = desc.value
- JS_FreeValue(ctx, val)
- JS_FreeAtom(ctx, atom)
- return res
-
-proc jsReflectSet(ctx: JSContext; this, val: JSValue; magic: cint): JSValue
- {.cdecl.} =
- if unlikely(not ctx.isInstanceOf(this, "Element")):
- return JS_ThrowTypeError(ctx,
- "Reflected getter called on a value that is not an element")
- let entry = ReflectTable[uint16(magic)]
- let op = this.getOpaque()
- assert op != nil
- let element = cast[Element](op)
- if element.tagType notin entry.tags:
- return JS_ThrowTypeError(ctx, "Invalid tag type %s", element.tagType)
- case entry.t
- of rtStr:
- var x: string
- if ctx.fromJS(val, x).isSome:
- element.attr(entry.attrname, x)
- of rtBool:
- var x: bool
- if ctx.fromJS(val, x).isSome:
- if x:
- element.attr(entry.attrname, "")
- else:
- let i = element.findAttr(entry.attrname)
- if i != -1:
- element.delAttr(i)
- of rtLong:
- var x: int32
- if ctx.fromJS(val, x).isSome:
- element.attrl(entry.attrname, x)
- of rtUlong:
- var x: uint32
- if ctx.fromJS(val, x).isSome:
- element.attrul(entry.attrname, x)
- of rtUlongGz:
- var x: uint32
- if ctx.fromJS(val, x).isSome:
- element.attrulgz(entry.attrname, x)
- of rtFunction:
- if JS_IsFunction(ctx, val):
- var target: EventTarget
- assert ctx.fromJS(this, target).isSome
- ctx.definePropertyC(this, $entry.attrname, JS_DupValue(ctx, val))
- #TODO I haven't checked but this might also be wrong
- doAssert ctx.addEventListener(target, entry.ctype.toAtom(), val).isSome
- return JS_DupValue(ctx, val)
-
func getReflectFunctions(tags: set[TagType]): seq[TabGetSet] =
result = @[]
for tag in tags:
if tag in TagReflectMap:
for i in TagReflectMap[tag]:
result.add(TabGetSet(
- name: ReflectTable[i].funcname,
+ name: $ReflectTable[i].funcname,
get: jsReflectGet,
set: jsReflectSet,
magic: i
@@ -5905,7 +5886,7 @@ func getElementReflectFunctions(): seq[TabGetSet] =
let entry = ReflectTable[i]
assert entry.tags == AllTagTypes
result.add(TabGetSet(
- name: ReflectTable[i].funcname,
+ name: $ReflectTable[i].funcname,
get: jsReflectGet,
set: jsReflectSet,
magic: i
diff --git a/src/html/env.nim b/src/html/env.nim
index cf96cbe1..5198c89e 100644
--- a/src/html/env.nim
+++ b/src/html/env.nim
@@ -330,15 +330,6 @@ proc postMessage(ctx: JSContext; window: Window; value: JSValue): Err[void]
window.fireEvent(event, window)
ok()
-proc setOnLoad(ctx: JSContext; window: Window; val: JSValue)
- {.jsfset: "onload".} =
- if JS_IsFunction(ctx, val):
- let this = ctx.toJS(window)
- ctx.definePropertyC(this, "onload", JS_DupValue(ctx, val))
- #TODO I haven't checked but this might also be wrong
- doAssert ctx.addEventListener(window, satLoad.toAtom(), val).isSome
- JS_FreeValue(ctx, this)
-
proc loadJSModule(ctx: JSContext; moduleName: cstringConst; opaque: pointer):
JSModuleDef {.cdecl.} =
let window = ctx.getWindow()
@@ -368,7 +359,14 @@ proc loadJSModule(ctx: JSContext; moduleName: cstringConst; opaque: pointer):
proc addWindowModule*(ctx: JSContext) =
ctx.addEventModule()
let eventTargetCID = ctx.getClass("EventTarget")
- ctx.registerType(Window, parent = eventTargetCID, asglobal = true)
+ const getset = [TabGetSet(
+ name: "onload",
+ get: eventReflectGet,
+ set: eventReflectSet,
+ magic: static int16(EventReflectMap.find(satLoad))
+ )]
+ ctx.registerType(Window, parent = eventTargetCID, asglobal = true,
+ hasExtraGetSet = true, extraGetSet = getset)
ctx.registerType(MediaQueryList)
proc addWindowModule2*(ctx: JSContext) =
diff --git a/src/html/event.nim b/src/html/event.nim
index 11a619ac..46fee333 100644
--- a/src/html/event.nim
+++ b/src/html/event.nim
@@ -75,17 +75,14 @@ type
EventTarget* = ref object of RootObj
eventListeners*: seq[EventListener]
- EventHandler* = JSValue
-
- EventListenerCallback = JSValue
-
EventListener* = ref object
- ctype*: CAtom
# if callback is undefined, the listener has been removed
- callback*: EventListenerCallback
+ callback*: JSValue
+ ctype*: CAtom
capture: bool
passive: Option[bool]
once: bool
+ internal: bool
#TODO AbortSignal
jsDestructor(Event)
@@ -302,10 +299,18 @@ proc defaultPassiveValue(ctype: CAtom; eventTarget: EventTarget): bool =
return true
return eventTarget.isDefaultPassiveImpl()
-proc findEventListener(eventTarget: EventTarget; ctype: CAtom;
- callback: EventListenerCallback; capture: bool): int =
+proc findEventListener(ctx: JSContext; eventTarget: EventTarget; ctype: CAtom;
+ callback: JSValue; capture: bool): int =
+ for i, it in eventTarget.eventListeners.mypairs:
+ if not it.internal and it.ctype == ctype and
+ JS_IsStrictEqual(ctx, it.callback, callback) and
+ it.capture == capture:
+ return i
+ return -1
+
+proc findInternalEventListener(eventTarget: EventTarget; ctype: CAtom): int =
for i, it in eventTarget.eventListeners.mypairs:
- if it.ctype == ctype and it.callback == callback and it.capture == capture:
+ if it.ctype == ctype and it.internal:
return i
return -1
@@ -334,13 +339,14 @@ proc invoke(ctx: JSContext; listener: EventListener; event: Event): JSValue =
return ret
# shared
-proc addAnEventListener(target: EventTarget; listener: EventListener) =
+proc addAnEventListener(ctx: JSContext; target: EventTarget;
+ listener: EventListener) =
#TODO signals
if JS_IsUndefined(listener.callback):
return
if listener.passive.isNone:
listener.passive = some(defaultPassiveValue(listener.ctype, target))
- if target.findEventListener(listener.ctype, listener.callback,
+ if ctx.findEventListener(target, listener.ctype, listener.callback,
listener.capture) == -1: # dedup
target.eventListeners.add(listener)
#TODO signals
@@ -381,13 +387,79 @@ proc flattenMore(ctx: JSContext; options: JSValue):
JS_FreeValue(ctx, jsPassive)
return (capture, once, passive)
+proc removeInternalEventListener(ctx: JSContext; eventTarget: EventTarget;
+ ctype: StaticAtom) =
+ let i = eventTarget.findInternalEventListener(ctype.toAtom())
+ if i != -1:
+ eventTarget.removeAnEventListener(ctx, i)
+
+proc addInternalEventListener*(ctx: JSContext; eventTarget: EventTarget;
+ ctype: StaticAtom; callback: JSValue) =
+ ctx.removeInternalEventListener(eventTarget, ctype)
+ ctx.addAnEventListener(eventTarget, EventListener(
+ ctype: ctype.toAtom(),
+ capture: false,
+ once: false,
+ internal: true,
+ callback: JS_DupValue(ctx, callback)
+ ))
+
+# Event reflection
+const EventReflectMap* = [
+ cint(0): satLoadstart,
+ satProgress,
+ satAbort,
+ satError,
+ satLoad,
+ satTimeout,
+ satLoadend,
+ satReadystatechange
+]
+
+type UnionHack {.union.} = object
+ fun: JSCFunction
+ fun2: JSSetterMagicFunction
+
+proc eventReflectGet*(ctx: JSContext; this: JSValue; magic: cint): JSValue
+ {.cdecl.} =
+ return JS_NULL
+
+proc eventReflectSet0*(ctx: JSContext; this, val: JSValue; magic: cint;
+ fun2: JSSetterMagicFunction; atom: StaticAtom): JSValue =
+ if JS_IsFunction(ctx, val) or JS_IsNull(val):
+ var target: EventTarget
+ doAssert ctx.fromJS(this, target).isSome
+ let name = "on" & $atom
+ let getter = ctx.identityFunction(val)
+ let hack = UnionHack(fun2: fun2) # cast does not work :(
+ let setter = JS_NewCFunction2(ctx, hack.fun, cstring(name), 1,
+ JS_CFUNC_setter_magic, magic)
+ let ja = JS_NewAtom(ctx, cstring(name))
+ let ret = JS_DefineProperty(ctx, this, ja, JS_UNDEFINED, getter, setter,
+ JS_PROP_HAS_GET or JS_PROP_HAS_SET or
+ JS_PROP_HAS_CONFIGURABLE or JS_PROP_CONFIGURABLE)
+ JS_FreeAtom(ctx, ja)
+ JS_FreeValue(ctx, getter)
+ JS_FreeValue(ctx, setter)
+ if ret == -1:
+ return JS_EXCEPTION
+ if JS_IsNull(val):
+ ctx.removeInternalEventListener(target, atom)
+ else:
+ ctx.addInternalEventListener(target, atom, val)
+ return JS_DupValue(ctx, val)
+
+proc eventReflectSet*(ctx: JSContext; this, val: JSValue; magic: cint): JSValue
+ {.cdecl.} =
+ return ctx.eventReflectSet0(this, val, magic, eventReflectSet,
+ EventReflectMap[magic])
+
proc addEventListener*(ctx: JSContext; eventTarget: EventTarget; ctype: CAtom;
- callback: EventListenerCallback; options = JS_UNDEFINED): Err[JSError]
- {.jsfunc.} =
+ callback: JSValue; options = JS_UNDEFINED): Err[JSError] {.jsfunc.} =
if not JS_IsObject(callback) and not JS_IsNull(callback):
return errTypeError("callback is not an object")
let (capture, once, passive) = flattenMore(ctx, options)
- eventTarget.addAnEventListener(EventListener(
+ ctx.addAnEventListener(eventTarget, EventListener(
ctype: ctype,
capture: capture,
passive: passive,
@@ -397,10 +469,9 @@ proc addEventListener*(ctx: JSContext; eventTarget: EventTarget; ctype: CAtom;
ok()
proc removeEventListener(ctx: JSContext; eventTarget: EventTarget;
- ctype: CAtom; callback: EventListenerCallback;
- options = JS_UNDEFINED) {.jsfunc.} =
+ ctype: CAtom; callback: JSValue; options = JS_UNDEFINED) {.jsfunc.} =
let capture = flatten(ctx, options)
- let i = eventTarget.findEventListener(ctype, callback, capture)
+ let i = ctx.findEventListener(eventTarget, ctype, callback, capture)
if i != -1:
eventTarget.removeAnEventListener(ctx, i)
diff --git a/src/html/script.nim b/src/html/script.nim
index 6ee89da2..9eaa9d7e 100644
--- a/src/html/script.nim
+++ b/src/html/script.nim
@@ -1,5 +1,6 @@
import monoucha/javascript
import monoucha/jsopaque
+import monoucha/jsutils
import monoucha/quickjs
import monoucha/tojs
import types/referrer
@@ -183,3 +184,12 @@ proc defineConsts*(ctx: JSContext; classid: JSClassID; consts: typedesc[enum]) =
ctx.definePropertyE(proto, s, uint16(e))
ctx.definePropertyE(ctor, s, uint16(e))
JS_FreeValue(ctx, proto)
+
+proc identity(ctx: JSContext; this_val: JSValue; argc: cint;
+ argv: ptr UncheckedArray[JSValue]; magic: cint;
+ func_data: ptr UncheckedArray[JSValue]): JSValue {.cdecl.} =
+ return JS_DupValue(ctx, func_data[0])
+
+#TODO move to javascript.nim?
+proc identityFunction*(ctx: JSContext; val: JSValue): JSValue =
+ return JS_NewCFunctionData(ctx, identity, 0, 0, 1, val.toJSValueArray())
diff --git a/src/html/xmlhttprequest.nim b/src/html/xmlhttprequest.nim
index 34602fa6..cacba66d 100644
--- a/src/html/xmlhttprequest.nim
+++ b/src/html/xmlhttprequest.nim
@@ -54,11 +54,11 @@ type
upload {.jsget.}: XMLHttpRequestUpload
flags: set[XMLHttpRequestFlag]
requestMethod: HttpMethod
+ responseType {.jsget.}: XMLHttpRequestResponseType
+ timeout {.jsget.}: uint32
requestURL: URL
headers: Headers
response: Response
- responseType {.jsget.}: XMLHttpRequestResponseType
- timeout {.jsget.}: uint32
responseObject: JSValue
received: string
contentTypeOverride: string
@@ -150,6 +150,7 @@ proc open(ctx: JSContext; this: XMLHttpRequest; httpMethod, url: string;
this.requestMethod = httpMethod
this.headers = newHeaders()
this.response = makeNetworkError()
+ this.received = ""
this.requestURL = parsedURL
#TODO response object, received bytes
if this.readyState != xhrsOpened:
@@ -466,55 +467,17 @@ proc response(ctx: JSContext; this: XMLHttpRequest): JSValue {.jsfget.} =
else: discard
if JS_IsException(this.responseObject):
this.responseObject = JS_UNDEFINED
- return this.responseObject
-
-# Event reflection
-
-const ReflectMap = [
- cint(0): satLoadstart,
- satProgress,
- satAbort,
- satError,
- satLoad,
- satTimeout,
- satLoadend,
- satReadystatechange
-]
-
-proc jsReflectGet(ctx: JSContext; this: JSValue; magic: cint): JSValue
- {.cdecl.} =
- let val = toJS(ctx, $ReflectMap[magic])
- let atom = JS_ValueToAtom(ctx, val)
- var res = JS_NULL
- var desc: JSPropertyDescriptor
- if JS_GetOwnProperty(ctx, addr desc, this, atom) > 0:
- JS_FreeValue(ctx, desc.setter)
- JS_FreeValue(ctx, desc.getter)
- res = JS_GetProperty(ctx, this, atom)
- JS_FreeValue(ctx, val)
- JS_FreeAtom(ctx, atom)
- return res
-
-proc jsReflectSet(ctx: JSContext; this, val: JSValue; magic: cint): JSValue
- {.cdecl.} =
- if JS_IsFunction(ctx, val):
- let atom = ReflectMap[magic]
- var target: EventTarget
- assert ctx.fromJS(this, target).isSome
- ctx.definePropertyC(this, "on" & $atom, JS_DupValue(ctx, val))
- #TODO I haven't checked but this might also be wrong
- doAssert ctx.addEventListener(target, atom.toAtom(), val).isSome
- return JS_DupValue(ctx, val)
+ return JS_DupValue(ctx, this.responseObject)
func xhretGetSet(): seq[TabGetSet] =
result = @[]
- for i, it in ReflectMap:
+ for i, it in EventReflectMap:
if it == satReadystatechange:
break
result.add(TabGetSet(
name: "on" & $it,
- get: jsReflectGet,
- set: jsReflectSet,
+ get: eventReflectGet,
+ set: eventReflectSet,
magic: int16(i)
))
@@ -528,9 +491,9 @@ proc addXMLHttpRequestModule*(ctx: JSContext) =
ctx.registerType(ProgressEvent, eventCID)
const getset1 = [TabGetSet(
name: "onreadystatechange",
- get: jsReflectGet,
- set: jsReflectSet,
- magic: int16(ReflectMap.high)
+ get: eventReflectGet,
+ set: eventReflectSet,
+ magic: static int16(EventReflectMap.find(satReadystatechange))
)]
let xhrCID = ctx.registerType(XMLHttpRequest, xhretCID, hasExtraGetSet = true,
extraGetSet = getset1)
diff --git a/src/local/pager.nim b/src/local/pager.nim
index 389b771c..0315eebf 100644
--- a/src/local/pager.nim
+++ b/src/local/pager.nim
@@ -3273,7 +3273,7 @@ proc inputLoop(pager: Pager) =
func hasSelectFds(pager: Pager): bool =
return not pager.timeouts.empty or pager.numload > 0 or
- pager.loader.mapFds > 0
+ pager.loader.hasFds()
proc headlessLoop(pager: Pager) =
while pager.hasSelectFds():
diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index a4abb676..7efaedcb 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -1060,7 +1060,7 @@ proc finishLoad(buffer: Buffer; data: InputData): EmptyPromise =
proc headlessMustWait(buffer: Buffer): bool =
return buffer.config.scripting != smFalse and
not buffer.window.timeouts.empty or
- buffer.loader.mapFds > 0
+ buffer.loader.hasFds()
# Returns:
# * -1 if loading is done
diff --git a/src/server/loaderiface.nim b/src/server/loaderiface.nim
index e92586d6..74c0307e 100644
--- a/src/server/loaderiface.nim
+++ b/src/server/loaderiface.nim
@@ -25,7 +25,7 @@ type
loaderPid*: int
clientPid*: int
map: seq[MapData]
- mapFds*: int # number of fds in map
+ mapFds: int # number of fds in map
unregistered*: seq[int]
registerFun*: proc(fd: int)
unregisterFun*: proc(fd: int)
@@ -194,6 +194,9 @@ proc unset*(loader: FileLoader; data: MapData) =
if loader.get(fd) != nil:
loader.unset(fd)
+func hasFds*(loader: FileLoader): bool =
+ return loader.mapFds > 0 or loader.registerQueue.len > 0
+
proc register(loader: FileLoader; data: ConnectData) =
if loader.registerBlocked:
loader.registerQueue.add(data)