X-Git-Url: http://git.code-monkey.de/?p=ruby-ecore.git;a=blobdiff_plain;f=src%2Fecore_x%2Frb_window.c;h=204d3014444db9e32a8d5972bc6dca4d32e48de5;hp=04bb1166e8dd42c1c2c52394593035285add0b0b;hb=d907bd016f15dc5be72d12ee1742047eafc2abae;hpb=0ad70bf579b712a8bf770e2775cffa4a50097557 diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c index 04bb116..204d301 100644 --- a/src/ecore_x/rb_window.c +++ b/src/ecore_x/rb_window.c @@ -1,5 +1,5 @@ /* - * $Id: rb_window.c 77 2004-08-19 17:39:29Z tilman $ + * $Id: rb_window.c 351 2006-02-10 15:25:40Z 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; @@ -49,9 +50,6 @@ VALUE TO_ECORE_X_WINDOW (VALUE parent, Ecore_X_Window w) VALUE self; RbWindow *window = NULL; - if (!w) - return Qnil; - self = Data_Make_Struct (cWindow, RbWindow, c_mark, free, window); window->real = w; @@ -62,14 +60,21 @@ VALUE TO_ECORE_X_WINDOW (VALUE parent, Ecore_X_Window w) return self; } -static VALUE c_new (int argc, VALUE *argv, VALUE klass) +static VALUE c_alloc (VALUE klass) +{ + RbWindow *window = NULL; + + return Data_Make_Struct (cWindow, RbWindow, c_mark, c_free, window); +} + +static VALUE c_init (int argc, VALUE *argv, VALUE self) { - VALUE self, parent, geom[4]; - RbWindow *window = NULL, *p = NULL; + VALUE parent, geom[4]; + RbWindow *p = NULL; int i, igeom[4] = {0, 0, 0, 0}; Ecore_X_Window pwin = 0; - self = Data_Make_Struct (cWindow, RbWindow, c_mark, c_free, window); + GET_OBJ (self, RbWindow, win); rb_scan_args (argc, argv, "05", &parent, &geom[0], &geom[1], &geom[2], &geom[3]); @@ -86,15 +91,28 @@ static VALUE c_new (int argc, VALUE *argv, VALUE klass) igeom[i] = FIX2INT (geom[i]); } - window->real = ecore_x_window_new (pwin, igeom[0], igeom[1], - igeom[2], igeom[3]); - window->parent = parent; + win->real = ecore_x_window_new (pwin, igeom[0], igeom[1], + igeom[2], igeom[3]); + win->parent = parent; - rb_obj_call_init (self, 0, NULL); + rb_iv_set (self, "@cursor", Qnil); return self; } +static VALUE c_inspect (VALUE self) +{ + char buf[128]; + + GET_OBJ (self, RbWindow, win); + + snprintf (buf, sizeof (buf), + "#<%s:%p id=%u>", rb_obj_classname (self), + (void *) self, win->real); + + return rb_str_new2 (buf); +} + static VALUE c_equal_value (VALUE self, VALUE other) { GET_OBJ (self, RbWindow, w1); @@ -105,6 +123,47 @@ static VALUE c_equal_value (VALUE self, VALUE other) return w1->real == w2->real ? Qtrue : Qfalse; } +static VALUE c_configure (int argc, VALUE *argv, VALUE self) +{ + VALUE mask, geom[4], border, sibling, stackm; + RbWindow *sibwin = NULL; + int i; + + GET_OBJ (self, RbWindow, win); + + rb_scan_args (argc, argv, "17", &mask, + &geom[0], &geom[1], &geom[2], &geom[3], + &border, &sibling, &stackm); + + Check_Type (mask, T_FIXNUM); + + for (i = 0; i < 4; i++) + if (!NIL_P (geom[i])) + Check_Type (geom[i], T_FIXNUM); + + if (!NIL_P (border)) + Check_Type (border, T_FIXNUM); + + if (!NIL_P (sibling)) { + CHECK_CLASS (sibling, cWindow); + Data_Get_Struct (sibling, RbWindow, sibwin); + } + + if (!NIL_P (stackm)) + Check_Type (stackm, T_FIXNUM); + + ecore_x_window_configure (win->real, FIX2INT (mask), + NIL_P (geom[0]) ? 0 : FIX2INT (geom[0]), + NIL_P (geom[1]) ? 0 : FIX2INT (geom[1]), + NIL_P (geom[2]) ? 0 : FIX2INT (geom[2]), + NIL_P (geom[3]) ? 0 : FIX2INT (geom[3]), + NIL_P (border) ? 0 : FIX2INT (border), + sibwin ? sibwin->real : 0, + NIL_P (stackm) ? 0 : FIX2INT (stackm)); + + return Qnil; +} + static VALUE c_show (VALUE self) { GET_OBJ (self, RbWindow, win); @@ -123,14 +182,27 @@ static VALUE c_hide (VALUE self) return Qnil; } +static VALUE c_visible_get (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + return ecore_x_window_visible_get (win->real) ? Qtrue : Qfalse; +} + static VALUE c_delete (VALUE self) { GET_OBJ (self, RbWindow, win); - if (win->real) { - ecore_x_window_del (win->real); - win->real = 0; - } + ecore_x_window_del (win->real); + + return Qnil; +} + +static VALUE c_send_delete_request (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_delete_request_send (win->real); return Qnil; } @@ -153,6 +225,31 @@ static VALUE c_lower (VALUE self) return Qnil; } +static VALUE c_reparent (VALUE self, VALUE other, VALUE x, VALUE y) +{ + GET_OBJ (self, RbWindow, win); + + CHECK_CLASS (other, cWindow); + GET_OBJ (other, RbWindow, o); + + Check_Type (x, T_FIXNUM); + Check_Type (y, T_FIXNUM); + + ecore_x_window_reparent (win->real, o->real, + FIX2INT (x), FIX2INT (y)); + + return Qnil; +} + +static VALUE c_focus (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_focus (win->real); + + return Qnil; +} + static VALUE c_move (VALUE self, VALUE x, VALUE y) { GET_OBJ (self, RbWindow, win); @@ -172,23 +269,23 @@ static VALUE c_resize (VALUE self, VALUE w, VALUE h) Check_Type (w, T_FIXNUM); Check_Type (h, T_FIXNUM); - ecore_x_window_move (win->real, FIX2INT (w), FIX2INT (h)); + ecore_x_window_resize (win->real, FIX2INT (w), FIX2INT (h)); return Qnil; } -static VALUE c_get_size (VALUE self) +static VALUE c_size_get (VALUE self) { - int x = 0, y = 0; + int w = 0, h = 0; GET_OBJ (self, RbWindow, win); - ecore_x_window_size_get (win->real, &x, &y); + ecore_x_window_size_get (win->real, &w, &h); - return rb_ary_new3 (2, INT2FIX (x), INT2FIX (y)); + return rb_ary_new3 (2, INT2FIX (w), INT2FIX (h)); } -static VALUE c_get_geometry (VALUE self) +static VALUE c_geometry_get (VALUE self) { int x = 0, y = 0, w = 0, h = 0; @@ -200,6 +297,63 @@ static VALUE c_get_geometry (VALUE self) INT2FIX (w), INT2FIX (h)); } +static VALUE c_border_width_get (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + 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); + + return INT2FIX (ecore_x_window_depth_get (win->real)); +} + +static VALUE c_parent_get (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + return TO_ECORE_X_WINDOW (Qnil, + ecore_x_window_parent_get (win->real)); +} + +#if 0 +static VALUE c_title_get (VALUE self) +{ + char *s; + + GET_OBJ (self, RbWindow, win); + + s = ecore_x_window_prop_title_get (win->real); + + return s ? rb_str_new2 (s) : Qnil; +} + +static VALUE c_title_set (VALUE self, VALUE val) +{ + GET_OBJ (self, RbWindow, win); + + Check_Type (val, T_STRING); + + ecore_x_window_prop_title_set (win->real, StringValuePtr (val)); + + return Qnil; +} +#endif + static VALUE c_set_event_mask (VALUE self, VALUE val) { GET_OBJ (self, RbWindow, win); @@ -222,6 +376,7 @@ static VALUE c_unset_event_mask (VALUE self, VALUE val) return Qnil; } +#if 0 static VALUE c_set_protocol (VALUE self, VALUE proto, VALUE on) { GET_OBJ (self, RbWindow, win); @@ -234,24 +389,176 @@ static VALUE c_set_protocol (VALUE self, VALUE proto, VALUE on) return Qnil; } +#endif + +static VALUE c_get_protocol (VALUE self, VALUE proto) +{ + int s; + + GET_OBJ (self, RbWindow, win); + + s = ecore_x_window_prop_protocol_isset (win->real, FIX2INT (proto)); + + return s ? Qtrue : Qfalse; +} + +#if 0 +static VALUE c_sticky_get (VALUE self) +{ + int s; + + GET_OBJ (self, RbWindow, win); + + s = ecore_x_window_prop_state_isset (win->real, + ECORE_X_WINDOW_STATE_STICKY); + + return s ? Qtrue : Qfalse; +} + +static VALUE c_sticky_set (VALUE self, VALUE val) +{ + GET_OBJ (self, RbWindow, win); + + CHECK_BOOL (val); + + ecore_x_window_prop_sticky_set (win->real, val == Qtrue); + + return Qnil; +} + +static VALUE c_borderless_get (VALUE self) +{ + int s; + + GET_OBJ (self, RbWindow, win); + + s = ecore_x_window_prop_borderless_get (win->real); + + return s ? Qtrue : Qfalse; +} + +static VALUE c_borderless_set (VALUE self, VALUE val) +{ + GET_OBJ (self, RbWindow, win); + + CHECK_BOOL (val); + + ecore_x_window_prop_borderless_set (win->real, val == Qtrue); + + return Qnil; +} +#endif + +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); + + ecore_x_window_manage (win->real); + + return Qnil; +} + +static VALUE c_manage_container (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_container_manage (win->real); + + return Qnil; +} + +static VALUE c_manage_client (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_client_manage (win->real); + + return Qnil; +} + +static VALUE c_sniff (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_sniff (win->real); + + return Qnil; +} + +static VALUE c_sniff_client (VALUE self) +{ + GET_OBJ (self, RbWindow, win); + + ecore_x_window_client_sniff (win->real); + + return Qnil; +} void Init_Window (void) { cWindow = rb_define_class_under (mX, "Window", rb_cObject); - rb_define_singleton_method (cWindow, "new", c_new, -1); + rb_define_alloc_func (cWindow, c_alloc); + rb_define_method (cWindow, "initialize", c_init, -1); + rb_define_method (cWindow, "inspect", c_inspect, 0); + rb_define_method (cWindow, "eql?", c_equal_value, 1); rb_define_method (cWindow, "==", c_equal_value, 1); + rb_define_method (cWindow, "===", c_equal_value, 1); + rb_define_method (cWindow, "configure", c_configure, -1); rb_define_method (cWindow, "show", c_show, 0); rb_define_method (cWindow, "hide", c_hide, 0); + rb_define_method (cWindow, "visible?", c_visible_get, 0); rb_define_method (cWindow, "delete", c_delete, 0); + rb_define_method (cWindow, "send_delete_request", + c_send_delete_request, 0); rb_define_method (cWindow, "raise", c_raise, 0); rb_define_method (cWindow, "lower", c_lower, 0); + rb_define_method (cWindow, "reparent", c_reparent, 3); + rb_define_method (cWindow, "focus", c_focus, 0); rb_define_method (cWindow, "move", c_move, 2); rb_define_method (cWindow, "resize", c_resize, 2); - rb_define_method (cWindow, "get_size", c_get_size, 0); - rb_define_method (cWindow, "get_geometry", c_get_geometry, 0); + 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); +#if 0 + rb_define_method (cWindow, "title", c_title_get, 0); + rb_define_method (cWindow, "title=", c_title_set, 1); +#endif rb_define_method (cWindow, "set_event_mask", c_set_event_mask, 1); rb_define_method (cWindow, "unset_event_mask", c_unset_event_mask, 1); +#if 0 rb_define_method (cWindow, "set_protocol", c_set_protocol, 2); +#endif + rb_define_method (cWindow, "get_protocol", c_get_protocol, 1); +#if 0 + rb_define_method (cWindow, "sticky?", c_sticky_get, 0); + rb_define_method (cWindow, "sticky=", c_sticky_set, 1); + rb_define_method (cWindow, "borderless?", c_borderless_get, 0); + rb_define_method (cWindow, "borderless=", c_borderless_set, 1); +#endif + 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); }