X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=d309abcb09d94ffb78329032453d62fab23cecc5;hp=e6a89b4bf51cd42c1ac15e2eb210757c4b7d822c;hb=0f8d24c745efc1057f8d25ada1375c88a1ab2ed7;hpb=fff6e50c308822a53bab712d321c33f557742193 diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c index e6a89b4..d309abc 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 94 2004-08-23 10:53:25Z tilman $ - * * Copyright (C) 2004 ruby-ecore team (see AUTHORS) * * This library is free software; you can redistribute it and/or @@ -28,10 +26,7 @@ #include "../ecore/rb_event_handler.h" #include "rb_ecore_x.h" #include "rb_window.h" - -#define DEF_CONST(mod, prefix, name) \ - rb_define_const ((mod), #name, \ - INT2FIX (prefix##name)); +#include "rb_cursor.h" static VALUE default_root; @@ -224,6 +219,37 @@ static VALUE c_ev_win_delete_request_init (VALUE self, VALUE event) return self; } +static VALUE c_ev_win_configure_request_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Configure_Request *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, "detail", 1, 0); + rb_define_attr (c, "value_mask", 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, "@detail", INT2FIX (e->detail)); + rb_iv_set (self, "@value_mask", INT2FIX (e->value_mask)); + 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); @@ -255,6 +281,46 @@ static VALUE c_ev_win_configure_init (VALUE self, VALUE event) return self; } +static VALUE c_ev_win_resize_request_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Resize_Request *e = (void *) event; + + rb_define_attr (c, "window", 1, 0); + rb_define_attr (c, "w", 1, 0); + rb_define_attr (c, "h", 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, "@w", INT2FIX (e->w)); + rb_iv_set (self, "@h", INT2FIX (e->h)); + rb_iv_set (self, "@time", UINT2NUM (e->time)); + + return self; +} + +static VALUE c_ev_win_damage_init (VALUE self, VALUE event) +{ + VALUE c = CLASS_OF (self); + Ecore_X_Event_Window_Damage *e = (void *) event; + + rb_define_attr (c, "window", 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, "time", 1, 0); + + rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win)); + 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, "@time", UINT2NUM (e->time)); + + return self; +} + static VALUE c_ev_win_visibility_change_init (VALUE self, VALUE event) { VALUE c = CLASS_OF (self); @@ -322,11 +388,11 @@ void Init_ecore_x (void) m_default_root_window_get, 0); Init_Window (); + Init_Cursor (); /* now create the default root window object */ w = DefaultRootWindow (ecore_x_display_get ()); default_root = TO_ECORE_X_WINDOW (Qnil, w); - OBJ_FREEZE (default_root); rb_global_variable (&default_root); /* event mask values */ @@ -388,84 +454,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); + ADD_EVENT (mX, ECORE_X_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_X_EVENT_MOUSE_BUTTON_UP, + "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); + 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_delete_request_init, 1); + 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_VISIBILITY_CHANGE, - "WindowVisibilityChange", 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, "WindowDamageEvent", c); + rb_define_private_method (c, "initialize", + c_ev_win_damage_init, 1); + + 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); }