keyboard events: Update to latest DOM spec.

1 files changed, 29 insertions, 16 deletions

diff --git a/include/dom/events/keyboard_event.h b/include/dom/events/keyboard_event.h
index 236a3f4..03cab4b 100644
--- a/include/dom/events/keyboard_event.h
+++ b/include/dom/events/keyboard_event.h
@@ -27,14 +27,20 @@ dom_exception _dom_keyboard_event_create(dom_keyboard_event **evt);
 #define dom_keyboard_event_create(n) \
 		_dom_keyboard_event_create((dom_keyboard_event **) (n))
 
-dom_exception _dom_keyboard_event_get_key_identifier(dom_keyboard_event *evt,
-		dom_string **ident);
-#define dom_keyboard_event_get_key_identifier(e, i) \
-		_dom_keyboard_event_get_key_identifier( \
+dom_exception _dom_keyboard_event_get_key(dom_keyboard_event *evt,
+		dom_string **key);
+#define dom_keyboard_event_get_key(e, i) \
+		_dom_keyboard_event_get_key( \
 		(dom_keyboard_event *) (e), (dom_string **) (i))
 
-dom_exception _dom_keyboard_event_get_key_location(dom_keyboard_event *evt,
-		dom_key_location *loc);
+dom_exception _dom_keyboard_event_get_code(dom_keyboard_event *evt,
+		dom_string **code);
+#define dom_keyboard_event_get_code(e, i) \
+		_dom_keyboard_event_get_code( \
+		(dom_keyboard_event *) (e), (dom_string **) (i))
+
+dom_exception _dom_keyboard_event_get_location(dom_keyboard_event *evt,
+		dom_key_location *location);
 #define dom_keyboard_event_get_key_location(e, l) \
 		_dom_keyboard_event_get_key_location( \
 		(dom_keyboard_event *) (e), (dom_key_location *) (l))
@@ -69,25 +75,32 @@ dom_exception _dom_keyboard_event_get_modifier_state(dom_keyboard_event *evt,
 
 dom_exception _dom_keyboard_event_init(dom_keyboard_event *evt, 
 		dom_string *type, bool bubble, bool cancelable, 
-		struct dom_abstract_view *view, dom_string *key_ident,
-		dom_key_location key_loc, dom_string *modifier_list);
-#define dom_keyboard_event_init(e, t, b, c, v, ki, kl, m) \
+		struct dom_abstract_view *view, dom_string *key,
+		dom_string *code, dom_key_location location,
+		bool ctrl_key, bool shift_key, bool alt_key, bool meta_key,
+		bool repeat, bool is_composing);
+#define dom_keyboard_event_init(e, t, b, c, v, kk, kc, kl, ck, sk, ak, mk, r, ic) \
 		_dom_keyboard_event_init((dom_keyboard_event *) (e), \
 		(dom_string *) (t), (bool) (b), (bool) (c), \
-		(struct dom_abstract_view *) (v), (dom_string *) (ki), \
-		(dom_key_location) (kl), (dom_string *) (m))
+		(struct dom_abstract_view *) (v), (dom_string *) (kk), \
+		(dom_string *) (kc), (dom_key_location) (kl), \
+		(bool) (ck), (bool) (sk), (bool) (ak), (bool) (mk), \
+		(bool) (r), (bool) (ic))
 
 dom_exception _dom_keyboard_event_init_ns(dom_keyboard_event *evt, 
 		dom_string *namespace, dom_string *type,
 		bool bubble, bool cancelable, struct dom_abstract_view *view,
-		dom_string *key_ident, dom_key_location key_loc,
-		dom_string *modifier_list);
+		dom_string *key, dom_string *code, dom_key_location location,
+		bool ctrl_key, bool shift_key, bool alt_key, bool meta_key,
+		bool repeat, bool is_composing);
 #define dom_keyboard_event_init_ns(e, n, t, b, c, v, ki, kl, m) \
 		_dom_keyboard_event_init_ns((dom_keyboard_event *) (e), \
 		(dom_string *) (n), (dom_string *) (t), \
-		(bool) (b), (bool) (c), (struct dom_abstract_view *) (v), \
-		(dom_string *) (ki), (dom_key_location) (kl), \
-		(dom_string *) (m)) 
+		(bool) (b), (bool) (c), \
+		(struct dom_abstract_view *) (v), (dom_string *) (kk), \
+		(dom_string *) (kc), (dom_key_location) (kl), \
+		(bool) (ck), (bool) (sk), (bool) (ak), (bool) (mk), \
+		(bool) (r), (bool) (ic))
 
 #endif