X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=3ef0b1e1fcb4beefa55a7b8d6fcd3d8f3e5b9e93;hb=0b272da1f7cdde3609b78fb949a7cff429c33eb7;hp=5df711ed2aec94aa492a501ea8ddc08ec4598c49;hpb=0ad70bf579b712a8bf770e2775cffa4a50097557;p=ruby-ecore.git diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c index 5df711e..3ef0b1e 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 77 2004-08-19 17:39:29Z tilman $ + * $Id: rb_ecore_x.c 88 2004-08-22 14:52:37Z tilman $ * * Copyright (C) 2004 ruby-ecore team (see AUTHORS) * @@ -22,7 +22,6 @@ #include #include -#include #include "../ecore/rb_ecore.h" #include "../ecore/rb_event_handler.h" @@ -46,10 +45,166 @@ static VALUE m_default_root_window_get (VALUE self) return default_root; } -static VALUE c_ev_win_show_req_init (VALUE self, VALUE event) +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); + Ecore_X_Event_Window_Focus_In *e = (void *) event; + + rb_define_attr (c, "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, "@window", TO_ECORE_X_WINDOW (Qnil, e->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_delete_request_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Delete_Request *e = (void *) event; + + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "time", 1, 0); + + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); + rb_iv_set (self, "@time", UINT2NUM (e->time)); + + return self; +} + +static VALUE c_ev_win_configure_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Configure *e = (void *) event; + + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "window_above", 1, 0); + rb_define_attr (c, "x", 1, 0); + rb_define_attr (c, "y", 1, 0); + rb_define_attr (c, "w", 1, 0); + rb_define_attr (c, "h", 1, 0); + rb_define_attr (c, "border", 1, 0); + rb_define_attr (c, "override", 1, 0); + rb_define_attr (c, "from_wm", 1, 0); + rb_define_attr (c, "time", 1, 0); + + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); + rb_iv_set (self, "@window_above", TO_ECORE_X_WINDOW (Qnil, + e->abovewin)); + rb_iv_set (self, "@x", INT2FIX (e->x)); + rb_iv_set (self, "@y", INT2FIX (e->y)); + rb_iv_set (self, "@w", INT2FIX (e->w)); + rb_iv_set (self, "@h", INT2FIX (e->h)); + rb_iv_set (self, "@border", INT2FIX (e->border)); + rb_iv_set (self, "@override", e->override ? Qtrue : Qfalse); + rb_iv_set (self, "@from_wm", e->from_wm ? Qtrue : Qfalse); + rb_iv_set (self, "@time", UINT2NUM (e->time)); + + return self; +} + +static VALUE c_ev_win_visibility_change_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Visibility_Change *e = (void *) event; + + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "fully_obscured", 1, 0); + rb_define_attr (c, "time", 1, 0); + + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); + rb_iv_set (self, "@fully_obscured", e->fully_obscured ? Qtrue : Qfalse); + rb_iv_set (self, "@time", UINT2NUM (e->time)); + + return self; +} + +static VALUE c_ev_win_create_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Create *e = (void *) event; + + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "override", 1, 0); + rb_define_attr (c, "time", 1, 0); + + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); + rb_iv_set (self, "@override", e->override ? Qtrue : Qfalse); + rb_iv_set (self, "@time", UINT2NUM (e->time)); + + return self; +} + +static VALUE c_ev_win_show_request_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); Ecore_X_Event_Window_Show_Request *e = (void *) event; + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "parent", 1, 0); + rb_define_attr (c, "time", 1, 0); + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); rb_iv_set (self, "@parent", TO_ECORE_X_WINDOW (Qnil, e->parent)); rb_iv_set (self, "@time", UINT2NUM (e->time)); @@ -59,7 +214,6 @@ static VALUE c_ev_win_show_req_init (VALUE self, VALUE event) void Init_ecore_x (void) { - Ecore_X_Window w; VALUE c; rb_require ("ecore"); @@ -78,8 +232,7 @@ void Init_ecore_x (void) Init_Window (); /* now create the default root window object */ - w = DefaultRootWindow (ecore_x_display_get ()); - default_root = TO_ECORE_X_WINDOW (Qnil, w); + default_root = TO_ECORE_X_WINDOW (Qnil, 0); OBJ_FREEZE (default_root); rb_global_variable (&default_root); @@ -113,43 +266,87 @@ void Init_ecore_x (void) DEF_CONST (c, ECORE_X_WM_PROTOCOL_, DELETE_REQUEST); DEF_CONST (c, ECORE_X_WM_PROTOCOL_, TAKE_FOCUS); + /* event modes */ + c = rb_define_class_under (mX, "EventMode", rb_cObject); + rb_define_private_method (rb_singleton_class (c), "new", NULL, 0); + DEF_CONST (c, ECORE_X_EVENT_MODE_, NORMAL); + DEF_CONST (c, ECORE_X_EVENT_MODE_, WHILE_GRABBED); + DEF_CONST (c, ECORE_X_EVENT_MODE_, GRAB); + DEF_CONST (c, ECORE_X_EVENT_MODE_, UNGRAB); + + /* event details */ + c = rb_define_class_under (mX, "EventDetails", 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_, INFERIOR); + DEF_CONST (c, ECORE_X_EVENT_DETAIL_, NON_LINEAR); + DEF_CONST (c, ECORE_X_EVENT_DETAIL_, NON_LINEAR_VIRTUAL); + DEF_CONST (c, ECORE_X_EVENT_DETAIL_, POINTER); + DEF_CONST (c, ECORE_X_EVENT_DETAIL_, POINTER_ROOT); + DEF_CONST (c, ECORE_X_EVENT_DETAIL_, DETAIL_NONE); + /* events */ + 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", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_focus_change_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_FOCUS_OUT, "WindowFocusOut", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_focus_change_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DELETE_REQUEST, "WindowDeleteRequest", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_delete_request_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE_REQUEST, "WindowConfigureRequest", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_delete_request_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE, "WindowConfigure", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_configure_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_VISIBILITY_CHANGE, "WindowVisibilityChange", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_visibility_change_init, 1); + + ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CREATE, "WindowCreate", c); + rb_define_private_method (c, "initialize", + c_ev_win_create_init, 1); + + ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DESTROY, "WindowDestroy", c); + rb_define_private_method (c, "initialize", + c_ev_win_delete_request_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW, "WindowShow", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_delete_request_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_HIDE, "WindowHide", c); - rb_define_private_method (c, "initialize", c_ev_generic_init, 1); + rb_define_private_method (c, "initialize", + c_ev_win_delete_request_init, 1); ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_SHOW_REQUEST, "WindowShowRequest", c); rb_define_private_method (c, "initialize", - c_ev_win_show_req_init, 1); - - rb_define_attr (c, "window", 1, 0); - rb_define_attr (c, "parent", 1, 0); - rb_define_attr (c, "time", 1, 0); + c_ev_win_show_request_init, 1); }