diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | pango.defs | 57 | ||||
| -rw-r--r-- | pango.override | 80 |
3 files changed, 148 insertions, 0 deletions
@@ -1,5 +1,16 @@ 2006-07-06 John Finlay <finlay@moeraki.com> + * pango.override (_wrap_pango_attr_underline_color_new) + (_wrap_pango_attr_strikethrough_color_new) + (_wrap_pango_attr_size_new_absolute) + (_wrap_pango_attr_letter_spacing_new): Add. + + * pango.defs (AttrSizeAbsolute, AttrUnderlineColor) + (AttrStrikethroughColor, AttrLetterSpacing) + (pango_font_description_set_absolute_size) + (pango_font_description_get_size_is_absolute) + (pango_font_get_font_map): Add. + * gtk/gtk.override (_wrap_gtk_color_selection_palette_to_string): Allow colors to be a sequence. @@ -192,6 +192,42 @@ ) ) +(define-function AttrSizeAbsolute + (c-name "pango_attr_size_new_absolute") + (return-type "PangoAttribute*") + (parameters + '("int" "size") + ) +) + +(define-function AttrUnderlineColor + (c-name "pango_attr_underline_color_new") + (return-type "PangoAttribute*") + (parameters + '("guint16" "red") + '("guint16" "green") + '("guint16" "blue") + ) +) + +(define-function AttrStrikethroughColor + (c-name "pango_attr_strikethrough_color_new") + (return-type "PangoAttribute*") + (parameters + '("guint16" "red") + '("guint16" "green") + '("guint16" "blue") + ) +) + +(define-function AttrLetterSpacing + (c-name "pango_attr_letter_spacing_new") + (return-type "PangoAttribute*") + (parameters + '("int" "letter_spacing") + ) +) + (define-function pango_attr_list_get_type (c-name "pango_attr_list_get_type") (return-type "GType") @@ -785,6 +821,21 @@ (return-type "char*") ) +(define-method set_absolute_size + (of-object "PangoFontDescription") + (c-name "pango_font_description_set_absolute_size") + (return-type "none") + (parameters + '("double" "size") + ) +) + +(define-method get_size_is_absolute + (of-object "PangoFontDescription") + (c-name "pango_font_description_get_size_is_absolute") + (return-type "gboolean") +) + (define-function pango_font_metrics_get_type (c-name "pango_font_metrics_get_type") (return-type "GType") @@ -960,6 +1011,12 @@ ) ) +(define-method get_font_map + (of-object "PangoFont") + (c-name "pango_font_get_font_map") + (return-type "PangoFontMap*") +) + ;; From /opt/gtk2/include/pango-1.0/pango/pango-fontmap.h diff --git a/pango.override b/pango.override index ae91348e..f56c6fcb 100644 --- a/pango.override +++ b/pango.override @@ -204,6 +204,8 @@ pypango_attr_tp_getattr(PyPangoAttribute *self, char *attr) case PANGO_ATTR_STRIKETHROUGH: case PANGO_ATTR_RISE: case PANGO_ATTR_FALLBACK: + case PANGO_ATTR_LETTER_SPACING: + case PANGO_ATTR_ABSOLUTE_SIZE: if (!strcmp(attr, "__members__")) return Py_BuildValue("[s]", "value"); if (!strcmp(attr, "value")) @@ -219,6 +221,8 @@ pypango_attr_tp_getattr(PyPangoAttribute *self, char *attr) break; case PANGO_ATTR_FOREGROUND: case PANGO_ATTR_BACKGROUND: + case PANGO_ATTR_UNDERLINE_COLOR: + case PANGO_ATTR_STRIKETHROUGH_COLOR: if (!strcmp(attr, "__members__")) return Py_BuildValue("[s]", "color"); if (!strcmp(attr, "color")) @@ -1947,3 +1951,79 @@ _wrap_pango_layout_line__get_runs(PyGObject *self, void *closure) } return list; } +%% +override pango_attr_underline_color_new kwargs +static PyObject * +_wrap_pango_attr_underline_color_new(PyObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "red", "green", "blue", "start_index", + "end_index", NULL }; + guint16 red, green, blue; + guint start = 0, end = 1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "HHH|ii:PangoAttrUnderlineColor", + kwlist, &red, &green, &blue, + &start, &end)) + return NULL; + + return pypango_attr_new(pango_attr_underline_color_new(red, green, blue), + start, end); +} +%% +override pango_attr_strikethrough_color_new kwargs +static PyObject * +_wrap_pango_attr_strikethrough_color_new(PyObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "red", "green", "blue", "start_index", + "end_index", NULL }; + guint16 red, green, blue; + guint start = 0, end = 1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "HHH|ii:PangoAttrStrikethroughColor", + kwlist, &red, &green, &blue, + &start, &end)) + return NULL; + + return pypango_attr_new(pango_attr_strikethrough_color_new(red, green, blue), + start, end); +} +%% +override pango_attr_size_new_absolute kwargs +static PyObject * +_wrap_pango_attr_size_new_absolute(PyObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "size", "start_index", "end_index", NULL }; + int size; + guint start = 0, end = 1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "i|ii:PangoAttrSizeAbsolute", + kwlist, &size, &start, &end)) + return NULL; + + return pypango_attr_new(pango_attr_size_new_absolute(size), start, end); +} +%% +override pango_attr_letter_spacing_new kwargs +static PyObject * +_wrap_pango_attr_letter_spacing_new(PyObject *self, PyObject *args, + PyObject *kwargs) +{ + static char *kwlist[] = { "letter_spacing", "start_index", "end_index", + NULL }; + int spacing; + guint start = 0, end = 1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + "i|ii:PangoAttrLetterSpacing", + kwlist, &spacing, &start, &end)) + return NULL; + + return pypango_attr_new(pango_attr_letter_spacing_new(spacing), + start, end); +} |