X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_x%2Frb_window.c;h=b5c0f6549ebe7880d1e2ecfdf6d2ff1ac72a0721;hb=f581ab591b3fd398dda2eb58cff4a4a30c37d045;hp=f5af7c78d9a168fc17db7e565b846624866db2ba;hpb=ddaa53d3761be0e96352e75e2002072d92389d10;p=ruby-ecore.git

diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c
index f5af7c7..b5c0f65 100644
--- a/src/ecore_x/rb_window.c
+++ b/src/ecore_x/rb_window.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_window.c 97 2004-08-23 18:30:28Z tilman $
+ * $Id: rb_window.c 99 2004-08-26 18:08:05Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -27,6 +27,7 @@
 #include "../ecore/rb_ecore.h"
 #include "rb_ecore_x.h"
 #include "rb_window.h"
+#include "rb_cursor.h"
 
 VALUE cWindow;
 
@@ -92,6 +93,13 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass)
 	return self;
 }
 
+static VALUE c_init (int argc, VALUE *argv, VALUE self)
+{
+	rb_iv_set (self, "@cursor", Qnil);
+
+	return self;
+}
+
 static VALUE c_inspect (VALUE self)
 {
 	char buf[128];
@@ -255,6 +263,17 @@ static VALUE c_border_width_get (VALUE self)
 	return INT2FIX (ecore_x_window_border_width_get (win->real));
 }
 
+static VALUE c_border_width_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbWindow, win);
+
+	Check_Type (val, T_FIXNUM);
+
+	ecore_x_window_border_width_set (win->real, FIX2INT (val));
+
+	return Qnil;
+}
+
 static VALUE c_depth_get (VALUE self)
 {
 	GET_OBJ (self, RbWindow, win);
@@ -361,6 +380,19 @@ static VALUE c_sticky_set (VALUE self, VALUE val)
 	return Qnil;
 }
 
+static VALUE c_cursor_set (VALUE self, VALUE val)
+{
+	GET_OBJ (self, RbWindow, win);
+
+	CHECK_CLASS (val, cCursor);
+	GET_OBJ (val, RbCursor, c);
+
+	ecore_x_window_cursor_set (win->real, c->real);
+	rb_iv_set (self, "@cursor", val);
+
+	return Qnil;
+}
+
 static VALUE c_manage (VALUE self)
 {
 	GET_OBJ (self, RbWindow, win);
@@ -411,6 +443,7 @@ void Init_Window (void)
 	cWindow = rb_define_class_under (mX, "Window", rb_cObject);
 
 	rb_define_singleton_method (cWindow, "new", c_new, -1);
+	rb_define_method (cWindow, "initialize", c_init, -1);
 	rb_define_method (cWindow, "inspect", c_inspect, 0);
 	rb_define_method (cWindow, "==", c_equal_value, 1);
 	rb_define_method (cWindow, "show", c_show, 0);
@@ -428,6 +461,7 @@ void Init_Window (void)
 	rb_define_method (cWindow, "size", c_size_get, 0);
 	rb_define_method (cWindow, "geometry", c_geometry_get, 0);
 	rb_define_method (cWindow, "border_width", c_border_width_get, 0);
+	rb_define_method (cWindow, "border_width=", c_border_width_set, 1);
 	rb_define_method (cWindow, "depth", c_depth_get, 0);
 	rb_define_method (cWindow, "parent", c_parent_get, 0);
 	rb_define_method (cWindow, "title", c_title_get, 0);
@@ -439,9 +473,12 @@ void Init_Window (void)
 	rb_define_method (cWindow, "get_protocol", c_get_protocol, 1);
 	rb_define_method (cWindow, "sticky?", c_sticky_get, 0);
 	rb_define_method (cWindow, "sticky=", c_sticky_set, 1);
+	rb_define_method (cWindow, "cursor=", c_cursor_set, 1);
 	rb_define_method (cWindow, "manage", c_manage, 0);
 	rb_define_method (cWindow, "manage_container", c_manage_container, 0);
 	rb_define_method (cWindow, "manage_client", c_manage_client, 0);
 	rb_define_method (cWindow, "sniff", c_sniff, 0);
 	rb_define_method (cWindow, "sniff_client", c_sniff_client, 0);
+
+	rb_define_attr (cWindow, "cursor", 1, 0);
 }