Renamed Window#border_size to Window#border_width.

[ruby-ecore.git] / src / ecore_x / rb_window.c

diff --git a/src/ecore_x/rb_window.c b/src/ecore_x/rb_window.c
index d17817afdf06b21a3e2bc118a506cc340639e038..417ba0581eac877e6914b3deb2a4c894198fe603 100644 (file)
--- a/src/ecore_x/rb_window.c
+++ b/src/ecore_x/rb_window.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_window.c 85 2004-08-22 11:53:57Z tilman $
+ * $Id: rb_window.c 93 2004-08-23 08:57:10Z tilman $
  *
  * Copyright (C) 2004 ruby-ecore team (see AUTHORS)
  *
@@ -186,6 +186,15 @@ static VALUE c_reparent (VALUE self, VALUE other, VALUE x, VALUE 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);
@@ -233,11 +242,11 @@ static VALUE c_geometry_get (VALUE self)
                            INT2FIX (w), INT2FIX (h));
 }
 
-static VALUE c_border_size_get (VALUE self)
+static VALUE c_border_width_get (VALUE self)
 {
        GET_OBJ (self, RbWindow, win);
 
-       return INT2FIX (ecore_x_window_border_size_get (win->real));
+       return INT2FIX (ecore_x_window_border_width_get (win->real));
 }
 
 static VALUE c_depth_get (VALUE self)
@@ -308,6 +317,40 @@ static VALUE c_set_protocol (VALUE self, VALUE proto, VALUE on)
        return Qnil;
 }
 
+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;
+}
+
+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_manage (VALUE self)
 {
        GET_OBJ (self, RbWindow, win);
@@ -367,11 +410,12 @@ void Init_Window (void)
        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, "size", c_size_get, 0);
        rb_define_method (cWindow, "geometry", c_geometry_get, 0);
-       rb_define_method (cWindow, "border_size", c_border_size_get, 0);
+       rb_define_method (cWindow, "border_width", c_border_width_get, 0);
        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);
@@ -380,6 +424,9 @@ void Init_Window (void)
        rb_define_method (cWindow, "unset_event_mask",
                          c_unset_event_mask, 1);
        rb_define_method (cWindow, "set_protocol", c_set_protocol, 2);
+       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, "manage", c_manage, 0);
        rb_define_method (cWindow, "manage_container", c_manage_container, 0);
        rb_define_method (cWindow, "manage_client", c_manage_client, 0);