add is-constructor-of arguments to some defs, and add fields to some

2001-07-03  James Henstridge  <james@daa.com.au>

	* pango.defs: add is-constructor-of arguments to some defs, and
	add fields to some object and boxed defs.

	* pango.override: add more overrides.

	* pango.defs: add more boxed type defs.

	* gtk/gtk.defs (dequeue_resize_handler): remove removed function.

	* codegen/override.py (Overrides.__parse_override): fix bug here.
	string.find returns negative value on error -- not zero.

	* codegen/argtypes.py (GTypeArg.write_param): fix up arg handler.

8 files changed, 105 insertions, 294 deletions

diff --git a/ChangeLog b/ChangeLog
index a4cc3bda..683619d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,18 @@
-2001-07-02  James Henstridge  <james@daa.com.au>
+2001-07-03  James Henstridge  <james@daa.com.au>
+
+	* pango.defs: add is-constructor-of arguments to some defs, and
+	add fields to some object and boxed defs.
+
+	* pango.override: add more overrides.
+
+	* pango.defs: add more boxed type defs.
+
+	* gtk/gtk.defs (dequeue_resize_handler): remove removed function.
+
+	* codegen/override.py (Overrides.__parse_override): fix bug here.
+	string.find returns negative value on error -- not zero.
+
+	* codegen/argtypes.py (GTypeArg.write_param): fix up arg handler.
 
 	* Makefile.am (pangomodule_la_SOURCES): fix up makefile rules to
 	build the pango module.
diff --git a/codegen/argtypes.py b/codegen/argtypes.py
index 49811a6f..77f2be61 100644
--- a/codegen/argtypes.py
+++ b/codegen/argtypes.py
@@ -441,7 +441,7 @@ class GTypeArg(ArgType):
             '        return NULL;\n'
     def write_param(self, ptype, pname, pdflt, pnull, varlist, parselist,
 		    extracode, arglist):
-        varlist.add(self.enumname, pname)
+        varlist.add('GType', pname)
 	varlist.add('PyObject', '*py_' + pname + ' = NULL')
 	parselist.append('&py_' + pname)
 	extracode.append(self.gtype % {'name': pname})
diff --git a/codegen/codegen.py b/codegen/codegen.py
index e85abfa6..b5f4113c 100644
--- a/codegen/codegen.py
+++ b/codegen/codegen.py
@@ -583,7 +583,7 @@ def write_boxed_getattr(parser, boxedobj, overrides, fp=sys.stdout):
                                                         'varlist': varlist,
                                                         'code': code }
         except:
-            sys.stderr.write("couldn't write check for " + objobj.c_name +
+            sys.stderr.write("couldn't write check for " + boxedobj.c_name +
                              '.' + fname + '\n')
 	    #traceback.print_exc()
     funcname = '_wrap_' + string.lower(uline) + '_getattr'
diff --git a/codegen/override.py b/codegen/override.py
index 2d5d0005..bfd581ac 100644
--- a/codegen/override.py
+++ b/codegen/override.py
@@ -23,7 +23,7 @@ class Overrides:
 	    self.__parse_override(buf)
     def __parse_override(self, buffer):
 	pos = string.find(buffer, '\n')
-	if pos:
+	if pos >= 0:
 	    line = buffer[:pos]
 	    rest = buffer[pos+1:]
 	else:
@@ -41,7 +41,7 @@ class Overrides:
 	    if 'kwargs' in words[1:]:
 		self.kwargs[func] = 1
 	    self.overrides[func] = rest
-        elif words[0] == 'override_attr':
+        elif words[0] == 'override-attr':
             attr = words[1]
             self.override_attrs[attr] = rest
         elif words[0] == 'headers':
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index 14e7657a..710d6c8b 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -3650,12 +3650,6 @@
   (parameter (type-and-name GtkWidget* child))
 )
 
-(method dequeue_resize_handler
-  (of-object Container (Gtk))
-  (c-name gtk_container_dequeue_resize_handler)
-  (return-type none)
-)
-
 
 
 ;; From /opt/gtk2/include/gtk-2.0/gtk/gtkctree.h
diff --git a/gtk/gtk.override b/gtk/gtk.override
index e1d9c23d..0e1f1790 100644
--- a/gtk/gtk.override
+++ b/gtk/gtk.override
@@ -796,7 +796,7 @@ _wrap_gdk_event_getattr(PyObject *self, char *attr)
     return NULL;
 }
 %%
-override_attr GdkDevice.axes
+override-attr GdkDevice.axes
 GdkDevice *device = GDK_DEVICE(self->obj);
 PyObject *ret;
 gint i;
@@ -809,7 +809,7 @@ for (i = 0; i < device->num_axes; i++)
 					  device->axes[i].max));
 return ret;
 %%
-override_attr GdkDevice.keys
+override-attr GdkDevice.keys
 GdkDevice *device = GDK_DEVICE(self->obj);
 PyObject *ret;
 gint i;
@@ -933,7 +933,7 @@ _wrap_gdk_device_get_axis(PyGObject *self, PyObject *args, PyObject *kwargs)
 %%
 ignore gtk_selection_data_copy gtk_selection_data_free
 %%
-override_attr GtkSelectionData.data
+override-attr GtkSelectionData.data
 if (pyg_boxed_get(self, GtkSelectionData)->length >= 0) {
     return PyString_FromStringAndSize(
 			pyg_boxed_get(self, GtkSelectionData)->data,
@@ -1625,7 +1625,7 @@ _wrap_gdk_drag_find_window(PyGObject *self, PyObject *args, PyObject *kwargs)
 			 protocol);
 }
 %%
-override_attr GdkDragContext.targets
+override-attr GdkDragContext.targets
 PyObject *atom, *ret = PyList_New(0);
 GList *tmp;
 if (ret == NULL)
diff --git a/pango.defs b/pango.defs
index 446ad9cb..ebc4086f 100644
--- a/pango.defs
+++ b/pango.defs
@@ -28,6 +28,13 @@
 
 ;; boxed definitions ...
 
+(boxed AttrList
+  (in-module Pango)
+  (c-name PangoAttrList)
+  (copy-func pango_attr_list_ref)
+  (release-func pango_attr_list_unref)
+)
+
 (boxed Color
   (in-module Pango)
   (c-name PangoColor)
@@ -38,11 +45,39 @@
   (field (type-and-name guint16 blue))
 )
 
-(boxed AttrList
+(boxed FontDescription
   (in-module Pango)
-  (c-name PangoAttrList)
-  (copy-func pango_attr_list_ref)
-  (release-func pango_attr_list_unref)
+  (c-name PangoFontDescription)
+  (copy-func pango_font_description_copy)
+  (release-func pango_font_description_free)
+  (field (type-and-name char* family_name))
+  (field (type-and-name PangoStyle style))
+  (field (type-and-name PangoVariant variant))
+  (field (type-and-name PangoWeight weight))
+  (field (type-and-name PangoStretch stretch))
+  (field (type-and-name int size))
+)
+
+(boxed GlyphString
+  (in-module Pango)
+  (c-name PangoGlyphString)
+  (copy-func pango_glyph_string_copy)
+  (release-func pango_glyph_string_free)
+  (field (type-and-name gint num_glyphs))
+  (field (type-and-name PangoGlyphInfo* glyphs))
+  (field (type-and-name gint* log_clusters))
+)
+
+(boxed Language
+  (in-module Pango)
+  (c-name PangoLanguage)
+)
+
+(boxed TabArray
+  (in-module Pango)
+  (c-name PangoTabArray)
+  (copy-func pango_tab_array_copy)
+  (release-func pango_tab_array_free)
 )
 
 
@@ -305,6 +340,7 @@
 (function pango_attr_list_new
   (c-name pango_attr_list_new)
   (return-type PangoAttrList*)
+  (is-constructor-of PangoAttrList)
 )
 
 (method ref
@@ -404,7 +440,7 @@
   (parameter (type-and-name GSList** extra_attrs))
 )
 
-(function pango_parse_markup
+(function parse_markup
   (c-name pango_parse_markup)
   (return-type gboolean)
   (parameter (type-and-name const-char* markup_text))
@@ -420,7 +456,7 @@
 
 ;; From /opt/gtk2/include/pango-1.0/pango/pango-break.h
 
-(function pango_break
+(function break
   (c-name pango_break)
   (return-type none)
   (parameter (type-and-name const-gchar* text))
@@ -429,7 +465,7 @@
   (parameter (type-and-name PangoLogAttr* attrs))
 )
 
-(function pango_find_paragraph_boundary
+(function find_paragraph_boundary
   (c-name pango_find_paragraph_boundary)
   (return-type none)
   (parameter (type-and-name const-gchar* text))
@@ -438,7 +474,7 @@
   (parameter (type-and-name gint* next_paragraph_start))
 )
 
-(function pango_get_log_attrs
+(function get_log_attrs
   (c-name pango_get_log_attrs)
   (return-type none)
   (parameter (type-and-name const-char* text))
@@ -448,7 +484,7 @@
   (parameter (type-and-name PangoLogAttr* log_attrs))
 )
 
-(function pango_default_break
+(function default_break
   (c-name pango_default_break)
   (return-type none)
   (parameter (type-and-name const-gchar* text))
@@ -464,6 +500,7 @@
 (function pango_context_new
   (c-name pango_context_new)
   (return-type PangoContext*)
+  (is-constructor-of PangoContext)
 )
 
 (method add_font_map
@@ -545,10 +582,10 @@
   (return-type PangoDirection)
 )
 
-(function pango_itemize
+(method itemize
+  (of-object Context (Pango))
   (c-name pango_itemize)
   (return-type GList*)
-  (parameter (type-and-name PangoContext* context))
   (parameter (type-and-name const-char* text))
   (parameter (type-and-name int start_index))
   (parameter (type-and-name int length))
@@ -558,142 +595,6 @@
 
 
 
-;; From /opt/gtk2/include/pango-1.0/pango/pango-coverage.h
-
-(method ref
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_ref)
-  (return-type PangoCoverage*)
-)
-
-(method unref
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_unref)
-  (return-type none)
-)
-
-(method copy
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_copy)
-  (return-type PangoCoverage*)
-)
-
-(method get
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_get)
-  (return-type PangoCoverageLevel)
-  (parameter (type-and-name int index))
-)
-
-(method set
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_set)
-  (return-type none)
-  (parameter (type-and-name int index))
-  (parameter (type-and-name PangoCoverageLevel level))
-)
-
-(method max
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_max)
-  (return-type none)
-  (parameter (type-and-name PangoCoverage* other))
-)
-
-(method to_bytes
-  (of-object Coverage (Pango))
-  (c-name pango_coverage_to_bytes)
-  (return-type none)
-  (parameter (type-and-name guchar** bytes))
-  (parameter (type-and-name int* n_bytes))
-)
-
-(function pango_coverage_from_bytes
-  (c-name pango_coverage_from_bytes)
-  (return-type PangoCoverage*)
-  (parameter (type-and-name guchar* bytes))
-  (parameter (type-and-name int n_bytes))
-)
-
-
-
-;; From /opt/gtk2/include/pango-1.0/pango/pango-engine.h
-
-(function script_engine_list
-  (c-name script_engine_list)
-  (return-type none)
-  (parameter (type-and-name PangoEngineInfo** engines))
-  (parameter (type-and-name int* n_engines))
-)
-
-(function script_engine_load
-  (c-name script_engine_load)
-  (return-type PangoEngine*)
-  (parameter (type-and-name const-char* id))
-)
-
-(function script_engine_unload
-  (c-name script_engine_unload)
-  (return-type none)
-  (parameter (type-and-name PangoEngine* engine))
-)
-
-
-
-;; From /opt/gtk2/include/pango-1.0/pango/pango-enum-types.h
-
-(function pango_underline_get_type
-  (c-name pango_underline_get_type)
-  (return-type GType)
-)
-
-(function pango_coverage_level_get_type
-  (c-name pango_coverage_level_get_type)
-  (return-type GType)
-)
-
-(function pango_style_get_type
-  (c-name pango_style_get_type)
-  (return-type GType)
-)
-
-(function pango_variant_get_type
-  (c-name pango_variant_get_type)
-  (return-type GType)
-)
-
-(function pango_weight_get_type
-  (c-name pango_weight_get_type)
-  (return-type GType)
-)
-
-(function pango_stretch_get_type
-  (c-name pango_stretch_get_type)
-  (return-type GType)
-)
-
-(function pango_alignment_get_type
-  (c-name pango_alignment_get_type)
-  (return-type GType)
-)
-
-(function pango_wrap_mode_get_type
-  (c-name pango_wrap_mode_get_type)
-  (return-type GType)
-)
-
-(function pango_tab_align_get_type
-  (c-name pango_tab_align_get_type)
-  (return-type GType)
-)
-
-(function pango_direction_get_type
-  (c-name pango_direction_get_type)
-  (return-type GType)
-)
-
-
-
 ;; From /opt/gtk2/include/pango-1.0/pango/pango-font.h
 
 (method copy
@@ -724,6 +625,7 @@
 
 (function pango_font_description_from_string
   (c-name pango_font_description_from_string)
+  (is-constructor-of PangoFontDescription)
   (return-type PangoFontDescription*)
   (parameter (type-and-name const-char* str))
 )
@@ -829,6 +731,7 @@
 
 (function pango_glyph_string_new
   (c-name pango_glyph_string_new)
+  (is-constructor-of PangoGlyphString)
   (return-type PangoGlyphString*)
 )
 
@@ -839,6 +742,12 @@
   (parameter (type-and-name gint new_len))
 )
 
+(method copy
+  (of-object GlyphString (Pango))
+  (c-name pango_glyph_string_copy)
+  (return-type PangoGlyphString*)
+)
+
 (method free
   (of-object GlyphString (Pango))
   (c-name pango_glyph_string_free)
@@ -899,7 +808,7 @@
   (parameter (type-and-name int* trailing))
 )
 
-(function pango_shape
+(function shape
   (c-name pango_shape)
   (return-type none)
   (parameter (type-and-name const-gchar* text))
@@ -908,7 +817,7 @@
   (parameter (type-and-name PangoGlyphString* glyphs))
 )
 
-(function pango_reorder_items
+(function reorder_items
   (c-name pango_reorder_items)
   (return-type GList*)
   (parameter (type-and-name GList* logical_items))
@@ -918,7 +827,7 @@
 
 ;; From /opt/gtk2/include/pango-1.0/pango/pango-indic.h
 
-(function pango_indic_shift_vowels
+(function indic_shift_vowels
   (c-name pango_indic_shift_vowels)
   (return-type none)
   (parameter (type-and-name PangoIndicScript* script))
@@ -926,7 +835,7 @@
   (parameter (type-and-name gunichar* end))
 )
 
-(function pango_indic_compact
+(function indic_compact
   (c-name pango_indic_compact)
   (return-type none)
   (parameter (type-and-name PangoIndicScript* script))
@@ -935,7 +844,7 @@
   (parameter (type-and-name int* cluster))
 )
 
-(function pango_indic_convert_vowels
+(function indic_convert_vowels
   (c-name pango_indic_convert_vowels)
   (return-type none)
   (parameter (type-and-name PangoIndicScript* script))
@@ -945,7 +854,7 @@
   (parameter (type-and-name gboolean has_standalone_vowels))
 )
 
-(function pango_indic_split_out_characters
+(function indic_split_out_characters
   (c-name pango_indic_split_out_characters)
   (return-type none)
   (parameter (type-and-name PangoIndicScript* script))
@@ -958,35 +867,6 @@
 
 
 
-;; From /opt/gtk2/include/pango-1.0/pango/pango-item.h
-
-(function pango_item_new
-  (c-name pango_item_new)
-  (return-type PangoItem*)
-)
-
-(method copy
-  (of-object Item (Pango))
-  (c-name pango_item_copy)
-  (return-type PangoItem*)
-)
-
-(method free
-  (of-object Item (Pango))
-  (c-name pango_item_free)
-  (return-type none)
-)
-
-(method split
-  (of-object Item (Pango))
-  (c-name pango_item_split)
-  (return-type PangoItem*)
-  (parameter (type-and-name int split_index))
-  (parameter (type-and-name int split_offset))
-)
-
-
-
 ;; From /opt/gtk2/include/pango-1.0/pango/pango-layout.h
 
 (function pango_layout_get_type
@@ -996,6 +876,7 @@
 
 (function pango_layout_new
   (c-name pango_layout_new)
+  (is-constructor-of PangoLayout)
   (return-type PangoLayout*)
   (parameter (type-and-name PangoContext* context))
 )
@@ -1473,6 +1354,7 @@
 
 (function pango_tab_array_new_with_positions
   (c-name pango_tab_array_new_with_positions)
+  (is-constructor-of PangoTabArray)
   (return-type PangoTabArray*)
   (parameter (type-and-name gint size))
   (parameter (type-and-name gboolean positions_in_pixels))
@@ -1550,100 +1432,3 @@
 )
 
 
-
-;; From /opt/gtk2/include/pango-1.0/pango/pango-utils.h
-
-(function pango_split_file_list
-  (c-name pango_split_file_list)
-  (return-type char**)
-  (parameter (type-and-name const-char* str))
-)
-
-(function pango_read_line
-  (c-name pango_read_line)
-  (return-type gint)
-  (parameter (type-and-name FILE* stream))
-  (parameter (type-and-name GString* str))
-)
-
-(function pango_skip_space
-  (c-name pango_skip_space)
-  (return-type gboolean)
-  (parameter (type-and-name const-char** pos))
-)
-
-(function pango_scan_word
-  (c-name pango_scan_word)
-  (return-type gboolean)
-  (parameter (type-and-name const-char** pos))
-  (parameter (type-and-name GString* out))
-)
-
-(function pango_scan_string
-  (c-name pango_scan_string)
-  (return-type gboolean)
-  (parameter (type-and-name const-char** pos))
-  (parameter (type-and-name GString* out))
-)
-
-(function pango_scan_int
-  (c-name pango_scan_int)
-  (return-type gboolean)
-  (parameter (type-and-name const-char** pos))
-  (parameter (type-and-name int* out))
-)
-
-(function pango_config_key_get
-  (c-name pango_config_key_get)
-  (return-type char*)
-  (parameter (type-and-name const-char* key))
-)
-
-(function pango_parse_style
-  (c-name pango_parse_style)
-  (return-type gboolean)
-  (parameter (type-and-name const-char* str))
-  (parameter (type-and-name PangoFontDescription* desc))
-  (parameter (type-and-name gboolean warn))
-)
-
-(function pango_parse_variant
-  (c-name pango_parse_variant)
-  (return-type gboolean)
-  (parameter (type-and-name const-char* str))
-  (parameter (type-and-name PangoFontDescription* desc))
-  (parameter (type-and-name gboolean warn))
-)
-
-(function pango_parse_weight
-  (c-name pango_parse_weight)
-  (return-type gboolean)
-  (parameter (type-and-name const-char* str))
-  (parameter (type-and-name PangoFontDescription* desc))
-  (parameter (type-and-name gboolean warn))
-)
-
-(function pango_parse_stretch
-  (c-name pango_parse_stretch)
-  (return-type gboolean)
-  (parameter (type-and-name const-char* str))
-  (parameter (type-and-name PangoFontDescription* desc))
-  (parameter (type-and-name gboolean warn))
-)
-
-(function pango_log2vis_get_embedding_levels
-  (c-name pango_log2vis_get_embedding_levels)
-  (return-type gboolean)
-  (parameter (type-and-name gunichar* str))
-  (parameter (type-and-name int len))
-  (parameter (type-and-name PangoDirection* pbase_dir))
-  (parameter (type-and-name guint8* embedding_level_list))
-)
-
-(function pango_get_mirror_char
-  (c-name pango_get_mirror_char)
-  (return-type gboolean)
-  (parameter (type-and-name gunichar ch))
-  (parameter (type-and-name gunichar* mirrored_ch))
-)
-
diff --git a/pango.override b/pango.override
index e1bda477..67779cbc 100644
--- a/pango.override
+++ b/pango.override
@@ -23,3 +23,21 @@ init
         return;
     }
 }
+%%
+ignore-glob *_get_type
+%%
+ignore
+  pango_color_copy
+  pango_color_free
+  pango_attribute_copy
+  pango_attribute_destroy
+  pango_attribute_equal
+  pango_attr_list_ref
+  pango_attr_list_unref
+  pango_font_description_copy
+  pango_font_description_equal
+  pango_font_description_free
+  pango_font_descriptions_free
+  pango_font_map_free_families
+  pango_glyph_string_free
+  pango_tab_array_free