r3913 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: . bindings bindings/python libmokoui
chris at sita.openmoko.org
chris at sita.openmoko.org
Tue Jan 22 13:00:12 CET 2008
Author: chris
Date: 2008-01-22 13:00:10 +0100 (Tue, 22 Jan 2008)
New Revision: 3913
Added:
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
Modified:
trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
Log:
Patch by: Frank Li <frank.li at intel.com>
* Makefile.am:
* bindings/python/Makefile.am:
* bindings/python/moko.override:
* bindings/python/mokomodule.c: (initmoko):
* configure.ac:
* libmokoui/Makefile.am:
* libmokoui/moko-finger-scroll.c:
(moko_finger_scroll_mode_get_type):
Add python bindings for MokoFingerScroll
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog 2008-01-22 12:00:10 UTC (rev 3913)
@@ -1,10 +1,24 @@
-2008-01-04 Michael Lauer <mickey at openmoko.org>
+2008-01-22 Chris Lord <chris at openedhand.com>
- * bindings/vala/libmokoui2.vapi
- * bindings/vala/libmokoui2.deps
- * bindings/vala/Makefile.am
- * configure.ac
- * Makefile.am
+ Patch by: Frank Li <frank.li at intel.com>
+
+ * Makefile.am:
+ * bindings/python/Makefile.am:
+ * bindings/python/moko.override:
+ * bindings/python/mokomodule.c: (initmoko):
+ * configure.ac:
+ * libmokoui/Makefile.am:
+ * libmokoui/moko-finger-scroll.c:
+ (moko_finger_scroll_mode_get_type):
+ Add python bindings for MokoFingerScroll
+
+2008-01-04 Michael Lauer <mickey at openmoko.org>
+
+ * bindings/vala/libmokoui2.vapi:
+ * bindings/vala/libmokoui2.deps:
+ * bindings/vala/Makefile.am:
+ * configure.ac:
+ * Makefile.am:
Add Vala Bindings
2007-12-19 Chris Lord <chris at openedhand.com>
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/Makefile.am 2008-01-22 12:00:10 UTC (rev 3913)
@@ -1,4 +1,4 @@
-SUBDIRS = libmokoui bindings/vala doc
+SUBDIRS = libmokoui bindings/vala doc $(PYTHON_BIND_DIR)
pcdata_DATA= libmokoui2.pc
pcdatadir= $(libdir)/pkgconfig
Added: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am 2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,29 @@
+
+PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
+PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION}
+
+CLEANFILES =
+ moko.defs \
+ moko.c
+
+moko.defs: ../../libmokoui/moko-finger-scroll.h
+ python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > moko.defs
+
+moko.c: moko.defs moko.override
+ pygtk-codegen-2.0 --prefix moko \
+ --register $(PY_DEFS)/gdk-types.defs \
+ --register $(PY_DEFS)/gtk-types.defs \
+ --override moko.override \
+ moko.defs > $@
+
+pyexec_LTLIBRARIES =moko.la
+
+moko_la_SOURCES =moko.c mokomodule.c
+
+# set the include path found by configure
+INCLUDES= $(all_includes)
+
+AM_CPPFLAGS = $(PYTHON_INCLUDES) $(GTK_CFLAGS) $(PYGDK_CFLAGS) $(PYGOB_CFLAGS) -I../../libmokoui/
+
+# the library search path.
+moko_la_LDFLAGS =-module -avoid-version $(all_libraries) $(GTK_LIBS) $(PYGDK_LIBS) $(PYGOB_LIBS) ../../libmokoui/libmokoui2.la
Added: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override 2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,14 @@
+%%
+headers
+#include "pygobject.h"
+#include "moko-finger-scroll.h"
+#include "moko-type.h"
+%%
+modulename moko
+%%
+import gtk.EventBox as PyGtkEventBox_Type
+import gtk.Widget as PyGtkWidget_Type
+%%
+ignore-glob
+ *_get_type
+%%
Added: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c 2008-01-22 12:00:10 UTC (rev 3913)
@@ -0,0 +1,21 @@
+#include <pygobject.h>
+
+void moko_register_classes (PyObject *d);
+extern PyMethodDef moko_functions[];
+
+DL_EXPORT(void)
+initmoko(void)
+{
+ PyObject *m, *d;
+
+ init_pygobject ();
+
+ m = Py_InitModule ("moko", moko_functions);
+ d = PyModule_GetDict (m);
+
+ moko_register_classes (d);
+
+ if (PyErr_Occurred ()) {
+ Py_FatalError ("can't initialise module trayicon");
+ }
+}
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/configure.ac 2008-01-22 12:00:10 UTC (rev 3913)
@@ -21,6 +21,24 @@
# base deps
PKG_CHECK_MODULES(DEPS, gtk+-2.0)
+AC_ARG_ENABLE(python,
+ [ --enable-python enable python binding [default=yes]],
+ enable_python=$enableval,
+ enable_python=yes)
+
+if test $enable_python != no ; then
+ AM_PATH_PYTHON(2.3.5)
+ PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00)
+ AC_SUBST(PYGDK_CFLAGS)
+ AC_SUBST(PYGDK_LIBS)
+
+ PKG_CHECK_MODULES(PYGOB, pygobject-2.0 >= 2.11.0)
+ AC_SUBST(PYGOB_CFLAGS)
+ AC_SUBST(PYGOB_LIBS)
+ PYTHON_BIND_DIR=bindings/python
+ AC_SUBST(PYTHON_BIND_DIR)
+fi
+
if test x$MOKO_DEVEL = xon ; then
AC_MSG_NOTICE([removing -O2 from CFLAGS])
CFLAGS="-g -Wall"
@@ -33,6 +51,7 @@
GTK_DOC_CHECK([1.4])
+
# output stuff
AC_OUTPUT([
Makefile
@@ -42,6 +61,7 @@
doc/Makefile
doc/reference/Makefile
doc/reference/version.xml
+bindings/python/Makefile
])
echo "CFLAGS = $CFLAGS"
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/Makefile.am 2008-01-22 12:00:10 UTC (rev 3913)
@@ -2,13 +2,14 @@
moko-stock.h \
moko-finger-scroll.h \
moko-search-bar.h \
- moko-hint-entry.h
+ moko-hint-entry.h \
+ moko-type.h
source_c = \
moko-stock.c \
moko-finger-scroll.c \
moko-search-bar.c \
- moko-hint-entry.c
+ moko-hint-entry.c
DATADIR=$(datadir)
Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c 2008-01-22 09:45:32 UTC (rev 3912)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.c 2008-01-22 12:00:10 UTC (rev 3913)
@@ -973,3 +973,24 @@
gtk_container_add (GTK_CONTAINER (scroll), viewport);
}
+GType
+moko_finger_scroll_mode_get_type(void)
+{
+ static GType etype = 0;
+
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { MOKO_FINGER_SCROLL_MODE_PUSH,
+ "MOKO_FINGER_SCROLL_MODE_PUSH", "" },
+ { MOKO_FINGER_SCROLL_MODE_ACCEL,
+ "MOKO_FINGER_SCROLL_MODE_ACCEL", "" },
+ {0, NULL, NULL}
+ };
+
+ etype = g_flags_register_static (
+ g_intern_static_string ("MokoFingerScrollMode"),
+ values);
+ }
+
+ return etype;
+}
More information about the commitlog
mailing list
