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

diff --git a/src/ecore_x/rb_ecore_x.c b/src/ecore_x/rb_ecore_x.c
index c30eef2..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 90 2004-08-22 16:23:19Z 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;
 
@@ -73,6 +71,68 @@ static VALUE c_ev_key_down_init (VALUE self, VALUE event)
 	return self;
 }
 
+static VALUE c_ev_mouse_button_down_init (VALUE self, VALUE event)
+{
+	VALUE c = CLASS_OF (self);
+	Ecore_X_Event_Mouse_Button_Down *e = (void *) event;
+
+	rb_define_attr (c, "button", 1, 0);
+	rb_define_attr (c, "modifiers", 1, 0);
+	rb_define_attr (c, "x", 1, 0);
+	rb_define_attr (c, "y", 1, 0);
+	rb_define_attr (c, "root", 1, 0);
+	rb_define_attr (c, "window", 1, 0);
+	rb_define_attr (c, "event_window", 1, 0);
+	rb_define_attr (c, "time", 1, 0);
+	rb_define_attr (c, "double_click", 1, 0);
+	rb_define_attr (c, "triple_click", 1, 0);
+
+	rb_iv_set (self, "@button", INT2FIX (e->button));
+	rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+	rb_iv_set (self, "@x", INT2FIX (e->x));
+	rb_iv_set (self, "@y", INT2FIX (e->x));
+	rb_iv_set (self, "@root", rb_ary_new3 (2, INT2FIX (e->root.x),
+	                                       INT2FIX (e->root.y)));
+	rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win));
+	rb_iv_set (self, "@event_window",
+	           TO_ECORE_X_WINDOW (Qnil, e->event_win));
+	rb_iv_set (self, "@time", UINT2NUM (e->time));
+	rb_iv_set (self, "@double_click",
+	           e->double_click ? Qtrue : Qfalse);
+	rb_iv_set (self, "@triple_click",
+	           e->triple_click ? Qtrue : Qfalse);
+
+	return self;
+}
+
+static VALUE c_ev_mouse_button_up_init (VALUE self, VALUE event)
+{
+	VALUE c = CLASS_OF (self);
+	Ecore_X_Event_Mouse_Button_Up *e = (void *) event;
+
+	rb_define_attr (c, "button", 1, 0);
+	rb_define_attr (c, "modifiers", 1, 0);
+	rb_define_attr (c, "x", 1, 0);
+	rb_define_attr (c, "y", 1, 0);
+	rb_define_attr (c, "root", 1, 0);
+	rb_define_attr (c, "window", 1, 0);
+	rb_define_attr (c, "event_window", 1, 0);
+	rb_define_attr (c, "time", 1, 0);
+
+	rb_iv_set (self, "@button", INT2FIX (e->button));
+	rb_iv_set (self, "@modifiers", INT2FIX (e->modifiers));
+	rb_iv_set (self, "@x", INT2FIX (e->x));
+	rb_iv_set (self, "@y", INT2FIX (e->x));
+	rb_iv_set (self, "@root", rb_ary_new3 (2, INT2FIX (e->root.x),
+	                                       INT2FIX (e->root.y)));
+	rb_iv_set (self, "@window", TO_ECORE_X_WINDOW (Qnil, e->win));
+	rb_iv_set (self, "@event_window",
+	           TO_ECORE_X_WINDOW (Qnil, e->event_win));
+	rb_iv_set (self, "@time", UINT2NUM (e->time));
+
+	return self;
+}
+
 static VALUE c_ev_mouse_move_init (VALUE self, VALUE event)
 {
 	VALUE c = CLASS_OF (self);
@@ -243,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");
 
@@ -258,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 */
@@ -331,6 +393,16 @@ void Init_ecore_x (void)
 	rb_define_private_method (c, "initialize",
 	                          c_ev_key_down_init, 1);
 
+	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_BUTTON_DOWN,
+	           "MouseButtonDown", 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);
+	rb_define_private_method (c, "initialize",
+	                          c_ev_mouse_button_up_init, 1);
+
 	ADD_EVENT (mX, ECORE_X_EVENT_, MOUSE_MOVE, "MouseMove", c);
 	rb_define_private_method (c, "initialize",
 	                          c_ev_mouse_move_init, 1);