X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=766b39a112fcbf81c204752769ba9d215d4a2413;hb=97db10dd4ed7ac0244fc4c6942af466a8e36be60;hp=e6a89b4bf51cd42c1ac15e2eb210757c4b7d822c;hpb=fff6e50c308822a53bab712d321c33f557742193;p=ruby-ecore.git

diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index e6a89b4..766b39a 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 94 2004-08-23 10:53:25Z tilman $
+ * $Id: rb_ecore_x.c 101 2004-08-27 23:56:26Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -28,10 +28,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 +221,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 +283,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 +390,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 */
@@ -436,13 +504,22 @@ void Init_ecore_x (void)
 	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_CONFIGURE_REQUEST,
 	           "WindowConfigureRequest", 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);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_win_configure_init, 1);
 
+	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_RESIZE_REQUEST,
+	           "WindowResizeRequest", c);
+	rb_define_private_method (c, "initialize",
+	                          c_ev_win_resize_request_init, 1);
+
+	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_DAMAGE, "WindowDamage", c);
+	rb_define_private_method (c, "initialize",
+	                          c_ev_win_damage_init, 1);
+
 	ADD_EVENT (mX, ECORE_X_EVENT_, WINDOW_VISIBILITY_CHANGE,
 	           "WindowVisibilityChange", c);
 	rb_define_private_method (c, "initialize",