aniani
/
elinks
mirror of https://github.com/rkd77/elinks.git
1
0
Fork 0
Code

[mujs] KeyboardEvent.keyCode (ENTER only) 

Something is broken.
This commit is contained in:
Witold Filipczyk 2024-05-12 13:48:31 +02:00
parent e44821367c
commit ffcbc08d12
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/ecmascript/mujs/keyboard.c
View File

@ -10,8 +10,10 @@
#include "elinks.h"
#include "ecmascript/ecmascript.h"
#include "ecmascript/libdom/dom.h"
#include "document/libdom/doc.h"
#include "ecmascript/ecmascript.h"
#include "ecmascript/mujs.h"
#include "ecmascript/mujs/keyboard.h"
#include "intl/charsets.h"
@ -19,6 +21,7 @@
static void mjs_keyboardEvent_get_property_code(js_State *J);
static void mjs_keyboardEvent_get_property_key(js_State *J);
static void mjs_keyboardEvent_get_property_keyCode(js_State *J);
static void mjs_keyboardEvent_get_property_bubbles(js_State *J);
static void mjs_keyboardEvent_get_property_cancelable(js_State *J);
@ -28,8 +31,6 @@ static void mjs_keyboardEvent_get_property_type(js_State *J);
static void mjs_keyboardEvent_preventDefault(js_State *J);
static unicode_val_T keyCode;
extern struct term_event last_event;
static void
@ -52,19 +53,21 @@ mjs_push_keyboardEvent(js_State *J, struct term_event *ev, const char *type_)
js_error(J, "error");
return;
}
keyCode = ev ? get_kbd_key(ev) : 0;
term_event_key_T keyCode = ev ? get_kbd_key(ev) : 0;
dom_string *typ = NULL;
const char *t = js_tostring(J, 1);
const char *t = type_ ?: "keydown";
exc = dom_string_create(t, strlen(t), &typ);
dom_string *dom_key = NULL;
convert_key_to_dom_string(keyCode, &dom_key);
if (t) {
exc = dom_string_create(t, strlen(t), &typ);
}
exc = dom_keyboard_event_init(event, typ, false, false,
NULL, NULL, NULL, DOM_KEY_LOCATION_STANDARD,
NULL, dom_key, NULL, DOM_KEY_LOCATION_STANDARD,
false, false, false, false,
false, false);
if (typ) dom_string_unref(typ);
if (dom_key) dom_string_unref(dom_key);
js_newobject(J);
{
@ -76,6 +79,7 @@ mjs_push_keyboardEvent(js_State *J, struct term_event *ev, const char *type_)
// addproperty(J, "composed", mjs_keyboardEvent_get_property_composed, NULL);
addproperty(J, "defaultPrevented", mjs_keyboardEvent_get_property_defaultPrevented, NULL);
addproperty(J, "key", mjs_keyboardEvent_get_property_key, NULL);
addproperty(J, "keyCode", mjs_keyboardEvent_get_property_key, NULL);
addproperty(J, "type", mjs_keyboardEvent_get_property_type, NULL);
}
}
@ -171,6 +175,30 @@ mjs_keyboardEvent_get_property_key(js_State *J)
dom_string_unref(key);
}
static void
mjs_keyboardEvent_get_property_keyCode(js_State *J)
{
#ifdef ECMASCRIPT_DEBUG
fprintf(stderr, "%s:%s\n", __FILE__, __FUNCTION__);
#endif
dom_keyboard_event *event = (dom_keyboard_event *)js_touserdata(J, 0, "event");
if (!event) {
js_pushnull(J);
return;
}
dom_string *key = NULL;
dom_exception exc = dom_keyboard_event_get_key(event, &key);
if (exc != DOM_NO_ERR) {
js_pushnull(J);
return;
}
unicode_val_T keyCode = convert_dom_string_to_keycode(key);
if (key) dom_string_unref(key);
js_pushnumber(J, keyCode);
}
static void
mjs_keyboardEvent_get_property_code(js_State *J)
{
@ -307,6 +335,7 @@ mjs_keyboardEvent_constructor(js_State *J)
// addproperty(J, "composed", mjs_keyboardEvent_get_property_composed, NULL);
addproperty(J, "defaultPrevented", mjs_keyboardEvent_get_property_defaultPrevented, NULL);
addproperty(J, "key", mjs_keyboardEvent_get_property_key, NULL);
addproperty(J, "keyCode", mjs_keyboardEvent_get_property_keyCode, NULL);
addproperty(J, "type", mjs_keyboardEvent_get_property_type, NULL);
}
}

2
src/ecmascript/quickjs/keyboard.c
View File

@ -185,7 +185,7 @@ js_keyboardEvent_get_property_keyCode(JSContext *ctx, JSValueConst this_val)
}
unicode_val_T keyCode = convert_dom_string_to_keycode(key);
JSValue r = JS_NewUint32(ctx, keyCode);
dom_string_unref(key);
if (key) dom_string_unref(key);
RETURN_JS(r);
}