/*
- * $Id: rb_ecore_x.c 101 2004-08-27 23:56:26Z tilman $
- *
* Copyright (C) 2004 ruby-ecore team (see AUTHORS)
*
* This library is free software; you can redistribute it and/or
#include <Ecore.h>
#include <Ecore_X.h>
+#include <Ecore_Input.h>
#include <X11/Xlib.h>
#include "../ecore/rb_ecore.h"
#include "rb_window.h"
#include "rb_cursor.h"
+#if 0
static VALUE default_root;
+#endif
static void at_exit ()
{
ecore_shutdown ();
}
+#if 0
static VALUE m_default_root_window_get (VALUE self)
{
return default_root;
}
+#endif
static VALUE c_ev_key_down_init (VALUE self, VALUE event)
{
VALUE c = CLASS_OF (self);
- Ecore_X_Event_Key_Down *e = (void *) event;
+ Ecore_Event_Key *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, "key", 1, 0);
+ rb_define_attr (c, "string", 1, 0);
+ rb_define_attr (c, "compose", 1, 0);
rb_define_attr (c, "modifiers", 1, 0);
rb_define_attr (c, "window", 1, 0);
+ rb_define_attr (c, "root_window", 1, 0);
rb_define_attr (c, "event_window", 1, 0);
- rb_define_attr (c, "time", 1, 0);
+ rb_define_attr (c, "timestamp", 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, "@key",
+ e->key ? rb_str_new2 (e->key) : Qnil);
+ rb_iv_set (self, "@string",
+ e->string ? rb_str_new2 (e->string) : Qnil);
+ rb_iv_set (self, "@compose",
+ e->compose ? rb_str_new2 (e->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, "@window", TO_ECORE_X_WINDOW (Qnil, e->window));
+ rb_iv_set (self, "@root_window",
+ TO_ECORE_X_WINDOW (Qnil, e->root_window));
rb_iv_set (self, "@event_window",
- TO_ECORE_X_WINDOW (Qnil, e->event_win));
- rb_iv_set (self, "@time", UINT2NUM (e->time));
+ TO_ECORE_X_WINDOW (Qnil, e->event_window));
+ rb_iv_set (self, "@timestamp", UINT2NUM (e->timestamp));
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;
+ Ecore_Event_Mouse_Button *e = (void *) event;
- rb_define_attr (c, "button", 1, 0);
+ rb_define_attr (c, "buttons", 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, "root_window", 1, 0);
rb_define_attr (c, "event_window", 1, 0);
- rb_define_attr (c, "time", 1, 0);
+ rb_define_attr (c, "timestamp", 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, "@buttons", INT2FIX (e->buttons));
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, "@window", TO_ECORE_X_WINDOW (Qnil, e->window));
+ rb_iv_set (self, "@root_window",
+ TO_ECORE_X_WINDOW (Qnil, e->root_window));
rb_iv_set (self, "@event_window",
- TO_ECORE_X_WINDOW (Qnil, e->event_win));
- rb_iv_set (self, "@time", UINT2NUM (e->time));
+ TO_ECORE_X_WINDOW (Qnil, e->event_window));
+ rb_iv_set (self, "@timestamp", UINT2NUM (e->timestamp));
rb_iv_set (self, "@double_click",
e->double_click ? Qtrue : Qfalse);
rb_iv_set (self, "@triple_click",
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);
- Ecore_X_Event_Mouse_Move *e = (void *) event;
+ Ecore_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, "root_window", 1, 0);
rb_define_attr (c, "event_window", 1, 0);
- rb_define_attr (c, "time", 1, 0);
+ rb_define_attr (c, "timestamp", 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, "@window", TO_ECORE_X_WINDOW (Qnil, e->window));
+ rb_iv_set (self, "@root_window",
+ TO_ECORE_X_WINDOW (Qnil, e->root_window));
rb_iv_set (self, "@event_window",
- TO_ECORE_X_WINDOW (Qnil, e->event_win));
- rb_iv_set (self, "@time", UINT2NUM (e->time));
+ TO_ECORE_X_WINDOW (Qnil, e->event_window));
+ rb_iv_set (self, "@timestamp", UINT2NUM (e->timestamp));
return self;
}
atexit (at_exit);
mX = rb_define_module_under (mEcore, "X");
+
+#if 0
rb_define_module_function (mX, "default_root_window",
m_default_root_window_get, 0);
+#endif
Init_Window ();
Init_Cursor ();
+#if 0
/* now create the default root window object */
w = DefaultRootWindow (ecore_x_display_get ());
default_root = TO_ECORE_X_WINDOW (Qnil, w);
rb_global_variable (&default_root);
+#endif
/* event mask values */
c = rb_define_class_under (mX, "EventMask", rb_cObject);
/* 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);
+ DEF_CONST (c, ECORE_EVENT_MODIFIER_, SHIFT);
+ DEF_CONST (c, ECORE_EVENT_MODIFIER_, CTRL);
+ DEF_CONST (c, ECORE_EVENT_MODIFIER_, ALT);
+ DEF_CONST (c, ECORE_EVENT_MODIFIER_, WIN);
/* events */
- ADD_EVENT (mX, ECORE_X_EVENT_, KEY_DOWN, "KeyDown", c);
+ ADD_EVENT (mX, ECORE_EVENT_KEY_DOWN, "KeyDownEvent", c);
rb_define_private_method (c, "initialize",
c_ev_key_down_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, KEY_UP, "KeyUp", c);
+ ADD_EVENT (mX, ECORE_EVENT_KEY_UP, "KeyUpEvent", c);
rb_define_private_method (c, "initialize",
c_ev_key_down_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_DOWN,
- "MouseButtonDown", c);
+ ADD_EVENT (mX, ECORE_EVENT_MOUSE_BUTTON_DOWN,
+ "MouseButtonDownEvent", 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);
+ ADD_EVENT (mX, ECORE_EVENT_MOUSE_BUTTON_UP,
+ "MouseButtonUpEvent", c);
rb_define_private_method (c, "initialize",
- c_ev_mouse_button_up_init, 1);
+ c_ev_mouse_button_down_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_MOVE, "MouseMove", c);
+ ADD_EVENT (mX, ECORE_EVENT_MOUSE_MOVE, "MouseMoveEvent", c);
rb_define_private_method (c, "initialize",
c_ev_mouse_move_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_IN, "MouseIn", c);
+ ADD_EVENT (mX, ECORE_EVENT_MOUSE_IN, "MouseInEvent", c);
rb_define_private_method (c, "initialize",
c_ev_mouse_in_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_OUT, "MouseOut", c);
+ ADD_EVENT (mX, ECORE_EVENT_MOUSE_OUT, "MouseOutEvent", c);
rb_define_private_method (c, "initialize",
c_ev_mouse_in_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_IN,
- "WindowFocusIn", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_IN,
+ "WindowFocusInEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_focus_change_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_OUT,
- "WindowFocusOut", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_FOCUS_OUT,
+ "WindowFocusOutEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_focus_change_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DELETE_REQUEST,
- "WindowDeleteRequest", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DELETE_REQUEST,
+ "WindowDeleteRequestEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_delete_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE_REQUEST,
- "WindowConfigureRequest", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE_REQUEST,
+ "WindowConfigureRequestEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_configure_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE,
- "WindowConfigure", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CONFIGURE,
+ "WindowConfigureEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_configure_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_RESIZE_REQUEST,
- "WindowResizeRequest", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_RESIZE_REQUEST,
+ "WindowResizeRequestEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_resize_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DAMAGE, "WindowDamage", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DAMAGE, "WindowDamageEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_damage_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_VISIBILITY_CHANGE,
- "WindowVisibilityChange", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE,
+ "WindowVisibilityChangeEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_visibility_change_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CREATE, "WindowCreate", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_CREATE, "WindowCreateEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_create_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DESTROY, "WindowDestroy", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_DESTROY, "WindowDestroyEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_delete_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW, "WindowShow", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW, "WindowShowEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_delete_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_HIDE, "WindowHide", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_HIDE, "WindowHideEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_delete_request_init, 1);
- ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW_REQUEST,
- "WindowShowRequest", c);
+ ADD_EVENT (mX, ECORE_X_EVENT_WINDOW_SHOW_REQUEST,
+ "WindowShowRequestEvent", c);
rb_define_private_method (c, "initialize",
c_ev_win_show_request_init, 1);
}