/*
- * $Id: rb_ecore_x.c 89 2004-08-22 15:12:39Z tilman $
+ * $Id: rb_ecore_x.c 91 2004-08-22 23:06:05Z tilman $
*
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
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, "@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",
return self;
}
+static VALUE c_ev_mouse_button_down_init (VALUE self, VALUE event)
+{
+ VALUE c = CLASS_OF (self);
+ Ecore_X_Event_Mouse_Button_Down *e = (void *) event;
+
+ rb_define_attr (c, "button", 1, 0);
+ 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_define_attr (c, "double_click", 1, 0);
+ rb_define_attr (c, "triple_click", 1, 0);
+
+ rb_iv_set (self, "@button", INT2FIX (e->button));
+ rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+ rb_iv_set (self, "@x", INT2FIX (e->x));
+ rb_iv_set (self, "@y", INT2FIX (e->x));
+ 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));
+ rb_iv_set (self, "@double_click",
+ e->double_click ? Qtrue : Qfalse);
+ rb_iv_set (self, "@triple_click",
+ e->triple_click ? Qtrue : Qfalse);
+
+ return self;
+}
+
+static VALUE c_ev_mouse_button_up_init (VALUE self, VALUE event)
+{
+ VALUE c = CLASS_OF (self);
+ Ecore_X_Event_Mouse_Button_Up *e = (void *) event;
+
+ rb_define_attr (c, "button", 1, 0);
+ 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, "@button", INT2FIX (e->button));
+ rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+ rb_iv_set (self, "@x", INT2FIX (e->x));
+ rb_iv_set (self, "@y", INT2FIX (e->x));
+ 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_move_init (VALUE self, VALUE event)
{
VALUE c = CLASS_OF (self);
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);
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",
rb_define_private_method (c, "initialize",
c_ev_key_down_init, 1);
+ ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_DOWN,
+ "MouseButtonDown", c);
+ rb_define_private_method (c, "initialize",
+ c_ev_mouse_button_down_init, 1);
+
+ ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_UP,
+ "MouseButtonUp", c);
+ rb_define_private_method (c, "initialize",
+ c_ev_mouse_button_up_init, 1);
+
ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_MOVE, "MouseMove", c);
rb_define_private_method (c, "initialize",
c_ev_mouse_move_init, 1);