Skip to content
Snippets Groups Projects
Commit 921514ce authored by rswindell's avatar rswindell
Browse files

key parameter to handle_ctrlkey can be string or number (ascii value).

parent 07f7e73c
No related branches found
No related tags found
No related merge requests found
...@@ -295,6 +295,7 @@ js_getkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) ...@@ -295,6 +295,7 @@ js_getkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
static JSBool static JSBool
js_handle_ctrlkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) js_handle_ctrlkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{ {
char key;
int32 mode=0; int32 mode=0;
sbbs_t* sbbs; sbbs_t* sbbs;
JSString* js_str; JSString* js_str;
...@@ -304,13 +305,18 @@ js_handle_ctrlkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * ...@@ -304,13 +305,18 @@ js_handle_ctrlkey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *
if((sbbs=(sbbs_t*)JS_GetContextPrivate(cx))==NULL) if((sbbs=(sbbs_t*)JS_GetContextPrivate(cx))==NULL)
return(JS_FALSE); return(JS_FALSE);
if((js_str=JS_ValueToString(cx, argv[0]))==NULL) if(JSVAL_IS_INT(argv[0]))
return(JS_FALSE); key=(char)JSVAL_TO_INT(argv[0]);
else {
if((js_str=JS_ValueToString(cx, argv[0]))==NULL)
return(JS_FALSE);
key=*JS_GetStringBytes(js_str);
}
if(argc>1) if(argc>1)
JS_ValueToInt32(cx, argv[1], &mode); JS_ValueToInt32(cx, argv[1], &mode);
*rval = BOOLEAN_TO_JSVAL(sbbs->handle_ctrlkey(*JS_GetStringBytes(js_str),mode)); *rval = BOOLEAN_TO_JSVAL(sbbs->handle_ctrlkey(key,mode));
return(JS_TRUE); return(JS_TRUE);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment