X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fecore_x%2Frb_ecore_x.c;h=83405b02bd30160e3fb726eb8b0dd363efe536e6;hb=ed7756f1892ec068be14445c39a86f14f7e76a46;hp=cce61d2c463328444b8d0824ac61cc9242180e29;hpb=eb5e1150186236a48b183da22b2b173add857eef;p=ruby-ecore.git

diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index cce61d2..83405b0 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 91 2004-08-22 23:06:05Z tilman $
+ * $Id: rb_ecore_x.c 98 2004-08-26 13:12:55Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -22,15 +22,13 @@
 
 #include <Ecore.h>
 #include <Ecore_X.h>
+#include <X11/Xlib.h>
 
 #include "../ecore/rb_ecore.h"
 #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;
 
@@ -305,6 +303,7 @@ static VALUE c_ev_win_show_request_init (VALUE self, VALUE event)
 void Init_ecore_x (void)
 {
 	VALUE c;
+	Ecore_X_Window w;
 
 	rb_require ("ecore");
 
@@ -320,10 +319,11 @@ void Init_ecore_x (void)
 	                           m_default_root_window_get, 0);
 
 	Init_Window ();
+	Init_Cursor ();
 
 	/* now create the default root window object */
-	default_root = TO_ECORE_X_WINDOW (Qnil, 0);
-	OBJ_FREEZE (default_root);
+	w = DefaultRootWindow (ecore_x_display_get ());
+	default_root = TO_ECORE_X_WINDOW (Qnil, w);
 	rb_global_variable (&default_root);
 
 	/* event mask values */