X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=bbb5bbeb8ff6f15a054bf5057ae43c583c0cc322;hb=ff5839c2520cf1a652dfb41d76c71dc9318268b1;hp=0acba6b698c8a54324b59a4d5de39752a9becbb4;hpb=dfaa1fcfd2bee38479f36ef86fb4021fafe82484;p=ruby-ecore.git

diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index 0acba6b..bbb5bbe 100644
--- 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 84 2004-08-21 20:16:25Z tilman $
+ * $Id: rb_ecore_x.c 89 2004-08-22 15:12:39Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -45,6 +45,87 @@ 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", rb_str_new2 (e->keyname));
+	rb_iv_set (self, "@keysymbol", rb_str_new2 (e->keysymbol));
+	rb_iv_set (self, "@key_compose", rb_str_new2 (e->key_compose));
+	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);
+	Ecore_X_Event_Mouse_Move *e = (void *) event;
+
+	rb_define_attr (c, "modifiers", 1, 0);
+	rb_define_attr (c, "x", 1, 0);
+	rb_define_attr (c, "y", 1, 0);
+	rb_define_attr (c, "root", 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, "@modifiers", INT2FIX (e->modifiers));
+	rb_iv_set (self, "@x", INT2FIX (e->x));
+	rb_iv_set (self, "@y", INT2FIX (e->y));
+	rb_iv_set (self, "@root", rb_ary_new3 (2, INT2FIX (e->root.x),
+	                                       INT2FIX (e->root.y)));
+	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_in_init (VALUE self, VALUE event)
+{
+	VALUE c = CLASS_OF (self);
+	Ecore_X_Event_Mouse_In *e = (void *) event;
+
+	rb_define_attr (c, "modifiers", 1, 0);
+	rb_define_attr (c, "x", 1, 0);
+	rb_define_attr (c, "y", 1, 0);
+	rb_define_attr (c, "root", 1, 0);
+	rb_define_attr (c, "window", 1, 0);
+	rb_define_attr (c, "event_window", 1, 0);
+	rb_define_attr (c, "mode", 1, 0);
+	rb_define_attr (c, "detail", 1, 0);
+	rb_define_attr (c, "time", 1, 0);
+
+	rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+	rb_iv_set (self, "@x", INT2FIX (e->x));
+	rb_iv_set (self, "@y", INT2FIX (e->y));
+	rb_iv_set (self, "@root", rb_ary_new3 (2, INT2FIX (e->root.x),
+	                                       INT2FIX (e->root.y)));
+	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, "@mode", INT2FIX (e->mode));
+	rb_iv_set (self, "@detail", INT2FIX (e->detail));
+	rb_iv_set (self, "@time", UINT2NUM (e->time));
+
+	return self;
+}
+
 static VALUE c_ev_win_focus_change_init (VALUE self, VALUE event)
 {
 	VALUE c = CLASS_OF (self);
@@ -231,6 +312,26 @@ void Init_ecore_x (void)
 	DEF_CONST (c, ECORE_X_EVENT_DETAIL_, DETAIL_NONE);
 
 	/* 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);
+
+	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_IN, "MouseIn", c);
+	rb_define_private_method (c, "initialize",
+	                          c_ev_mouse_in_init, 1);
+
+	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_OUT, "MouseOut", c);
+	rb_define_private_method (c, "initialize",
+	                          c_ev_mouse_in_init, 1);
+
 	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_IN,
 	           "WindowFocusIn", c);
 	rb_define_private_method (c, "initialize",