From c6e5ed3a1d1b82b5f7515c0dc2ef391ae8d10638 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Wed, 27 Sep 2000 15:14:06 +0000 Subject: [PATCH] some basic start on documentation....what's happening to me? all this documentation? :) SVN revision: 3554 --- legacy/evas/Makefile.am | 2 +- legacy/evas/configure.in | 2 +- legacy/evas/doc/Makefile.am | 3 + legacy/evas/doc/index.html | 189 +++++++++++++++++++++++++++++++ legacy/evas/doc/logo.gif | Bin 0 -> 16998 bytes legacy/evas/src/Evas.h | 11 +- legacy/evas/src/Evas_private.h | 1 + legacy/evas/src/evas_callbacks.c | 4 + legacy/evas/src/evas_events.c | 19 ++-- legacy/evas/src/evas_gradient.c | 15 ++- legacy/evas/src/evas_image.c | 110 ++++++++++++------ legacy/evas/src/evas_line.c | 3 + legacy/evas/src/evas_misc.c | 57 +++++++++- legacy/evas/src/evas_object.c | 53 +++++++-- legacy/evas/src/evas_rectangle.c | 1 + legacy/evas/src/evas_render.c | 47 +++++--- legacy/evas/src/evas_text.c | 35 +++++- 17 files changed, 469 insertions(+), 83 deletions(-) create mode 100644 legacy/evas/doc/Makefile.am create mode 100644 legacy/evas/doc/index.html create mode 100644 legacy/evas/doc/logo.gif diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am index 45fea275ca..e1738968cd 100644 --- a/legacy/evas/Makefile.am +++ b/legacy/evas/Makefile.am @@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \ ltconfig ltmain.sh missing mkinstalldirs \ stamp-h.in -SUBDIRS = src test +SUBDIRS = src test doc bin_SCRIPTS = evas-config diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index bd47269312..0b51deb3d3 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -171,7 +171,7 @@ AC_SUBST(ttf_includes) AC_SUBST(ttf_libs) AC_OUTPUT([ -Makefile src/Makefile test/Makefile evas-config +Makefile src/Makefile test/Makefile evas-config doc/Makefile ], [ chmod +x evas-config ]) diff --git a/legacy/evas/doc/Makefile.am b/legacy/evas/doc/Makefile.am new file mode 100644 index 0000000000..2d1d64c3a5 --- /dev/null +++ b/legacy/evas/doc/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +index.html \ +loogo.gif diff --git a/legacy/evas/doc/index.html b/legacy/evas/doc/index.html new file mode 100644 index 0000000000..0a6ecf9c17 --- /dev/null +++ b/legacy/evas/doc/index.html @@ -0,0 +1,189 @@ + + +Evas - Documentation + + +
+ +Evas
+Documentation for programming using Evas
+By Carsten Haitzler
+Copyright (C) 2000
+
+ +
+ +

+Introduction +

+

+

+Evas is a canvas library, designed to work with the X Window System. It is +designed to be able to take advantage of any graphics hardwre or CPU +processing power you may have, or to adjust for the lack of it. It has a +simplistic API to access the features of a canvas to aid in making +development using Evas easy. +

+First it is necessary to explain what a canvas is and how in principle it +works. For those used to doing the drawing themselves, it is a new way of +looking at the problem of drawing displays that contain lots of information +an application may have to keep track of. This may be in the form of +primities (lines, circles, rectangles, polygons and text) or may be a +mixture of these and more complex objects such as gradients, images etc. An +application normally needs to hold all this data and when required, redraw +the data do a window or pixmap if the data changes, or the window contents +become damaged and need a redraw to restore them. To do this optimally the +application would also need to figure out what exactly canged, which parts +of the window or pixmap this data mapped to and then order the drawing so +all objects are drawn in the right order, and only the part of the window +that needs redrawing is drawn to to save excess processing. For a large +range of objects and data this become a fairly involved problem all on it's +own. Thus came the evolution of the canvas. +

+Some of the better known canvas systems around are the Tk Canvas and the +GNOME canvas. In principle a canvas works on an object level. Like windows +in X11, you create objects, move them, resize them show them, hide them, +change their properties etc. The canvas figures out what objects changed and +how only when it comes to it's draw cycle - not every time you do something. +This means moving, resizing and changing object properties is a very fast +and inexpensive operation since only attribute values change, rather than +any drawing being done, unlike when you move and resize windows in X11 which +happens instantly, not later. This means higher efficiency for the +application's rendering, as long ad evas render calls are only called when +the application has hit an idle state (nothing left in it's queue of things +to do for the moment). This also means object maintinence is now left up to +the canvas - the application only needs to keep a handle to that object +aroun so it can be uniquely identified. +

+The best way to use Evas is as follows (simplistic pseudo-code): +

+

+Initialise program
+...
+Create canvas
+Add objects to canvas (fill in with some content)
+...
+Infinite loop ...
+  while input events are pending ...
+    if event is for evas window then pass onto evas
+  ... (no more input events in queue awaiting processing)
+  modify, add or delete  objects in evas to reflect new state
+  call evas render function
+... continue program infinite loop
+
+

+In a naievely written program an event loop may have many re-renderins and +re-drawings going on as things are modified, otherwise the application needs +to retain state like evas does and ten handle draws in idle time too, which +means applications need to do the work Evas does themselves, as well as the +optimizations already in place in Evas. +

+The major advantages arise out of the fact that Evas does not only handle +the logic of such object management and rendering for you, and optimize it, +it also provides and abstraction layer that allows evas to render not just +solid objects, but temi-transparent objects and images that can be +alpha-blended, anti-aliased text and much more. It not only does these and +does them fast (using Imlib2 as the core rendering engine to do this), but +is able to instantly take advantage of hardware acceleration (for example +OpenGL) quietly for you to blend and scale images, speeding up rendering +many times over, without you having to know a single line of OpenGL. Evas's +Software rotuines alone are many many many times faster than Mesa's software +OpenGL rendering, as Imlib2's code is purpose written for 2D operations with +Assembly optimizations for the core routines. +

+

+

+API Reference +

+

+

+Basic Types +

+Here is a list of the basic types of objects Evas deals with and can +generate. It is small to keep things simple. +

+

+Evas
+Evas_Gradient
+Evas_Object
+Evas_List
+Evas_Callback_Type
+Evas_Image_Format
+Evas_Render_Method
+
+

+Evas: +

+This is the basic type of an Evas itself. When you create a new evas this +type will be returned (not a pointer to it - the Evas type itself. It is +intended to be completely opaque to the application and may change its nature +over time - it may be a void pointer now and tomorrow a hashe'd ID or +anything else). All functions dealing with Evas's and their contents will +require you use this handle to denote what Evas you are talking about. +

+Evas_Gradient: +

+This is the basic type use to build a gradient object from or modify its +colors. You need to create a new one of these before you can create any +useful gradient object. You add colors to the gradient, each one (after the +first color added) are added a certain ``distance'' from the previous color +which will determine relative distances between colors in the gradient. The +larger the distance number, the more of the total gradient length the +transition between the previous color and the one being added will take. +Once you hve filled the gradient with colors, create a gradient object, or +multiple gradient objects and set the gradient to those gradient objects. +When you are done and don't need that gradient anymore, simply free the +gradient. If you wish to change the colors or distances between them in a +gradient object simply build a new gradient, set it to the object then free +the gradient you created. +

+Evas_Object: +

+This is the fundamental building block that makes the contents of an Evas +have meaning. Without any objects in an Evas it will not draw anything, or +draw usless garbage where no objects exist. Whenever you create an object +you will get this type of handle back. If you wish to modify an object's +geoemtry, show, hide, change its properties or delete it you will need to +use this as the handle to addess it by. +

+Evas_List: +

+This is the only non-opaque data type. It is for conevenience of Evas, and +for the application to use to. This type is a doubly-linked list of data. +You may traverse the list using loops and using the next and prev members of +this structure. Do not modify these though as this could mean memory leaks +and losing parts of the list. If prev is NULL, you are at the start of the +list and if next is NULL you are at the end. The data member poitns to +whatever data was inserted at that place in the list. You may read this and +cast it to whatever makes sense in the situation. If Evas returns an +Evas_List of things the data member will be of the type specified by the +function. You may use Evas_List's yourself for anything you find them useful +for. +

+Evas_Callback_Type: +

+This is an enumerated type to specify what kind of event would trigger a +callback to be called when attaching a callback to an object. Legal values +for this are CALLBACK_MOUSE_IN (when the mouse enters the bounds of this +object), CALLBACK_MOUSE_OUT (when the mouse leaves the bounadry of this +object), CALLBACK_MOUSE_DOWN (when a mouse button is pressed in this object), +CALLBACK_MOUSE_UP (when a mouse button is raised in this object), +CALLBACK_MOUSE_MOVE (when the mouse mpoves around in this object) and +CALLBACK_FREE (when this object is actually freed so the application can +find free and data attached to the object if it needs to). +

+Evas_Image_Format: +

+

+Evas_Render_Method: +

+

+

+ + + diff --git a/legacy/evas/doc/logo.gif b/legacy/evas/doc/logo.gif new file mode 100644 index 0000000000000000000000000000000000000000..2c177424b4e07c732ed0549ad037a02f6740f963 GIT binary patch literal 16998 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 literal 0 HcmV?d00001 diff --git a/legacy/evas/src/Evas.h b/legacy/evas/src/Evas.h index b7092c3bc1..d90b2be703 100644 --- a/legacy/evas/src/Evas.h +++ b/legacy/evas/src/Evas.h @@ -27,11 +27,11 @@ struct _Evas_List #define RENDER_METHOD_COUNT 5 enum _Evas_Render_Method { - RENDER_METHOD_ALPHA_SOFTWARE, - RENDER_METHOD_BASIC_HARDWARE, - RENDER_METHOD_3D_HARDWARE, - RENDER_METHOD_ALPHA_HARDWARE, - RENDER_METHOD_IMAGE + RENDER_METHOD_ALPHA_SOFTWARE, /* imlib2 rendering to any drawable */ + RENDER_METHOD_BASIC_HARDWARE, /* X11 pixmap rendering to any drawable */ + RENDER_METHOD_3D_HARDWARE, /* oepngl rendering to windows only */ + RENDER_METHOD_ALPHA_HARDWARE, /* unimplimented */ + RENDER_METHOD_IMAGE /* imlib2 rendering to imlib image target */ }; enum _Evas_Callback_Type @@ -188,7 +188,6 @@ double evas_text_get_inset(Evas e, Evas_Object o); /* object query ops */ void evas_get_color(Evas e, Evas_Object o, int *r, int *g, int *b, int *a); Evas_Object evas_get_object_under_mouse(Evas e); -Evas_Object evas_get_object_at_pos(Evas e, double x, double y); /* data attachment ops */ void evas_put_data(Evas e, Evas_Object o, char *key, void *data); diff --git a/legacy/evas/src/Evas_private.h b/legacy/evas/src/Evas_private.h index 38b15ac05e..b6f91168d7 100644 --- a/legacy/evas/src/Evas_private.h +++ b/legacy/evas/src/Evas_private.h @@ -83,6 +83,7 @@ struct _Evas_Color_Point struct _Evas_Gradient { Evas_List color_points; + int references; }; struct _Evas_Rectangle diff --git a/legacy/evas/src/evas_callbacks.c b/legacy/evas/src/evas_callbacks.c index a60fea68bb..7a17ee175c 100644 --- a/legacy/evas/src/evas_callbacks.c +++ b/legacy/evas/src/evas_callbacks.c @@ -35,6 +35,8 @@ evas_callback_add(Evas e, Evas_Object o, Evas_Callback_Type callback, void (*fun { Evas_Callback cb; + if (!e) return; + if (!o) return; cb = malloc(sizeof(struct _Evas_Callback)); cb->type = callback; cb->data = data; @@ -48,6 +50,8 @@ evas_callback_del(Evas e, Evas_Object o, Evas_Callback_Type callback) Evas_List l; int have_cb; + if (!e) return; + if (!o) return; have_cb = 1; while (have_cb) { diff --git a/legacy/evas/src/evas_events.c b/legacy/evas/src/evas_events.c index c25c9b2c9c..ac45a80684 100644 --- a/legacy/evas/src/evas_events.c +++ b/legacy/evas/src/evas_events.c @@ -9,7 +9,8 @@ int _evas_point_in_object(Evas e, Evas_Object o, int x, int y) { int ox, oy, ow, oh; - + + if (o->delete_me) return 0; _evas_object_get_current_translated_coords(e, o, &ox, &oy, &ow, &oh); if ((x >= ox) && (x < (ox + ow)) && (y >= oy) && (y < (oy + oh))) return 1; @@ -33,7 +34,7 @@ _evas_highest_object_at_point(Evas e, int x, int y) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (_evas_point_in_object(e, ob, x, y)) o = ob; @@ -59,7 +60,7 @@ _evas_objects_at_point(Evas e, int x, int y) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (_evas_point_in_object(e, ll->data, x, y)) objs = evas_list_prepend(objs, ll->data); @@ -75,6 +76,7 @@ evas_event_button_down(Evas e, int x, int y, int b) { Evas_Object o; + if (!e) return; if ((b < 1) || (b > 32)) return; if (!e->mouse.buttons) { @@ -94,6 +96,7 @@ evas_event_button_up(Evas e, int x, int y, int b) { Evas_Object o; + if (!e) return; if ((b < 1) || (b > 32)) return; e->mouse.buttons &= ~(1 << (b - 1)); e->mouse.x = x; @@ -115,6 +118,7 @@ evas_event_move(Evas e, int x, int y) { Evas_Object o; + if (!e) return; o = _evas_highest_object_at_point(e, e->mouse.x, e->mouse.y); if (o != e->mouse.object) { @@ -159,23 +163,20 @@ evas_event_move(Evas e, int x, int y) void evas_event_enter(Evas e) { + if (!e) return; e->mouse.in = 1; } void evas_event_leave(Evas e) { + if (!e) return; e->mouse.in = 0; } Evas_Object evas_get_object_under_mouse(Evas e) { + if (!e) return NULL; return _evas_highest_object_at_point(e, e->mouse.x, e->mouse.y); } - -Evas_Object -evas_get_object_at_pos(Evas e, double x, double y) -{ - return _evas_highest_object_at_point(e, x, y); -} diff --git a/legacy/evas/src/evas_gradient.c b/legacy/evas/src/evas_gradient.c index 076594d636..3d88eab11c 100644 --- a/legacy/evas/src/evas_gradient.c +++ b/legacy/evas/src/evas_gradient.c @@ -59,6 +59,7 @@ evas_add_gradient_box(Evas e) Evas_List l; Evas_Layer layer; + if (!e) return NULL; o = oo = malloc(sizeof(struct _Evas_Object_Gradient_Box)); memset(o, 0, sizeof(struct _Evas_Object_Gradient_Box)); o->type = OBJECT_GRADIENT_BOX; @@ -95,10 +96,13 @@ evas_set_gradient(Evas e, Evas_Object o, Evas_Gradient grad) { Evas_Object_Gradient_Box oo; + if (!e) return; + if (!o) return; + if (!grad) return; IF_OBJ(o, OBJECT_GRADIENT_BOX) return; oo = o; - if (oo->current.gradient) - evas_gradient_free(oo->current.gradient); + grad->references++; + if (oo->current.gradient) evas_gradient_free(oo->current.gradient); oo->current.gradient = grad; switch (e->current.render_method) { @@ -196,6 +200,7 @@ evas_gradient_new(void) gr = malloc(sizeof(struct _Evas_Gradient)); gr->color_points = NULL; + gr->references = 1; return gr; } @@ -204,6 +209,9 @@ evas_gradient_free(Evas_Gradient grad) { Evas_List l; + if (!grad) return; + grad->references--; + if (grad->references > 0) return; if (grad->color_points) { for (l = grad->color_points; l; l = l->next) @@ -218,6 +226,7 @@ evas_gradient_add_color(Evas_Gradient grad, int r, int g, int b, int a, int dist { Evas_Color_Point col; + if (!grad) return; col = malloc(sizeof(struct _Evas_Color_Point)); col->r = r; col->g = g; @@ -230,6 +239,8 @@ evas_gradient_add_color(Evas_Gradient grad, int r, int g, int b, int a, int dist void evas_set_angle(Evas e, Evas_Object o, double angle) { + if (!e) return; + if (!o) return; switch (o->type) { case OBJECT_GRADIENT_BOX: diff --git a/legacy/evas/src/evas_image.c b/legacy/evas/src/evas_image.c index b92a991eeb..d9f68c3299 100644 --- a/legacy/evas/src/evas_image.c +++ b/legacy/evas/src/evas_image.c @@ -44,24 +44,28 @@ evas_add_image_from_file(Evas e, char *file) Evas_Object_Any o; Evas_List l; Evas_Layer layer; - + + if (!e) return NULL; o = oo = malloc(sizeof(struct _Evas_Object_Image)); memset(o, 0, sizeof(struct _Evas_Object_Image)); o->type = OBJECT_IMAGE; o->object_free = _evas_free_image; o->object_renderer_data_free = _evas_free_image_renderer_data; - oo->current.file = strdup(file); + if (file) { - Imlib_Image im; - - im = imlib_load_image(file); - if (im) + oo->current.file = strdup(file); { - imlib_context_set_image(im); - oo->current.image.w = imlib_image_get_width(); - oo->current.image.h = imlib_image_get_height(); - imlib_free_image(); + Imlib_Image im; + + im = imlib_load_image(file); + if (im) + { + imlib_context_set_image(im); + oo->current.image.w = imlib_image_get_width(); + oo->current.image.h = imlib_image_get_height(); + imlib_free_image(); + } } } oo->current.fill.x = 0; @@ -108,44 +112,66 @@ evas_set_image_file(Evas e, Evas_Object o, char *file) { Evas_Object_Image oo; + if (!e) return; + if (!o) return; + IF_OBJ(o, OBJECT_IMAGE) return; oo = o; - if (oo->current.file) - free(oo->current.file); - oo->previous.file = NULL; - oo->current.file = strdup(file); + if ((oo->current.file) && (file) && (strcmp(file, oo->current.file))) { - Imlib_Image im; - - im = imlib_load_image(file); - if (im) + if (oo->current.file) + free(oo->current.file); + oo->previous.file = NULL; + oo->current.file = strdup(file); { - imlib_context_set_image(im); - oo->current.image.w = imlib_image_get_width(); - oo->current.image.h = imlib_image_get_height(); - imlib_free_image(); - evas_resize(e, o, - (double)oo->current.image.w, - (double)oo->current.image.h); - oo->current.fill.x = 0; - oo->current.fill.y = 0; - oo->current.fill.w = (double)oo->current.image.w; - oo->current.fill.h = (double)oo->current.image.h; + Imlib_Image im; + + im = imlib_load_image(file); + if (im) + { + imlib_context_set_image(im); + oo->current.image.w = imlib_image_get_width(); + oo->current.image.h = imlib_image_get_height(); + imlib_free_image(); + evas_resize(e, o, + (double)oo->current.image.w, + (double)oo->current.image.h); + oo->current.fill.x = 0; + oo->current.fill.y = 0; + oo->current.fill.w = (double)oo->current.image.w; + oo->current.fill.h = (double)oo->current.image.h; + } + else + { + oo->current.image.w = 0; + oo->current.image.h = 0; + evas_resize(e, o, + (double)oo->current.image.w, + (double)oo->current.image.h); + oo->current.fill.x = 0; + oo->current.fill.y = 0; + oo->current.fill.w = (double)oo->current.image.w; + oo->current.fill.h = (double)oo->current.image.h; + } + } + o->changed = 1; + e->changed = 1; + } + else + { + if (!file) + { + oo->current.file = NULL; + o->changed = 1; + e->changed = 1; } else { - oo->current.image.w = 0; - oo->current.image.h = 0; - evas_resize(e, o, - (double)oo->current.image.w, - (double)oo->current.image.h); oo->current.fill.x = 0; oo->current.fill.y = 0; oo->current.fill.w = (double)oo->current.image.w; oo->current.fill.h = (double)oo->current.image.h; } } - o->changed = 1; - e->changed = 1; } void @@ -159,6 +185,8 @@ evas_set_image_fill(Evas e, Evas_Object o, double x, double y, double w, double { Evas_Object_Image oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_IMAGE) return; oo = o; oo->current.fill.x = x; @@ -175,6 +203,8 @@ evas_get_image_size(Evas e, Evas_Object o, int *w, int *h) { Evas_Object_Image oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_IMAGE) return; oo = o; if (w) *w = oo->current.image.w; @@ -186,8 +216,14 @@ evas_set_image_border(Evas e, Evas_Object o, int l, int r, int t, int b) { Evas_Object_Image oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_IMAGE) return; oo = o; + if (l < 0) l = 0; + if (r < 0) r = 0; + if (t < 0) t = 0; + if (b < 0) b = 0; oo->current.border.l = l; oo->current.border.r = r; oo->current.border.t = t; @@ -201,6 +237,8 @@ evas_get_image_border(Evas e, Evas_Object o, int *l, int *r, int *t, int *b) { Evas_Object_Image oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_IMAGE) return; oo = o; if (l) *l = oo->current.border.l; diff --git a/legacy/evas/src/evas_line.c b/legacy/evas/src/evas_line.c index c458b6d8a0..6ae47337cc 100644 --- a/legacy/evas/src/evas_line.c +++ b/legacy/evas/src/evas_line.c @@ -43,6 +43,7 @@ evas_add_line(Evas e) Evas_List l; Evas_Layer layer; + if (!e) return NULL; o = oo = malloc(sizeof(struct _Evas_Object_Line)); memset(o, 0, sizeof(struct _Evas_Object_Line)); o->type = OBJECT_LINE; @@ -83,6 +84,8 @@ evas_set_line_xy(Evas e, Evas_Object o, double x1, double y1, double x2, double Evas_Object_Line oo; int event_update = 0; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_LINE) return; oo = (Evas_Object_Line)o; if ((o->current.visible) && diff --git a/legacy/evas/src/evas_misc.c b/legacy/evas/src/evas_misc.c index 15eb7543fb..4519b04d1f 100644 --- a/legacy/evas/src/evas_misc.c +++ b/legacy/evas/src/evas_misc.c @@ -54,42 +54,49 @@ evas_new_all(Display *display, Window parent_window, Window evas_get_window(Evas e) { + if (!e) return 0; return e->current.drawable; } Display * evas_get_display(Evas e) { + if (!e) return NULL; return e->current.display; } Visual * evas_get_visual(Evas e) { + if (!e) return NULL; return e->current.visual; } Colormap evas_get_colormap(Evas e) { + if (!e) return 0; return e->current.colormap; } int evas_get_colors(Evas e) { + if (!e) return 0; return e->current.colors; } Imlib_Image evas_get_image(Evas e) { + if (!e) return NULL; return e->current.image; } Evas_Render_Method evas_get_render_method(Evas e) { + if (!e) return RENDER_METHOD_ALPHA_SOFTWARE; return e->current.render_method; } @@ -105,7 +112,7 @@ evas_new(void) e->current.viewport.w = 0.0; e->current.viewport.h = 0.0; e->current.render_method = RENDER_METHOD_ALPHA_SOFTWARE; - e->current.colors = 128; + e->current.colors = 216; return e; } @@ -114,6 +121,7 @@ evas_free(Evas e) { Evas_List l; + if (!e) return; if (e->current.created_window) XDestroyWindow(e->current.display, e->current.drawable); for (l = e->layers; l; l = l->next) @@ -131,6 +139,16 @@ evas_free(Evas e) void evas_set_color(Evas e, Evas_Object o, int r, int g, int b, int a) { + if (!e) return; + if (!o) return; + if (r < 0) r = 0; + else if (r > 255) r = 255; + if (g < 0) g = 0; + else if (g > 255) g = 255; + if (b < 0) b = 0; + else if (b > 255) b = 255; + if (a < 0) a = 0; + else if (a > 255) a = 255; switch (o->type) { case OBJECT_IMAGE: @@ -193,8 +211,21 @@ evas_set_color(Evas e, Evas_Object o, int r, int g, int b, int a) void evas_get_color(Evas e, Evas_Object o, int *r, int *g, int *b, int *a) { + if (!e) return; + if (!o) return; switch (o->type) { + case OBJECT_IMAGE: + { + Evas_Object_Image oo; + + oo = (Evas_Object_Image)o; + if (r) *r = oo->current.color.r; + if (g) *g = oo->current.color.g; + if (b) *b = oo->current.color.b; + if (a) *a = oo->current.color.a; + } + break; case OBJECT_TEXT: { Evas_Object_Text oo; @@ -236,6 +267,8 @@ evas_get_color(Evas e, Evas_Object o, int *r, int *g, int *b, int *a) void evas_set_zoom_scale(Evas e, Evas_Object o, int scale) { + if (!e) return; + if (!o) return; o->current.zoomscale = scale; o->changed = 1; e->changed = 1; @@ -244,12 +277,15 @@ evas_set_zoom_scale(Evas e, Evas_Object o, int scale) void evas_set_pass_events(Evas e, Evas_Object o, int pass_events) { + if (!e) return; + if (!o) return; o->pass_events = 1; } void evas_set_font_cache(Evas e, int size) { + if (!e) return; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -275,6 +311,7 @@ evas_set_font_cache(Evas e, int size) int evas_get_font_cache(Evas e) { + if (!e) return 0; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -301,6 +338,7 @@ evas_get_font_cache(Evas e) void evas_flush_font_cache(Evas e) { + if (!e) return; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -326,6 +364,7 @@ evas_flush_font_cache(Evas e) void evas_set_image_cache(Evas e, int size) { + if (!e) return; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -351,6 +390,7 @@ evas_set_image_cache(Evas e, int size) int evas_get_image_cache(Evas e) { + if (!e) return 0; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -377,6 +417,7 @@ evas_get_image_cache(Evas e) void evas_flush_image_cache(Evas e) { + if (!e) return; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -402,6 +443,8 @@ evas_flush_image_cache(Evas e) void evas_font_add_path(Evas e, char *path) { + if (!e) return; + if (!path) return; evas_font_del_path(e, path); switch (e->current.render_method) { @@ -428,6 +471,8 @@ evas_font_add_path(Evas e, char *path) void evas_font_del_path(Evas e, char *path) { + if (!e) return; + if (!path) return; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -456,6 +501,8 @@ evas_put_data(Evas e, Evas_Object o, char *key, void *data) Evas_Data d; Evas_List l; + if (!e) return; + if (!o) return; if (!key) return; for (l = o->data; l; l = l->next) { @@ -479,6 +526,8 @@ evas_get_data(Evas e, Evas_Object o, char *key) { Evas_List l; + if (!e) return NULL; + if (!o) return NULL; if (!key) return NULL; for (l = o->data; l; l = l->next) { @@ -495,6 +544,8 @@ evas_remove_data(Evas e, Evas_Object o, char *key) { Evas_List l; + if (!e) return NULL; + if (!o) return NULL; if (!key) return NULL; for (l = o->data; l; l = l->next) { @@ -518,6 +569,7 @@ evas_remove_data(Evas e, Evas_Object o, char *key) int evas_world_x_to_screen(Evas e, double x) { + if (!e) return 0; return (int)((x - e->current.viewport.x) * ((double)e->current.drawable_width / e->current.viewport.w)); } @@ -525,6 +577,7 @@ evas_world_x_to_screen(Evas e, double x) int evas_world_y_to_screen(Evas e, double y) { + if (!e) return 0; return (int)((y - e->current.viewport.y) * ((double)e->current.drawable_height / e->current.viewport.h)); } @@ -532,6 +585,7 @@ evas_world_y_to_screen(Evas e, double y) double evas_screen_x_to_world(Evas e, int x) { + if (!e) return 0; return (double)((double)x * (e->current.viewport.w / (double)e->current.drawable_width)); + e->current.viewport.x; } @@ -539,6 +593,7 @@ evas_screen_x_to_world(Evas e, int x) double evas_screen_y_to_world(Evas e, int y) { + if (!e) return 0; return (double)((double)y * (e->current.viewport.h / (double)e->current.drawable_height)); + e->current.viewport.y; } diff --git a/legacy/evas/src/evas_object.c b/legacy/evas/src/evas_object.c index 438363dc5f..36217c7340 100644 --- a/legacy/evas/src/evas_object.c +++ b/legacy/evas/src/evas_object.c @@ -114,6 +114,8 @@ _evas_layer_free(Evas e, Evas_Layer layer) void evas_del_object(Evas e, Evas_Object o) { + if (!e) return; + if (!o) return; o->delete_me = 1; evas_hide(e, o); } @@ -126,6 +128,8 @@ evas_set_layer(Evas e, Evas_Object o, int layer_num) Evas_List l; int removed; + if (!e) return; + if (!o) return; if (layer_num == o->current.layer) return; removed = 0; for (l = e->layers; l; l = l->next) @@ -184,6 +188,7 @@ evas_set_layer(Evas e, Evas_Object o, int layer_num) void evas_set_layer_store(Evas e, int l, int store) { + if (!e) return; /* FIXME: find layer and set store flag */ /* e->changed = 1; */ } @@ -194,6 +199,9 @@ evas_objects_in_rect(Evas e, double x, double y, double w, double h) Evas_List l, ll, objs; Evas_Layer layer; + if (!e) return NULL; + if (w < 0) w = 0; + if (h < 0) h = 0; objs = NULL; for (l = e->layers; l ; l = l->next) { @@ -204,7 +212,7 @@ evas_objects_in_rect(Evas e, double x, double y, double w, double h) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (RECTS_INTERSECT(x, y, w, h, ob->current.x, ob->current.y, @@ -222,6 +230,7 @@ evas_objects_at_position(Evas e, double x, double y) Evas_List l, ll, objs; Evas_Layer layer; + if (!e) return NULL; objs = NULL; for (l = e->layers; l ; l = l->next) { @@ -232,7 +241,7 @@ evas_objects_at_position(Evas e, double x, double y) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (RECTS_INTERSECT(x, y, 1, 1, ob->current.x, ob->current.y, @@ -251,6 +260,7 @@ evas_object_in_rect(Evas e, double x, double y, double w, double h) Evas_Layer layer; Evas_Object o; + if (!e) return NULL; o = NULL; for (l = e->layers; l ; l = l->next) { @@ -261,7 +271,7 @@ evas_object_in_rect(Evas e, double x, double y, double w, double h) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (RECTS_INTERSECT(x, y, w, h, ob->current.x, ob->current.y, @@ -280,6 +290,7 @@ evas_object_at_position(Evas e, double x, double y) Evas_Layer layer; Evas_Object o; + if (!e) return NULL; o = NULL; for (l = e->layers; l ; l = l->next) { @@ -290,7 +301,7 @@ evas_object_at_position(Evas e, double x, double y) Evas_Object ob; ob = ll->data; - if ((ob->current.visible) && (!ob->pass_events)) + if ((ob->current.visible) && (!ob->pass_events) && (!ob->delete_me)) { if (RECTS_INTERSECT(x, y, 1, 1, ob->current.x, ob->current.y, @@ -308,6 +319,8 @@ evas_raise(Evas e, Evas_Object o) { Evas_Layer layer; + if (!e) return; + if (!o) return; layer = _evas_get_object_layer(e, o); if (layer) { @@ -327,6 +340,8 @@ evas_lower(Evas e, Evas_Object o) { Evas_Layer layer; + if (!e) return; + if (!o) return; layer = _evas_get_object_layer(e, o); if (layer) { @@ -346,6 +361,8 @@ evas_stack_above(Evas e, Evas_Object o, Evas_Object above) { Evas_Layer layer; + if (!e) return; + if (!o) return; layer = _evas_get_object_layer(e, o); if (layer) { @@ -361,16 +378,18 @@ evas_stack_above(Evas e, Evas_Object o, Evas_Object above) } void -evas_stack_below(Evas e, Evas_Object o, Evas_Object above) +evas_stack_below(Evas e, Evas_Object o, Evas_Object below) { Evas_Layer layer; + if (!e) return; + if (!o) return; layer = _evas_get_object_layer(e, o); if (layer) { o->current.stacking = 1; layer->objects = evas_list_remove(layer->objects, o); - layer->objects = evas_list_prepend_relative(layer->objects, o, above); + layer->objects = evas_list_prepend_relative(layer->objects, o, below); o->changed = 1; e->changed = 1; if ((o->current.visible) && @@ -385,6 +404,8 @@ evas_move(Evas e, Evas_Object o, double x, double y) { int event_update = 0; + if (!e) return; + if (!o) return; if ((o->type == OBJECT_LINE)) return; if ((o->current.visible) && (_evas_point_in_object(e, o, e->mouse.x, e->mouse.y))) @@ -404,11 +425,15 @@ evas_resize(Evas e, Evas_Object o, double w, double h) { int event_update = 0; + if (!e) return; + if (!o) return; if ((o->type == OBJECT_LINE)) return; if ((o->type == OBJECT_TEXT)) return; if ((o->current.visible) && (_evas_point_in_object(e, o, e->mouse.x, e->mouse.y))) event_update = 1; + if (w < 0) w = 0; + if (h < 0) h = 0; o->current.w = w; o->current.h = h; o->changed = 1; @@ -422,6 +447,8 @@ evas_resize(Evas e, Evas_Object o, double w, double h) void evas_get_geometry(Evas e, Evas_Object o, double *x, double *y, double *w, double *h) { + if (!e) return; + if (!o) return; if (x) *x = o->current.x; if (y) *y = o->current.y; if (w) *w = o->current.w; @@ -433,6 +460,8 @@ evas_get_geometry(Evas e, Evas_Object o, double *x, double *y, double *w, double void evas_show(Evas e, Evas_Object o) { + if (!e) return; + if (!o) return; o->current.visible = 1; o->changed = 1; e->changed = 1; @@ -443,9 +472,12 @@ evas_show(Evas e, Evas_Object o) void evas_hide(Evas e, Evas_Object o) { + if (!e) return; + if (!o) return; o->current.visible = 0; o->changed = 1; e->changed = 1; + if (e->mouse.button_object == o) e->mouse.button_object = NULL; if (_evas_point_in_object(e, o, e->mouse.x, e->mouse.y)) evas_event_move(e, e->mouse.x, e->mouse.y); } @@ -466,7 +498,10 @@ evas_object_get_named(Evas e, char *name) for (ll = layer->objects; ll; ll = ll->next) { o = ll->data; - if ((o->name) && (!strcmp(name, o->name))) return o; + if (!o->delete_me) + { + if ((o->name) && (!strcmp(name, o->name))) return o; + } } } return NULL; @@ -475,6 +510,8 @@ evas_object_get_named(Evas e, char *name) void evas_object_set_name(Evas e, Evas_Object o, char *name) { + if (!e) return; + if (!o) return; if (o->name) free(o->name); o->name = NULL; if (name) @@ -484,5 +521,7 @@ evas_object_set_name(Evas e, Evas_Object o, char *name) char * evas_object_get_name(Evas e, Evas_Object o) { + if (!e) return NULL; + if (!o) return NULL; return o->name; } diff --git a/legacy/evas/src/evas_rectangle.c b/legacy/evas/src/evas_rectangle.c index 8d433337e0..4bc074ca4d 100644 --- a/legacy/evas/src/evas_rectangle.c +++ b/legacy/evas/src/evas_rectangle.c @@ -43,6 +43,7 @@ evas_add_rectangle(Evas e) Evas_List l; Evas_Layer layer; + if (!e) return NULL; o = oo = malloc(sizeof(struct _Evas_Object_Rectangle)); memset(o, 0, sizeof(struct _Evas_Object_Rectangle)); o->type = OBJECT_RECTANGLE; diff --git a/legacy/evas/src/evas_render.c b/legacy/evas/src/evas_render.c index c4fa591cb8..48b755661d 100644 --- a/legacy/evas/src/evas_render.c +++ b/legacy/evas/src/evas_render.c @@ -53,28 +53,13 @@ _evas_object_get_previous_translated_coords(Evas e, Evas_Object o, void evas_update_rect(Evas e, int x, int y, int w, int h) { + if (!e) return; + if (w <= 0) return; + if (h <= 0) return; e->updates = imlib_update_append_rect(e->updates, x, y, w, h); e->changed = 1; } -#if 0 -switch (e->current.render_method) -{ -case RENDER_METHOD_ALPHA_SOFTWARE: - break; -case RENDER_METHOD_BASIC_HARDWARE: - break; -case RENDER_METHOD_3D_HARDWARE: - break; -case RENDER_METHOD_ALPHA_HARDWARE: - break; -case RENDER_METHOD_IMAGE: - break; -default: - break; -} -#endif - /* drawing */ void evas_render(Evas e) @@ -98,6 +83,7 @@ evas_render(Evas e) void (*func_line_draw) (Display *disp, Imlib_Image dstim, Window win, int win_w, int win_h, int x1, int y1, int x2, int y2, int r, int g, int b, int a); void (*func_gradient_draw) (void *gr, Display *disp, Imlib_Image dstim, Window win, int win_w, int win_h, int x, int y, int w, int h, double angle); + if (!e) return; if ((!e->changed) || (!e->current.display) || (!e->current.drawable) || @@ -652,6 +638,8 @@ evas_render(Evas e) Visual * evas_get_optimal_visual(Evas e, Display *disp) { + if (!e) return NULL; + if (!disp) return NULL; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -696,6 +684,8 @@ evas_get_optimal_visual(Evas e, Display *disp) Colormap evas_get_optimal_colormap(Evas e, Display *disp) { + if (!e) return 0; + if (!disp) return 0; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: @@ -740,6 +730,7 @@ evas_get_optimal_colormap(Evas e, Display *disp) void evas_get_drawable_size(Evas e, int *w, int *h) { + if (!e) return; if (w) *w = e->current.drawable_width; if (h) *h = e->current.drawable_height; } @@ -747,6 +738,7 @@ evas_get_drawable_size(Evas e, int *w, int *h) void evas_get_viewport(Evas e, double *x, double *y, double *w, double *h) { + if (!e) return; if (x) *x = e->current.viewport.x; if (y) *y = e->current.viewport.y; if (w) *w = e->current.viewport.w; @@ -757,6 +749,7 @@ evas_get_viewport(Evas e, double *x, double *y, double *w, double *h) void evas_set_output(Evas e, Display *disp, Drawable d, Visual *v, Colormap c) { + if (!e) return; e->current.display = disp; e->current.drawable = d; e->current.visual = v; @@ -767,6 +760,7 @@ evas_set_output(Evas e, Display *disp, Drawable d, Visual *v, Colormap c) void evas_set_output_image(Evas e, Imlib_Image image) { + if (!e) return; e->current.image = image; e->changed = 1; } @@ -774,6 +768,9 @@ evas_set_output_image(Evas e, Imlib_Image image) void evas_set_output_colors(Evas e, int colors) { + if (!e) return; + if (colors < 2) colors = 1; + else if (colors > 256) colors = 256; e->current.colors = colors; e->changed = 1; } @@ -781,6 +778,9 @@ evas_set_output_colors(Evas e, int colors) void evas_set_output_size(Evas e, int w, int h) { + if (!e) return; + if (w < 1) w = 1; + if (h < 1) h = 1; e->current.drawable_width = w; e->current.drawable_height = h; e->changed = 1; @@ -789,6 +789,7 @@ evas_set_output_size(Evas e, int w, int h) void evas_set_output_viewport(Evas e, double x, double y, double w, double h) { + if (!e) return; e->current.viewport.x = x; e->current.viewport.y = y; e->current.viewport.w = w; @@ -799,6 +800,13 @@ evas_set_output_viewport(Evas e, double x, double y, double w, double h) void evas_set_output_method(Evas e, Evas_Render_Method method) { + if (!e) return; + if ((method != RENDER_METHOD_ALPHA_SOFTWARE) && + (method != RENDER_METHOD_BASIC_HARDWARE) && + (method != RENDER_METHOD_3D_HARDWARE) && + (method != RENDER_METHOD_ALPHA_HARDWARE) && + (method != RENDER_METHOD_IMAGE)) + return; if (!e->current.display) { e->current.render_method = method; @@ -809,6 +817,9 @@ evas_set_output_method(Evas e, Evas_Render_Method method) void evas_set_scale_smoothness(Evas e, int smooth) { + if (!e) return; + if (smooth <= 0) smooth = 0; + else smooth = 1; switch (e->current.render_method) { case RENDER_METHOD_ALPHA_SOFTWARE: diff --git a/legacy/evas/src/evas_text.c b/legacy/evas/src/evas_text.c index 0535a3b28e..ed3d360ee3 100644 --- a/legacy/evas/src/evas_text.c +++ b/legacy/evas/src/evas_text.c @@ -48,6 +48,7 @@ evas_add_text(Evas e, char *font, int size, char *text) Evas_List l; Evas_Layer layer; + if (!e) return NULL; o = oo = malloc(sizeof(struct _Evas_Object_Text)); memset(o, 0, sizeof(struct _Evas_Object_Text)); o->type = OBJECT_TEXT; @@ -160,6 +161,8 @@ evas_get_text_string(Evas e, Evas_Object o) { Evas_Object_Text oo; + if (!e) return NULL; + if (!o) return NULL; IF_OBJ(o, OBJECT_TEXT) return ""; oo = o; return oo->current.text; @@ -170,6 +173,8 @@ evas_get_text_font(Evas e, Evas_Object o) { Evas_Object_Text oo; + if (!e) return NULL; + if (!o) return NULL; IF_OBJ(o, OBJECT_TEXT) return ""; oo = o; return oo->current.font; @@ -180,6 +185,8 @@ evas_get_text_size(Evas e, Evas_Object o) { Evas_Object_Text oo; + if (!e) return 0; + if (!o) return 0; IF_OBJ(o, OBJECT_TEXT) return 0; oo = o; return oo->current.size; @@ -191,6 +198,8 @@ evas_text_at_position(Evas e, Evas_Object o, double x, double y, { Evas_Object_Text oo; + if (!e) return -1; + if (!o) return -1; IF_OBJ(o, OBJECT_TEXT) return -1; oo = o; switch (e->current.render_method) @@ -281,6 +290,8 @@ evas_text_at(Evas e, Evas_Object o, int index, { Evas_Object_Text oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_TEXT) return; oo = o; switch (e->current.render_method) @@ -359,6 +370,8 @@ evas_text_get_ascent_descent(Evas e, Evas_Object o, int a, d; Evas_Object_Text oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_TEXT) return; oo = o; a = 0; d = 0; @@ -432,6 +445,8 @@ evas_text_get_max_ascent_descent(Evas e, Evas_Object o, int a, d; Evas_Object_Text oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_TEXT) return; oo = o; a = 0; d = 0; @@ -505,6 +520,8 @@ evas_text_get_advance(Evas e, Evas_Object o, int a, d; Evas_Object_Text oo; + if (!e) return; + if (!o) return; IF_OBJ(o, OBJECT_TEXT) return; oo = o; a = 0; d = 0; @@ -573,7 +590,9 @@ evas_text_get_inset(Evas e, Evas_Object o) Evas_Object_Text oo; int inset; - IF_OBJ(o, OBJECT_TEXT) return 0.0; + if (!e) return 0; + if (!o) return 0; + IF_OBJ(o, OBJECT_TEXT) return 0; oo = o; switch (e->current.render_method) { @@ -640,6 +659,8 @@ evas_text_get_inset(Evas e, Evas_Object o) void evas_set_text(Evas e, Evas_Object o, char *text) { + if (!e) return; + if (!o) return; switch (o->type) { case OBJECT_TEXT: @@ -647,8 +668,12 @@ evas_set_text(Evas e, Evas_Object o, char *text) Evas_Object_Text oo; oo = (Evas_Object_Text)o; + if ((text) && (oo->current.text) && (!strcmp(oo->current.text, text))) + return; if (oo->current.text) free(oo->current.text); - oo->current.text = strdup(text); + oo->current.text = NULL; + if (text) + oo->current.text = strdup(text); oo->previous.text = NULL; { switch (e->current.render_method) @@ -749,6 +774,10 @@ evas_set_text(Evas e, Evas_Object o, char *text) void evas_set_font(Evas e, Evas_Object o, char *font, int size) { + if (!e) return; + if (!o) return; + if (!font) return; + if (size < 0) size = 0; switch (o->type) { case OBJECT_TEXT: @@ -756,6 +785,8 @@ evas_set_font(Evas e, Evas_Object o, char *font, int size) Evas_Object_Text oo; oo = (Evas_Object_Text)o; + if ((oo->current.font) && (!strcmp(oo->current.font, font))) + return; if (oo->current.font) free(oo->current.font); oo->current.font = strdup(font); oo->previous.font = NULL;