gtk3 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c6994d68f81dec49c86dc70f29f78378bb9ec9a
-  data.tar.gz: 5251145db0e1b4ed585131342dbd9dc2d6a84a8d
+  metadata.gz: 86ace380c7f68b661c83c42978c6d07aaca67133
+  data.tar.gz: 15ae090f259f378bc6629b140d8e93d371fbde48
 SHA512:
-  metadata.gz: 715a487f3600c51a9080836381218d4dba59bf44b9547146288e822be356b183c2a36313e28aef031d3e9d693256d07e46552293ca6d9db9d3e011bda1ffbf11
-  data.tar.gz: e68133a79404d51521e4b9f1f6adc25f3aed6182297f853b329b90b0eb3d3be9c13bafa570434be9649245541aee5d9535451ac872cbeb809b1b92bc9bfb8c1d
+  metadata.gz: a1927bb46da007d645fb39afd588cf0b82d45ea66e5f3880dfb8fde8f0308982cf59ff3522eb3a77ee5ecaf340bcd754348e1c5e4a373be588199eb8b7041ffc
+  data.tar.gz: 2a5d05997753b21191141781ec86b6d308d7bb86c8756f1f74fd7e51d0e7c0b9473b4f89c640c328d69eab5df9c69d2cdd6318fb8046502512e5ffd23c44b6a1

data/ext/gtk3/extconf.rb

@@ -33,7 +33,7 @@ end
 
 have_func("rb_errinfo")
 
-["glib2", "atk", "pango", "gdk_pixbuf2", "gdk3"].each do |package|
+["glib2", "cairo-gobject", "atk", "pango", "gdk_pixbuf2"].each do |package|
   directory = "#{package}#{version_suffix}"
   build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
   add_depend_package(package, "#{directory}/ext/#{package}",

data/ext/gtk3/rbgtk-color-button.c

@@ -34,7 +34,13 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     if (NIL_P(color)){
         widget = gtk_color_button_new();
     } else {
-        widget = gtk_color_button_new_with_color(RVAL2GDKCOLOR(color));
+        GType gtype = RVAL2GTYPE(color);
+
+        if (gtype == GDK_TYPE_COLOR) {
+            widget = gtk_color_button_new_with_color(RVAL2GDKCOLOR(color));
+        } else {
+            widget = gtk_color_button_new_with_rgba(RVAL2GDKRGBA(color));
+        }
     }
 
     RBGTK_INITIALIZE(self, widget);

data/ext/gtk3/rbgtk-dialog.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
  *  Copyright (C) 2002-2005 Ruby-GNOME2 Project Team
  *  Copyright (C) 1998-2000 Yukihiro Matsumoto,
  *                          Daisuke Kanda,
@@ -74,15 +74,35 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
     return Qnil;
 }
 
+static gboolean
+destroy_dialog(gpointer user_data)
+{
+    GtkWidget *dialog = user_data;
+    gtk_widget_destroy(dialog);
+    return G_SOURCE_REMOVE;
+}
+
 static VALUE
 rg_run(VALUE self)
 {
-    if (rb_block_given_p()){
-        VALUE ret = INT2NUM(gtk_dialog_run(_SELF(self)));
-        rb_yield(ret);
-        return ret;
+    GtkDialog *dialog;
+    GSource *interrupt_source;
+    VALUE response;
+
+    dialog = _SELF(self);
+    interrupt_source = rbg_interrupt_source_new();
+    g_source_set_callback(interrupt_source, destroy_dialog, dialog, NULL);
+    g_source_attach(interrupt_source, NULL);
+    response = INT2NUM(gtk_dialog_run(dialog));
+    g_source_destroy(interrupt_source);
+    g_source_unref(interrupt_source);
+
+    rb_thread_check_ints();
+
+    if (rb_block_given_p()) {
+        return rb_yield(response);
     } else {
-        return INT2NUM(gtk_dialog_run(_SELF(self)));
+        return response;
     }
 }
 

data/ext/gtk3/rbgtk-image.c

@@ -72,6 +72,7 @@ rg_initialize(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eArgError, "Invalid arguments.");
 
     RBGTK_INITIALIZE(self, widget);
+    g_object_unref(widget);
 
     return Qnil;
 }

data/ext/gtk3/rbgtk-selection-data.c

@@ -36,20 +36,19 @@ rbgtk_atom2selectiondata(VALUE type, VALUE size, VALUE src, GdkAtom *gtype,
     GdkAtom ntype = RVAL2ATOM(type);
 
     if(ntype == GDK_SELECTION_TYPE_INTEGER){
-        int *i;
-        i = ALLOC(int);
+        glong *i;
+        i = ALLOC(glong);
         *i = NUM2INT(src);
         dat = i;
-        fmt = sizeof(int) * 8;
+        fmt = 32;
         len = 1;
     } else if(ntype == GDK_SELECTION_TYPE_STRING) {
         dat = (void *)RVAL2CSTR(src);
+        fmt = 8;
         if (NIL_P(size)) {
-            fmt = sizeof(char) * 8;
             len = RSTRING_LEN(src);
         } else {
             len = NUM2UINT(size);
-            fmt = (RSTRING_LEN(src) / len) * 8;
         }
 /* TODO
     } else if(ntype == compound_text){

data/ext/gtk3/rbgtk-stack-switcher.c

@@ -0,0 +1,41 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2014 Ruby-GNOME2 Project Team
+ *
+ *  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 "rbgtk3private.h"
+
+#if GTK_CHECK_VERSION(3, 10, 0)
+
+#define RG_TARGET_NAMESPACE cStackSwitcher
+
+static VALUE
+rg_initialize(VALUE self)
+{
+    RBGTK_INITIALIZE(self, gtk_stack_switcher_new());
+    return Qnil;
+}
+
+void
+Init_gtk_stack_switcher(VALUE mGtk)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GTK_TYPE_STACK_SWITCHER, "StackSwitcher", mGtk);
+
+    RG_DEF_METHOD(initialize, 0);
+}
+#endif

data/ext/gtk3/rbgtk-window.c

@@ -485,6 +485,13 @@ rg_set_default_geometry(VALUE self, VALUE width, VALUE height)
     return self;
 }
 
+static VALUE
+rg_set_titlebar(VALUE self, VALUE titlebar)
+{
+    gtk_window_set_titlebar(_SELF(self), RVAL2GTKWIDGET(titlebar));
+    return self;
+}
+
 void
 Init_gtk_window(VALUE mGtk)
 {
@@ -544,6 +551,7 @@ Init_gtk_window(VALUE mGtk)
     RG_DEF_METHOD(propagate_key_event, 1);
     RG_DEF_METHOD(resize_to_geometry, 2);
     RG_DEF_METHOD(set_default_geometry, 2);
+    RG_DEF_METHOD(set_titlebar, 1);
 
     G_DEF_CLASS(GTK_TYPE_WINDOW_POSITION, "Position", RG_TARGET_NAMESPACE);
     G_DEF_CLASS(GTK_TYPE_WINDOW_TYPE, "Type", RG_TARGET_NAMESPACE);

data/ext/gtk3/rbgtk.c

@@ -28,6 +28,146 @@
 #endif
 #include <locale.h>
 
+/* TODO: REMOVE ME */
+/*
+ * They are temporary. They will be needless after Ruby/GTK3
+ * is based on Ruby/GObjectIntrospection.
+ */
+/* From Ruby/GDK3 - start */
+static GdkGeometry*
+geo_copy(const GdkGeometry* geo)
+{
+  GdkGeometry* new_geo;
+  g_return_val_if_fail (geo != NULL, NULL);
+  new_geo = g_new(GdkGeometry, 1);
+  *new_geo = *geo;
+  return new_geo;
+}
+
+GType
+gdk_geometry_get_type(void)
+{
+  static GType our_type = 0;
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GdkGeometry",
+                    (GBoxedCopyFunc)geo_copy,
+                    (GBoxedFreeFunc)g_free);
+  return our_type;
+}
+
+static GdkAtomData *
+gdk_atom_copy(const GdkAtom atom)
+{
+    GdkAtomData* data;
+    data = g_new(GdkAtomData, 1);
+    data->atom = atom;
+    return data;
+}
+
+GType
+gdk_atom_get_type(void)
+{
+    static GType our_type = 0;
+    if (our_type == 0)
+        our_type = g_boxed_type_register_static ("GdkAtomData",
+                                                 (GBoxedCopyFunc)gdk_atom_copy,
+                                                 (GBoxedFreeFunc)g_free);
+    return our_type;
+}
+
+struct rbgdk_rval2gdkatoms_args {
+    VALUE ary;
+    long n;
+    GdkAtom *result;
+};
+
+static VALUE
+rbgdk_rval2gdkatoms_body(VALUE value)
+{
+    long i;
+    struct rbgdk_rval2gdkatoms_args *args = (struct rbgdk_rval2gdkatoms_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result[i] = RVAL2ATOM(RARRAY_PTR(args->ary)[i]);
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkatoms_rescue(VALUE value)
+{
+    g_free(((struct rbgdk_rval2gdkatoms_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+GdkAtom *
+rbgdk_rval2gdkatoms(VALUE value, long *n)
+{
+    struct rbgdk_rval2gdkatoms_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = g_new(GdkAtom, args.n + 1);
+
+    rb_rescue(rbgdk_rval2gdkatoms_body, (VALUE)&args,
+              rbgdk_rval2gdkatoms_rescue, (VALUE)&args);
+
+    *n = args.n;
+
+    return args.result;
+}
+
+struct rval2gdkpixbufglist_args {
+    VALUE ary;
+    long n;
+    GList *result;
+};
+
+static VALUE
+rbgdk_rval2gdkpixbufglist_body(VALUE value)
+{
+    long i;
+    struct rval2gdkpixbufglist_args *args = (struct rval2gdkpixbufglist_args *)value;
+
+    for (i = 0; i < args->n; i++)
+        args->result = g_list_append(args->result, RVAL2GDKPIXBUF(RARRAY_PTR(args->ary)[i]));
+
+    return Qnil;
+}
+
+static G_GNUC_NORETURN VALUE
+rbgdk_rval2gdkpixbufglist_rescue(VALUE value)
+{
+    g_list_free(((struct rval2gdkpixbufglist_args *)value)->result);
+
+    rb_exc_raise(rb_errinfo());
+}
+
+GList *
+rbgdk_rval2gdkpixbufglist(VALUE value)
+{
+    struct rval2gdkpixbufglist_args args;
+
+    args.ary = rb_ary_to_ary(value);
+    args.n = RARRAY_LEN(args.ary);
+    args.result = NULL;
+
+    rb_rescue(rbgdk_rval2gdkpixbufglist_body, (VALUE)&args,
+              rbgdk_rval2gdkpixbufglist_rescue, (VALUE)&args);
+
+    return args.result;
+}
+
+GdkAtom
+rbgdk_rval2gdkatom(VALUE atom)
+{
+    if (TYPE(atom) == T_STRING)
+        return gdk_atom_intern(RVAL2CSTR(atom), FALSE);
+    return (RVAL2GDKATOM(atom))->atom;
+}
+/* From Ruby/GDK3 - end */
+
 #define RG_TARGET_NAMESPACE mGtk
 
 static VALUE RG_TARGET_NAMESPACE;
@@ -179,10 +319,27 @@ rg_s_init(int argc, VALUE *argv, VALUE self)
 gtk_init()
 */
 
+static gboolean
+quit_loop(G_GNUC_UNUSED gpointer user_data)
+{
+    gtk_main_quit();
+    return G_SOURCE_REMOVE;
+}
+
 static VALUE
 rg_s_main(G_GNUC_UNUSED VALUE self)
 {
+    GSource *interrupt_source;
+
+    interrupt_source = rbg_interrupt_source_new();
+    g_source_set_callback(interrupt_source, quit_loop, NULL, NULL);
+    g_source_attach(interrupt_source, NULL);
     gtk_main();
+    g_source_destroy(interrupt_source);
+    g_source_unref(interrupt_source);
+
+    rb_thread_check_ints();
+
     return Qnil;
 }
 
@@ -569,6 +726,7 @@ Init_gtk(void)
     Init_gtk_spinner(RG_TARGET_NAMESPACE);
 #if GTK_CHECK_VERSION(3, 10, 0)
     Init_gtk_stack(RG_TARGET_NAMESPACE);
+    Init_gtk_stack_switcher(RG_TARGET_NAMESPACE);
 #endif
     Init_gtk_statusbar(RG_TARGET_NAMESPACE);
     Init_gtk_status_icon(RG_TARGET_NAMESPACE);

data/ext/gtk3/rbgtk3.h

@@ -30,6 +30,39 @@
 #include <rbgobject.h>
 #include "rbgtk3conversions.h"
 
+/* TODO: REMOVE ME */
+/*
+ * They are temporary. They will be needless after Ruby/GTK3
+ * is based on Ruby/GObjectIntrospection.
+ */
+/* From rbgdk3.h - start */
+#include <gdk/gdk.h>
+#ifdef GDK_WINDOWING_X11
+#  include <gdk/gdkx.h>
+#endif
+#ifdef GDK_WINDOWING_WIN32
+#  include <gdk/gdkwin32.h>
+#endif
+
+#define RVAL2GDKPIXBUFGLIST(value) rbgdk_rval2gdkpixbufglist(value)
+#define RVAL2ATOM(atom)            rbgdk_rval2gdkatom(atom)
+#define RVAL2GDKATOMS(value, n)    rbgdk_rval2gdkatoms(value, n)
+
+#define GDK_TYPE_GEOMETRY          (gdk_geometry_get_type())
+#define GDK_TYPE_ATOM              (gdk_atom_get_type())
+
+typedef struct {
+    GdkAtom atom;
+} GdkAtomData;
+
+GType gdk_atom_get_type(void);
+GType gdk_geometry_get_type(void);
+
+GList *rbgdk_rval2gdkpixbufglist(VALUE value);
+GdkAtom rbgdk_rval2gdkatom(VALUE atom);
+GdkAtom *rbgdk_rval2gdkatoms(VALUE value, long *n);
+/* From rbgdk3.h - end */
+
 #define RBGTK_MAJOR_VERSION RBGLIB_MAJOR_VERSION
 #define RBGTK_MINOR_VERSION RBGLIB_MINOR_VERSION
 #define RBGTK_MICRO_VERSION RBGLIB_MICRO_VERSION

data/ext/gtk3/rbgtk3conversions.h

@@ -366,7 +366,7 @@
 #define RVAL2GTKUIMANAGERITEMTYPE(o)       (RVAL2GFLAGS(o, GTK_TYPE_UI_MANAGER_ITEM_TYPE))
 #define GTKUIMANAGERITEMTYPE2RVAL(o)       (GFLAGS2RVAL(o, GTK_TYPE_UI_MANAGER_ITEM_TYPE))
 
-/* For GIO. They are temporary. They will be needless after Ruby/GDK3
+/* For GIO. They are temporary. They will be needless after Ruby/GTK3
  * is based on Ruby/GObjectIntrospection.
  */
 #define RVAL2GFILE(o)                      (G_FILE(RVAL2GOBJ(o)))
@@ -374,4 +374,63 @@
 #define RVAL2GPERMISSION(o)                (G_PERMISSION(RVAL2GOBJ(o)))
 #define RVAL2GAPPLICATIONFLAGS(o)          (RVAL2GFLAGS(o, G_TYPE_APPLICATION_FLAGS))
 
+/* For GDK. They are temporary. They will be needless after Ruby/GTK3
+ * is based on Ruby/GObjectIntrospection.
+ */
+#define RVAL2GDKCOLOR(o)                   ((GdkColor*)RVAL2BOXED(o, GDK_TYPE_COLOR))
+#define GDKCOLOR2RVAL(o)                   (BOXED2RVAL(o, GDK_TYPE_COLOR))
+
+#define RVAL2GDKRGBA(o)                    ((GdkRGBA*)RVAL2BOXED(o, GDK_TYPE_RGBA))
+#define GDKRGBA2RVAL(o)                    (BOXED2RVAL(o, GDK_TYPE_RGBA))
+
+#define RVAL2GDKMODIFIERTYPE(o)            (RVAL2GFLAGS(o, GDK_TYPE_MODIFIER_TYPE))
+
+#define RVAL2GDKDRAGCONTEXT(o)             (GDK_DRAG_CONTEXT(RVAL2GOBJ(o)))
+
+#define RVAL2GDKSCREEN(o)                  (GDK_SCREEN(RVAL2GOBJ(o)))
+
+#define RVAL2GDKWINDOW(o)                  (GDK_WINDOW(RVAL2GOBJ(o)))
+
+#define GDKEVENT2RVAL(o)                   (BOXED2RVAL(o, GDK_TYPE_EVENT))
+#define RVAL2GDKEVENT(o)                   ((GdkEvent *)RVAL2BOXED(o, GDK_TYPE_EVENT))
+#define GEV2RVAL(ev)                       GDKEVENT2RVAL(ev)
+#define RVAL2GEV(ev)                       RVAL2GDKEVENT(ev)
+
+#define GDKMODIFIERTYPE2RVAL(o)            (GFLAGS2RVAL(o, GDK_TYPE_MODIFIER_TYPE))
+
+#define GDKRECTANGLE2RVAL(o)               (BOXED2RVAL(o, CAIRO_GOBJECT_TYPE_RECTANGLE_INT))
+#define RVAL2GDKRECTANGLE(o)               ((GdkRectangle*)RVAL2BOXED(o, CAIRO_GOBJECT_TYPE_RECTANGLE_INT))
+
+#define RVAL2GDKDISPLAYOBJECT(o)           (GDK_DISPLAY_OBJECT(RVAL2GOBJ(o)))
+
+#define GDKATOM2RVAL(o)                    (BOXED2RVAL(o, GDK_TYPE_ATOM))
+#define RVAL2GDKATOM(o)                    ((GdkAtomData*)RVAL2BOXED(o, GDK_TYPE_ATOM))
+
+#define RVAL2GDKEVENTKEY(o)                ((GdkEventKey*)RVAL2GDKEVENT(o))
+
+#define RVAL2GDKDRAGACTION(o)              (RVAL2GFLAGS(o, GDK_TYPE_DRAG_ACTION))
+
+#define RVAL2GDKGEOMETRY(o)                ((GdkGeometry*)RVAL2BOXED(o, GDK_TYPE_GEOMETRY))
+
+#define RVAL2GDKWINDOWHINTS(o)             (RVAL2GFLAGS(o, GDK_TYPE_WINDOW_HINTS))
+
+#define RVAL2GDKWINDOWEDGE(o)              (RVAL2GENUM(o, GDK_TYPE_WINDOW_EDGE))
+
+#define RVAL2GDKDEVICE(o)                  (GDK_DEVICE(RVAL2GOBJ(o)))
+
+#define RVAL2GDKEVENTMASK(o)               (RVAL2GFLAGS(o, GDK_TYPE_EVENT_MASK))
+#define GDKEVENTMASK2RVAL(o)               (GFLAGS2RVAL(o, GDK_TYPE_EVENT_MASK))
+
+#define RVAL2GDKVISUAL(o)                  (GDK_VISUAL(RVAL2GOBJ(o)))
+
+#define RVAL2GDKDRAGPROTOCOL(o)            (RVAL2GENUM(o, GDK_TYPE_DRAG_PROTOCOL))
+
 #endif /* __RBGTK3CONVERSIONS_H__ */
+
+
+
+
+
+
+
+