X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=c0c358fd65ff6701f0579c3044416cd6a33c2873;hp=69520a36476033330752f6f4d9a6711f9e2c81ad;hb=ab7b3b89f6a3a3069871ca5f59722a3f23e2f631;hpb=4f2835571a13e31777b36def3056547b997e0599 diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c index 69520a3..c0c358f 100644 --- a/src/ecore_x/rb_ecore_x.c +++ b/src/ecore_x/rb_ecore_x.c @@ -1,6 +1,4 @@ /* - * $Id: rb_ecore_x.c 365 2006-02-14 21:50:47Z tilman $ - * * Copyright (C) 2004 ruby-ecore team (see AUTHORS) * * This library is free software; you can redistribute it and/or @@ -30,7 +28,9 @@ #include "rb_window.h" #include "rb_cursor.h" +#if 0 static VALUE default_root; +#endif static void at_exit () { @@ -38,10 +38,12 @@ 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) { @@ -386,16 +388,21 @@ void Init_ecore_x (void) 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); @@ -456,93 +463,93 @@ void Init_ecore_x (void) DEF_CONST (c, ECORE_X_MODIFIER_, WIN); /* events */ - ADD_EVENT (mX, ECORE_X_EVENT_KEY_DOWN, "KeyDown", c); + ADD_EVENT (mX, ECORE_X_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_X_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); + "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); + "MouseButtonUpEvent", c); rb_define_private_method (c, "initialize", c_ev_mouse_button_up_init, 1); - ADD_EVENT (mX, ECORE_X_EVENT_MOUSE_MOVE, "MouseMove", c); + ADD_EVENT (mX, ECORE_X_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_X_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_X_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); + "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); + "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); + "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); + "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); + "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); + "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); + "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); + "WindowShowRequestEvent", c); rb_define_private_method (c, "initialize", c_ev_win_show_request_init, 1); }