Author: tack
Date: Tue Sep 26 02:23:07 2006
New Revision: 1902
Modified:
trunk/evas/src/__init__.py
trunk/evas/src/image.c
trunk/evas/src/object.c
trunk/evas/src/text.c
Log:
Support for new render_op stuff in evas. Requires recent cvs of evas; render
ops (other than the default, RENDER_BLEND) do not work with xgl engine.
Modified: trunk/evas/src/__init__.py
==============================================================================
--- trunk/evas/src/__init__.py (original)
+++ trunk/evas/src/__init__.py Tue Sep 26 02:23:07 2006
@@ -11,6 +11,19 @@
PIXEL_FORMAT_ARGB32 = 1
PIXEL_FORMAT_YUV420P_601 = 2
+RENDER_BLEND = 0
+RENDER_BLEND_REL = 1
+RENDER_COPY = 2
+RENDER_COPY_REL = 3
+RENDER_ADD = 4
+RENDER_ADD_REL = 5
+RENDER_SUB = 6
+RENDER_SUB_REL = 7
+RENDER_TINT = 8
+RENDER_TINT_REL = 9
+RENDER_MASK = 10
+RENDER_MUL = 11
+
# Evas doesn't seem to use anything but NONE or GENERIC yet.
LOAD_ERROR_NONE = 0
LOAD_ERROR_GENERIC = 1
@@ -176,6 +189,11 @@
def stack_below(self, below):
self._object.stack_above(below._object)
+ def render_op_set(self, op):
+ self._object.render_op_set(op)
+
+ def render_op_get(self):
+ return self._object.render_op_get()
class Rectangle(Object):
Modified: trunk/evas/src/image.c
==============================================================================
--- trunk/evas/src/image.c (original)
+++ trunk/evas/src/image.c Tue Sep 26 02:23:07 2006
@@ -22,7 +22,7 @@
PyObject *
Evas_Object_PyObject_image_file_get(Evas_Object_PyObject * self, PyObject *
args)
{
- char *filename;
+ const char *filename;
BENCH_START
evas_object_image_file_get(self->object, &filename, NULL);
Modified: trunk/evas/src/object.c
==============================================================================
--- trunk/evas/src/object.c (original)
+++ trunk/evas/src/object.c Tue Sep 26 02:23:07 2006
@@ -375,6 +375,31 @@
}
PyObject *
+Evas_Object_PyObject_render_op_set(Evas_Object_PyObject * self, PyObject *
args)
+{
+ int op;
+
+ if (!PyArg_ParseTuple(args, "i", &op))
+ return NULL;
+
+ BENCH_START
+ evas_object_render_op_set(self->object, op);
+ BENCH_END
+ return Py_INCREF(Py_None), Py_None;
+}
+
+PyObject *
+Evas_Object_PyObject_render_op_get(Evas_Object_PyObject * self, PyObject *
args)
+{
+ int op;
+
+ BENCH_START
+ op = evas_object_render_op_get(self->object);
+ BENCH_END
+
+ return Py_BuildValue("i", op);
+}
+PyObject *
Evas_Object_PyObject_raise(Evas_Object_PyObject * self, PyObject * args)
{
BENCH_START
@@ -444,6 +469,8 @@
{"clip_get", (PyCFunction) Evas_Object_PyObject_clip_get, METH_VARARGS},
{"clip_unset", (PyCFunction) Evas_Object_PyObject_clip_unset,
METH_VARARGS},
{"clipees_get", (PyCFunction) Evas_Object_PyObject_clipees_get,
METH_VARARGS},
+ {"render_op_set", (PyCFunction) Evas_Object_PyObject_render_op_set,
METH_VARARGS},
+ {"render_op_get", (PyCFunction) Evas_Object_PyObject_render_op_get,
METH_VARARGS},
// stacking
{"object_raise", (PyCFunction) Evas_Object_PyObject_raise, METH_VARARGS},
Modified: trunk/evas/src/text.c
==============================================================================
--- trunk/evas/src/text.c (original)
+++ trunk/evas/src/text.c Tue Sep 26 02:23:07 2006
@@ -23,7 +23,7 @@
PyObject *
Evas_Object_PyObject_text_font_get(Evas_Object_PyObject * self, PyObject *
args)
{
- char *font;
+ const char *font;
int size;
BENCH_START
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog