Added modifier enum. Fixed key event init methods.

[ruby-ecore.git] / src / ecore_x / rb_ecore_x.c

diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index 3ef0b1e1fcb4beefa55a7b8d6fcd3d8f3e5b9e93..c30eef24e89c1b0f20c6e68ee0100eeee3de646b 100644 (file)
--- a/src/ecore_x/rb_ecore_x.c
+++ b/src/ecore_x/rb_ecore_x.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_ecore_x.c 88 2004-08-22 14:52:37Z tilman $
+ * $Id: rb_ecore_x.c 90 2004-08-22 16:23:19Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -45,6 +45,34 @@ static VALUE m_default_root_window_get (VALUE self)
        return default_root;
 }
 
+static VALUE c_ev_key_down_init (VALUE self, VALUE event)
+{
+       VALUE c = CLASS_OF (self);
+       Ecore_X_Event_Key_Down *e = (void *) event;
+
+       rb_define_attr (c, "keyname", 1, 0);
+       rb_define_attr (c, "keysymbol", 1, 0);
+       rb_define_attr (c, "key_compose", 1, 0);
+       rb_define_attr (c, "modifiers", 1, 0);
+       rb_define_attr (c, "window", 1, 0);
+       rb_define_attr (c, "event_window", 1, 0);
+       rb_define_attr (c, "time", 1, 0);
+
+       rb_iv_set (self, "@keyname",
+                  e->keyname ?  rb_str_new2 (e->keyname) : Qnil);
+       rb_iv_set (self, "@keysymbol",
+                  e->keysymbol ? rb_str_new2 (e->keysymbol) : Qnil);
+       rb_iv_set (self, "@key_compose",
+                  e->key_compose ? rb_str_new2 (e->key_compose) : Qnil);
+       rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+       rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win));
+       rb_iv_set (self, "@event_window",
+                  TO_ECORE_X_WINDOW (Qnil, e->event_win));
+       rb_iv_set (self, "@time", UINT2NUM (e->time));
+
+       return self;
+}
+
 static VALUE c_ev_mouse_move_init (VALUE self, VALUE event)
 {
        VALUE c = CLASS_OF (self);
@@ -275,7 +303,7 @@ void Init_ecore_x (void)
        DEF_CONST (c, ECORE_X_EVENT_MODE_, UNGRAB);
 
        /* event details */
-       c = rb_define_class_under (mX, "EventDetails", rb_cObject);
+       c = rb_define_class_under (mX, "EventDetail", rb_cObject);
        rb_define_private_method (rb_singleton_class (c), "new", NULL, 0);
        DEF_CONST (c, ECORE_X_EVENT_DETAIL_, ANCESTOR);
        DEF_CONST (c, ECORE_X_EVENT_DETAIL_, VIRTUAL);
@@ -286,7 +314,23 @@ void Init_ecore_x (void)
        DEF_CONST (c, ECORE_X_EVENT_DETAIL_, POINTER_ROOT);
        DEF_CONST (c, ECORE_X_EVENT_DETAIL_, DETAIL_NONE);
 
+       /* key modifiers */
+       c = rb_define_class_under (mX, "Modifier", rb_cObject);
+       rb_define_private_method (rb_singleton_class (c), "new", NULL, 0);
+       DEF_CONST (c, ECORE_X_MODIFIER_, SHIFT);
+       DEF_CONST (c, ECORE_X_MODIFIER_, CTRL);
+       DEF_CONST (c, ECORE_X_MODIFIER_, ALT);
+       DEF_CONST (c, ECORE_X_MODIFIER_, WIN);
+
        /* events */
+       ADD_EVENT (mX, ECORE_X_EVENT_, KEY_DOWN, "KeyDown", c);
+       rb_define_private_method (c, "initialize",
+                                 c_ev_key_down_init, 1);
+
+       ADD_EVENT (mX, ECORE_X_EVENT_, KEY_UP, "KeyUp", c);
+       rb_define_private_method (c, "initialize",
+                                 c_ev_key_down_init, 1);
+
        ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_MOVE, "MouseMove", c);
        rb_define_private_method (c, "initialize",
                                  c_ev_mouse_move_init, 1);