gtk2 1.0.3 → 1.1.0

data/ext/gtk2/rbgtkiconview.c

@@ -1,25 +1,36 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkiconview.c -
-
-  $Author: ggc $
-  $Date: 2007/07/13 16:07:31 $
-
-  Copyright (C) 2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2005  Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
 #if GTK_CHECK_VERSION(2,6,0)
 
+#define RG_TARGET_NAMESPACE cIconView
 #define _SELF(s) (GTK_ICON_VIEW(RVAL2GOBJ(s)))
 
 static ID id_model;
 static ID id_select_path;
 
 static VALUE
-iview_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE model;
     rb_scan_args(argc, argv, "01", &model);
@@ -33,23 +44,8 @@ iview_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
-/* Defined as Properties
-void        gtk_icon_view_set_model         (GtkIconView *icon_view,
-                                             GtkTreeModel *model);
-GtkTreeModel* gtk_icon_view_get_model       (GtkIconView *icon_view);
-void        gtk_icon_view_set_text_column   (GtkIconView *icon_view,
-                                             gint column);
-gint        gtk_icon_view_get_text_column   (GtkIconView *icon_view);
-void        gtk_icon_view_set_markup_column (GtkIconView *icon_view,
-                                             gint column);
-gint        gtk_icon_view_get_markup_column (GtkIconView *icon_view);
-void        gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
-                                             gint column);
-gint        gtk_icon_view_get_pixbuf_column (GtkIconView *icon_view);
-*/
-
 static VALUE
-iview_get_path_at_pos(VALUE self, VALUE x, VALUE y)
+rg_get_path_at_pos(VALUE self, VALUE x, VALUE y)
 {
     return GTKTREEPATH2RVAL(gtk_icon_view_get_path_at_pos(_SELF(self), NUM2INT(x), NUM2INT(y)));
 }
@@ -61,7 +57,7 @@ iview_foreach_func(GtkIconView *iview, GtkTreePath *path, gpointer *func)
 }
 
 static VALUE
-iview_selected_foreach(VALUE self)
+rg_selected_each(VALUE self)
 {
     VALUE func = rb_block_proc();
     G_RELATIVE(self, func);
@@ -71,43 +67,8 @@ iview_selected_foreach(VALUE self)
     return self;
 }
 
-/* Defined as Properties 
-void        gtk_icon_view_set_selection_mode
-                                            (GtkIconView *icon_view,
-                                             GtkSelectionMode mode);
-GtkSelectionMode gtk_icon_view_get_selection_mode
-                                            (GtkIconView *icon_view);
-void        gtk_icon_view_set_orientation   (GtkIconView *icon_view,
-                                             GtkOrientation orientation);
-GtkOrientation gtk_icon_view_get_orientation
-                                            (GtkIconView *icon_view);
-void        gtk_icon_view_set_columns       (GtkIconView *icon_view,
-                                             gint columns);
-gint        gtk_icon_view_get_columns       (GtkIconView *icon_view);
-void        gtk_icon_view_set_item_width    (GtkIconView *icon_view,
-                                             gint item_width);
-gint        gtk_icon_view_get_item_width    (GtkIconView *icon_view);
-void        gtk_icon_view_set_spacing       (GtkIconView *icon_view,
-                                             gint spacing);
-gint        gtk_icon_view_get_spacing       (GtkIconView *icon_view);
-void        gtk_icon_view_set_row_spacing   (GtkIconView *icon_view,
-                                             gint row_spacing);
-gint        gtk_icon_view_get_row_spacing   (GtkIconView *icon_view);
-void        gtk_icon_view_set_column_spacing
-                                            (GtkIconView *icon_view,
-                                             gint column_spacing);
-gint        gtk_icon_view_get_column_spacing
-                                            (GtkIconView *icon_view);
-void        gtk_icon_view_set_margin        (GtkIconView *icon_view,
-                                             gint margin);
-gint        gtk_icon_view_get_margin        (GtkIconView *icon_view);
-void        gtk_icon_view_set_reorderable   (GtkIconView *icon_view,
-                                             gboolean reorderable);
-gboolean    gtk_icon_view_get_reorderable   (GtkIconView *icon_view);
-*/
-
 static VALUE
-iview_select_path(VALUE self, VALUE path)
+rg_select_path(VALUE self, VALUE path)
 {
     G_CHILD_SET(self, id_select_path, path);
     gtk_icon_view_select_path(_SELF(self), RVAL2GTKTREEPATH(path));
@@ -115,21 +76,21 @@ iview_select_path(VALUE self, VALUE path)
 }
 
 static VALUE
-iview_unselect_path(VALUE self, VALUE path)
+rg_unselect_path(VALUE self, VALUE path)
 {
     G_CHILD_UNSET(self, id_select_path);
     gtk_icon_view_unselect_path(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
 }
- 
+
 static VALUE
-iview_path_is_selected(VALUE self, VALUE path)
+rg_path_is_selected_p(VALUE self, VALUE path)
 {
     return CBOOL2RVAL(gtk_icon_view_path_is_selected(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-iview_get_selected_items(VALUE self)
+rg_selected_items(VALUE self)
 {
     GList* list = gtk_icon_view_get_selected_items(_SELF(self));
     VALUE ret = GLIST2ARY2(list, GTK_TYPE_TREE_PATH);
@@ -138,13 +99,8 @@ iview_get_selected_items(VALUE self)
     return ret;
 }
 
-/* Defined as Signals
-void                gtk_icon_view_select_all            (GtkIconView *icon_view);
-void                gtk_icon_view_unselect_all          (GtkIconView *icon_view);
-*/
- 
 static VALUE
-iview_item_activated(VALUE self, VALUE path)
+rg_item_activated(VALUE self, VALUE path)
 {
     gtk_icon_view_item_activated(_SELF(self), RVAL2GTKTREEPATH(path));
     return self;
@@ -153,34 +109,44 @@ iview_item_activated(VALUE self, VALUE path)
 
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-iview_create_drag_icon(VALUE self, VALUE path)
+rg_create_drag_icon(VALUE self, VALUE path)
 {
     return GOBJ2RVAL(gtk_icon_view_create_drag_icon(_SELF(self), RVAL2GTKTREEPATH(path)));
 }
 
 static VALUE
-iview_enable_model_drag_dest(VALUE self, VALUE targets, VALUE actions)
+rg_enable_model_drag_dest(VALUE self, VALUE rbtargets, VALUE rbactions)
 {
-    gtk_icon_view_enable_model_drag_dest(_SELF(self),
-                                         rbgtk_get_target_entry(targets),
-                                         RARRAY_LEN(targets),
-                                         RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
+    GtkIconView *icon_view = _SELF(self);
+    GdkDragAction actions = RVAL2GFLAGS(rbactions, GDK_TYPE_DRAG_ACTION);
+    long n;
+    GtkTargetEntry *targets = RVAL2GTKTARGETENTRIES(rbtargets, &n);
+
+    gtk_icon_view_enable_model_drag_dest(icon_view, targets, n, actions);
+
+    g_free(targets);
+
     return self;
 }
 
 static VALUE
-iview_enable_model_drag_source(VALUE self, VALUE flags, VALUE targets, VALUE actions)
+rg_enable_model_drag_source(VALUE self, VALUE rbstart_button_mask, VALUE rbtargets, VALUE rbactions)
 {
-    gtk_icon_view_enable_model_drag_source(_SELF(self),
-                                           RVAL2GFLAGS(flags, GDK_TYPE_MODIFIER_TYPE),
-                                           rbgtk_get_target_entry(targets),
-                                           RARRAY_LEN(targets),
-                                           RVAL2GFLAGS(actions, GDK_TYPE_DRAG_ACTION));
+    GtkIconView *icon_view = _SELF(self);
+    GdkModifierType start_button_mask = RVAL2GFLAGS(rbstart_button_mask, GDK_TYPE_MODIFIER_TYPE);
+    GdkDragAction actions = RVAL2GFLAGS(rbactions, GDK_TYPE_DRAG_ACTION);
+    long n;
+    GtkTargetEntry *targets = RVAL2GTKTARGETENTRIES(rbtargets, &n);
+
+    gtk_icon_view_enable_model_drag_source(icon_view, start_button_mask, targets, n, actions);
+
+    g_free(targets);
+
     return self;
 }
 
 static VALUE
-iview_cursor(VALUE self)
+rg_cursor(VALUE self)
 {
     GtkTreePath* path;
     GtkCellRenderer* cell;
@@ -189,7 +155,7 @@ iview_cursor(VALUE self)
 }
 
 static VALUE
-iview_get_dest_item_at_pos(VALUE self, VALUE drag_x, VALUE drag_y)
+rg_get_dest_item(VALUE self, VALUE drag_x, VALUE drag_y)
 {
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
@@ -199,7 +165,7 @@ iview_get_dest_item_at_pos(VALUE self, VALUE drag_x, VALUE drag_y)
 }
 
 static VALUE
-iview_drag_dest_item(VALUE self)
+rg_drag_dest_item(VALUE self)
 {
     GtkTreePath* path;
     GtkIconViewDropPosition pos;
@@ -209,7 +175,7 @@ iview_drag_dest_item(VALUE self)
 }
 
 static VALUE
-iview_get_item_at_pos(VALUE self, VALUE x, VALUE y)
+rg_get_item(VALUE self, VALUE x, VALUE y)
 {
     GtkTreePath* path;
     GtkCellRenderer* cell;
@@ -218,7 +184,7 @@ iview_get_item_at_pos(VALUE self, VALUE x, VALUE y)
 }
 
 static VALUE
-iview_visible_range(VALUE self)
+rg_visible_range(VALUE self)
 {
     GtkTreePath* start_path;
     GtkTreePath* end_path;
@@ -230,7 +196,7 @@ iview_visible_range(VALUE self)
 }
 
 static VALUE
-iview_scroll_to_path(VALUE self, VALUE path, VALUE use_align, VALUE row_align, VALUE col_align)
+rg_scroll_to_path(VALUE self, VALUE path, VALUE use_align, VALUE row_align, VALUE col_align)
 {
     gtk_icon_view_scroll_to_path(_SELF(self),
                                  RVAL2GTKTREEPATH(path),
@@ -241,7 +207,7 @@ iview_scroll_to_path(VALUE self, VALUE path, VALUE use_align, VALUE row_align, V
 }
 
 static VALUE
-iview_set_cursor(VALUE self, VALUE path, VALUE cell, VALUE start_editing)
+rg_set_cursor(VALUE self, VALUE path, VALUE cell, VALUE start_editing)
 {
     gtk_icon_view_set_cursor(_SELF(self), RVAL2GTKTREEPATH(path),
                              NIL_P(cell) ? NULL : RVAL2GOBJ(cell), RVAL2CBOOL(start_editing));
@@ -249,7 +215,7 @@ iview_set_cursor(VALUE self, VALUE path, VALUE cell, VALUE start_editing)
 }
 
 static VALUE
-iview_set_drag_dest_item(VALUE self, VALUE path, VALUE pos)
+rg_set_drag_dest_item(VALUE self, VALUE path, VALUE pos)
 {
     gtk_icon_view_set_drag_dest_item(_SELF(self),
                                      NIL_P(path) ? NULL : RVAL2GTKTREEPATH(path),
@@ -258,14 +224,14 @@ iview_set_drag_dest_item(VALUE self, VALUE path, VALUE pos)
 }
 
 static VALUE
-iview_unset_model_drag_dest(VALUE self)
+rg_unset_model_drag_dest(VALUE self)
 {
     gtk_icon_view_unset_model_drag_dest(_SELF(self));
     return self;
 }
 
 static VALUE
-iview_unset_model_drag_source(VALUE self)
+rg_unset_model_drag_source(VALUE self)
 {
     gtk_icon_view_unset_model_drag_source(_SELF(self));
     return self;
@@ -273,41 +239,41 @@ iview_unset_model_drag_source(VALUE self)
 #endif
 
 void
-Init_gtk_iconview()
+Init_gtk_iconview(VALUE mGtk)
 {
 #if GTK_CHECK_VERSION(2,6,0)
-    VALUE iview = G_DEF_CLASS(GTK_TYPE_ICON_VIEW, "IconView", mGtk);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_ICON_VIEW, "IconView", mGtk);
 
     id_model = rb_intern("model");
     id_select_path = rb_intern("select_path");
 
-    rb_define_method(iview, "initialize", iview_initialize, -1);
-    rb_define_method(iview, "get_path_at_pos", iview_get_path_at_pos, 2);
-    rb_define_alias(iview, "get_path", "get_path_at_pos");
-    rb_define_method(iview, "selected_each", iview_selected_foreach, 0);
-    rb_define_method(iview, "select_path", iview_select_path, 1);
-    rb_define_method(iview, "unselect_path", iview_unselect_path, 1);
-    rb_define_method(iview, "path_is_selected?", iview_path_is_selected, 1);
-    rb_define_method(iview, "selected_items", iview_get_selected_items, 0);
-    rb_define_method(iview, "item_activated", iview_item_activated, 1);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(get_path_at_pos, 2);
+    RG_DEF_ALIAS("get_path", "get_path_at_pos");
+    RG_DEF_METHOD(selected_each, 0);
+    RG_DEF_METHOD(select_path, 1);
+    RG_DEF_METHOD(unselect_path, 1);
+    RG_DEF_METHOD_P(path_is_selected, 1);
+    RG_DEF_METHOD(selected_items, 0);
+    RG_DEF_METHOD(item_activated, 1);
 #endif
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(iview, "create_drag_icon", iview_create_drag_icon, 1);
-    rb_define_method(iview, "enable_model_drag_dest", iview_enable_model_drag_dest, 2);
-    rb_define_method(iview, "enable_model_drag_source", iview_enable_model_drag_source, 3);
-    rb_define_method(iview, "cursor", iview_cursor, 0);
-    rb_define_method(iview, "get_dest_item", iview_get_dest_item_at_pos, 2); 
-    rb_define_method(iview, "drag_dest_item", iview_drag_dest_item, 0);
-    rb_define_method(iview, "get_item", iview_get_item_at_pos, 2);
-    rb_define_method(iview, "visible_range", iview_visible_range, 0);
-    rb_define_method(iview, "scroll_to_path", iview_scroll_to_path, 4);
-    rb_define_method(iview, "set_cursor", iview_set_cursor, 3);
-    rb_define_method(iview, "set_drag_dest_item", iview_set_drag_dest_item, 2);
-    rb_define_method(iview, "unset_model_drag_dest", iview_unset_model_drag_dest, 0);
-    rb_define_method(iview, "unset_model_drag_source", iview_unset_model_drag_source, 0);
+    RG_DEF_METHOD(create_drag_icon, 1);
+    RG_DEF_METHOD(enable_model_drag_dest, 2);
+    RG_DEF_METHOD(enable_model_drag_source, 3);
+    RG_DEF_METHOD(cursor, 0);
+    RG_DEF_METHOD(get_dest_item, 2); 
+    RG_DEF_METHOD(drag_dest_item, 0);
+    RG_DEF_METHOD(get_item, 2);
+    RG_DEF_METHOD(visible_range, 0);
+    RG_DEF_METHOD(scroll_to_path, 4);
+    RG_DEF_METHOD(set_cursor, 3);
+    RG_DEF_METHOD(set_drag_dest_item, 2);
+    RG_DEF_METHOD(unset_model_drag_dest, 0);
+    RG_DEF_METHOD(unset_model_drag_source, 0);
 
     /* GtkIconViewDropPosition */
-    G_DEF_CLASS(GTK_TYPE_ICON_VIEW_DROP_POSITION, "Type", iview);
-    G_DEF_CONSTANTS(iview, GTK_TYPE_ICON_VIEW_DROP_POSITION, "GTK_ICON_VIEW_");
+    G_DEF_CLASS(GTK_TYPE_ICON_VIEW_DROP_POSITION, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_ICON_VIEW_DROP_POSITION, "GTK_ICON_VIEW_");
 #endif
 }

data/ext/gtk2/rbgtkimage.c

@@ -1,30 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgtkimage.c -
-
-  $Author: ggc $
-  $Date: 2005/09/23 22:02:07 $
-
-  Copyright (C) 2002-2005 Masao Mutoh
-************************************************/
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2005 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
 
 #include "global.h"
 
+#define RG_TARGET_NAMESPACE cImage
 #define _SELF(s) (GTK_IMAGE(RVAL2GOBJ(s)))
-/*
-Use properties instead.
-void        gtk_image_get_icon_set          (GtkImage *image,
-                                             GtkIconSet **icon_set,
-                                             GtkIconSize *size);
-void        gtk_image_get_image             (GtkImage *image,
-                                             GdkImage **gdk_image,
-                                             GdkBitmap **mask);
-GtkImageType gtk_image_get_storage_type     (GtkImage *image);
-*/
 
 static VALUE
-image_initialize(int argc, VALUE *argv, VALUE self)
+rg_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GType gtype;
@@ -65,7 +66,7 @@ image_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-image_set(int argc, VALUE *argv, VALUE self)
+rg_set(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2;
     GType gtype;
@@ -89,7 +90,7 @@ image_set(int argc, VALUE *argv, VALUE self)
                                      GDK_BITMAP(RVAL2GOBJ(arg2)));
         } else if (gtype == GDK_TYPE_PIXBUF){
             gtk_image_set_from_pixbuf(_SELF(self), GDK_PIXBUF(RVAL2GOBJ(arg1)));
-            
+
         } else if (gtype == GDK_TYPE_PIXMAP){
             gtk_image_set_from_pixmap(_SELF(self), GDK_PIXMAP(RVAL2GOBJ(arg1)),
                                       GDK_BITMAP(RVAL2GOBJ(arg2)));
@@ -107,19 +108,9 @@ image_set(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/* Defined as property
-void        gtk_image_get_icon_name         (GtkImage *image,
-                                             G_CONST_RETURN gchar **icon_name,
-                                             GtkIconSize *size);
-void        gtk_image_set_pixel_size        (GtkImage *image,
-                                             gint pixel_size);
-gint        gtk_image_get_pixel_size        (GtkImage *image);
-
-*/
-
 #if GTK_CHECK_VERSION(2,8,0)
 static VALUE
-image_clear(VALUE self)
+rg_clear(VALUE self)
 {
     gtk_image_clear(_SELF(self));
     return self;
@@ -127,18 +118,18 @@ image_clear(VALUE self)
 #endif
 
 void 
-Init_gtk_image()
+Init_gtk_image(VALUE mGtk)
 {
-    VALUE gImage = G_DEF_CLASS(GTK_TYPE_IMAGE, "Image", mGtk);
-    rb_define_method(gImage, "initialize", image_initialize, -1);
-    rb_define_method(gImage, "set", image_set, -1);
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_IMAGE, "Image", mGtk);
+    RG_DEF_METHOD(initialize, -1);
+    RG_DEF_METHOD(set, -1);
 #if GTK_CHECK_VERSION(2,8,0)
-    rb_define_method(gImage, "clear", image_clear, 0);
+    RG_DEF_METHOD(clear, 0);
 #endif
 
     /* GtkImageType */
-    G_DEF_CLASS(GTK_TYPE_IMAGE_TYPE, "Type", gImage);
-    G_DEF_CONSTANTS(gImage, GTK_TYPE_IMAGE_TYPE, "GTK_IMAGE_");
+    G_DEF_CLASS(GTK_TYPE_IMAGE_TYPE, "Type", RG_TARGET_NAMESPACE);
+    G_DEF_CONSTANTS(RG_TARGET_NAMESPACE, GTK_TYPE_IMAGE_TYPE, "GTK_IMAGE_");
 
     G_SET_SYMBOL_PROPERTY(GTK_TYPE_IMAGE, "stock");