fix that event problem... and errr.. some gfx optimizations :)

SVN revision: 4074
This commit is contained in:
Carsten Haitzler 2001-01-02 23:09:32 +00:00
parent 6a62ebfa0e
commit 72a83a2724
4 changed files with 9 additions and 8 deletions

View File

@ -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);

View File

@ -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;

View File

@ -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);

View File

@ -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);