From 19315e136e6e54de11c4d25f2a30ab02dbedc402 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Sat, 12 Aug 2006 18:43:31 +0200 Subject: [PATCH] Ecmascript: the code adjusted for SEE-2.0 --- src/ecmascript/see/document.c | 3 +- src/ecmascript/see/form.c | 12 +- src/ecmascript/see/location.c | 6 +- src/ecmascript/see/navigator.c | 3 +- src/ecmascript/see/strings.c | 354 ++++++++------------------------- src/ecmascript/see/unibar.c | 6 +- src/ecmascript/see/window.c | 3 +- 7 files changed, 93 insertions(+), 294 deletions(-) diff --git a/src/ecmascript/see/document.c b/src/ecmascript/see/document.c index 523914e17..959d8d310 100644 --- a/src/ecmascript/see/document.c +++ b/src/ecmascript/see/document.c @@ -56,7 +56,7 @@ static void js_document_writeln(struct SEE_interpreter *, struct SEE_object *, s void location_goto(struct document_view *, unsigned char *); struct SEE_objectclass js_document_object_class = { - NULL, + "document", document_get, document_put, document_canput, @@ -288,7 +288,6 @@ init_js_document_object(struct ecmascript_interpreter *interpreter) struct js_document_object); doc->object.objectclass = &js_document_object_class; - doc->object.objectclass->Class = s_document; doc->object.Prototype = NULL; SEE_SET_OBJECT(&v, (struct SEE_object *)doc); diff --git a/src/ecmascript/see/form.c b/src/ecmascript/see/form.c index 27c0e9a80..8f8404b42 100644 --- a/src/ecmascript/see/form.c +++ b/src/ecmascript/see/form.c @@ -77,7 +77,7 @@ static void js_form_submit(struct SEE_interpreter *, struct SEE_object *, struct struct SEE_objectclass js_input_object_class = { - NULL, + "input", input_get, input_put, input_canput, @@ -91,7 +91,7 @@ struct SEE_objectclass js_input_object_class = { }; struct SEE_objectclass js_form_elems_class = { - NULL, + "elements", form_elems_get, SEE_no_put, SEE_no_canput, @@ -105,7 +105,7 @@ struct SEE_objectclass js_form_elems_class = { }; struct SEE_objectclass js_forms_object_class = { - NULL, + "forms", forms_get, SEE_no_put, SEE_no_canput, @@ -119,7 +119,7 @@ struct SEE_objectclass js_forms_object_class = { }; struct SEE_objectclass js_form_class = { - NULL, + "form", form_get, form_put, form_canput, @@ -464,7 +464,6 @@ js_get_input_object(struct SEE_interpreter *interp, struct js_form *jsform, jsinput = SEE_NEW(interp, struct js_input); jsinput->object.objectclass = &js_input_object_class; - jsinput->object.objectclass->Class = s_input; jsinput->object.Prototype = NULL; jsinput->blur = SEE_cfunction_make(interp, js_input_blur, s_blur, 0); @@ -822,7 +821,6 @@ form_get(struct SEE_interpreter *interp, struct SEE_object *o, struct js_form_elems *jsfe = SEE_NEW(interp, struct js_form_elems); jsfe->object.objectclass = &js_form_elems_class; - jsfe->object.objectclass->Class = s_elements; jsfe->object.Prototype = NULL; jsfe->parent = js_form; jsfe->item = SEE_cfunction_make(interp, js_form_elems_item, s_item, 1); @@ -971,7 +969,6 @@ struct js_form *js_get_form_object(struct SEE_interpreter *interp, * should be its parent, but gimme DOM first. --pasky */ js_form = SEE_NEW(interp, struct js_form); js_form->object.objectclass = &js_form_class; - js_form->object.objectclass->Class = s_form; js_form->object.Prototype = NULL; /* TODO: use prototype for form */ js_form->parent = doc; js_form->reset = SEE_cfunction_make(interp, js_form_reset, s_reset, 0); @@ -992,7 +989,6 @@ init_js_forms_object(struct ecmascript_interpreter *interpreter) struct js_forms_object); forms->object.objectclass = &js_forms_object_class; - forms->object.objectclass->Class = s_forms; forms->object.Prototype = NULL; SEE_OBJECT_GET(interp, interp->Global, s_document, &document); diff --git a/src/ecmascript/see/location.c b/src/ecmascript/see/location.c index a187bebb5..31274b7dd 100644 --- a/src/ecmascript/see/location.c +++ b/src/ecmascript/see/location.c @@ -80,7 +80,7 @@ struct delayed_goto { }; struct SEE_objectclass js_history_object_class = { - NULL, + "history", history_get, SEE_no_put, SEE_no_canput, @@ -94,7 +94,7 @@ struct SEE_objectclass js_history_object_class = { }; struct SEE_objectclass js_location_object_class = { - NULL, + "location", location_get, location_put, location_canput, @@ -332,7 +332,6 @@ init_js_history_object(struct ecmascript_interpreter *interpreter) struct js_history_object); history->object.objectclass = &js_history_object_class; - history->object.objectclass->Class = s_history; history->object.Prototype = NULL; SEE_SET_OBJECT(&v, (struct SEE_object *)history); @@ -353,7 +352,6 @@ init_js_location_object(struct ecmascript_interpreter *interpreter) struct js_location_object); loc->object.objectclass = &js_location_object_class; - loc->object.objectclass->Class = s_location; loc->object.Prototype = NULL; SEE_SET_OBJECT(&v, (struct SEE_object *)loc); diff --git a/src/ecmascript/see/navigator.c b/src/ecmascript/see/navigator.c index 52b600e9d..5b7d89979 100644 --- a/src/ecmascript/see/navigator.c +++ b/src/ecmascript/see/navigator.c @@ -50,7 +50,7 @@ static void navigator_get(struct SEE_interpreter *, struct SEE_object *, struct static int navigator_hasproperty(struct SEE_interpreter *, struct SEE_object *, struct SEE_string *); struct SEE_objectclass js_navigator_object_class = { - NULL, + "navigator", navigator_get, SEE_no_put, SEE_no_canput, @@ -142,7 +142,6 @@ init_js_navigator_object(struct ecmascript_interpreter *interpreter) navigator = SEE_NEW(interp, struct SEE_object); navigator->objectclass = &js_navigator_object_class; - navigator->objectclass->Class = s_navigator; navigator->Prototype = NULL; SEE_SET_OBJECT(&v, navigator); diff --git a/src/ecmascript/see/strings.c b/src/ecmascript/see/strings.c index 42364925b..c2b391388 100644 --- a/src/ecmascript/see/strings.c +++ b/src/ecmascript/see/strings.c @@ -1,4 +1,5 @@ #include +#include "ecmascript/see/strings.h" struct SEE_string *s_window; struct SEE_string *s_closed; @@ -95,293 +96,102 @@ struct SEE_string *s_hidden; struct SEE_string *s_timeout; + void init_intern_strings(void) { - static SEE_char_t SA_window[] = {'w','i','n','d','o','w'}; - static struct SEE_string S_window = SEE_STRING_DECL(SA_window); - static SEE_char_t SA_closed[] = {'c','l','o','s','e','d'}; - static struct SEE_string S_closed = SEE_STRING_DECL(SA_closed); - static SEE_char_t SA_parent[] = {'p','a','r','e','n','t'}; - static struct SEE_string S_parent = SEE_STRING_DECL(SA_parent); - static SEE_char_t SA_self[] = {'s','e','l','f'}; - static struct SEE_string S_self = SEE_STRING_DECL(SA_self); - static SEE_char_t SA_top[] = {'t','o','p'}; - static struct SEE_string S_top = SEE_STRING_DECL(SA_top); - static SEE_char_t SA_alert[] ={'a','l','e','r','t'}; - static struct SEE_string S_alert = SEE_STRING_DECL(SA_alert); - static SEE_char_t SA_open[] ={'o','p','e','n'}; - static struct SEE_string S_open = SEE_STRING_DECL(SA_open); + s_window = SEE_intern_global("window"); + s_closed = SEE_intern_global("closed"); + s_parent = SEE_intern_global("parent"); + s_self = SEE_intern_global("self"); + s_top = SEE_intern_global("top"); + s_alert = SEE_intern_global("alert"); + s_open = SEE_intern_global("open"); - static SEE_char_t SA_menubar[] = {'m','e','n','u','b','a','r'}; - static struct SEE_string S_menubar = SEE_STRING_DECL(SA_menubar); + s_menubar = SEE_intern_global("menubar"); - static SEE_char_t SA_statusbar[] = {'s','t','a','t','u','s','b','a','r'}; - static struct SEE_string S_statusbar = SEE_STRING_DECL(SA_statusbar); - static SEE_char_t SA_visible[] = {'v','i','s','i','b','l','e'}; - static struct SEE_string S_visible = SEE_STRING_DECL(SA_visible); + s_statusbar = SEE_intern_global("statusbar"); + s_visible = SEE_intern_global("visible"); - static SEE_char_t SA_navigator[] ={'n','a','v','i','g','a','t','o','r'}; - static struct SEE_string S_navigator = SEE_STRING_DECL(SA_navigator); - static SEE_char_t SA_appCodeName[] ={'a','p','p','C','o','d','e','N','a','m','e'}; - static struct SEE_string S_appCodeName = SEE_STRING_DECL(SA_appCodeName); - static SEE_char_t SA_appName[] ={'a','p','p','N','a','m','e'}; - static struct SEE_string S_appName = SEE_STRING_DECL(SA_appName); - static SEE_char_t SA_appVersion[] ={'a','p','p','V','e','r','s','i','o','n'}; - static struct SEE_string S_appVersion = SEE_STRING_DECL(SA_appVersion); - static SEE_char_t SA_language[] ={'l','a','n','g','u','a','g','e'}; - static struct SEE_string S_language = SEE_STRING_DECL(SA_language); - static SEE_char_t SA_platform[] ={'p','l','a','t','f','o','r','m'}; - static struct SEE_string S_platform = SEE_STRING_DECL(SA_platform); - static SEE_char_t SA_userAgent[] ={'u','s','e','r','A','g','e','n','t'}; - static struct SEE_string S_userAgent = SEE_STRING_DECL(SA_userAgent); + s_navigator = SEE_intern_global("navigator"); + s_appCodeName = SEE_intern_global("appCodeName"); + s_appName = SEE_intern_global("appName"); + s_appVersion = SEE_intern_global("appVersion"); + s_language = SEE_intern_global("language"); + s_platform = SEE_intern_global("platform"); + s_userAgent = SEE_intern_global("userAgent"); - static SEE_char_t SA_history[] ={'h','i','s','t','o','r','y'}; - static struct SEE_string S_history = SEE_STRING_DECL(SA_history); - static SEE_char_t SA_back[] ={'b','a','c','k'}; - static struct SEE_string S_back = SEE_STRING_DECL(SA_back); - static SEE_char_t SA_forward[] ={'f','o','r','w','a','r','d'}; - static struct SEE_string S_forward = SEE_STRING_DECL(SA_forward); - static SEE_char_t SA_go[] ={'g','o'}; - static struct SEE_string S_go = SEE_STRING_DECL(SA_go); + s_history = SEE_intern_global("history"); + s_back = SEE_intern_global("back"); + s_forward = SEE_intern_global("forward"); + s_go = SEE_intern_global("go"); - static SEE_char_t SA_location[] ={'l','o','c','a','t','i','o','n'}; - static struct SEE_string S_location = SEE_STRING_DECL(SA_location); - static SEE_char_t SA_href[] ={'h','r','e','f'}; - static struct SEE_string S_href = SEE_STRING_DECL(SA_href); - static SEE_char_t SA_toString[] ={'t','o','S','t','r','i','n','g'}; - static struct SEE_string S_toString = SEE_STRING_DECL(SA_toString); - static SEE_char_t SA_toLocaleString[] ={'t','o','L','o','c','a','l','e','S','t','r','i','n','g'}; - static struct SEE_string S_toLocaleString = SEE_STRING_DECL(SA_toLocaleString); + s_location = SEE_intern_global("location"); + s_href = SEE_intern_global("href"); + s_toString = SEE_intern_global("toString"); + s_toLocaleString = SEE_intern_global("toLocaleString"); - static SEE_char_t SA_input[] ={'i','n','p','u','t'}; - static struct SEE_string S_input = SEE_STRING_DECL(SA_input); - static SEE_char_t SA_accessKey[] ={'a','c','c','e','s','s','K','e','y'}; - static struct SEE_string S_accessKey = SEE_STRING_DECL(SA_accessKey); - static SEE_char_t SA_alt[] ={'a','l','t'}; - static struct SEE_string S_alt = SEE_STRING_DECL(SA_alt); - static SEE_char_t SA_checked[] ={'c','h','e','c','k','e','d'}; - static struct SEE_string S_checked = SEE_STRING_DECL(SA_checked); - static SEE_char_t SA_defaultChecked[] ={'d','e','f','a','u','l','t','C','h','e','c','k','e','d'}; - static struct SEE_string S_defaultChecked = SEE_STRING_DECL(SA_defaultChecked); - static SEE_char_t SA_defaultValue[] ={'d','e','f','a','u','l','t','V','a','l','u','e'}; - static struct SEE_string S_defaultValue = SEE_STRING_DECL(SA_defaultValue); - static SEE_char_t SA_disabled[] ={'d','i','s','a','b','l','e','d'}; - static struct SEE_string S_disabled = SEE_STRING_DECL(SA_disabled); - static SEE_char_t SA_form[] ={'f','o','r','m'}; - static struct SEE_string S_form = SEE_STRING_DECL(SA_form); - static SEE_char_t SA_maxLength[] ={'m','a','x','L','e','n','g','t','h'}; - static struct SEE_string S_maxLength = SEE_STRING_DECL(SA_maxLength); - static SEE_char_t SA_name[] ={'n','a','m','e'}; - static struct SEE_string S_name = SEE_STRING_DECL(SA_name); - static SEE_char_t SA_readonly[] ={'r','e','a','d','o','n','l','y'}; - static struct SEE_string S_readonly = SEE_STRING_DECL(SA_readonly); - static SEE_char_t SA_size[] ={'s','i','z','e'}; - static struct SEE_string S_size = SEE_STRING_DECL(SA_size); - static SEE_char_t SA_src[] ={'s','r','c'}; - static struct SEE_string S_src = SEE_STRING_DECL(SA_src); - static SEE_char_t SA_tabindex[] ={'t','a','b','i','n','d','e','x'}; - static struct SEE_string S_tabindex = SEE_STRING_DECL(SA_tabindex); - static SEE_char_t SA_type[] ={'t','y','p','e'}; - static struct SEE_string S_type = SEE_STRING_DECL(SA_type); - static SEE_char_t SA_value[] ={'v','a','l','u','e'}; - static struct SEE_string S_value = SEE_STRING_DECL(SA_value); - static SEE_char_t SA_blur[] ={'b','l','u','r'}; - static struct SEE_string S_blur = SEE_STRING_DECL(SA_blur); - static SEE_char_t SA_click[] ={'c','l','i','c','k'}; - static struct SEE_string S_click = SEE_STRING_DECL(SA_click); - static SEE_char_t SA_focus[] ={'f','o','c','u','s'}; - static struct SEE_string S_focus = SEE_STRING_DECL(SA_focus); - static SEE_char_t SA_select[] ={'s','e','l','e','c','t'}; - static struct SEE_string S_select = SEE_STRING_DECL(SA_select); - static SEE_char_t SA_selectedIndex[] ={'s','e','l','e','c','t','e','d','I','n','d','e','x'}; - static struct SEE_string S_selectedIndex = SEE_STRING_DECL(SA_selectedIndex); + s_input = SEE_intern_global("input"); + s_accessKey = SEE_intern_global("accessKey"); + s_alt = SEE_intern_global("alt"); + s_checked = SEE_intern_global("checked"); + s_defaultChecked = SEE_intern_global("defaultChecked"); + s_defaultValue = SEE_intern_global("defaultValue"); + s_disabled = SEE_intern_global("disabled"); + s_form = SEE_intern_global("form"); + s_maxLength = SEE_intern_global("maxLength"); + s_name = SEE_intern_global("name"); + s_readonly = SEE_intern_global("readonly"); + s_size = SEE_intern_global("size"); + s_src = SEE_intern_global("src"); + s_tabindex = SEE_intern_global("tabindex"); + s_type = SEE_intern_global("type"); + s_value = SEE_intern_global("value"); + s_blur = SEE_intern_global("blur"); + s_click = SEE_intern_global("click"); + s_focus = SEE_intern_global("focus"); + s_select = SEE_intern_global("select"); + s_selectedIndex = SEE_intern_global("selectedIndex"); - static SEE_char_t SA_elements[] ={'e','l','e','m','e','n','t','s'}; - static struct SEE_string S_elements = SEE_STRING_DECL(SA_elements); - static SEE_char_t SA_item[] ={'i','t','e','m'}; - static struct SEE_string S_item = SEE_STRING_DECL(SA_item); - static SEE_char_t SA_namedItem[] ={'n','a','m','e','d','I','t','e','m'}; - static struct SEE_string S_namedItem = SEE_STRING_DECL(SA_namedItem); - static SEE_char_t SA_length[] ={'l','e','n','g','t','h'}; - static struct SEE_string S_length = SEE_STRING_DECL(SA_length); + s_elements = SEE_intern_global("elements"); + s_item = SEE_intern_global("item"); + s_namedItem = SEE_intern_global("namedItem"); + s_length = SEE_intern_global("length"); - static SEE_char_t SA_action[] ={'a','c','t','i','o','n'}; - static struct SEE_string S_action = SEE_STRING_DECL(SA_action); - static SEE_char_t SA_encoding[] ={'e','n','c','o','d','i','g'}; - static struct SEE_string S_encoding = SEE_STRING_DECL(SA_encoding); - static SEE_char_t SA_method[] ={'m','e','t','h','o','d'}; - static struct SEE_string S_method = SEE_STRING_DECL(SA_method); - static SEE_char_t SA_target[] ={'t','a','r','g','e','t'}; - static struct SEE_string S_target = SEE_STRING_DECL(SA_target); - static SEE_char_t SA_reset[] ={'r','e','s','e','t'}; - static struct SEE_string S_reset = SEE_STRING_DECL(SA_reset); - static SEE_char_t SA_submit[] ={'s','u','b','m','i','t'}; - static struct SEE_string S_submit = SEE_STRING_DECL(SA_submit); + s_action = SEE_intern_global("action"); + s_encoding = SEE_intern_global("encoding"); + s_method = SEE_intern_global("method"); + s_target = SEE_intern_global("target"); + s_reset = SEE_intern_global("reset"); + s_submit = SEE_intern_global("submit"); - static SEE_char_t SA_forms[] ={'f','o','r','m','s'}; - static struct SEE_string S_forms = SEE_STRING_DECL(SA_forms); + s_forms = SEE_intern_global("forms"); - static SEE_char_t SA_document[] = {'d','o','c','u','m','e','n','t'}; - static struct SEE_string S_document = SEE_STRING_DECL(SA_document); - static SEE_char_t SA_referrer[] ={'r','e','f','e','r','r','e','r'}; - static struct SEE_string S_referrer = SEE_STRING_DECL(SA_referrer); - static SEE_char_t SA_title[] ={'t','i','t','l','e'}; - static struct SEE_string S_title = SEE_STRING_DECL(SA_title); - static SEE_char_t SA_url[] ={'u','r','l'}; - static struct SEE_string S_url = SEE_STRING_DECL(SA_url); - static SEE_char_t SA_write[] = {'w','r','i','t','e'}; - static struct SEE_string S_write = SEE_STRING_DECL(SA_write); - static SEE_char_t SA_writeln[] = {'w','r','i','t','e','l','n'}; - static struct SEE_string S_writeln = SEE_STRING_DECL(SA_writeln); + s_document = SEE_intern_global("document"); + s_referrer = SEE_intern_global("referrer"); + s_title = SEE_intern_global("title"); + s_url = SEE_intern_global("url"); + s_write = SEE_intern_global("write"); + s_writeln = SEE_intern_global("writeln"); - static SEE_char_t SA_Mozilla[] = {'M','o','z','i','l','l','a'}; - static struct SEE_string S_Mozilla = SEE_STRING_DECL(SA_Mozilla); - static SEE_char_t SA_ELinks_[] = {'E','L','i','n','k','s',' ','(', - 'r','o','u','g','h','l','y',' ','c','o','m','p','a','t','i','b','l','e', - ' ','w','i','t','h',' ','N','e','t','s','c','a','p','e',' ', - 'N','a','v','i','g','a','t','o','r',',',' ','M','o','z','i','l','l','a', - ' ','a','n','d',' ','M','i','c','r','o','s','o','f','t',' ', - 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r',')'}; - static struct SEE_string S_ELinks_ = SEE_STRING_DECL(SA_ELinks_); + s_Mozilla = SEE_intern_global("Mozilla"); + s_ELinks_ = SEE_intern_global("ELinks (roughly compatible with Netscape Navigator Mozilla and Microsoft Internet Explorer)"); + s_cookie = SEE_intern_global("cookie"); - static SEE_char_t SA_cookie[] = {'c','o','o','k','i','e'}; - static struct SEE_string S_cookie = SEE_STRING_DECL(SA_cookie); + s_GET = SEE_intern_global("GET"); + s_POST = SEE_intern_global("POST"); + s_application_ = SEE_intern_global("application/x-www-form-urlencoded"); + s_multipart_ = SEE_intern_global("multipart/form-data"); + s_textplain = SEE_intern_global("text/plain"); - static SEE_char_t SA_GET[] = {'G','E','T'}; - static struct SEE_string S_GET = SEE_STRING_DECL(SA_GET); - static SEE_char_t SA_POST[] = {'P','O','S','T'}; - static struct SEE_string S_POST = SEE_STRING_DECL(SA_POST); + s_text = SEE_intern_global("text"); + s_password = SEE_intern_global("password"); + s_file = SEE_intern_global("file"); + s_checkbox = SEE_intern_global("checkbox"); + s_radio = SEE_intern_global("radio"); + s_image = SEE_intern_global("image"); + s_button = SEE_intern_global("button"); + s_hidden = SEE_intern_global("hidden"); - static SEE_char_t SA_application_[] = {'a','p','p','l','i','c','a','t', - 'i','o','n','/','x','-','w','w','w','-','f','o','r','m','-','u','r','l', - 'e','n','c','o','d','e','d'}; - static struct SEE_string S_application_ = SEE_STRING_DECL(SA_application_); - static SEE_char_t SA_multipart_[] = {'m','u','l','t','i','p','a','r','t','/', - 'f','o','r','m','-','d','a','t','a'}; - static struct SEE_string S_multipart_ = SEE_STRING_DECL(SA_multipart_); - static SEE_char_t SA_textplain[] = {'t','e','x','t','/','p','l','a','i','n'}; - static struct SEE_string S_textplain = SEE_STRING_DECL(SA_textplain); - - static SEE_char_t SA_text[] = {'t','e','x','t'}; - static struct SEE_string S_text = SEE_STRING_DECL(SA_text); - - static SEE_char_t SA_password[] = {'p','a','s','s','w','o','r','d'}; - static struct SEE_string S_password = SEE_STRING_DECL(SA_password); - - static SEE_char_t SA_file[] = {'f','i','l','e'}; - static struct SEE_string S_file = SEE_STRING_DECL(SA_file); - - static SEE_char_t SA_checkbox[] = {'c','h','e','c','k','b','o','x'}; - static struct SEE_string S_checkbox = SEE_STRING_DECL(SA_checkbox); - - static SEE_char_t SA_radio[] = {'r','a','d','i','o'}; - static struct SEE_string S_radio = SEE_STRING_DECL(SA_radio); - - static SEE_char_t SA_image[] = {'i','m','a','g','e'}; - static struct SEE_string S_image = SEE_STRING_DECL(SA_image); - - static SEE_char_t SA_button[] = {'b','u','t','t','o','n'}; - static struct SEE_string S_button = SEE_STRING_DECL(SA_button); - - static SEE_char_t SA_hidden[] = {'h','i','d','d','e','n'}; - static struct SEE_string S_hidden = SEE_STRING_DECL(SA_hidden); - - static SEE_char_t SA_timeout[] = {'t','i','m','e','o','u','t'}; - static struct SEE_string S_timeout = SEE_STRING_DECL(SA_timeout); - - SEE_intern_global(s_window = &S_window); - SEE_intern_global(s_closed = &S_closed); - SEE_intern_global(s_parent = &S_parent); - SEE_intern_global(s_self = &S_self); - SEE_intern_global(s_top = &S_top); - SEE_intern_global(s_alert = &S_alert); - SEE_intern_global(s_open = &S_open); - - SEE_intern_global(s_menubar = &S_menubar); - SEE_intern_global(s_statusbar = &S_statusbar); - SEE_intern_global(s_visible = &S_visible); - - SEE_intern_global(s_navigator = &S_navigator); - SEE_intern_global(s_appCodeName = &S_appCodeName); - SEE_intern_global(s_appName = &S_appName); - SEE_intern_global(s_appVersion = &S_appVersion); - SEE_intern_global(s_language = &S_language); - SEE_intern_global(s_platform = &S_platform); - SEE_intern_global(s_userAgent = &S_userAgent); - - SEE_intern_global(s_history = &S_history); - SEE_intern_global(s_back = &S_back); - SEE_intern_global(s_forward = &S_forward); - SEE_intern_global(s_go = &S_go); - - SEE_intern_global(s_location = &S_location); - SEE_intern_global(s_href = &S_href); - SEE_intern_global(s_toString = &S_toString); - SEE_intern_global(s_toLocaleString = &S_toLocaleString); - - SEE_intern_global(s_input = &S_input); - SEE_intern_global(s_accessKey = &S_accessKey); - SEE_intern_global(s_alt = &S_alt); - SEE_intern_global(s_checked = &S_checked); - SEE_intern_global(s_defaultChecked = &S_defaultChecked); - SEE_intern_global(s_defaultValue = &S_defaultValue); - SEE_intern_global(s_disabled = &S_disabled); - SEE_intern_global(s_form = &S_form); - SEE_intern_global(s_maxLength = &S_maxLength); - SEE_intern_global(s_name = &S_name); - SEE_intern_global(s_readonly = &S_readonly); - SEE_intern_global(s_size = &S_size); - SEE_intern_global(s_src = &S_src); - SEE_intern_global(s_tabindex = &S_tabindex); - SEE_intern_global(s_type = &S_type); - SEE_intern_global(s_value = &S_value); - SEE_intern_global(s_blur = &S_blur); - SEE_intern_global(s_click = &S_click); - SEE_intern_global(s_focus = &S_focus); - SEE_intern_global(s_select = &S_select); - SEE_intern_global(s_selectedIndex = &S_selectedIndex); - - SEE_intern_global(s_elements = &S_elements); - SEE_intern_global(s_item = &S_item); - SEE_intern_global(s_namedItem = &S_namedItem); - SEE_intern_global(s_length = &S_length); - - SEE_intern_global(s_action = &S_action); - SEE_intern_global(s_encoding = &S_encoding); - SEE_intern_global(s_method = &S_method); - SEE_intern_global(s_target = &S_target); - SEE_intern_global(s_reset = &S_reset); - SEE_intern_global(s_submit = &S_submit); - - SEE_intern_global(s_forms = &S_forms); - - SEE_intern_global(s_document = &S_document); - SEE_intern_global(s_referrer = &S_referrer); - SEE_intern_global(s_title = &S_title); - SEE_intern_global(s_url = &S_url); - SEE_intern_global(s_write = &S_write); - SEE_intern_global(s_writeln = &S_writeln); - - SEE_intern_global(s_Mozilla = &S_Mozilla); - SEE_intern_global(s_ELinks_ = &S_ELinks_); - SEE_intern_global(s_cookie = &S_cookie); - - SEE_intern_global(s_GET = &S_GET); - SEE_intern_global(s_POST = &S_POST); - - SEE_intern_global(s_application_ = &S_application_); - SEE_intern_global(s_multipart_ = &S_multipart_); - SEE_intern_global(s_textplain = &S_textplain); - - SEE_intern_global(s_text = &S_text); - SEE_intern_global(s_password = &S_password); - SEE_intern_global(s_file = &S_file); - SEE_intern_global(s_checkbox = &S_checkbox); - SEE_intern_global(s_radio = &S_radio); - SEE_intern_global(s_image = &S_image); - SEE_intern_global(s_button = &S_button); - SEE_intern_global(s_hidden = &S_hidden); - - SEE_intern_global(s_timeout = &S_timeout); + s_timeout = SEE_intern_global("timeout"); } diff --git a/src/ecmascript/see/unibar.c b/src/ecmascript/see/unibar.c index ca10f8d80..c5fa9047f 100644 --- a/src/ecmascript/see/unibar.c +++ b/src/ecmascript/see/unibar.c @@ -57,7 +57,7 @@ struct js_unibar_object { }; struct SEE_objectclass js_menubar_object_class = { - NULL, + "menubar", unibar_get, unibar_put, unibar_canput, @@ -71,7 +71,7 @@ struct SEE_objectclass js_menubar_object_class = { }; struct SEE_objectclass js_statusbar_object_class = { - NULL, + "statusbar", unibar_get, unibar_put, unibar_canput, @@ -178,7 +178,6 @@ init_js_menubar_object(struct ecmascript_interpreter *interpreter) menu = SEE_NEW(interp, struct js_unibar_object); menu->object.objectclass = &js_menubar_object_class; - menu->object.objectclass->Class = s_menubar; menu->object.Prototype = NULL; menu->bar = 't'; @@ -197,7 +196,6 @@ init_js_statusbar_object(struct ecmascript_interpreter *interpreter) status = SEE_NEW(interp, struct js_unibar_object); status->object.objectclass = &js_statusbar_object_class; - status->object.objectclass->Class = s_statusbar; status->object.Prototype = NULL; status->bar = 's'; diff --git a/src/ecmascript/see/window.c b/src/ecmascript/see/window.c index 6324092a7..1f878e7c0 100644 --- a/src/ecmascript/see/window.c +++ b/src/ecmascript/see/window.c @@ -58,7 +58,7 @@ static void js_window_open(struct SEE_interpreter *, struct SEE_object *, struct void location_goto(struct document_view *, unsigned char *); struct SEE_objectclass js_window_object_class = { - NULL, + "window", window_get, window_put, window_canput, @@ -329,7 +329,6 @@ init_js_window_object(struct ecmascript_interpreter *interpreter) g->win = SEE_NEW(interp, struct js_window_object); g->win->object.objectclass = &js_window_object_class; - g->win->object.objectclass->Class = s_window; g->win->object.Prototype = NULL; g->win->vs = interpreter->vs;