[Galago-commits] r2608 - in trunk/galago-gtk-python: . src
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Fri Mar 17 00:57:05 PST 2006
Author: chipx86
Date: 2006-03-17 00:57:03 -0800 (Fri, 17 Mar 2006)
New Revision: 2608
Added:
trunk/galago-gtk-python/src/galago-gdk.defs
trunk/galago-gtk-python/src/galago-gdk.override
trunk/galago-gtk-python/src/galago-gdkmodule.c
Modified:
trunk/galago-gtk-python/ChangeLog
trunk/galago-gtk-python/src/
trunk/galago-gtk-python/src/Makefile.am
trunk/galago-gtk-python/src/galago-gtk.defs
Log:
Split off the gdk functions into galago.gdk.
Modified: trunk/galago-gtk-python/ChangeLog
===================================================================
--- trunk/galago-gtk-python/ChangeLog 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/ChangeLog 2006-03-17 08:57:03 UTC (rev 2608)
@@ -1,3 +1,12 @@
+Fri Mar 17 00:56:49 PST 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ A src/galago-gdk.defs:
+ A src/galago-gdkmodule.c:
+ A src/galago-gdk.override:
+ * src/galago-gtk.defs:
+ * src/Makefile.am:
+ - Split off the gdk functions into galago.gdk.
+
Fri Mar 17 00:29:40 PST 2006 Christian Hammond <chipx86 at chipx86.com>
* src/galago-gtk.override:
Property changes on: trunk/galago-gtk-python/src
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
galago-gtk.c
.libs
.deps
.*.swp
*.lo*
+ Makefile
Makefile.in
galago-gdk.c
galago-gtk.c
.libs
.deps
.*.swp
*.lo*
Modified: trunk/galago-gtk-python/src/Makefile.am
===================================================================
--- trunk/galago-gtk-python/src/Makefile.am 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/src/Makefile.am 2006-03-17 08:57:03 UTC (rev 2608)
@@ -1,5 +1,5 @@
defsdir = $(datadir)/pygtk/2.0/defs
-defs_DATA = galago-gtk.defs
+defs_DATA = galago-gtk.defs galago-gdk.defs
INCLUDES = \
-DG_LOG_DOMAIN=\"galago-gtk-python\" \
@@ -11,16 +11,22 @@
pkgpythondir = $(pyexecdir)/gtk-2.0
pkgpyexecdir = $(pyexecdir)/gtk-2.0
-pkgpyexec_LTLIBRARIES = galago-gtk.la
+pkgpyexec_LTLIBRARIES = galago-gtk.la galago-gdk.la
+
galago_gtk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgalago_gtk
galago_gtk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
galago_gtk_la_SOURCES = galago-gtkmodule.c galago-gtk.c
-CLEANFILES = galago-gtk.c
-EXTRA_DIST = galago-gtk.override $(defs_DATA)
+galago_gdk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgalago_gdk
+galago_gdk_la_LIBADD = $(GALAGO_GTK_PYTHON_LIBS)
+galago_gdk_la_SOURCES = galago-gdkmodule.c galago-gdk.c
+
+CLEANFILES = galago-gtk.c galago-gdk.c
+EXTRA_DIST = galago-gtk.override galago-gdk.override $(defs_DATA)
galago-gtk.c: $(defs_DATA) galago-gtk.override
+galago-gdk.c: $(defs_DATA) galago-gdk.override
-%.c: %.defs
+galago-gtk.c: galago-gtk.defs
(cd $(srcdir) \
&& $(PYGTK_CODEGEN) \
--register $(PYGTK_DEFSDIR)/gdk-types.defs \
@@ -31,10 +37,24 @@
&& cp gen-$*.c $*.c \
&& rm -f gen-$*.c
-DEFHEADERS = $(wildcard $(includedir)/libgalago-gtk/*.h)
+galago-gdk.c: galago-gdk.defs
+ (cd $(srcdir) \
+ && $(PYGTK_CODEGEN) \
+ --register $(PYGTK_DEFSDIR)/gdk-types.defs \
+ --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+ --register $(PYGTK_DEFSDIR)/galago.defs \
+ --register galago-gtk.defs \
+ --override $*.override \
+ --prefix pygalago_gdk $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
+ && rm -f gen-$*.c
-update-defs:
- python $(datadir)/pygtk/2.0/codegen/h2def.py $(DEFHEADERS) > galago-gtk.defs.tmp \
+GDK_DEFHEADERS = $(wildcard $(includedir)/libgalago-gtk/galago-gdk-*.h)
+GTK_DEFHEADERS = $(filter-out $(GDK_DEFHEADERS), \
+ $(wildcard $(includedir)/libgalago-gtk/*.h))
+
+update-gtk-defs:
+ python $(datadir)/pygtk/2.0/codegen/h2def.py $(GTK_DEFHEADERS) > galago-gtk.defs.tmp \
&& sed -i \
-e 's/"const-Galago/"Galago/g' \
-e 's/\(define-\(object\|method\|enum\)\) Gtk/\1 /g' \
@@ -45,5 +65,20 @@
python $(datadir)/pygtk/2.0/codegen/mergedefs.py \
galago-gtk.defs.tmp galago-gtk.defs; \
fi) \
- && mv galago-gtk.defs.tmp galago-gtk.defs \
- && echo Definitions updated
+ && mv galago-gtk.defs.tmp galago-gtk.defs
+
+update-gdk-defs:
+ python $(datadir)/pygtk/2.0/codegen/h2def.py $(GDK_DEFHEADERS) > galago-gdk.defs.tmp \
+ && sed -i \
+ -e 's/function galago_gdk_/function /g' \
+ -e 's/in-module "Galago"/in-module "GalagoGdk"/g' \
+ -e 's/"const-Galago/"Galago/g' \
+ galago-gdk.defs.tmp \
+ && (if test 1 -eq 2 -a -e galago-gdk.defs; then \
+ python $(datadir)/pygtk/2.0/codegen/mergedefs.py \
+ galago-gdk.defs.tmp galago-gdk.defs; \
+ fi) \
+ && mv galago-gdk.defs.tmp galago-gdk.defs
+
+update-defs: update-gtk-defs update-gdk-defs
+ @echo Definitions updated
Added: trunk/galago-gtk-python/src/galago-gdk.defs
===================================================================
--- trunk/galago-gtk-python/src/galago-gdk.defs 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/src/galago-gdk.defs 2006-03-17 08:57:03 UTC (rev 2608)
@@ -0,0 +1,116 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From /usr/include/libgalago-gtk/galago-gdk-pixbuf.h
+
+(define-function pixbuf_new_generic
+ (c-name "galago_gdk_pixbuf_new_generic")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-function pixbuf_new_from_image
+ (c-name "galago_gdk_pixbuf_new_from_image")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoImage*" "image")
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-function pixbuf_new_from_image_with_size
+ (c-name "galago_gdk_pixbuf_new_from_image_with_size")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoImage*" "image")
+ '("GtkIconSize" "size")
+ )
+)
+
+(define-function pixbuf_new_from_service
+ (c-name "galago_gdk_pixbuf_new_from_service")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoService*" "service")
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-function pixbuf_new_from_service_with_size
+ (c-name "galago_gdk_pixbuf_new_from_service_with_size")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoService*" "service")
+ '("GtkIconSize" "size")
+ )
+)
+
+(define-function pixbuf_new_from_account
+ (c-name "galago_gdk_pixbuf_new_from_account")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoAccount*" "account")
+ '("int" "width")
+ '("int" "height")
+ )
+)
+
+(define-function pixbuf_new_from_account_with_size
+ (c-name "galago_gdk_pixbuf_new_from_account_with_size")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoAccount*" "account")
+ '("GtkIconSize" "size")
+ )
+)
+
+(define-function pixbuf_new_from_presence
+ (c-name "galago_gdk_pixbuf_new_from_presence")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoPresence*" "presence")
+ '("int" "width")
+ '("int" "height")
+ '("GalagoGtkIconPrecedence" "precedence")
+ )
+)
+
+(define-function pixbuf_new_from_presence_with_size
+ (c-name "galago_gdk_pixbuf_new_from_presence_with_size")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoPresence*" "presence")
+ '("GtkIconSize" "size")
+ '("GalagoGtkIconPrecedence" "precedence")
+ )
+)
+
+(define-function pixbuf_new_from_person
+ (c-name "galago_gdk_pixbuf_new_from_person")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoPerson*" "person")
+ '("int" "width")
+ '("int" "height")
+ '("GalagoGtkIconPrecedence" "precedence")
+ )
+)
+
+(define-function pixbuf_new_from_person_with_size
+ (c-name "galago_gdk_pixbuf_new_from_person_with_size")
+ (return-type "GdkPixbuf*")
+ (parameters
+ '("GalagoPerson*" "person")
+ '("GtkIconSize" "size")
+ '("GalagoGtkIconPrecedence" "precedence")
+ )
+)
+
+
Added: trunk/galago-gtk-python/src/galago-gdk.override
===================================================================
--- trunk/galago-gtk-python/src/galago-gdk.override 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/src/galago-gdk.override 2006-03-17 08:57:03 UTC (rev 2608)
@@ -0,0 +1,15 @@
+%%
+headers
+#include <Python.h>
+#include <libgalago-gtk/galago-gtk.h>
+#include "pygobject.h"
+%%
+modulename galago.gdk
+%%
+import galago.Account as PyGalagoAccount_Type
+import galago.Image as PyGalagoImage_Type
+import galago.Person as PyGalagoPerson_Type
+import galago.Presence as PyGalagoPresence_Type
+import galago.Service as PyGalagoService_Type
+%%
+// vim: ft=c
Added: trunk/galago-gtk-python/src/galago-gdkmodule.c
===================================================================
--- trunk/galago-gtk-python/src/galago-gdkmodule.c 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/src/galago-gdkmodule.c 2006-03-17 08:57:03 UTC (rev 2608)
@@ -0,0 +1,22 @@
+#include <pygobject.h>
+
+void pygalago_gdk_register_classes(PyObject *d);
+extern PyMethodDef pygalago_gdk_functions[];
+
+DL_EXPORT(void)
+initgalago_gdk(void)
+{
+ PyObject *m, *d;
+
+ init_pygobject();
+
+ m = Py_InitModule("galago.gdk", pygalago_gdk_functions);
+ d = PyModule_GetDict(m);
+
+ pygalago_gdk_register_classes(d);
+ pygalago_gdk_add_constants(m, "GALAGO_GDK_");
+
+ if (PyErr_Occurred()) {
+ Py_FatalError("can't initialize module galago-gdk");
+ }
+}
Modified: trunk/galago-gtk-python/src/galago-gtk.defs
===================================================================
--- trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-17 08:30:09 UTC (rev 2607)
+++ trunk/galago-gtk-python/src/galago-gtk.defs 2006-03-17 08:57:03 UTC (rev 2608)
@@ -153,118 +153,6 @@
)
-;; From /usr/include/libgalago-gtk/galago-gdk-pixbuf.h
-
-(define-function galago_gdk_pixbuf_new_generic
- (c-name "galago_gdk_pixbuf_new_generic")
- (return-type "GdkPixbuf*")
- (parameters
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_image
- (c-name "galago_gdk_pixbuf_new_from_image")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoImage*" "image")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_image_with_size
- (c-name "galago_gdk_pixbuf_new_from_image_with_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoImage*" "image")
- '("GtkIconSize" "size")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_service
- (c-name "galago_gdk_pixbuf_new_from_service")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoService*" "service")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_service_with_size
- (c-name "galago_gdk_pixbuf_new_from_service_with_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoService*" "service")
- '("GtkIconSize" "size")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_account
- (c-name "galago_gdk_pixbuf_new_from_account")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoAccount*" "account")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_account_with_size
- (c-name "galago_gdk_pixbuf_new_from_account_with_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoAccount*" "account")
- '("GtkIconSize" "size")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_presence
- (c-name "galago_gdk_pixbuf_new_from_presence")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoPresence*" "presence")
- '("int" "width")
- '("int" "height")
- '("GalagoGtkIconPrecedence" "precedence")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_presence_with_size
- (c-name "galago_gdk_pixbuf_new_from_presence_with_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoPresence*" "presence")
- '("GtkIconSize" "size")
- '("GalagoGtkIconPrecedence" "precedence")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_person
- (c-name "galago_gdk_pixbuf_new_from_person")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoPerson*" "person")
- '("int" "width")
- '("int" "height")
- '("GalagoGtkIconPrecedence" "precedence")
- )
-)
-
-(define-function galago_gdk_pixbuf_new_from_person_with_size
- (c-name "galago_gdk_pixbuf_new_from_person_with_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("GalagoPerson*" "person")
- '("GtkIconSize" "size")
- '("GalagoGtkIconPrecedence" "precedence")
- )
-)
-
-
-
;; From /usr/include/libgalago-gtk/galago-gtk-account-combo-box.h
(define-function galago_gtk_account_combo_box_get_type
More information about the galago-commits
mailing list