gtk3 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a469f47e28f7ffc04dd725197d1d90ca7058b9dd
-  data.tar.gz: 74beb40f3a9299295113a675ba049bbeb4fe47f7
+  metadata.gz: f8a7abe19144fd779ab738e2a2f755877575864b
+  data.tar.gz: d5f9ab206a3c583f0c12d1f3cd3b4504904a5dd5
 SHA512:
-  metadata.gz: 8e490c0634e0104b611ffd397c1e1adf0f23430156f433b774bf06441e1de65afdc9c86a50163078458a4d683d2a6af8f35214d49d0b74c33f8ce5177b515203
-  data.tar.gz: f25d346db49b6b2a559d3dab8c040ed52726d75e4ba1d2bf901d6ef0cf7f0236bf6ffb051199103cfc2ef69137f391b1b219bad7ada7d7d4bcf0963be5084b0e
+  metadata.gz: d435afe30b78995cc55bc8ee8b6b8f8c7502734d3eaf79dce00c36c8fe3b0e6dcbd62a43c4bb97fb7239dbd2314dda5d5286fc18aa4d59f39b18238146e3eda4
+  data.tar.gz: 602cc76363c40fd0bf51306edb00417f136be3b509dd098440767d6826f46dbdf4647dafdf6bae6b6c199272cdced2b099f55f6fd2f5b3becda590fe745733c9

data/ext/gtk3/extconf.rb

@@ -64,6 +64,7 @@ end
 setup_windows(module_name, base_dir)
 
 unless required_pkg_config_package(package_id,
+                                   :altlinux => "libgtk+3-devel",
                                    :debian => "libgtk-3-dev",
                                    :redhat => "gtk3-devel",
                                    :arch => "gtk3",

data/ext/gtk3/rb-gtk3-tree-view.c

@@ -26,6 +26,7 @@ rb_gtk3_tree_view_mark(gpointer object)
     GtkTreeView *tree_view = object;
     GList *node;
     GList *columns;
+    GtkTreeSelection *selection;
 
     columns = gtk_tree_view_get_columns(tree_view);
     for (node = columns; node; node = g_list_next(node)) {
@@ -33,6 +34,9 @@ rb_gtk3_tree_view_mark(gpointer object)
         rbgobj_gc_mark_instance(column);
     }
     g_list_free(columns);
+
+    selection = gtk_tree_view_get_selection(tree_view);
+    rbgobj_gc_mark_instance(selection);
 }
 
 void

data/ext/gtk3/rb-gtk3.c

@@ -20,6 +20,9 @@
 
 #include "rb-gtk3-private.h"
 
+static ID id_call;
+static VALUE cGdkAtom;
+
 /*
 #if GTK_CHECK_VERSION(3, 10, 0)
 #    define RB_GTK_ACTION_IS_DEPRECATED
@@ -53,51 +56,11 @@ static void
 rb_gtk3_callback_callback(GtkWidget *widget, gpointer user_data)
 {
     RBGICallbackData *callback_data = user_data;
-    ID id_call;
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback, id_call, 1,
                GOBJ2RVAL(widget));
 }
 
-static gint
-rb_gtk3_assistant_page_func_callback(gint current_page, gpointer user_data)
-{
-    RBGICallbackData *callback_data = user_data;
-    ID id_call;
-    VALUE rb_next_page;
-
-    CONST_ID(id_call, "call");
-    rb_next_page = rb_funcall(callback_data->rb_callback, id_call, 1,
-                              INT2NUM(current_page));
-    return NUM2INT(rb_next_page);
-}
-
-static void
-rb_gtk3_builder_connect_func_callback(GtkBuilder *builder,
-                                      GObject *object,
-                                      const gchar *signal_name,
-                                      const gchar *handler_name,
-                                      GObject *connect_object,
-                                      GConnectFlags flags,
-                                      gpointer user_data)
-{
-    RBGICallbackData *callback_data = user_data;
-    ID id___connect_signals__;
-    VALUE rb_object;
-
-    CONST_ID(id___connect_signals__, "__connect_signals__");
-    rb_object = GOBJ2RVAL(object);
-    G_RELATIVE(rb_object, callback_data->rb_callback);
-    rb_funcall(GOBJ2RVAL(builder), id___connect_signals__, 6,
-               callback_data->rb_callback,
-               rb_object,
-               CSTR2RVAL(signal_name),
-               CSTR2RVAL(handler_name),
-               GOBJ2RVAL(connect_object),
-               GCONNECTFLAGS2RVAL(flags));
-}
-
 static void
 rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
                                        GtkCellRenderer *cell,
@@ -107,7 +70,6 @@ rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
 
@@ -116,7 +78,6 @@ rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback,
                id_call,
                4,
@@ -126,15 +87,179 @@ rb_gtk3_cell_layout_data_func_callback(GtkCellLayout *cell_layout,
                rb_iter);
 }
 
+static void
+rb_gtk3_clipboard_received_func_callback(GtkClipboard *clipboard,
+                                         GtkSelectionData *selection_data,
+                                         gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               2,
+               GOBJ2RVAL(clipboard),
+               BOXED2RVAL(selection_data, GTK_TYPE_SELECTION_DATA));
+}
+
+static void
+rb_gtk3_clipboard_rich_text_received_func_callback(GtkClipboard *clipboard,
+                                                   GdkAtom format,
+                                                   const guint *text,
+                                                   G_GNUC_UNUSED gsize length,
+                                                   gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               3,
+               GOBJ2RVAL(clipboard),
+               Data_Wrap_Struct(cGdkAtom, NULL, NULL, format),
+               CSTR2RVAL((const gchar *)text));
+}
+
+static void
+rb_gtk3_clipboard_image_received_func_callback(GtkClipboard *clipboard,
+                                               GdkPixbuf *pixbuf,
+                                               gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               2,
+               GOBJ2RVAL(clipboard),
+               GOBJ2RVAL(pixbuf));
+}
+
+static void
+rb_gtk3_clipboard_targets_received_func_callback(GtkClipboard *clipboard,
+                                                 GdkAtom *atoms,
+                                                 gint n_atoms,
+                                                 gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    VALUE rb_atoms;
+    gint i;
+
+    if (!atoms) {
+        rb_atoms = Qnil;
+    } else {
+        rb_atoms = rb_ary_new2(n_atoms);
+        for (i = 0; i < n_atoms; i++) {
+            VALUE rb_atom;
+            rb_atom = Data_Wrap_Struct(cGdkAtom, NULL, NULL, atoms[i]);
+            rb_ary_push(rb_atoms, rb_atom);
+        }
+    }
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               2,
+               GOBJ2RVAL(clipboard),
+               rb_atoms);
+}
+
+static void
+rb_gtk3_clipboard_text_received_func_callback(GtkClipboard *clipboard,
+                                              const gchar *text,
+                                              gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               2,
+               GOBJ2RVAL(clipboard),
+               CSTR2RVAL(text));
+}
+
+static void
+rb_gtk3_clipboard_uri_received_func_callback(GtkClipboard *clipboard,
+                                             gchar **uris,
+                                             gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+
+    rb_funcall(callback_data->rb_callback,
+               id_call,
+               2,
+               GOBJ2RVAL(clipboard),
+               STRV2RVAL((const gchar **)uris));
+}
+
+static gboolean
+rb_gtk3_entry_completion_match_func_callback(GtkEntryCompletion *completion,
+                                             const gchar *key,
+                                             GtkTreeIter *iter,
+                                             gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    ID id_set_model;
+    VALUE rb_model;
+    VALUE rb_iter;
+    GtkTreeModel *model;
+    VALUE rb_match;
+    gboolean match = FALSE;
+
+    model = gtk_entry_completion_get_model(completion);
+    CONST_ID(id_set_model, "model=");
+    rb_model = GOBJ2RVAL(model);
+    rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
+    rb_funcall(rb_iter, id_set_model, 1, rb_model);
+
+    rb_match = rb_funcall(callback_data->rb_callback,
+                       id_call,
+                       3,
+                       GOBJ2RVAL(completion),
+                       CSTR2RVAL(key),
+                       rb_iter);
+
+    match = RVAL2CBOOL(rb_match);
+    return match;
+}
+
+static void
+rb_gtk3_menu_position_func_callback(GtkMenu *menu,
+                                    gint *x,
+                                    gint *y,
+                                    gboolean *push_in,
+                                    gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    VALUE rb_result_raw;
+    VALUE rb_result;
+
+    rb_result_raw = rb_funcall(callback_data->rb_callback,
+                               id_call,
+                               3,
+                               GOBJ2RVAL(menu),
+                               INT2NUM(*x),
+                               INT2NUM(*y));
+    rb_result = rbg_check_array_type(rb_result_raw);
+    if (NIL_P(rb_result) ||
+        !(RARRAY_LEN(rb_result) == 2 ||
+          RARRAY_LEN(rb_result) == 3)) {
+        /* TODO: Raising an error will abort the program. :< */
+        rb_raise(rb_eArgError,
+                 "block should return [x, y, push_in]: %s",
+                 RBG_INSPECT(rb_result_raw));
+    }
+
+    *x = NUM2INT(RARRAY_PTR(rb_result)[0]);
+    *y = NUM2INT(RARRAY_PTR(rb_result)[1]);
+    if (RARRAY_LEN(rb_result) == 3) {
+        *push_in = RVAL2CBOOL(RARRAY_PTR(rb_result)[2]);
+    }
+}
+
 static const gchar *
 rb_gtk3_translate_func_callback(const gchar *path,
                                 gpointer user_data)
 {
     RBGICallbackData *callback_data = user_data;
-    ID id_call;
     VALUE rb_translated;
 
-    CONST_ID(id_call, "call");
     rb_translated = rb_funcall(callback_data->rb_callback,
                                id_call,
                                1,
@@ -151,7 +276,6 @@ rb_gtk3_tree_cell_data_func_callback(GtkTreeViewColumn *column,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
 
@@ -160,7 +284,6 @@ rb_gtk3_tree_cell_data_func_callback(GtkTreeViewColumn *column,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback,
                id_call,
                4,
@@ -170,6 +293,37 @@ rb_gtk3_tree_cell_data_func_callback(GtkTreeViewColumn *column,
                rb_iter);
 }
 
+static gint
+rb_gtk3_tree_iter_compare_func_callback(GtkTreeModel *model,
+                                        GtkTreeIter *iter1,
+                                        GtkTreeIter *iter2,
+                                        gpointer user_data)
+{
+    RBGICallbackData *callback_data = user_data;
+    ID id_set_model;
+    VALUE rb_model;
+    VALUE rb_iter1;
+    VALUE rb_iter2;
+    VALUE rb_result;
+
+    CONST_ID(id_set_model, "model=");
+    rb_model = GOBJ2RVAL(model);
+
+    rb_iter1 = BOXED2RVAL(iter1, GTK_TYPE_TREE_ITER);
+    rb_funcall(rb_iter1, id_set_model, 1, rb_model);
+
+    rb_iter2 = BOXED2RVAL(iter2, GTK_TYPE_TREE_ITER);
+    rb_funcall(rb_iter2, id_set_model, 1, rb_model);
+
+    rb_result = rb_funcall(callback_data->rb_callback,
+                           id_call,
+                           3,
+                           rb_model,
+                           rb_iter1,
+                           rb_iter2);
+    return NUM2INT(rb_result);
+}
+
 static void
 rb_gtk3_tree_model_filter_modify_func_callback(GtkTreeModel *model,
                                                GtkTreeIter *iter,
@@ -179,7 +333,6 @@ rb_gtk3_tree_model_filter_modify_func_callback(GtkTreeModel *model,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
     VALUE rb_value;
@@ -191,7 +344,6 @@ rb_gtk3_tree_model_filter_modify_func_callback(GtkTreeModel *model,
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
     rb_column = INT2NUM(column);
 
-    CONST_ID(id_call, "call");
     rb_value = rb_funcall(callback_data->rb_callback,
                           id_call,
                           3,
@@ -208,7 +360,6 @@ rb_gtk3_tree_model_filter_visible_func_callback(GtkTreeModel *model,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
     VALUE rb_visible;
@@ -219,7 +370,6 @@ rb_gtk3_tree_model_filter_visible_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    CONST_ID(id_call, "call");
     rb_visible = rb_funcall(callback_data->rb_callback,
                             id_call,
                             2,
@@ -238,7 +388,6 @@ rb_gtk3_tree_model_foreach_func_callback(GtkTreeModel *model,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
     gboolean stop = FALSE;
@@ -248,7 +397,6 @@ rb_gtk3_tree_model_foreach_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback,
                id_call,
                3,
@@ -267,7 +415,6 @@ rb_gtk3_tree_selection_foreach_func_callback(GtkTreeModel *model,
 {
     RBGICallbackData *callback_data = user_data;
     ID id_set_model;
-    ID id_call;
     VALUE rb_model;
     VALUE rb_iter;
 
@@ -276,7 +423,6 @@ rb_gtk3_tree_selection_foreach_func_callback(GtkTreeModel *model,
     rb_iter = BOXED2RVAL(iter, GTK_TYPE_TREE_ITER);
     rb_funcall(rb_iter, id_set_model, 1, rb_model);
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback,
                id_call,
                3,
@@ -285,15 +431,34 @@ rb_gtk3_tree_selection_foreach_func_callback(GtkTreeModel *model,
                rb_iter);
 }
 
+static gboolean
+rb_gtk3_tree_selection_func_callback(GtkTreeSelection *selection,
+                                     GtkTreeModel *model,
+                                     GtkTreePath *path,
+                                     gboolean path_currently_selected,
+                                     gpointer data)
+{
+    RBGICallbackData *callback_data = data;
+    VALUE rb_selection_is_changeable;
+
+    rb_selection_is_changeable =
+        rb_funcall(callback_data->rb_callback,
+                   id_call,
+                   4,
+                   GOBJ2RVAL(selection),
+                   GOBJ2RVAL(model),
+                   BOXED2RVAL(path, GTK_TYPE_TREE_PATH),
+                   CBOOL2RVAL(path_currently_selected));
+    return RVAL2CBOOL(rb_selection_is_changeable);
+}
+
 static void
 rb_gtk3_tree_view_mapping_func_callback(GtkTreeView *tree_view,
                                         GtkTreePath *path,
                                         gpointer user_data)
 {
     RBGICallbackData *callback_data = user_data;
-    ID id_call;
 
-    CONST_ID(id_call, "call");
     rb_funcall(callback_data->rb_callback,
                id_call,
                2,
@@ -306,16 +471,30 @@ rb_gtk3_callback_finder(GIArgInfo *info)
 {
     if (name_equal(info, "Callback")) {
         return rb_gtk3_callback_callback;
-    } else if (name_equal(info, "AssistantPageFunc")) {
-        return rb_gtk3_assistant_page_func_callback;
-    } else if (name_equal(info, "BuilderConnectFunc")) {
-        return rb_gtk3_builder_connect_func_callback;
     } else if (name_equal(info, "CellLayoutDataFunc")) {
         return rb_gtk3_cell_layout_data_func_callback;
+    } else if (name_equal(info, "ClipboardReceivedFunc")) {
+        return rb_gtk3_clipboard_received_func_callback;
+    } else if (name_equal(info, "ClipboardRichTextReceivedFunc")) {
+        return rb_gtk3_clipboard_rich_text_received_func_callback;
+    } else if (name_equal(info, "ClipboardImageReceivedFunc")) {
+        return rb_gtk3_clipboard_image_received_func_callback;
+    } else if (name_equal(info, "ClipboardTargetsReceivedFunc")) {
+        return rb_gtk3_clipboard_targets_received_func_callback;
+    } else if (name_equal(info, "ClipboardTextReceivedFunc")) {
+        return rb_gtk3_clipboard_text_received_func_callback;
+    } else if (name_equal(info, "ClipboardURIReceivedFunc")) {
+        return rb_gtk3_clipboard_uri_received_func_callback;
+    } else if (name_equal(info, "EntryCompletionMatchFunc")) {
+        return rb_gtk3_entry_completion_match_func_callback;
+    } else if (name_equal(info, "MenuPositionFunc")) {
+        return rb_gtk3_menu_position_func_callback;
     } else if (name_equal(info, "TranslateFunc")) {
         return rb_gtk3_translate_func_callback;
     } else if (name_equal(info, "TreeCellDataFunc")) {
         return rb_gtk3_tree_cell_data_func_callback;
+    } else if (name_equal(info, "TreeIterCompareFunc")) {
+        return rb_gtk3_tree_iter_compare_func_callback;
     } else if (name_equal(info, "TreeModelFilterModifyFunc")) {
         return rb_gtk3_tree_model_filter_modify_func_callback;
     } else if (name_equal(info, "TreeModelFilterVisibleFunc")) {
@@ -324,6 +503,8 @@ rb_gtk3_callback_finder(GIArgInfo *info)
         return rb_gtk3_tree_model_foreach_func_callback;
     } else if (name_equal(info, "TreeSelectionForeachFunc")) {
         return rb_gtk3_tree_selection_foreach_func_callback;
+    } else if (name_equal(info, "TreeSelectionFunc")) {
+        return rb_gtk3_tree_selection_func_callback;
     } else if (name_equal(info, "TreeViewMappingFunc")) {
         return rb_gtk3_tree_view_mapping_func_callback;
     } else {
@@ -417,6 +598,10 @@ rbgtk3_initialize(VALUE self)
 void
 Init_gtk3(void)
 {
+    id_call = rb_intern("call");
+    cGdkAtom = rb_const_get(rb_const_get(rb_cObject, rb_intern("Gdk")),
+                            rb_intern("Atom"));
+
     rb_gi_callback_register_finder(rb_gtk3_callback_finder);
 
 #ifndef RB_GTK_ACTION_IS_DEPRECATED