Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/gl_x11
Modified Files:
evas_engine.c evas_engine.h evas_x_main.c
Log Message:
whitespace
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_engine.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_engine.c 28 Mar 2005 03:58:04 -0000 1.15
+++ evas_engine.c 22 May 2005 02:49:49 -0000 1.16
@@ -164,7 +164,7 @@
evas_engine_gl_x11_font_h_advance_get,
evas_engine_gl_x11_font_v_advance_get,
evas_engine_gl_x11_font_char_coords_get,
- evas_engine_gl_x11_font_char_at_coords_get,
+ evas_engine_gl_x11_font_char_at_coords_get,
evas_engine_gl_x11_font_draw,
/* font cache functions */
evas_engine_gl_x11_font_cache_flush,
@@ -176,7 +176,7 @@
evas_engine_gl_x11_info(Evas *e)
{
Evas_Engine_Info_GL_X11 *info;
-
+
info = calloc(1, sizeof(Evas_Engine_Info_GL_X11));
if (!info) return NULL;
info->magic.magic = rand();
@@ -192,7 +192,7 @@
evas_engine_gl_x11_info_free(Evas *e, void *info)
{
Evas_Engine_Info_GL_X11 *in;
-
+
in = (Evas_Engine_Info_GL_X11 *)info;
free(in);
}
@@ -202,22 +202,22 @@
{
Render_Engine *re;
Evas_Engine_Info_GL_X11 *info;
-
+
info = (Evas_Engine_Info_GL_X11 *)in;
printf("GL: setup info...\n");
if (!e->engine.data.output)
- e->engine.data.output =
+ e->engine.data.output =
evas_engine_gl_x11_output_setup(e->output.w,
e->output.h,
info->info.display,
info->info.drawable,
info->info.visual,
info->info.colormap,
- info->info.depth);
+ info->info.depth);
if (!e->engine.data.output) return;
if (!e->engine.data.context)
- e->engine.data.context =
- e->engine.func->context_new(e->engine.data.output);
+ e->engine.data.context =
+ e->engine.func->context_new(e->engine.data.output);
re = e->engine.data.output;
}
@@ -226,11 +226,11 @@
{
Render_Engine *re;
int eb, evb;
-
- if (!glXQueryExtension(disp, &eb, &evb)) return NULL;
+
+ if (!glXQueryExtension(disp, &eb, &evb)) return NULL;
re = calloc(1, sizeof(Render_Engine));
-
- re->win = evas_engine_gl_x11_window_new(disp, draw,
+
+ re->win = evas_engine_gl_x11_window_new(disp, draw,
0 /* FIXME: screen 0 assumption */,
vis, cmap, depth, w, h);
if (!re->win)
@@ -240,7 +240,7 @@
}
printf("GL: gl window setup done.\n");
evas_common_cpu_init();
-
+
evas_common_blend_init();
evas_common_image_init();
evas_common_convert_init();
@@ -252,7 +252,7 @@
evas_common_font_init();
evas_common_draw_init();
evas_common_tilebuf_init();
-
+
return re;
}
@@ -260,7 +260,7 @@
evas_engine_gl_x11_output_free(void *data)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
free(re);
@@ -272,7 +272,7 @@
evas_engine_gl_x11_output_resize(void *data, int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
re->win->w = w;
re->win->h = h;
@@ -283,7 +283,7 @@
evas_engine_gl_x11_output_tile_size_set(void *data, int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
}
@@ -291,12 +291,12 @@
evas_engine_gl_x11_output_redraws_rect_add(void *data, int x, int y, int w,
int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
/* smple bounding box */
if (!re->win->draw.redraw)
{
-#if 0
+#if 0
re->win->draw.x1 = x;
re->win->draw.y1 = y;
re->win->draw.x2 = x + w - 1;
@@ -306,7 +306,7 @@
re->win->draw.y1 = 0;
re->win->draw.x2 = re->win->w - 1;
re->win->draw.y2 = re->win->h - 1;
-#endif
+#endif
}
else
{
@@ -322,7 +322,7 @@
evas_engine_gl_x11_output_redraws_rect_del(void *data, int x, int y, int w,
int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
}
@@ -330,7 +330,7 @@
evas_engine_gl_x11_output_redraws_clear(void *data)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
re->win->draw.redraw = 0;
// printf("GL: finish update cycle!\n");
@@ -340,7 +340,7 @@
evas_engine_gl_x11_output_redraws_next_update_get(void *data, int *x, int *y,
int *w, int *h, int *cx, int *cy, int *cw, int *ch)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
/* get the upate rect surface - return engine data as dummy */
if (!re->win->draw.redraw)
@@ -364,7 +364,7 @@
evas_engine_gl_x11_output_redraws_next_update_push(void *data, void *surface,
int x, int y, int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
/* put back update surface.. in this case just unflag redraw */
// printf("GL: update done.\n");
@@ -376,20 +376,20 @@
{
Render_Engine *re;
static int fr = 0;
-
+
re = (Render_Engine *)data;
// printf("GL: flush your mush!\n");
evas_engine_gl_x11_window_use(re->win);
/* SLOW AS ALL HELL! */
#if 0
- evas_gl_common_swap_rect(re->win->gl_context,
+ evas_gl_common_swap_rect(re->win->gl_context,
re->win->draw.x1, re->win->draw.y1,
re->win->draw.x2 - re->win->draw.x1 + 1,
re->win->draw.y2 - re->win->draw.y1 + 1);
#else
- glXSwapBuffers(re->win->disp, re->win->win);
-#endif
+ glXSwapBuffers(re->win->disp, re->win->win);
+#endif
// glFlush();
// glXWaitGL();
// XSync(re->win->disp, False);
@@ -400,7 +400,7 @@
evas_engine_gl_x11_context_new(void *data)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_draw_context_new();
}
@@ -409,7 +409,7 @@
evas_engine_gl_x11_context_free(void *data, void *context)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_free(context);
}
@@ -418,7 +418,7 @@
evas_engine_gl_x11_context_clip_set(void *data, void *context, int x, int y,
int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_set_clip(context, x, y, w, h);
}
@@ -427,7 +427,7 @@
evas_engine_gl_x11_context_clip_clip(void *data, void *context, int x, int y,
int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_clip_clip(context, x, y, w, h);
}
@@ -436,7 +436,7 @@
evas_engine_gl_x11_context_clip_unset(void *data, void *context)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_unset_clip(context);
}
@@ -445,7 +445,7 @@
evas_engine_gl_x11_context_clip_get(void *data, void *context, int *x, int *y,
int *w, int *h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
*x = ((RGBA_Draw_Context *)context)->clip.x;
*y = ((RGBA_Draw_Context *)context)->clip.y;
@@ -458,7 +458,7 @@
evas_engine_gl_x11_context_color_set(void *data, void *context, int r, int g,
int b, int a)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_set_color(context, r, g, b, a);
}
@@ -467,7 +467,7 @@
evas_engine_gl_x11_context_color_get(void *data, void *context, int *r, int
*g, int *b, int *a)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
*r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
*g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
@@ -480,7 +480,7 @@
evas_engine_gl_x11_context_multiplier_set(void *data, void *context, int r,
int g, int b, int a)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_set_multiplier(context, r, g, b, a);
}
@@ -489,7 +489,7 @@
evas_engine_gl_x11_context_multiplier_unset(void *data, void *context)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_common_draw_context_unset_multiplier(context);
}
@@ -498,7 +498,7 @@
evas_engine_gl_x11_context_multiplier_get(void *data, void *context, int *r,
int *g, int *b, int *a)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
*r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
*g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
@@ -511,7 +511,7 @@
evas_engine_gl_x11_context_cutout_add(void *data, void *context, int x, int y,
int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
/* not used in gl engine */
}
@@ -520,7 +520,7 @@
evas_engine_gl_x11_context_cutout_clear(void *data, void *context)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
/* not used in gl engine */
}
@@ -534,7 +534,7 @@
evas_engine_gl_x11_rectangle_draw(void *data, void *context, void *surface,
int x, int y, int w, int h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
evas_gl_common_rect_draw(re->win->gl_context, context, x, y, w, h);
@@ -544,7 +544,7 @@
evas_engine_gl_x11_line_draw(void *data, void *context, void *surface, int x1,
int y1, int x2, int y2)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_gl_common_line_draw(re->win->gl_context, context, x1, y1, x2, y2);
}
@@ -553,17 +553,17 @@
evas_engine_gl_x11_polygon_point_add(void *data, void *context, void *polygon,
int x, int y)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_gl_common_poly_point_add(polygon, x, y);
-
+
}
static void *
evas_engine_gl_x11_polygon_points_clear(void *data, void *context, void
*polygon)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_gl_common_poly_points_clear(polygon);
}
@@ -572,7 +572,7 @@
evas_engine_gl_x11_polygon_draw(void *data, void *context, void *surface, void
*polygon)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_gl_common_poly_draw(re->win->gl_context, context, polygon);
}
@@ -581,7 +581,7 @@
evas_engine_gl_x11_gradient_color_add(void *data, void *context, void
*gradient, int r, int g, int b, int a, int distance)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_gl_common_gradient_color_add(gradient, r, g, b, a, distance);
}
@@ -590,7 +590,7 @@
evas_engine_gl_x11_gradient_colors_clear(void *data, void *context, void
*gradient)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_gl_common_gradient_colors_clear(gradient);
}
@@ -599,7 +599,7 @@
evas_engine_gl_x11_gradient_draw(void *data, void *context, void *surface,
void *gradient, int x, int y, int w, int h, double angle)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
evas_gl_common_gradient_draw(re->win->gl_context, context, gradient, x, y,
w, h, angle);
@@ -620,7 +620,7 @@
evas_engine_gl_x11_image_new_from_data(void *data, int w, int h, DATA32
*image_data)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
return evas_gl_common_image_new_from_data(re->win->gl_context, w, h,
image_data);
@@ -630,7 +630,7 @@
evas_engine_gl_x11_image_new_from_copied_data(void *data, int w, int h, DATA32
*image_data)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
return evas_gl_common_image_new_from_copied_data(re->win->gl_context, w, h,
image_data);
@@ -650,7 +650,7 @@
evas_engine_gl_x11_image_size_get(void *data, void *image, int *w, int *h)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
if (w) *w = ((Evas_GL_Image *)image)->im->image->w;
if (h) *h = ((Evas_GL_Image *)image)->im->image->h;
@@ -661,7 +661,7 @@
{
Render_Engine *re;
Evas_GL_Image *im, *im_old;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
if (!image) return NULL;
@@ -687,7 +687,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
evas_gl_common_image_dirty(image);
return image;
@@ -698,7 +698,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
im = image;
evas_engine_gl_x11_window_use(re->win);
@@ -708,7 +708,7 @@
if (im->references > 1)
{
Evas_GL_Image *im_new;
-
+
im_new = evas_gl_common_image_new_from_copied_data(im->gc,
im->im->image->w, im->im->image->h, im->im->image->data);
if (!im_new)
{
@@ -720,7 +720,7 @@
else
evas_gl_common_image_dirty(im);
}
- *image_data = im->im->image->data;
+ *image_data = im->im->image->data;
return im;
}
@@ -729,14 +729,14 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
im = image;
evas_engine_gl_x11_window_use(re->win);
if (image_data != im->im->image->data)
{
int w, h;
-
+
w = im->im->image->w;
h = im->im->image->h;
evas_gl_common_image_free(im);
@@ -752,7 +752,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
im = image;
@@ -761,7 +761,7 @@
if (im->references > 1)
{
Evas_GL_Image *im_new;
-
+
im_new = evas_gl_common_image_new_from_copied_data(im->gc,
im->im->image->w, im->im->image->h, im->im->image->data);
if (!im_new) return im;
evas_gl_common_image_free(im);
@@ -782,7 +782,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
im = image;
evas_engine_gl_x11_window_use(re->win);
@@ -794,10 +794,10 @@
evas_engine_gl_x11_image_draw(void *data, void *context, void *surface, void
*image, int src_x, int src_y, int src_w, int src_h, int dst_x, int dst_y, int
dst_w, int dst_h, int smooth)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
evas_engine_gl_x11_window_use(re->win);
- evas_gl_common_image_draw(re->win->gl_context, context, image,
+ evas_gl_common_image_draw(re->win->gl_context, context, image,
src_x, src_y, src_w, src_h,
dst_x, dst_y, dst_w, dst_h,
smooth);
@@ -808,7 +808,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
im = image;
return im->im->info.comment;
@@ -819,7 +819,7 @@
{
Render_Engine *re;
Evas_GL_Image *im;
-
+
re = (Render_Engine *)data;
im = image;
if (im->im->info.format == 1) return "png";
@@ -831,7 +831,7 @@
{
Render_Engine *re;
int tmp_size;
-
+
re = (Render_Engine *)data;
tmp_size = evas_common_image_get_cache();
evas_common_image_set_cache(0);
@@ -878,7 +878,7 @@
evas_engine_gl_x11_font_add(void *data, void *font, char *name, int size)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_font_add(font, name, size);
}
@@ -887,7 +887,7 @@
evas_engine_gl_x11_font_memory_add(void *data, void *font, char *name, int
size, const void *fdata, int fdata_size)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_font_memory_add(font, name, size, fdata, fdata_size);
}
@@ -910,7 +910,7 @@
return evas_common_font_ascent_get(font);
}
-static int
+static int
evas_engine_gl_x11_font_descent_get(void *data, void *font)
{
Render_Engine *re;
@@ -960,7 +960,7 @@
{
Render_Engine *re;
int h, v;
-
+
re = (Render_Engine *)data;
evas_common_font_query_advance(font, text, &h, &v);
return h;
@@ -971,7 +971,7 @@
{
Render_Engine *re;
int h, v;
-
+
re = (Render_Engine *)data;
evas_common_font_query_advance(font, text, &h, &v);
return v;
@@ -992,7 +992,7 @@
Render_Engine *re;
re = (Render_Engine *)data;
- return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw,
ch);
+ return evas_common_font_query_text_at_pos(font, text, x, y, cx, cy, cw, ch);
}
static void
@@ -1004,7 +1004,7 @@
/* text renderign takes benchmark from 40 to 27 on gf4-ti4400 */
{
static RGBA_Image *im = NULL;
-
+
if (!im)
{
im = evas_common_image_new();
@@ -1021,9 +1021,9 @@
evas_gl_font_texture_draw);
/* 40 */
evas_common_font_draw(im, context, font, x, y, text);
- evas_common_draw_context_font_ext_set(context,
+ evas_common_draw_context_font_ext_set(context,
+ NULL,
NULL,
- NULL,
NULL,
NULL);
}
@@ -1071,7 +1071,7 @@
{
if (!disp) return NULL;
if (!_evas_gl_x11_vi)
- _evas_gl_x11_vi = glXChooseVisual(disp, screen,
+ _evas_gl_x11_vi = glXChooseVisual(disp, screen,
_evas_gl_x11_configuration);
if (!_evas_gl_x11_vi) return NULL;
return _evas_gl_x11_vi->visual;
@@ -1084,7 +1084,7 @@
if (!_evas_gl_x11_vi)
evas_engine_gl_x11_best_visual_get(disp, screen);
if (!_evas_gl_x11_vi) return 0;
- _evas_gl_x11_cmap = XCreateColormap(disp, RootWindow(disp, screen),
+ _evas_gl_x11_cmap = XCreateColormap(disp, RootWindow(disp, screen),
_evas_gl_x11_vi->visual, 0);
return _evas_gl_x11_cmap;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_engine.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine.h 4 Sep 2003 07:40:33 -0000 1.3
+++ evas_engine.h 22 May 2005 02:49:49 -0000 1.4
@@ -15,7 +15,7 @@
Visual *visual;
Colormap colormap;
int depth;
- GLXContext context;
+ GLXContext context;
Evas_GL_Context *gl_context;
struct {
int redraw : 1;
@@ -40,5 +40,5 @@
evas_engine_gl_x11_window_free(Evas_GL_X11_Window *gw);
void
evas_engine_gl_x11_window_use(Evas_GL_X11_Window *gw);
-
+
#endif
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/gl_x11/evas_x_main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_x_main.c 9 Sep 2003 05:51:03 -0000 1.5
+++ evas_x_main.c 22 May 2005 02:49:49 -0000 1.6
@@ -35,7 +35,7 @@
int h)
{
Evas_GL_X11_Window *gw;
-
+
if (!_evas_gl_x11_vi) return NULL;
gw = calloc(1, sizeof(Evas_GL_X11_Window));
if (!gw) return NULL;
@@ -45,7 +45,7 @@
gw->visual = vis;
gw->colormap = cmap;
gw->depth = depth;
-
+
gw->visualinfo = _evas_gl_x11_vi;
if (!context)
context = glXCreateContext(disp, gw->visualinfo, NULL, GL_TRUE);
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
