Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/software_qtopia Modified Files: evas_engine.c evas_engine.h evas_outbuf.c evas_qt_main.cpp Log Message: whitespace =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/software_qtopia/evas_engine.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- evas_engine.c 28 Mar 2005 03:58:04 -0000 1.13 +++ evas_engine.c 22 May 2005 02:49:49 -0000 1.14 @@ -161,7 +161,7 @@ evas_engine_software_qtopia_font_h_advance_get, evas_engine_software_qtopia_font_v_advance_get, evas_engine_software_qtopia_font_char_coords_get, - evas_engine_software_qtopia_font_char_at_coords_get, + evas_engine_software_qtopia_font_char_at_coords_get, evas_engine_software_qtopia_font_draw, /* font cache functions */ evas_engine_software_qtopia_font_cache_flush, @@ -173,7 +173,7 @@ evas_engine_software_qtopia_info(Evas *e) { Evas_Engine_Info_Software_Qtopia *info; - + info = calloc(1, sizeof(Evas_Engine_Info_Software_Qtopia)); if (!info) return NULL; info->magic.magic = rand(); @@ -185,7 +185,7 @@ evas_engine_software_qtopia_info_free(Evas *e, void *info) { Evas_Engine_Info_Software_Qtopia *in; - + in = (Evas_Engine_Info_Software_Qtopia *)info; free(in); } @@ -195,19 +195,19 @@ { Render_Engine *re; Evas_Engine_Info_Software_Qtopia *info; - + info = (Evas_Engine_Info_Software_Qtopia *)in; if (!e->engine.data.output) - e->engine.data.output = + e->engine.data.output = evas_engine_software_qtopia_output_setup(e->output.w, e->output.h, info->info.rotation, info->info.target); 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; } @@ -215,11 +215,11 @@ evas_engine_software_qtopia_output_setup(int w, int h, int rot, QWidget *target) { Render_Engine *re; - + re = calloc(1, sizeof(Render_Engine)); /* if we haven't initialized - init (automatic abort if already done) */ evas_common_cpu_init(); - + evas_common_blend_init(); evas_common_image_init(); evas_common_convert_init(); @@ -231,9 +231,9 @@ evas_common_font_init(); evas_common_draw_init(); evas_common_tilebuf_init(); - - evas_qtopia_outbuf_software_qtopia_init(); - + + evas_qtopia_outbuf_software_qtopia_init(); + /* get any stored performance metrics from device (xserver) */ re->ob = evas_qtopia_outbuf_software_qtopia_setup_q(w, h, rot, OUTBUF_DEPTH_INHERIT, target); if (!re->ob) @@ -258,7 +258,7 @@ evas_engine_software_qtopia_output_free(void *data) { Render_Engine *re; - + re = (Render_Engine *)data; evas_qtopia_outbuf_software_qtopia_free(re->ob); evas_common_tilebuf_free(re->tb); @@ -273,9 +273,9 @@ evas_engine_software_qtopia_output_resize(void *data, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; - evas_qtopia_outbuf_software_qtopia_reconfigure(re->ob, w, h, + evas_qtopia_outbuf_software_qtopia_reconfigure(re->ob, w, h, evas_qtopia_outbuf_software_qtopia_get_rot(re->ob), OUTBUF_DEPTH_INHERIT); evas_qtopia_outbuf_software_qtopia_set_have_backbuf(re->ob, 0); @@ -289,16 +289,16 @@ evas_engine_software_qtopia_output_tile_size_set(void *data, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; - evas_common_tilebuf_set_tile_size(re->tb, w, h); + evas_common_tilebuf_set_tile_size(re->tb, w, h); } static void evas_engine_software_qtopia_output_redraws_rect_add(void *data, int x, int y, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_tilebuf_add_redraw(re->tb, x, y, w, h); } @@ -307,7 +307,7 @@ evas_engine_software_qtopia_output_redraws_rect_del(void *data, int x, int y, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_tilebuf_del_redraw(re->tb, x, y, w, h); } @@ -316,7 +316,7 @@ evas_engine_software_qtopia_output_redraws_clear(void *data) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_tilebuf_clear(re->tb); } @@ -328,14 +328,14 @@ RGBA_Image *surface; Tilebuf_Rect *rect; int ux, uy, uw, uh; - + re = (Render_Engine *)data; if (re->end) { re->end = 0; return NULL; } - if (!re->rects) + if (!re->rects) { re->rects = evas_common_tilebuf_get_render_rects(re->tb); re->cur_rect = (Evas_Object_List *)re->rects; @@ -344,15 +344,15 @@ rect = (Tilebuf_Rect *)re->cur_rect; ux = rect->x; uy = rect->y; uw = rect->w; uh = rect->h; re->cur_rect = re->cur_rect->next; - if (!re->cur_rect) + if (!re->cur_rect) { evas_common_tilebuf_free_render_rects(re->rects); re->rects = NULL; re->end = 1; } - - surface = evas_qtopia_outbuf_software_qtopia_new_region_for_update(re->ob, - ux, uy, uw, uh, + + surface = evas_qtopia_outbuf_software_qtopia_new_region_for_update(re->ob, + ux, uy, uw, uh, cx, cy, cw, ch); *x = ux; *y = uy; *w = uw; *h = uh; return surface; @@ -363,7 +363,7 @@ { Render_Engine *re; Evas_Engine_Info_Software_Qtopia *info; - + re = (Render_Engine *)data; evas_qtopia_outbuf_software_qtopia_push_updated_region(re->ob, surface, x, y, w, h); evas_qtopia_outbuf_software_qtopia_free_region_for_update(re->ob, surface); @@ -374,7 +374,7 @@ evas_engine_software_qtopia_output_flush(void *data) { Render_Engine *re; - + re = (Render_Engine *)data; } @@ -382,7 +382,7 @@ evas_engine_software_qtopia_context_new(void *data) { Render_Engine *re; - + re = (Render_Engine *)data; return evas_common_draw_context_new(); } @@ -391,7 +391,7 @@ evas_engine_software_qtopia_context_free(void *data, void *context) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_draw_context_free(context); } @@ -400,7 +400,7 @@ evas_engine_software_qtopia_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); } @@ -409,7 +409,7 @@ evas_engine_software_qtopia_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); } @@ -418,7 +418,7 @@ evas_engine_software_qtopia_context_clip_unset(void *data, void *context) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_draw_context_unset_clip(context); } @@ -427,7 +427,7 @@ evas_engine_software_qtopia_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; @@ -440,7 +440,7 @@ evas_engine_software_qtopia_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); } @@ -449,7 +449,7 @@ evas_engine_software_qtopia_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)); @@ -462,7 +462,7 @@ evas_engine_software_qtopia_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); } @@ -471,7 +471,7 @@ evas_engine_software_qtopia_context_multiplier_unset(void *data, void *context) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_draw_context_unset_multiplier(context); } @@ -480,7 +480,7 @@ evas_engine_software_qtopia_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)); @@ -493,7 +493,7 @@ evas_engine_software_qtopia_context_cutout_add(void *data, void *context, int x, int y, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_draw_context_add_cutout(context, x, y, w, h); } @@ -502,7 +502,7 @@ evas_engine_software_qtopia_context_cutout_clear(void *data, void *context) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_draw_context_clear_cutouts(context); } @@ -516,7 +516,7 @@ evas_engine_software_qtopia_rectangle_draw(void *data, void *context, void *surface, int x, int y, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_rectangle_draw(surface, context, x, y, w, h); evas_common_cpu_end_opt(); @@ -526,7 +526,7 @@ evas_engine_software_qtopia_line_draw(void *data, void *context, void *surface, int x1, int y1, int x2, int y2) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_line_draw(surface, context, x1, y1, x2, y2); evas_common_cpu_end_opt(); @@ -536,7 +536,7 @@ evas_engine_software_qtopia_polygon_point_add(void *data, void *context, void *polygon, int x, int y) { Render_Engine *re; - + re = (Render_Engine *)data; return evas_common_polygon_point_add(polygon, x, y); context = NULL; @@ -546,7 +546,7 @@ evas_engine_software_qtopia_polygon_points_clear(void *data, void *context, void *polygon) { Render_Engine *re; - + re = (Render_Engine *)data; return evas_common_polygon_points_clear(polygon); context = NULL; @@ -556,7 +556,7 @@ evas_engine_software_qtopia_polygon_draw(void *data, void *context, void *surface, void *polygon) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_polygon_draw(surface, context, polygon); evas_common_cpu_end_opt(); @@ -566,7 +566,7 @@ evas_engine_software_qtopia_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; if (!gradient) gradient = evas_common_gradient_new(); @@ -579,7 +579,7 @@ evas_engine_software_qtopia_gradient_colors_clear(void *data, void *context, void *gradient) { Render_Engine *re; - + re = (Render_Engine *)data; if (gradient) evas_common_gradient_free(gradient); return NULL; @@ -590,7 +590,7 @@ evas_engine_software_qtopia_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_common_gradient_draw(surface, context, x, y, w, h, gradient, angle); evas_common_cpu_end_opt(); @@ -611,7 +611,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = evas_common_image_new(); im->image = evas_common_image_surface_new(im); @@ -632,7 +632,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = evas_common_image_create(w, h); if (!im) return NULL; @@ -655,7 +655,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; if (w) *w = im->image->w; @@ -667,7 +667,7 @@ { Render_Engine *re; RGBA_Image *im, *im_old; - + re = (Render_Engine *)data; im_old = image; im = evas_common_image_create(w, h); @@ -689,7 +689,7 @@ evas_engine_software_qtopia_image_dirty_region(void *data, void *image, int x, int y, int w, int h) { Render_Engine *re; - + re = (Render_Engine *)data; evas_common_image_dirty(image); return image; @@ -704,7 +704,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; evas_common_load_image_data_from_file(im); @@ -713,7 +713,7 @@ if (im->references > 1) { RGBA_Image *im_new; - + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; evas_common_blit_rectangle(im, im_new, 0, 0, im->image->w, im->image->h, 0, 0); @@ -733,13 +733,13 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; if (image_data != im->image->data) { int w, h; - + w = im->image->w; h = im->image->h; evas_common_image_unref(im); @@ -755,13 +755,13 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; if (im->references > 1) { RGBA_Image *im_new; - + im_new = evas_common_image_create(im->image->w, im->image->h); if (!im_new) return im; evas_common_load_image_data_from_file(im); @@ -785,7 +785,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; if (im->flags & RGBA_IMAGE_HAS_ALPHA) return 1; @@ -800,13 +800,13 @@ re = (Render_Engine *)data; evas_common_load_image_data_from_file(image); if (smooth) - evas_common_scale_rgba_in_to_out_clip_smooth(image, surface, context, - src_x, src_y, src_w, src_h, + evas_common_scale_rgba_in_to_out_clip_smooth(image, surface, context, + src_x, src_y, src_w, src_h, dst_x, dst_y, dst_w, dst_h); else - evas_common_scale_rgba_in_to_out_clip_sample(image, surface, context, - src_x, src_y, src_w, src_h, - dst_x, dst_y, dst_w, dst_h); + evas_common_scale_rgba_in_to_out_clip_sample(image, surface, context, + src_x, src_y, src_w, src_h, + dst_x, dst_y, dst_w, dst_h); evas_common_cpu_end_opt(); } @@ -815,7 +815,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; return im->info.comment; @@ -827,7 +827,7 @@ { Render_Engine *re; RGBA_Image *im; - + re = (Render_Engine *)data; im = image; if (im->info.format == 1) return "png"; @@ -839,7 +839,7 @@ { Render_Engine *re; int tmp_size; - + re = (Render_Engine *)data; tmp_size = evas_common_image_get_cache(); evas_common_image_set_cache(0); @@ -886,7 +886,7 @@ evas_engine_software_qtopia_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); } @@ -895,7 +895,7 @@ evas_engine_software_qtopia_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); } @@ -918,7 +918,7 @@ return evas_common_font_ascent_get(font); } -static int +static int evas_engine_software_qtopia_font_descent_get(void *data, void *font) { Render_Engine *re; @@ -968,7 +968,7 @@ { Render_Engine *re; int h, v; - + re = (Render_Engine *)data; evas_common_font_query_advance(font, text, &h, &v); return h; @@ -1022,7 +1022,7 @@ { RGBA_Image *im; int inset; - + dc->col.col = dc_in->col.col; inset = evas_common_font_query_inset( font, text); im = evas_common_image_create(ow+inset, oh); @@ -1030,18 +1030,18 @@ { int max_ascent; int i, j; - + im->flags |= RGBA_IMAGE_HAS_ALPHA; j = (ow+inset) * oh; memset(im->image->data, 0, j * sizeof(DATA32)); - + max_ascent = evas_common_font_max_ascent_get(font); - + evas_common_font_draw(im, dc, font, 0, max_ascent, text); evas_common_cpu_end_opt(); - evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, - inset, 0, ow, oh, - x + ((inset * w) / ow), y - ((max_ascent * h) / oh), + evas_common_scale_rgba_in_to_out_clip_smooth(im, surface, context, + inset, 0, ow, oh, + x + ((inset * w) / ow), y - ((max_ascent * h) / oh), w, h); evas_common_image_free(im); } =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/software_qtopia/evas_engine.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_engine.h 14 Nov 2002 05:38:10 -0000 1.2 +++ evas_engine.h 22 May 2005 02:49:49 -0000 1.3 @@ -25,10 +25,10 @@ Outbuf_Depth depth; int w, h; int rot; - + struct { void *target; - + struct { DATA32 r, g, b; } mask; @@ -71,10 +71,10 @@ #ifdef __cplusplus extern "C" { #endif - + /****/ void x_software_qtopia_init (void); - + void evas_qtopia_outbuf_software_qtopia_init (void); void evas_qtopia_outbuf_software_qtopia_free (Outbuf *buf); =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/software_qtopia/evas_outbuf.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_outbuf.c 14 Nov 2002 05:38:10 -0000 1.2 +++ evas_outbuf.c 22 May 2005 02:49:49 -0000 1.3 @@ -21,7 +21,7 @@ evas_qtopia_outbuf_software_qtopia_setup_q(int w, int h, int rot, Outbuf_Depth depth, QWidget *target) { Outbuf *buf; - + buf = calloc(1, sizeof(Outbuf)); if (!buf) { @@ -35,7 +35,7 @@ buf->priv.target = target; { QT_Direct *direct; - + direct = evas_qt_main_direct_start(buf->priv.target); if (direct) { @@ -62,7 +62,7 @@ evas_qtopia_outbuf_software_qtopia_new_region_for_update(Outbuf *buf, int x, int y, int w, int h, int *cx, int *cy, int *cw, int *ch) { RGBA_Image *im; - + *cx = 0; *cy = 0; *cw = w; *ch = h; im = evas_common_image_create(w, h); return im; @@ -80,7 +80,7 @@ Gfx_Func_Convert conv_func; DATA8 *data; QT_Direct *d; - + data = NULL; conv_func = NULL; @@ -88,20 +88,20 @@ if (d) { int i; - + for (i = 0; i < d->rects.count; i++) { int fb_bytes; DATA8 *fb_mem; int ox, oy, ow, oh; int rx, ry, rw, rh; - + ox = x; oy = y; ow = w; oh = h; rx = d->rects.r[i].x - d->location.x; ry = d->rects.r[i].y - d->location.y; rw = d->rects.r[i].w; rh = d->rects.r[i].h; - if (x < rx) + if (x < rx) { w += (x - rx); x = rx; @@ -118,8 +118,8 @@ fb_bytes = d->fb.bpp / 8; if (buf->rot == 0) { - fb_mem = d->fb.data + - ((d->location.y * d->fb.width * fb_bytes) + + fb_mem = d->fb.data + + ((d->location.y * d->fb.width * fb_bytes) + (d->location.x * fb_bytes)); data = fb_mem + (fb_bytes * (x + (y * d->fb.width))); conv_func = evas_common_convert_func_get(data, w, h, d->fb.bpp, @@ -129,7 +129,7 @@ else if (buf->rot == 270) { fb_mem = d->fb.data + - (fb_bytes * + (fb_bytes * ((d->location.x * d->fb.width) + (d->fb.width - d->location.y - d->location.h))); data = fb_mem + (fb_bytes * (buf->h - y - h + (x * d->fb.width))); @@ -140,8 +140,8 @@ else if (buf->rot == 90) { // FIXME: wrong fb_mem - fb_mem = d->fb.data + - ((d->location.y * d->fb.width * fb_bytes) + + fb_mem = d->fb.data + + ((d->location.y * d->fb.width * fb_bytes) + (d->location.x * fb_bytes)); data = fb_mem + (fb_bytes * (y + ((buf->w - x - w) * d->fb.width))); conv_func = evas_common_convert_func_get(data, h, w, d->fb.bpp, @@ -151,7 +151,7 @@ if (conv_func) { DATA32 *src_data; - + if (buf->rot == 0) { src_data = update->image->data + @@ -194,7 +194,7 @@ void evas_qtopia_outbuf_software_qtopia_reconfigure(Outbuf *buf, int w, int h, int rot, Outbuf_Depth depth) { - if ((w == buf->w) && (h == buf->h) && + if ((w == buf->w) && (h == buf->h) && (rot == buf->rot) && (depth == buf->depth)) return; buf->w = w; =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/software_qtopia/evas_qt_main.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_qt_main.cpp 8 Nov 2002 08:02:15 -0000 1.1 +++ evas_qt_main.cpp 22 May 2005 02:49:49 -0000 1.2 @@ -13,7 +13,7 @@ evas_qt_main_direct_start(void *target) { QT_Direct *d; - QDirectPainter *dp; + QDirectPainter *dp; QWidget *widget; int i; @@ -55,7 +55,7 @@ for (i = 0; i < d->rects.count; i++) { QRect r; - + r = dp->rect(i); if (d->fb.rotation == 0) { @@ -90,14 +90,14 @@ evas_qt_main_direct_stop(QT_Direct *d) { QDirectPainter *dp; - + #ifdef QVFB_BUG { QWidget *target = (QWidget *)d->target; - QRect rect(d->updated.x, d->updated.y, + QRect rect(d->updated.x, d->updated.y, d->updated.w, d->updated.h); QPainter p(target); - + p.fillRect(rect, QBrush::NoBrush); } #endif ------------------------------------------------------- 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