From 72a83a2724fd80f588b1a4bce8331ac0c6722837 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 2 Jan 2001 23:09:32 +0000 Subject: [PATCH] fix that event problem... and errr.. some gfx optimizations :) SVN revision: 4074 --- legacy/evas/src/Evas.h | 2 +- legacy/evas/src/evas_events.c | 4 ++-- legacy/evas/src/evas_gl_routines.c | 9 +++++---- legacy/evas/src/evas_x11_routines.c | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/legacy/evas/src/Evas.h b/legacy/evas/src/Evas.h index 6b6718a900..e32201ac80 100644 --- a/legacy/evas/src/Evas.h +++ b/legacy/evas/src/Evas.h @@ -222,7 +222,7 @@ void evas_event_leave(Evas e); int evas_pointer_in(Evas e); void evas_pointer_pos(Evas e, int *x, int *y); int evas_pointer_buttons(Evas e); -void evas_pinter_ungrab(Evas e); +void evas_pointer_ungrab(Evas e); /* callbacks */ void evas_callback_add(Evas e, Evas_Object o, Evas_Callback_Type callback, void (*func) (void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y), void *data); diff --git a/legacy/evas/src/evas_events.c b/legacy/evas/src/evas_events.c index 5b69e7dce0..c5c7da203d 100644 --- a/legacy/evas/src/evas_events.c +++ b/legacy/evas/src/evas_events.c @@ -86,7 +86,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); + o = _evas_highest_object_at_point(e, x, y); if (o != e->mouse.object) { if (e->mouse.object) @@ -179,7 +179,7 @@ evas_pointer_buttons(Evas e) } void -evas_pinter_ungrab(Evas e) +evas_pointer_ungrab(Evas e) { e->mouse.buttons = 0; e->mouse.button_object = NULL; diff --git a/legacy/evas/src/evas_gl_routines.c b/legacy/evas/src/evas_gl_routines.c index 1091068ad9..af925d809d 100644 --- a/legacy/evas/src/evas_gl_routines.c +++ b/legacy/evas/src/evas_gl_routines.c @@ -2707,14 +2707,14 @@ __evas_gl_poly_draw (Display *disp, Imlib_Image dstim, Window win, gluTessCallback(tess, GLU_TESS_VERTEX, __evas_gl_tess_vertex_cb); gluTessCallback(tess, GLU_TESS_COMBINE, __evas_gl_tess_combine_cb); } + num = 0; + for (l2 = points; l2; l2 = l2->next) num++; + i = 0; + glp = malloc(num * 6 * sizeof(GLdouble)); gluTessNormal(tess, 0, 0, 1); gluTessProperty(tess, GLU_TESS_WINDING_RULE, GLU_TESS_WINDING_ODD); gluTessBeginPolygon(tess, NULL); gluTessBeginContour(tess); - num = 0; - for (l2 = points; l2; l2 = l2->next) num++; - i = 0; - glp = malloc(num * 3 * sizeof(GLdouble)); for (l2 = points; l2; l2 = l2->next) { Evas_Point p; @@ -2724,6 +2724,7 @@ __evas_gl_poly_draw (Display *disp, Imlib_Image dstim, Window win, glp[i++] = p->y; glp[i++] = 0; gluTessVertex(tess, &(glp[i - 3]), &(glp[i - 3])); + i += 3; } gluTessEndContour(tess); gluTessEndPolygon(tess); diff --git a/legacy/evas/src/evas_x11_routines.c b/legacy/evas/src/evas_x11_routines.c index 7962d17cba..9571de3114 100644 --- a/legacy/evas/src/evas_x11_routines.c +++ b/legacy/evas/src/evas_x11_routines.c @@ -237,7 +237,7 @@ __evas_x11_image_draw(Evas_X11_Image *im, imlib_context_set_drawable(w); imlib_context_set_dither_mask(0); imlib_context_set_anti_alias(0); - if (imlib_get_visual_depth(disp, __evas_visual) < 8) + if (imlib_get_visual_depth(disp, __evas_visual) <= 8) imlib_context_set_dither(__evas_anti_alias); else imlib_context_set_dither(0); imlib_context_set_blend(0);