orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

now that was just silly.. evas shoudl have used the visual and colormap u 

provided regardless of its own suggestions


SVN revision: 4987
This commit is contained in:
Carsten Haitzler 2001-07-26 03:31:03 +00:00
parent 54d32f99c7
commit bf4d95b694
11 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/src/evas_gl_routines.c
View File

@ -2856,6 +2856,11 @@ __evas_gl_flush_draw(Display *disp, Imlib_Image dstim, Window win)
#endif
}
void
__evas_gl_set_vis_cmap(Visual *vis, Colormap cmap)
{
}
int
__evas_gl_capable(Display *disp)
{

1
legacy/evas/src/evas_gl_routines.h
View File

@ -262,6 +262,7 @@ void __evas_gl_poly_draw (Display *disp, Imlib_Image dstim, Window
/***********/
void __evas_gl_set_clip_rect(int on, int x, int y, int w, int h, int r, int g, int b, int a);
void __evas_gl_init(Display *disp, int screen, int colors);
void __evas_gl_set_vis_cmap(Visual *vis, Colormap cmap);
int __evas_gl_capable(Display *disp);
void __evas_gl_flush_draw(Display *disp, Imlib_Image dstim, Window win);
void __evas_gl_sync(Display *disp);

4
legacy/evas/src/evas_image_routines.c
View File

@ -969,6 +969,10 @@ __evas_image_flush_draw(Display *disp, Imlib_Image dstim, Window win)
drawable_list = NULL;
}
void
__evas_image_set_vis_cmap(Visual *vis, Colormap cmap)
{
}
int
__evas_image_capable(Display *disp)

1
legacy/evas/src/evas_image_routines.h
View File

@ -121,6 +121,7 @@ void __evas_image_poly_draw (Display *disp, Imlib_Image dstim, W
/***********/
void __evas_image_set_clip_rect(int on, int x, int y, int w, int h, int r, int g, int b, int a);
void __evas_image_init(Display *disp, int screen, int colors);
void __evas_image_set_vis_cmap(Visual *vis, Colormap cmap);
int __evas_image_capable(Display *disp);
void __evas_image_flush_draw(Display *disp, Imlib_Image dstim, Window win);
void __evas_image_sync(Display *disp);

10
legacy/evas/src/evas_imlib_routines.c
View File

@ -1133,8 +1133,14 @@ __evas_imlib_flush_draw(Display *disp, Imlib_Image dstim, Window win)
drawable_list = NULL;
}
int
void
__evas_imlib_set_vis_cmap(Visual *vis, Colormap cmap)
{
__evas_visual = vis;
__evas_cmap = cmap;
}
int
__evas_imlib_capable(Display *disp)
{
return 1;

1
legacy/evas/src/evas_imlib_routines.h
View File

@ -134,6 +134,7 @@ void __evas_imlib_poly_draw (Display *disp, Imlib_Image dstim, W
/***********/
void __evas_imlib_set_clip_rect(int on, int x, int y, int w, int h, int r, int g, int b, int a);
void __evas_imlib_init(Display *disp, int screen, int colors);
void __evas_imlib_set_vis_cmap(Visual *vis, Colormap cmap);
int __evas_imlib_capable(Display *disp);
void __evas_imlib_flush_draw(Display *disp, Imlib_Image dstim, Window win);
void __evas_imlib_sync(Display *disp);

10
legacy/evas/src/evas_render.c
View File

@ -196,6 +196,7 @@ evas_render_updates(Evas e)
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);
void (*func_poly_draw) (Display *disp, Imlib_Image dstim, Window win, int win_w, int win_h, Evas_List points, int r, int g, int b, int a);
void (*func_set_clip_rect) (int on, int x, int y, int w, int h, int r, int g, int b, int a);
void (*func_set_vis_cmap) (Visual *vis, Colormap cmap);
if (!e) return NULL;
if ((e->current.render_method == RENDER_METHOD_IMAGE) &&
@ -234,6 +235,7 @@ evas_render_updates(Evas e)
func_gradient_draw = __evas_imlib_gradient_draw;
func_poly_draw = __evas_imlib_poly_draw;
func_set_clip_rect = __evas_imlib_set_clip_rect;
func_set_vis_cmap = __evas_imlib_set_vis_cmap;
break;
case RENDER_METHOD_BASIC_HARDWARE:
func_draw_add_rect = __evas_x11_draw_add_rect;
@ -253,6 +255,7 @@ evas_render_updates(Evas e)
func_gradient_draw = __evas_x11_gradient_draw;
func_poly_draw = __evas_x11_poly_draw;
func_set_clip_rect = __evas_x11_set_clip_rect;
func_set_vis_cmap = __evas_x11_set_vis_cmap;
break;
#ifdef HAVE_GL
case RENDER_METHOD_3D_HARDWARE:
@ -273,8 +276,10 @@ evas_render_updates(Evas e)
func_gradient_draw = __evas_gl_gradient_draw;
func_poly_draw = __evas_gl_poly_draw;
func_set_clip_rect = __evas_gl_set_clip_rect;
func_set_vis_cmap = __evas_gl_set_vis_cmap;
break;
#endif
#ifdef HAVE_RENDER
case RENDER_METHOD_ALPHA_HARDWARE:
func_draw_add_rect = __evas_render_draw_add_rect;
func_image_new_from_file = __evas_render_image_new_from_file;
@ -293,7 +298,9 @@ evas_render_updates(Evas e)
func_gradient_draw = __evas_render_gradient_draw;
func_poly_draw = __evas_render_poly_draw;
func_set_clip_rect = __evas_render_set_clip_rect;
func_set_vis_cmap = __evas_render_set_vis_cmap;
break;
#endif
case RENDER_METHOD_IMAGE:
func_draw_add_rect = __evas_image_draw_add_rect;
func_image_new_from_file = __evas_image_image_new_from_file;
@ -312,8 +319,10 @@ evas_render_updates(Evas e)
func_gradient_draw = __evas_image_gradient_draw;
func_poly_draw = __evas_image_poly_draw;
func_set_clip_rect = __evas_image_set_clip_rect;
func_set_vis_cmap = __evas_image_set_vis_cmap;
break;
default:
return;
break;
}
if ((e->current.viewport.x != e->previous.viewport.x) ||
@ -832,6 +841,7 @@ evas_render_updates(Evas e)
u = imlib_updates_get_next(u);
}
/* draw all objects now */
func_set_vis_cmap(e->current.visual, e->current.colormap);
for (l = e->layers; l; l = l->next)
{
Evas_Layer layer;

6
legacy/evas/src/evas_render_routines.c
View File

@ -675,6 +675,12 @@ __evas_render_flush_draw(Display *disp, Imlib_Image dstim, Window win)
drawable_list = NULL;
}
void
__evas_render_set_vis_cmap(Visual *vis, Colormap cmap)
{
__evas_visual = vis;
__evas_cmap = cmap;
}
int
__evas_render_capable(Display *disp)

1
legacy/evas/src/evas_render_routines.h
View File

@ -133,6 +133,7 @@ void __evas_render_poly_draw (Display *disp, Imlib_Image dstim,
/***********/
void __evas_render_set_clip_rect(int on, int x, int y, int w, int h, int r, int g, int b, int a);
void __evas_render_init(Display *disp, int screen, int colors);
void __evas_render_set_vis_cmap(Visual *vis, Colormap cmap);
int __evas_render_capable(Display *disp);
void __evas_render_flush_draw(Display *disp, Imlib_Image dstim, Window win);
void __evas_render_sync(Display *disp);

6
legacy/evas/src/evas_x11_routines.c
View File

@ -1896,6 +1896,12 @@ __evas_x11_flush_draw(Display *disp, Imlib_Image dstim, Window win)
drawable_list = NULL;
}
void
__evas_x11_set_vis_cmap(Visual *vis, Colormap cmap)
{
__evas_visual = vis;
__evas_cmap = cmap;
}
int
__evas_x11_capable(Display *disp)

1
legacy/evas/src/evas_x11_routines.h
View File

@ -183,6 +183,7 @@ void __evas_x11_poly_draw (Display *disp, Imlib_Image dstim, Wi
/***********/
void __evas_x11_set_clip_rect(int on, int x, int y, int w, int h, int r, int g, int b, int a);
void __evas_x11_init(Display *disp, int screen, int colors);
void __evas_x11_set_vis_cmap(Visual *vis, Colormap cmap);
int __evas_x11_capable(Display *disp);
void __evas_x11_flush_draw(Display *disp, Imlib_Image dstim, Window win);
void __evas_x11_sync(Display *disp);