Changeset 18ea7d7259915b78d46dd59a412d35e63e315e14

Timestamp:

06/15/08 21:19:42 (4 years ago)

Author:

Lincoln de Sousa <lincoln@…>

Children:

34f52bf2edf0226b779ae8c1da93df18c630233e

Parents:

d7a910bbab81afc09b29d2245dba8c93a7d80c0b

git-committer:

Lincoln de Sousa <lincoln@…> (06/15/08 21:19:42)

Message:

Improving cellrenderer binding by making some function
names more pythonic and adding a new overriden function (accelerator_parse_virtual)

Files:

• ChangeLog (modified) (1 diff)
• src/eggcellrendererkeys/cellrendererkeys.defs (modified) (2 diffs)
• src/eggcellrendererkeys/cellrendererkeys.override (modified) (1 diff)

ChangeLog

@@ +1 @@
+2008-06-15  Lincoln de Sousa  <lincoln@minaslivre.org>
+
+        * src/eggcellrendererkeys/cellrendererkeys.override: Overriding
+        egg_accelerator_parse_virtual function to make it pythonic.
+
+        * src/eggcellrendererkeys/cellrendererkeys.defs: Renaming
+        virtual_accelerator_label to accelerator_label and
+        virtual_accelerator_name to accelerator_name. Adding
+        accelerator_parse_virtual definition.
+
 2008-06-15  Lincoln de Sousa  <lincoln@minaslivre.org>
 

src/eggcellrendererkeys/cellrendererkeys.defs

@@ -88 +88 @@
 ;; From eggaccelerators.h
 
-(define-function virtual_accelerator_name
+(define-function accelerator_parse_virtual
+  (c-name "egg_accelerator_parse_virtual")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "accelerator")
+    '("guint*" "accelerator_key")
+    '("guint*" "keycode")
+    '("EggVirtualModifierType*" "accelerator_mods")
+  )
+)
+
+(define-function accelerator_name
   (c-name "egg_virtual_accelerator_name")
   (return-type "gchar*")
@@ -98 +109 @@
 )
 
-(define-function virtual_accelerator_label
+(define-function accelerator_label
   (c-name "egg_virtual_accelerator_label")
   (return-type "gchar*")

src/eggcellrendererkeys/cellrendererkeys.override

@@ -13 +13 @@
 *_get_type
 %%
+override egg_accelerator_parse_virtual args
+static PyObject *
+_wrap_egg_accelerator_parse_virtual (PyObject *self, PyObject *fargs)
+{
+    PyObject *ret;
+    gchar *accelerator;
+    gint keyval, keycode;
+    EggVirtualModifierType mask;
+
+    if (!PyArg_ParseTuple (fargs, "s", &accelerator))
+        return NULL;
+
+    if (!egg_accelerator_parse_virtual (accelerator, &keyval, &keycode, &mask))
+        g_warning ("Some thing wrong occourred when parsing accelerator.");
+
+    ret = PyTuple_New (3);
+
+    PyTuple_SetItem (ret, 0, PyInt_FromLong (keyval));
+    PyTuple_SetItem (ret, 1, PyInt_FromLong (keycode));
+    PyTuple_SetItem (ret, 2, PyInt_FromLong (mask));
+
+    return ret;
+}
+%%