projects
/
ruby-ecore.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ff5839c
)
Added modifier enum. Fixed key event init methods.
author
Tilman Sauerbeck
<tilman@code-monkey.de>
Sun, 22 Aug 2004 16:23:19 +0000
(16:23 +0000)
committer
Tilman Sauerbeck
<tilman@code-monkey.de>
Sun, 22 Aug 2004 16:23:19 +0000
(16:23 +0000)
src/ecore_x/rb_ecore_x.c
patch
|
blob
|
history
diff --git
a/src/ecore_x/rb_ecore_x.c
b/src/ecore_x/rb_ecore_x.c
index bbb5bbeb8ff6f15a054bf5057ae43c583c0cc322..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
89 2004-08-22 15:12:3
9Z tilman $
+ * $Id: rb_ecore_x.c
90 2004-08-22 16:23:1
9Z tilman $
*
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
*
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
@@
-58,9
+58,12
@@
static VALUE c_ev_key_down_init (VALUE self, VALUE event)
rb_define_attr (c, "event_window", 1, 0);
rb_define_attr (c, "time", 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, "@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",
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",
@@
-300,7
+303,7
@@
void Init_ecore_x (void)
DEF_CONST (c, ECORE_X_EVENT_MODE_, UNGRAB);
/* event details */
DEF_CONST (c, ECORE_X_EVENT_MODE_, UNGRAB);
/* event details */
- c = rb_define_class_under (mX, "EventDetail
s
", 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);
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);
@@
-311,6
+314,14
@@
void Init_ecore_x (void)
DEF_CONST (c, ECORE_X_EVENT_DETAIL_, POINTER_ROOT);
DEF_CONST (c, ECORE_X_EVENT_DETAIL_, DETAIL_NONE);
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",
/* events */
ADD_EVENT (mX, ECORE_X_EVENT_, KEY_DOWN, "KeyDown", c);
rb_define_private_method (c, "initialize",