From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Pirotte Newsgroups: gmane.lisp.guile.devel Subject: guile-clutter, clutter-devel: add custom bindings for ClutterMatrix Date: Fri, 9 May 2014 12:27:17 -0300 Message-ID: <20140509122717.2f11a550@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/zsp8gL59Nbz2dUG_+Mgn_c/" X-Trace: ger.gmane.org 1399649295 3722 80.91.229.3 (9 May 2014 15:28:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 9 May 2014 15:28:15 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Fri May 09 17:28:08 2014 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1WimiU-0006Sy-NC for guile-devel@m.gmane.org; Fri, 09 May 2014 17:28:06 +0200 Original-Received: from localhost ([::1]:53120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WimiU-0006R9-5q for guile-devel@m.gmane.org; Fri, 09 May 2014 11:28:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WimiK-0006Qo-QU for guile-devel@gnu.org; Fri, 09 May 2014 11:28:02 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WimiD-0004fQ-Ou for guile-devel@gnu.org; Fri, 09 May 2014 11:27:56 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:45170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WimiD-0004XO-Er for guile-devel@gnu.org; Fri, 09 May 2014 11:27:49 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id 30A10A04C12E for ; Fri, 9 May 2014 17:27:28 +0200 (CEST) Original-Received: from maximusconfessor.all2all.org ([192.168.0.1]) by localhost (maximusconfessor.all2all.org [192.168.0.2]) (amavisd-new, port 10024) with ESMTP id dT0m8qWe7zB9 for ; Fri, 9 May 2014 17:08:54 +0200 (CEST) Original-Received: from capac (unknown [189.60.2.251]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 86D06A04C0D3 for ; Fri, 9 May 2014 17:27:20 +0200 (CEST) X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 79.99.200.102 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:17138 Archived-At: --MP_/zsp8gL59Nbz2dUG_+Mgn_c/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, guile-clutter clutter-devel: add custom bindings for ClutterMatrix Patch review solicited. Thanks, David --MP_/zsp8gL59Nbz2dUG_+Mgn_c/ Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0006-add-custom-bindings-for-ClutterMatrix.patch >From 8f15c981e0d8c6fd089c28c6ca953ec02313c413 Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Fri, 9 May 2014 12:16:07 -0300 Subject: [PATCH 6/6] add custom bindings for ClutterMatrix * clutter/gnome/gw/clutter-spec.scm: * clutter/gnome/gw/clutter-support.h: * clutter/gnome/gw/clutter-support.c: add custom bindings and support code for ClutterMatrix --- clutter/gnome/gw/clutter-spec.scm | 7 ++++++ clutter/gnome/gw/clutter-support.c | 49 +++++++++++++++++++++++++++++++++++++- clutter/gnome/gw/clutter-support.h | 3 +++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/clutter/gnome/gw/clutter-spec.scm b/clutter/gnome/gw/clutter-spec.scm index cd8d3d3..c6089e6 100644 --- a/clutter/gnome/gw/clutter-spec.scm +++ b/clutter/gnome/gw/clutter-spec.scm @@ -177,6 +177,13 @@ ;; unwrap (list c-var " = scm_scm_to_clutter_rect (" scm-var ");\n")) + (wrap-custom-boxed! + "ClutterMatrix" "CLUTTER_TYPE_MATRIX" + ;; wrap + (list scm-var " = " c-var " ? scm_clutter_matrix_to_scm (" c-var ") : SCM_BOOL_F;\n") + ;; unwrap + (list c-var " = scm_scm_to_clutter_matrix (" scm-var ");\n")) + (wrap-opaque-pointer! ws "ClutterInputDevice*") (wrap-opaque-pointer! ws "ClutterEventSequence*") diff --git a/clutter/gnome/gw/clutter-support.c b/clutter/gnome/gw/clutter-support.c index e166dfb..1cd52d2 100644 --- a/clutter/gnome/gw/clutter-support.c +++ b/clutter/gnome/gw/clutter-support.c @@ -358,4 +358,51 @@ scm_scm_to_clutter_rect (SCM scm) ret.size.height = scm_to_double (scm_cadddr (scm)); return clutter_rect_copy (&ret); -}; +} + +SCM +scm_clutter_matrix_to_scm (ClutterMatrix *m) +{ + return scm_list_n (scm_from_double (m->xx), /* column 0 */ + scm_from_double (m->yx), + scm_from_double (m->zx), + scm_from_double (m->wx), + scm_from_double (m->xy), /* column 1 */ + scm_from_double (m->yy), + scm_from_double (m->zy), + scm_from_double (m->wy), + scm_from_double (m->xz), /* column 2 */ + scm_from_double (m->yz), + scm_from_double (m->zz), + scm_from_double (m->wz), + scm_from_double (m->xw), /* column 3 */ + scm_from_double (m->yw), + scm_from_double (m->zw), + scm_from_double (m->ww), + SCM_UNDEFINED); +} + +ClutterMatrix* +scm_scm_to_clutter_matrix (SCM scm) +{ + ClutterMatrix ret; + + ret.xx = scm_to_double (scm_list_ref (scm, 0)); + ret.yx = scm_to_double (scm_list_ref (scm, 1)); + ret.zx = scm_to_double (scm_list_ref (scm, 2)); + ret.wx = scm_to_double (scm_list_ref (scm, 3)); + ret.xy = scm_to_double (scm_list_ref (scm, 4)); + ret.yy = scm_to_double (scm_list_ref (scm, 5)); + ret.zy = scm_to_double (scm_list_ref (scm, 6)); + ret.wy = scm_to_double (scm_list_ref (scm, 7)); + ret.xz = scm_to_double (scm_list_ref (scm, 8)); + ret.yz = scm_to_double (scm_list_ref (scm, 9)); + ret.zz = scm_to_double (scm_list_ref (scm, 10)); + ret.wz = scm_to_double (scm_list_ref (scm, 11)); + ret.xw = scm_to_double (scm_list_ref (scm, 12)); + ret.yw = scm_to_double (scm_list_ref (scm, 13)); + ret.zw = scm_to_double (scm_list_ref (scm, 14)); + ret.ww = scm_to_double (scm_list_ref (scm, 15)); + + return g_boxed_copy (clutter_matrix_get_type (), &ret); +} diff --git a/clutter/gnome/gw/clutter-support.h b/clutter/gnome/gw/clutter-support.h index 388858d..d5ead14 100644 --- a/clutter/gnome/gw/clutter-support.h +++ b/clutter/gnome/gw/clutter-support.h @@ -70,3 +70,6 @@ ClutterSize* scm_scm_to_clutter_size (SCM scm); SCM scm_clutter_rect_to_scm (ClutterRect *rect); ClutterRect* scm_scm_to_clutter_rect (SCM scm); + +SCM scm_clutter_matrix_to_scm (ClutterMatrix *m); +ClutterMatrix* scm_scm_to_clutter_matrix (SCM scm); -- 2.0.0.rc0 --MP_/zsp8gL59Nbz2dUG_+Mgn_c/--