Re: gdk-string-to-compound

[Kevin Ryde <user42@zip.com.au>]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

As threatened,

        * gdk-1.2.defs, gdk-support.c, guile-gtk.h
        (gdk_string_to_compound_text_interp): Return the status code, put text
        return in same position in values as the C function.


[-- Attachment #2: gdk-1.2.defs.compound.diff --]
[-- Type: text/plain, Size: 749 bytes --]

--- gdk-1.2.defs.~1.37.~	2003-07-03 11:01:30.000000000 +1000
+++ gdk-1.2.defs	2003-07-07 17:15:54.000000000 +1000
@@ -1928,12 +1928,17 @@
    (int format)
    (SCM text)))				; string
 
+;; The return value is only documented as zero for success or non-zero for
+;; failure, but a negative is an Xlib error code or positive is a count of
+;; failed characters.  Not sure if applications will find a use for this,
+;; but we may as well return it.
+;;
 (define-func gdk_string_to_compound_text_interp
-  (SCM					; string or #f
-   (values (encoding format)))
+  (int (values (encoding format ctext)))
   ((string str)
    (atom encoding)
-   (int format)))
+   (int format)
+   (SCM ctext)))  ;; string or #f
 
 (define-func gdk_atom_intern
   atom

[-- Attachment #3: gdk-support.c.compound.diff --]
[-- Type: text/plain, Size: 928 bytes --]

--- gdk-support.c.~1.24.~	2003-06-19 11:03:47.000000000 +1000
+++ gdk-support.c	2003-07-07 17:17:28.000000000 +1000
@@ -1501,17 +1501,21 @@
 }
 #undef FUNCNAME
 
-SCM
-gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding, gint *format)
+gint
+gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding, gint *format,
+                                    SCM *textp)
 {
   guchar *ctext;
-  gint length;
-  SCM text;
-  if (gdk_string_to_compound_text (str, encoding, format, &ctext, &length))
-    return SCM_BOOL_F;
-  text = scm_mem2string ((char *) ctext, length);
-  gdk_free_compound_text (ctext);
-  return text;
+  gint ret, length;
+  ret = gdk_string_to_compound_text (str, encoding, format, &ctext, &length);
+  if (ctext != NULL)
+    {
+      *textp = scm_mem2string ((char *) ctext, length);
+      gdk_free_compound_text (ctext);
+    }
+  else
+    *textp = SCM_BOOL_F;
+  return ret;
 }
 
 SCM

[-- Attachment #4: guile-gtk.h.compound.diff --]
[-- Type: text/plain, Size: 635 bytes --]

--- guile-gtk.h.~1.28.~	2003-07-03 11:08:31.000000000 +1000
+++ guile-gtk.h	2003-07-07 17:10:52.000000000 +1000
@@ -468,8 +468,8 @@
 
 SCM gdk_text_property_to_text_list_interp (GdkAtom encoding, gint format,
 					   SCM text);
-SCM gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding,
-					gint *format);
+gint gdk_string_to_compound_text_interp (char *str, GdkAtom *encoding,
+                                         gint *format, SCM *textp);
 SCM gdk_property_get_interp (GdkWindow *window, GdkAtom property, GdkAtom type,
 			     gulong offset, gulong length, int pdelete,
 			     GdkAtom *actual_property_type,