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 ClutterRect Date: Thu, 1 May 2014 17:09:16 -0300 Message-ID: <20140501170916.5d55beba@capac> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/T1EUWrAB+LQvXgqNOU64jGL" X-Trace: ger.gmane.org 1398975010 21527 80.91.229.3 (1 May 2014 20:10:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 May 2014 20:10:10 +0000 (UTC) To: guile-devel Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Thu May 01 22:10:03 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 1WfxIx-0000V0-A4 for guile-devel@m.gmane.org; Thu, 01 May 2014 22:10:03 +0200 Original-Received: from localhost ([::1]:41292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfxIw-00036f-L0 for guile-devel@m.gmane.org; Thu, 01 May 2014 16:10:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfxIp-00036S-1n for guile-devel@gnu.org; Thu, 01 May 2014 16:10:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WfxIj-0000Dg-5S for guile-devel@gnu.org; Thu, 01 May 2014 16:09:54 -0400 Original-Received: from maximusconfessor.all2all.org ([79.99.200.102]:51108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WfxIi-0000A8-Rf for guile-devel@gnu.org; Thu, 01 May 2014 16:09:49 -0400 Original-Received: from localhost (unknown [192.168.0.2]) by maximusconfessor.all2all.org (Postfix) with ESMTP id A1A44A04C0E5 for ; Thu, 1 May 2014 22:09:26 +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 ZvM7o-T1Ou6R for ; Thu, 1 May 2014 21:51:03 +0200 (CEST) Original-Received: from capac (unknown [189.60.2.251]) by maximusconfessor.all2all.org (Postfix) with ESMTPSA id 4F94BA04C0C3 for ; Thu, 1 May 2014 22:09:19 +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:17124 Archived-At: --MP_/T1EUWrAB+LQvXgqNOU64jGL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello, guile-clutter clutter-devel: add custom bindings for ClutterRect Patch review solicited. Thanks, David --MP_/T1EUWrAB+LQvXgqNOU64jGL Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0005-add-custom-bindings-for-ClutterRect.patch >From 511cf91f53708978dae0ceb93d2288c5b1389427 Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Thu, 1 May 2014 17:06:19 -0300 Subject: [PATCH 5/5] add custom bindings for ClutterRect * 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 ClutterRect --- clutter/gnome/gw/clutter-spec.scm | 7 +++++++ clutter/gnome/gw/clutter-support.c | 22 ++++++++++++++++++++++ clutter/gnome/gw/clutter-support.h | 3 +++ 3 files changed, 32 insertions(+) diff --git a/clutter/gnome/gw/clutter-spec.scm b/clutter/gnome/gw/clutter-spec.scm index 436967e..cd8d3d3 100644 --- a/clutter/gnome/gw/clutter-spec.scm +++ b/clutter/gnome/gw/clutter-spec.scm @@ -170,6 +170,13 @@ ;; unwrap (list c-var " = scm_scm_to_clutter_size (" scm-var ");\n")) + (wrap-custom-boxed! + "ClutterRect" "CLUTTER_TYPE_RECT" + ;; wrap + (list scm-var " = " c-var " ? scm_clutter_rect_to_scm (" c-var ") : SCM_BOOL_F;\n") + ;; unwrap + (list c-var " = scm_scm_to_clutter_rect (" 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 ecba8f4..e166dfb 100644 --- a/clutter/gnome/gw/clutter-support.c +++ b/clutter/gnome/gw/clutter-support.c @@ -337,3 +337,25 @@ scm_scm_to_clutter_size (SCM scm) return clutter_size_copy (&ret); } + +SCM +scm_clutter_rect_to_scm (ClutterRect *rect) +{ + return scm_list_4 (scm_from_double (rect->origin.x), + scm_from_double (rect->origin.y), + scm_from_double (rect->size.width), + scm_from_double (rect->size.height)); +} + +ClutterRect* +scm_scm_to_clutter_rect (SCM scm) +{ + ClutterRect ret; + + ret.origin.x = scm_to_double (scm_car (scm)); + ret.origin.y = scm_to_double (scm_cadr (scm)); + ret.size.width = scm_to_double (scm_caddr (scm)); + ret.size.height = scm_to_double (scm_cadddr (scm)); + + return clutter_rect_copy (&ret); +}; diff --git a/clutter/gnome/gw/clutter-support.h b/clutter/gnome/gw/clutter-support.h index c42fe1a..388858d 100644 --- a/clutter/gnome/gw/clutter-support.h +++ b/clutter/gnome/gw/clutter-support.h @@ -67,3 +67,6 @@ ClutterPoint* scm_scm_to_clutter_point (SCM scm); SCM scm_clutter_size_to_scm (ClutterSize *k); ClutterSize* scm_scm_to_clutter_size (SCM scm); + +SCM scm_clutter_rect_to_scm (ClutterRect *rect); +ClutterRect* scm_scm_to_clutter_rect (SCM scm); -- 1.9.2 --MP_/T1EUWrAB+LQvXgqNOU64jGL--