X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/ab0ddec30dcb224d7c4420ca4d71355282babf96..75689fea8b73ccc1e8cb32b671b7fd881da40cf3:/glib/alien/callback.c

diff --git a/glib/alien/callback.c b/glib/alien/callback.c
index 71f0c9c..5b0fa7c 100644
--- a/glib/alien/callback.c
+++ b/glib/alien/callback.c
@@ -1,120 +1,61 @@
-/* Common Lisp bindings for GTK+ v2.0
- * Copyright (C) 1999-2002 Espen S. Johnsen <espen@users.sourceforge.net>
+/* Common Lisp bindings for GTK+ v2.x
+ * Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
  *
- * 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 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
  *
- * 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.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: callback.c,v 1.1 2004-10-27 15:07:27 espen Exp $ */
+/* $Id: callback.c,v 1.5 2005-04-23 16:48:51 espen Exp $ */
 
 #include <glib-object.h>
 
-#ifdef CMUCL
-#include "lisp.h"
-#include "alloc.h"
-#include "arch.h"
+/* #ifdef CMUCL */
+/* #include "lisp.h" */
 
-lispobj callback_trampoline;
-lispobj destroy_user_data;
-#endif
-
-
-void callback_marshal (guint callback_id, GValue *return_value,
-		       guint n_params, const GValue *param_values)
-{
-#ifdef CMUCL
-  funcall3 (callback_trampoline, alloc_number ((unsigned int)callback_id),
-	    alloc_cons (alloc_number (n_params), alloc_sap (param_values)),
-	    alloc_sap (return_value));
-#elif defined(CLISP)
-  callback_trampoline ((unsigned long)callback_id,
-		       n_params, (unsigned int)param_values,
-		       (unsigned int)return_value);
-#endif
-}
-
-void destroy_notify (gpointer data)
-{ 
-#ifdef CMUCL
-  funcall1 (destroy_user_data, alloc_number ((unsigned long)data));
-#elif defined(CLISP)
-  destroy_user_data ((unsigned long)data);
-#endif
-}
-
-/* #ifndef CMUCL */
-/* void* */
-/* destroy_notify_address () */
-/* { */
-/*   return (void*)destroy_notify; */
-/* } */
+/* void (*log_handler) (gchar*, guint, gchar*); */
 /* #endif */
 
 
 
-void closure_callback_marshal (GClosure *closure,
-			       GValue *return_value,
-			       guint n_params,
-			       const GValue *param_values,
-			       gpointer invocation_hint,
-			       gpointer marshal_data)
-{
-  callback_marshal ((guint)closure->data, return_value, n_params, param_values);
-}
-
-void closure_destroy_notify (gpointer data, GClosure *closure)
-{ 
-  destroy_notify (data);
-}
-
 GClosure*
-g_lisp_callback_closure_new (guint callback_id)
+clg_callback_closure_new (gpointer callback_id, gpointer callback,
+			  gpointer destroy_notify)
 {
   GClosure *closure;
 
   closure = g_closure_new_simple (sizeof (GClosure), (gpointer)callback_id);
-  g_closure_set_marshal (closure, closure_callback_marshal);
-  g_closure_add_finalize_notifier (closure, (gpointer)callback_id, closure_destroy_notify);
+  g_closure_set_meta_marshal (closure, callback_id, callback);
+  g_closure_add_finalize_notifier (closure, callback_id, destroy_notify);
   
   return closure;
 }
 
 
-gboolean source_callback_marshal (gpointer data)
-{
-  GValue return_value;  
-  
-  memset (&return_value, 0, sizeof (GValue));
-  g_value_init (&return_value, G_TYPE_BOOLEAN);
-  callback_marshal ((guint)data, &return_value, 0, NULL);
-
-  return g_value_get_boolean (&return_value);
-}
-
-
-
-GEnumValue*
-g_enum_class_values (GEnumClass *class, guint *n_values)
-{
-  *n_values = class->n_values;
-  return class->values;
-}
-
-GFlagsValue*
-g_flags_class_values (GFlagsClass *class, guint *n_values)
-{
-  *n_values = class->n_values;
-  return class->values;
-}
+/* void */
+/* g_logv (const gchar   *log_domain, */
+/* 	GLogLevelFlags log_level, */
+/* 	const gchar   *format, */
+/* 	va_list	       args1) */
+/* { */
+/*   gchar *msg = g_strdup_vprintf (format, args1); */
+/*   log_handler (log_domain, log_level, msg); */
 
+/*   /\* Normally log_handler won't return, so we will be leaking this memory *\/ */
+/*   g_free (msg); */
+/* } */