E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_image.c Log Message: Reset image preferred size when removing a constrain size. Fix warning on pointer type passed to ewl_callback_call. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- ewl_image.c 8 Oct 2006 17:26:22 - 1.48 +++ ewl_image.c 9 Oct 2006 06:21:17 - 1.49 @@ -234,10 +234,13 @@ void ewl_image_constrain_set(Ewl_Image *i, unsigned int size) { + unsigned int osize; + DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("i", i); DCHECK_TYPE("i", i, EWL_IMAGE_TYPE); + osize = i->cs; i->cs = size; if (size) { ewl_object_preferred_inner_w_set(EWL_OBJECT(i), size); @@ -249,6 +252,12 @@ else if (i->aw != i->ow || i->ah != i->oh) { ewl_image_size_set(i, i->aw, i->ah); } + else { + if (ewl_object_preferred_inner_w_get(EWL_OBJECT(i)) == osize) + ewl_object_preferred_inner_w_set(EWL_OBJECT(i), i->ow); + if (ewl_object_preferred_inner_h_get(EWL_OBJECT(i)) == osize) + ewl_object_preferred_inner_h_set(EWL_OBJECT(i), i->oh); + } DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -611,7 +620,8 @@ if (ev->dest) { ewl_image_file_path_set(EWL_IMAGE(thumb), ev->dest); - ewl_callback_call(thumb, EWL_CALLBACK_VALUE_CHANGED); + ewl_callback_call(EWL_WIDGET(thumb), + EWL_CALLBACK_VALUE_CHANGED); } thumb->thumb = NULL; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje Dir : e17/libs/edje/src/bin Modified Files: edje_cc_handlers.c edje_test_main.c Log Message: add max text size for text objects - object wont get bigger than its text contents. useful for some things. === RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- edje_cc_handlers.c 21 Aug 2006 03:14:09 - 1.69 +++ edje_cc_handlers.c 9 Oct 2006 06:01:13 - 1.70 @@ -91,6 +91,7 @@ static void st_collections_group_parts_part_description_text_size(void); static void st_collections_group_parts_part_description_text_fit(void); static void st_collections_group_parts_part_description_text_min(void); +static void st_collections_group_parts_part_description_text_max(void); static void st_collections_group_parts_part_description_text_align(void); static void st_collections_group_parts_part_description_text_source(void); static void st_collections_group_parts_part_description_text_text_source(void); @@ -233,6 +234,7 @@ {"collections.group.parts.part.description.text.size", st_collections_group_parts_part_description_text_size}, {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit}, {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min}, + {"collections.group.parts.part.description.text.max", st_collections_group_parts_part_description_text_max}, {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align}, {"collections.group.parts.part.description.text.source", st_collections_group_parts_part_description_text_source}, {"collections.group.parts.part.description.text.text_source", st_collections_group_parts_part_description_text_text_source}, @@ -2141,6 +2143,33 @@ if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); ed->text.min_x = parse_bool(0); ed->text.min_y = parse_bool(1); +} + +static void +st_collections_group_parts_part_description_text_max(void) +{ + Edje_Part_Collection *pc; + Edje_Part *ep; + Edje_Part_Description *ed; + + check_arg_count(2); + + pc = evas_list_data(evas_list_last(edje_collections)); + ep = evas_list_data(evas_list_last(pc->parts)); + + if ((ep->type != EDJE_PART_TYPE_TEXT) && + (ep->type != EDJE_PART_TYPE_TEXTBLOCK)) + { + fprintf(stderr, "%s: Error. parse error %s:%i. " + "text attributes in non-TEXT part.\n", + progname, file_in, line - 1); + exit(-1); + } + + ed = ep->default_desc; + if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc)); + ed->text.max_x = parse_bool(0); + ed->text.max_y = parse_bool(1); } static void === RCS file: /cvs/e/e17/libs/edje/src/bin/edje_test_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- edje_test_main.c19 Jan 2006 12:12:46 - 1.4 +++ edje_test_main.c9 Oct 2006 06:01:13 - 1.5 @@ -290,6 +290,7 @@ main(int argc, char **argv) { Evas_Object *o; + Evas_Coord mw, mh; if (argc != 3) { @@ -344,6 +345,8 @@ evas_object_show(o); o_edje = o; +// edje_object_size_min_calc(o, &mw, &mh); +// evas_object_resize(o_edje, mw, mh); /* { Evas_Coord mw, mh; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_calc.c edje_data.c edje_embryo.c edje_private.h edje_util.c Log Message: add max text size for text objects - object wont get bigger than its text contents. useful for some things. === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- edje_calc.c 2 Oct 2006 13:19:20 - 1.91 +++ edje_calc.c 9 Oct 2006 06:01:13 - 1.92 @@ -718,7 +718,8 @@ } else evas_object_text_font_set(ep->object, font, size); - if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y)) + if ((chosen_desc->text.min_x) || (chosen_desc->text.min_y) || + (chosen_desc->text.max_x) || (chosen_desc->text.max_y)) { int mw, mh; Evas_Text_Style_Type style; @@ -742,6 +743,20 @@ evas_object_text_style_set(ep->object, style); evas_object_text_text_set(ep->object, text); evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th); +if (chosen_desc->text.max_x) + { + int l, r; + evas_object_text_style_pad_get(ep->object, &l, &r, NULL, NULL); + mw = tw + l + r; + if ((maxw < 0) || (mw < maxw)) maxw = mw; + } +if (chosen_desc->text.max_y) + { + int t, b; + evas_object_text_style_pad_get(ep->object, NULL, NULL, &t, &b); + mh = th + t + b; + if ((maxh < 0) || (mh < maxh)) maxh = mh; + } if (chosen_desc->text.min_x) { int l, r; === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- edje_data.c 21 Aug 2006 03:00:01 - 1.33 +++ edje_data.c 9 Oct 2006 06:01:13 - 1.34 @@ -315,6 +315,8 @@ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.fit_y", text.fit_y, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.min_x", text.min_x, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.min_y", text.min_y, EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.max_x", text.max_x, EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.max_y", text.max_y, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.align.x", text.align.x, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.align.y", text.align.y, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "text.id_source", text.id_source, EET_T_INT); === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_embryo.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- edje_embryo.c 28 Jun 2006 18:31:56 - 1.52 +++ edje_embryo.c 9 Oct 2006 06:01:13 - 1.53 @@ -1820,6 +1820,16 @@ GETINT(rp->custom.description->text.min_y, params[4]); break; + case EDJE_STATE_PARAM_TEXT_MAX: +if ( (rp->part->type != EDJE_PART_TYPE_TEXT) && \ + (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) + return 0; +CHKPARAM(4); + +GETINT(rp->custom.description->text.max_x, params[3]); +GETINT(rp->custom.description->text.max_y, params[4]); + +break; case EDJE_STATE_PARAM_TEXT_ALIGN: if ((rp->part->type != EDJE_PART_TYPE_TEXT)) return 0; CHKPARAM(4); @@ -2086,6 +2096,16 @@ SETINT(rp->custom.description->text.min_x, params[3]); SETINT(rp->custom.description->text.min_y, params[4]); + +break; + case EDJE_STATE_PARAM_TEXT_MAX: +if ( (rp->part->type != EDJE_PART_TYPE_TEXT) && \ + (rp->part->type != EDJE_PART_TYPE_TEXTBLOCK)) + return 0; +CHKPARAM(4); + +SETINT(rp->custom.description->text.max_x, params[3]); +SETINT(rp->custom.description->text.max_y, params[4]); break; case EDJE_STATE_PARAM_TEXT_ALIGN: === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v retrieving revision 1.114 retrieving revision 1.115 diff -u -3 -r1.114 -r1.115 --- edje_private.h 21 Aug 2006 03:00:01 -
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: fix rememebr resolution adjustment so it works - and make it more intelligent difiding things into 3x3 zones and achoring in each zone for re-adjust === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.550 retrieving revision 1.551 diff -u -3 -r1.550 -r1.551 --- e_border.c 8 Oct 2006 13:39:59 - 1.550 +++ e_border.c 9 Oct 2006 05:33:09 - 1.551 @@ -5329,32 +5329,126 @@ if (desk) e_border_desk_set(bd, desk); } +if (rem->apply & E_REMEMBER_APPLY_SIZE) + { + bd->client.w = rem->prop.w; + bd->client.h = rem->prop.h; + /* we can trust internal windows */ + if (bd->internal) + { + if (bd->client.icccm.min_w > bd->client.w) +bd->client.w = bd->client.icccm.min_w; + if (bd->client.icccm.max_w < bd->client.w) +bd->client.w = bd->client.icccm.max_w; + if (bd->client.icccm.min_h > bd->client.h) +bd->client.h = bd->client.icccm.min_h; + if (bd->client.icccm.max_h < bd->client.h) +bd->client.h = bd->client.icccm.max_h; + } + bd->w = bd->client.w + bd->client_inset.l + bd->client_inset.r; + bd->h = bd->client.h + bd->client_inset.t + bd->client_inset.b; + bd->changes.size = 1; + bd->changes.shape = 1; + } if ((rem->apply & E_REMEMBER_APPLY_POS) && (!bd->re_manage)) { bd->x = rem->prop.pos_x; bd->y = rem->prop.pos_y; if (bd->zone->w != rem->prop.res_x) { - bd->x = (rem->prop.pos_x * rem->prop.res_x) / bd->zone->w; + int px; + + px = bd->x + (bd->w / 2); + if (px < ((rem->prop.res_x * 1) / 3)) +{ + if (bd->zone->w >= (rem->prop.res_x / 3)) + bd->x = rem->prop.pos_x; + else + bd->x = ((rem->prop.pos_x - 0) * bd->zone->w) / + (rem->prop.res_x / 3); +} + else if (px < ((rem->prop.res_x * 2) / 3)) +{ + if (bd->zone->w >= (rem->prop.res_x / 3)) + bd->x = (bd->zone->w / 2) + + (px - (rem->prop.res_x / 2)) - + (bd->w / 2); + else + bd->x = (bd->zone->w / 2) + + (((px - (rem->prop.res_x / 2)) * bd->zone->w) / + (rem->prop.res_x / 3)) - + (bd->w / 2); +} + else +{ + if (bd->zone->w >= (rem->prop.res_x / 3)) + bd->x = bd->zone->w + + rem->prop.pos_x - rem->prop.res_x + + (rem->prop.w - bd->client.w); + else + bd->x = bd->zone->w + + (((rem->prop.pos_x - rem->prop.res_x) * bd->zone->w) / + (rem->prop.res_x / 3)) + + (rem->prop.w - bd->client.w); +} + if ((rem->prop.pos_x >= 0) && (bd->x < 0)) +bd->x = 0; + else if (((rem->prop.pos_x + rem->prop.w) < rem->prop.res_x) && + ((bd->x + bd->w) > bd->zone->w)) +bd->x = bd->zone->w - bd->w; } if (bd->zone->h != rem->prop.res_y) { - bd->y = (rem->prop.pos_y * rem->prop.res_y) / bd->zone->h; + int py; + + py = bd->y + (bd->h / 2); + if (py < ((rem->prop.res_y * 1) / 3)) +{ + if (bd->zone->h >= (rem->prop.res_y / 3)) + bd->y = rem->prop.pos_y; + else + bd->y = ((rem->prop.pos_y - 0) * bd->zone->h) / + (rem->prop.res_y / 3); +} + else if (py < ((rem->prop.res_y * 2) / 3)) +{ +
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_histogram.c Log Message: Update histogram colors to premul changes in evas. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_histogram.c 8 Oct 2006 17:26:22 - 1.6 +++ ewl_histogram.c 9 Oct 2006 05:23:00 - 1.7 @@ -297,13 +297,13 @@ color = (unsigned int)(128 << 24); switch (hist->channel) { case EWL_HISTOGRAM_CHANNEL_R: - color |= (unsigned int)(255 << 16); + color |= (unsigned int)(128 << 16); break; case EWL_HISTOGRAM_CHANNEL_G: - color |= (unsigned int)(255 << 8); + color |= (unsigned int)(128 << 8); break; case EWL_HISTOGRAM_CHANNEL_B: - color |= (unsigned int)(255); + color |= (unsigned int)(128); break; default: break; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mixer devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mixer Dir : e_modules/mixer Modified Files: e_mod_main.c Log Message: Remove the app installed check for metrics so apps can be run with arguments. === RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- e_mod_main.c3 Oct 2006 04:38:58 - 1.51 +++ e_mod_main.c9 Oct 2006 05:01:31 - 1.52 @@ -222,8 +222,7 @@ } else if (ev->button == 2) { - if ((ci->use_app) && (ci->app != NULL) && - (ecore_file_app_installed(ci->app))) + if ((ci->use_app) && (ci->app != NULL)) ecore_exe_run(ci->app, NULL); else _mixer_window_simple_pop_up(inst); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_fb Modified Files: ecore_fb_kbd.c Log Message: key down/up swap === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_fb/ecore_fb_kbd.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ecore_fb_kbd.c 31 Jul 2006 04:13:51 - 1.1 +++ ecore_fb_kbd.c 9 Oct 2006 04:26:41 - 1.2 @@ -166,7 +166,7 @@ v = read(_ecore_fb_kbd_fd, &buf, 1); if (v < 0) return 1; if (v < 1) return 1; - if (buf & 0x80) + if (!(buf & 0x80)) { /* DOWN */ int vt_switch = -1; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/src Modified Files: ephoto.c ephoto_callbacks.c ephoto_viewer.c Log Message: Finish moving ephoto to ewl_shadow === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v retrieving revision 1.86 retrieving revision 1.87 diff -u -3 -r1.86 -r1.87 --- ephoto.c7 Oct 2006 18:08:46 - 1.86 +++ ephoto.c9 Oct 2006 03:22:36 - 1.87 @@ -29,7 +29,7 @@ m->win = ewl_window_new(); ewl_window_title_set(EWL_WINDOW(m->win), "Ephoto"); ewl_window_name_set(EWL_WINDOW(m->win), "Ephoto"); - ewl_object_size_request(EWL_OBJECT(m->win), 620, 480); + ewl_object_size_request(EWL_OBJECT(m->win), 620, 475); ewl_callback_append(m->win, EWL_CALLBACK_DELETE_WINDOW, destroy_cb, NULL); ewl_widget_show(m->win); === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- ephoto_callbacks.c 7 Oct 2006 21:15:45 - 1.33 +++ ephoto_callbacks.c 9 Oct 2006 03:22:36 - 1.34 @@ -209,8 +209,8 @@ shadow = ewl_shadow_new(); ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), shadow); - ewl_object_minimum_size_set(EWL_OBJECT(shadow), 115, 95); - ewl_object_maximum_size_set(EWL_OBJECT(shadow), 115, 95); + ewl_object_minimum_size_set(EWL_OBJECT(shadow), 110, 90); + ewl_object_maximum_size_set(EWL_OBJECT(shadow), 110, 90); ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, view_images, image_path); ewl_widget_show(shadow); @@ -219,8 +219,9 @@ ewl_container_child_append(EWL_CONTAINER(shadow), image); ewl_image_size_set(EWL_IMAGE(image), 97, 83); ewl_image_proportional_set(EWL_IMAGE(image), TRUE); - ewl_theme_data_str_set(image, "/image_thumbnail/group", - ewl_theme_data_str_get(m->win, "group")); + ewl_theme_data_str_set(image, "/image_thumbnail/file", + PACKAGE_DATA_DIR "/images/image_bg.edj"); + ewl_theme_data_str_set(image, "/image_thumbnail/group", "image_bg"); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); ewl_widget_show(image); } === RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_viewer.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ephoto_viewer.c 7 Oct 2006 21:15:45 - 1.20 +++ ephoto_viewer.c 9 Oct 2006 03:22:36 - 1.21 @@ -461,7 +461,7 @@ shadow = ewl_shadow_new(); ewl_container_child_append(EWL_CONTAINER(freebox), shadow); ewl_object_minimum_size_set(EWL_OBJECT(shadow), 60, 60); - ewl_object_maximum_size_set(EWL_OBJECT(shadow), 60, 60); + ewl_object_maximum_size_set(EWL_OBJECT(shadow), 55, 55); ewl_callback_append(shadow, EWL_CALLBACK_CLICKED, change_image, current_image); ewl_widget_show(shadow); @@ -471,8 +471,9 @@ ewl_image_size_set(EWL_IMAGE(image), 48, 48); ewl_image_proportional_set(EWL_IMAGE(image), TRUE); ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER); - ewl_theme_data_str_set(image, "/image_thumbnail/group", -ewl_theme_data_str_get(m->win, "group")); + ewl_theme_data_str_set(image, "/image_thumbnail/file", +PACKAGE_DATA_DIR "/images/image_bg.edj"); + ewl_theme_data_str_set(image, "/image_thumbnail/group", "image_bg"); ewl_widget_show(image); ecore_dlist_next(view_thumbs); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto titan
Enlightenment CVS committal Author : titan Project : e17 Module : proto Dir : e17/proto/ephoto/data/images Modified Files: Makefile.am Added Files: image_bg.edc Log Message: Finish moving ephoto to ewl_shadow === RCS file: /cvs/e/e17/proto/ephoto/data/images/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 6 Oct 2006 02:25:11 - 1.8 +++ Makefile.am 9 Oct 2006 03:22:36 - 1.9 @@ -1,4 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in + +EDCS = image_bg.edc + +EDJS = $(EDCS:%.edc=%.edj) + FILES = add.png \ dialog-close.png \ emblem-favorite.png \ @@ -18,5 +23,12 @@ undo.png \ x-office-presentation.png imagedir = $(pkgdatadir)/images +edjedir = $(pkgdatadir)/images +edje_DATA = $(EDJS) +all: $(EDJS) +image_bg.edj: ${EDCS} +SUFFIXES = .edc .edj +.edc.edj: + edje_cc image_bg.edc image_bg.edj image_DATA = $(FILES) EXTRA_DIST = $(FILES) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_bg.c e_bg.h Log Message: break code that finds bg file for a zone into a separate function === RCS file: /cvs/e/e17/apps/e/src/bin/e_bg.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_bg.c 23 Aug 2006 03:39:01 - 1.18 +++ e_bg.c 8 Oct 2006 21:15:21 - 1.19 @@ -9,20 +9,12 @@ /* local subsystem globals */ /* externally accessible functions */ -EAPI void -e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) +EAPI const char * +e_bg_file_get(E_Zone *zone) { - Evas_Object *o; Evas_List *l, *ll, *entries; int ok; const char *bgfile = ""; - const char *trans = ""; - - if (transition == E_BG_TRANSITION_START) trans = e_config->transition_start; - else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk; - else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change; - if ((!trans) || (strlen(trans) < 1)) transition = E_BG_TRANSITION_NONE; - ok = 0; for (l = e_config->desktop_backgrounds; l; l = l->next) { @@ -73,6 +65,23 @@ bgfile = e_theme_edje_file_get("base/theme/background", "e/desktop/background"); } } + return bgfile; +} + +EAPI void +e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition) +{ + Evas_Object *o; + const char *bgfile = ""; + const char *trans = ""; + + if (transition == E_BG_TRANSITION_START) trans = e_config->transition_start; + else if (transition == E_BG_TRANSITION_DESK) trans = e_config->transition_desk; + else if (transition == E_BG_TRANSITION_CHANGE) trans = e_config->transition_change; + if ((!trans) || (strlen(trans) < 1)) transition = E_BG_TRANSITION_NONE; + + bgfile = e_bg_file_get(zone); + if (zone->bg_object) { const char *pfile = ""; === RCS file: /cvs/e/e17/apps/e/src/bin/e_bg.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_bg.h 30 Jun 2005 14:35:18 - 1.4 +++ e_bg.h 8 Oct 2006 21:15:21 - 1.5 @@ -14,6 +14,7 @@ #ifndef E_BG_H #define E_BG_H +EAPI const char *e_bg_file_get(E_Zone *zone); EAPI void e_bg_zone_update(E_Zone *zone, E_Bg_Transition transition); EAPI void e_bg_add(int container, int zone, int desk_x, int desk_y, char *file); EAPI void e_bg_del(int container, int zone, int desk_x, int desk_y); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_histogram.c ewl_icon.c ewl_icon.h ewl_image.c Log Message: - if the alt-text is set use that over the default image loading icon - ewl_image_thumbnail will now send a EWL_CALLBACK_VALUE_CHANGED when it loads the actual thumbnail image === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ewl_histogram.c 8 Oct 2006 07:06:54 - 1.5 +++ ewl_histogram.c 8 Oct 2006 17:26:22 - 1.6 @@ -272,7 +272,7 @@ int x, y; unsigned int color; unsigned int *data, *dst; - Evas_Coord img_w, img_h; + Evas_Coord img_w = 0, img_h = 0; Evas_Object *img; DENTER_FUNCTION(DLEVEL_STABLE); === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ewl_icon.c 8 Oct 2006 01:46:59 - 1.19 +++ ewl_icon.c 8 Oct 2006 17:26:22 - 1.20 @@ -12,6 +12,8 @@ void *data); static void ewl_icon_cb_entry_value_changed(Ewl_Widget *w, void *ev, void *data); +static void ewl_icon_cb_thumb_value_changed(Ewl_Widget *w, void *ev, + void *data); static void ewl_icon_update_label(Ewl_Icon *icon); @@ -129,28 +131,35 @@ DCHECK_PARAM_PTR("file", file); DCHECK_TYPE("icon", icon, EWL_ICON_TYPE); - if (icon->preview) + if (icon->image) { - if (ewl_widget_type_is(icon->preview, EWL_IMAGE_TYPE)) - constrain = ewl_icon_constrain_get(icon); - ewl_widget_destroy(icon->preview); + constrain = ewl_icon_constrain_get(icon); + ewl_widget_destroy(icon->image); } img = ewl_image_new(); ewl_image_file_set(EWL_IMAGE(img), file, key); - icon->preview = ewl_image_thumbnail_get(EWL_IMAGE(img)); - ewl_image_proportional_set(EWL_IMAGE(icon->preview), TRUE); + icon->image = ewl_image_thumbnail_get(EWL_IMAGE(img)); + ewl_image_proportional_set(EWL_IMAGE(icon->image), TRUE); + ewl_callback_append(icon->image, EWL_CALLBACK_VALUE_CHANGED, + ewl_icon_cb_thumb_value_changed, icon); ewl_icon_constrain_set(icon, constrain); - ewl_image_file_set(EWL_IMAGE(icon->preview), + ewl_object_alignment_set(EWL_OBJECT(icon->image), + EWL_FLAG_ALIGN_CENTER); + ewl_widget_internal_set(icon->image, TRUE); + ewl_container_child_prepend(EWL_CONTAINER(icon), icon->image); + + if (!icon->alt) + { + ewl_image_file_set(EWL_IMAGE(icon->image), ewl_icon_theme_icon_path_get( EWL_ICON_IMAGE_LOADING, NULL), EWL_ICON_IMAGE_LOADING); - ewl_object_alignment_set(EWL_OBJECT(icon->preview), - EWL_FLAG_ALIGN_CENTER); - ewl_widget_internal_set(icon->preview, TRUE); - ewl_container_child_prepend(EWL_CONTAINER(icon), icon->preview); - ewl_widget_show(icon->preview); + ewl_widget_show(icon->image); + } + else + ewl_widget_show(icon->alt); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -170,8 +179,8 @@ DCHECK_PARAM_PTR_RET("icon", icon, NULL); DCHECK_TYPE_RET("icon", icon, EWL_ICON_TYPE, NULL); - if (icon->preview) - file = ewl_image_file_path_get(EWL_IMAGE(icon->preview)); + if (icon->image) + file = ewl_image_file_path_get(EWL_IMAGE(icon->image)); DRETURN_PTR(file, DLEVEL_STABLE); } @@ -255,13 +264,13 @@ ewl_widget_show(icon->label); - /* if we have a preview make sure we are after it, but -* before anything that is after the preview */ - if (icon->preview && icon->extended) + /* if we have a image make sure we are after it, but +* before anything that is after the image */ + if (icon->image && icon->extended) { int idx; idx = ewl_container_child_index_get(EWL_CONTAINER(icon), - icon->preview); + icon->image); ewl_container_child_insert_internal(EWL_CONTAINER(icon), icon->label,
E CVS: libs/epsilon dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/lib Modified Files: Epsilon.c Log Message: - remove printf === RCS file: /cvs/e/e17/libs/epsilon/src/lib/Epsilon.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- Epsilon.c 6 Sep 2006 07:14:46 - 1.29 +++ Epsilon.c 8 Oct 2006 16:15:10 - 1.30 @@ -104,8 +104,6 @@ void* dl_ref; Epsilon_Plugin* (*epsilon_plugin_init)(); - printf ("Loading plugin '%s'...\n", path); - dl_ref = dlopen(path, RTLD_LAZY); if (dl_ref) { epsilon_plugin_init = dlsym(dl_ref, "epsilon_plugin_init"); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_cslider.c Log Message: fix color slider gradient fills after evas changes === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_cslider.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_widget_cslider.c 30 Sep 2006 10:16:23 - 1.8 +++ e_widget_cslider.c 8 Oct 2006 15:21:04 - 1.9 @@ -78,7 +78,7 @@ e_widget_sub_object_add(obj, o); if (wd->vertical) - evas_object_gradient_angle_set(o, 180); + evas_object_gradient_angle_set(o, 0); else evas_object_gradient_angle_set(o, 270); @@ -113,10 +113,7 @@ _e_wid_resize(void *data, Evas_Object *o, Evas_Coord w, Evas_Coord h) { E_Widget_Data *wd = data; - if (wd->vertical) - evas_object_gradient_fill_set(o, 0, 0, w, h); - else - evas_object_gradient_fill_set(o, 0, 0, h, w); + evas_object_gradient_fill_set(o, 0, 0, w, h); evas_object_resize(o, w, h); evas_object_resize(wd->o_event, w, h); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: ewins.c mod-misc.c Log Message: Remove duplicate const. === RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.173 retrieving revision 1.174 diff -u -3 -r1.173 -r1.174 --- ewins.c 24 Aug 2006 21:52:28 - 1.173 +++ ewins.c 8 Oct 2006 14:54:20 - 1.174 @@ -2270,7 +2270,7 @@ /* * Module descriptor */ -const const EModule ModEwins = { +const EModule ModEwins = { "ewins", NULL, EwinsSighan, {N_IPC_FUNCS, EwinsIpcArray} === RCS file: /cvs/e/e16/e/src/mod-misc.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- mod-misc.c 19 Sep 2006 16:55:16 - 1.45 +++ mod-misc.c 8 Oct 2006 14:54:20 - 1.46 @@ -238,7 +238,7 @@ #define N_IPC_FUNCS (sizeof(MiscIpcArray)/sizeof(IpcItem)) /* Stuff not elsewhere */ -const const EModule ModMisc = { +const EModule ModMisc = { "misc", NULL, NULL, {N_IPC_FUNCS, MiscIpcArray} - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas tilman
Enlightenment CVS committal Author : tilman Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_font_load.c Log Message: don't rely on TT_CONFIG_OPTION_BYTECODE_INTERPRETER in freetype 2.1, because distros suck so much. oh well. === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- evas_font_load.c8 Oct 2006 13:00:26 - 1.38 +++ evas_font_load.c8 Oct 2006 13:58:58 - 1.39 @@ -401,11 +401,12 @@ return FT_Get_TrueType_Engine_Type(evas_ft_lib) >= FT_TRUETYPE_ENGINE_TYPE_PATENTED; #else -# ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER +/* we may not rely on TT_CONFIG_OPTION_BYTECODE_INTERPRETER + * here to find out whether it's supported. + * + * so, assume it is. o_O + */ return 1; -# else -return 0; -# endif #endif } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: pager.c Log Message: Fix live pager update mode. === RCS file: /cvs/e/e16/e/src/pager.c,v retrieving revision 1.230 retrieving revision 1.231 diff -u -3 -r1.230 -r1.231 --- pager.c 8 Oct 2006 13:01:42 - 1.230 +++ pager.c 8 Oct 2006 13:44:15 - 1.231 @@ -382,9 +382,6 @@ vx = cx * VRoot.w; vy = cy * VRoot.h; - if (p->x1 >= p->x2 || p->y1 >= p->y2) - return; - update_screen_included = update_screen_only = 0; if (pager_mode == PAGER_MODE_SNAP && p->dsk == DesksGetCurrent() && Mode.mode == 0) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: another eap refernce nuked === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.549 retrieving revision 1.550 diff -u -3 -r1.549 -r1.550 --- e_border.c 5 Oct 2006 13:34:43 - 1.549 +++ e_border.c 8 Oct 2006 13:39:59 - 1.550 @@ -2559,7 +2559,7 @@ char *ext; ext = strrchr(bd->internal_icon, '.'); - if ((ext) && ((!strcmp(ext, ".eap")) || (!strcmp(ext, ".edj" + if ((ext) && ((!strcmp(ext, ".edj" { if (!edje_object_file_set(o, bd->internal_icon, "icon")) e_util_edje_icon_set(o, "enlightenment/e"); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c Log Message: and clever borders are back === RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.221 retrieving revision 1.222 diff -u -3 -r1.221 -r1.222 --- e_apps.c8 Oct 2006 13:13:55 - 1.221 +++ e_apps.c8 Oct 2006 13:38:42 - 1.222 @@ -1767,6 +1767,24 @@ //if (desktop->categories) a->categories = evas_stringshare_add(desktop->categories); } } +#if CLEVER_BORDERS + if (a->filled) + { +double begin, time; + +begin = ecore_time_get(); + +if ((a->path) && (a->win_class)) _e_apps_border_setup(&_e_apps_border_ng_win_class, &_e_apps_border_g_win_class, a->win_class, a->path, 'c'); +if ((a->path) && (a->win_name)) _e_apps_border_setup(&_e_apps_border_ng_win_name, &_e_apps_border_g_win_name, a->win_name, a->path, 'n'); +if ((a->path) && (a->win_title)) _e_apps_border_setup(&_e_apps_border_ng_win_title, &_e_apps_border_g_win_title, a->win_title, a->path, 't'); +if ((a->path) && (a->win_role)) _e_apps_border_setup(&_e_apps_border_ng_win_role, &_e_apps_border_g_win_role, a->win_role, a->path, 'r'); +if ((a->path) && (a->exe)) _e_apps_border_setup(&_e_apps_border_ng_exe, NULL, a->exe, a->path, 'e'); + +time = ecore_time_get() - begin; +border_setup_count++; +border_setup_time += time; + } +#endif } static char * - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am Removed Files: e_eapp_main.c Log Message: no mroe enlightenment_eapp tool === RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.155 retrieving revision 1.156 diff -u -3 -r1.155 -r1.156 --- Makefile.am 3 Oct 2006 05:49:31 - 1.155 +++ Makefile.am 8 Oct 2006 13:16:45 - 1.156 @@ -16,7 +16,6 @@ bin_PROGRAMS = \ enlightenment \ enlightenment_remote \ -enlightenment_eapp \ enlightenment_imc \ enlightenment_start \ enlightenment_thumb \ @@ -336,12 +335,6 @@ e_remote_main.c enlightenment_remote_LDFLAGS = @e_libs@ @dlopen_libs@ - -enlightenment_eapp_SOURCES = \ -e.h \ -e_eapp_main.c - -enlightenment_eapp_LDFLAGS = @e_libs@ @dlopen_libs@ enlightenment_imc_SOURCES = \ e.h \ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c Log Message: eap support... gone. === RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.220 retrieving revision 1.221 diff -u -3 -r1.220 -r1.221 --- e_apps.c5 Oct 2006 08:35:30 - 1.220 +++ e_apps.c8 Oct 2006 13:13:55 - 1.221 @@ -5,7 +5,6 @@ /* TODO List: * - * - We assume only .eap files in 'all', no subdirs * - If a .order file references a non-existing file, and the file * is added in 'all', it doesn't show! * - track app execution state, visibility state etc. and call callbacks @@ -52,7 +51,6 @@ static Evas_Bool _e_apps_hash_idler_cb_init(Evas_Hash *hash, const char *key, void *data, void *fdata); static void _e_app_free (E_App *a); static E_App *_e_app_subapp_file_find (E_App *a, const char *file); -static int_e_app_new_save (E_App *a); static void _e_app_change (E_App *a, E_App_Change ch); static int _e_apps_cb_exit (void *data, int type, void *event); static void _e_app_cb_monitor (void *data, Ecore_File_Monitor *em, Ecore_File_Event event, const char *path); @@ -114,50 +112,6 @@ static double border_time = 0.0, border_clever_time = 0.0; static intborder_count = 0; -#define EAP_MIN_WIDTH 8 -#define EAP_MIN_HEIGHT 8 - -#define EAP_EDC_TMPL \ -"images {\n" \ -" image: \"%s\" COMP;\n" \ -"}\n" \ -"collections {\n" \ -" group {\n" \ -" name: \"icon\";\n" \ -" max: %d %d;\n" \ -" parts {\n" \ -" part {\n" \ -" name: \"image\";\n" \ -" type: IMAGE;\n" \ -" mouse_events: 0;\n" \ -" description {\n" \ -" state: \"default\" 0.00;\n" \ -" visible: 1;\n" \ -" aspect: 1.00 1.00;\n" \ -" rel1 {\n" \ -"relative: 0.00 0.00;\n" \ -"offset: 0 0;\n" \ -" }\n" \ -" rel2 {\n" \ -"relative: 1.00 1.00;\n" \ -"offset: -1 -1;\n" \ -" }\n" \ -" image {\n" \ -"normal: \"%s\";\n" \ -" }\n" \ -" }\n" \ -" }\n" \ -" }\n" \ -" }\n" \ -"}\n" - -#define EAP_EDC_TMPL_EMPTY \ -"images {\n " \ -"}\n" \ -"collections {\n" \ -"}\n" - - /* externally accessible functions */ EAPI int e_app_init(void) @@ -473,7 +427,7 @@ { if ((!a->idle_fill) && (!a->filled)) { - snprintf(buf, sizeof(buf), "%s/.directory.eap", path); + snprintf(buf, sizeof(buf), "%s/.directory.desktop", path); if (ecore_file_exists(buf)) e_app_fields_fill(a, buf); else @@ -784,8 +738,6 @@ } if (before == NULL) fprintf(f, "%s\n", ecore_file_get_file(add->path)); fclose(f); - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", parent->path); - ecore_file_unlink(buf); } static void @@ -830,8 +782,6 @@ } } fclose(f); - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", parent->path); - ecore_file_unlink(buf); } static void @@ -849,8 +799,6 @@ snprintf(buf, sizeof(buf), "%s/%s", _e_apps_path_all, ecore_file_get_file(file)); if (!ecore_file_download(file, buf, NULL, NULL, NULL)) continue; - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", _e_apps_path_all); - ecore_file_unlink(buf); } } @@ -988,8 +936,6 @@ fprintf(f, "%s\n", ecore_file_get_file(a->path)); } fclose(f); - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", before->parent->path); - ecore_file_unlink(buf); } } @@ -1030,8 +976,6 @@ fprintf(f, "%s\n", ecore_file_get_file(file)); } fclose(f); - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", parent->path); - ecore_file_unlink(buf); } } @@ -1067,8 +1011,6 @@ a2 = l->data; e_app_remove(a2); } - snprintf(buf, sizeof(buf), "%s/.eap.cache.cfg", a->parent->path); - ecore_file_unlink(buf); _e_app_change(a, E_APP_DEL); a->parent = NULL; e_object_unref(E_OBJECT(a)); @@ -1825,80 +1767,6 @@ //if (desktop->categories) a->categories = evas_stringshare_add(desktop->categories); } } - else - { /* Must be an .eap file. */ - Eet_File *ef; - -/* FIXME: This entire process seems inefficient, each of the strings gets duped then freed three times. - * On the other hand, raster wants .eaps to go away, so no big deal. B-) - */ - -#define STORE_N_FREE(member) \ - if (v) \ - { \ - str = alloca(size + 1); \ -memcpy(str, (v), size); \ -str[size] = 0; \ -a->member = evas_stringshare_add(str); \ -
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: dialog.c hints.c menus.c pager.c Log Message: Fix applying matches to internal client windows in certain situations. === RCS file: /cvs/e/e16/e/src/dialog.c,v retrieving revision 1.173 retrieving revision 1.174 diff -u -3 -r1.173 -r1.174 --- dialog.c14 Sep 2006 21:20:35 - 1.173 +++ dialog.c8 Oct 2006 13:01:42 - 1.174 @@ -312,6 +312,7 @@ if (d->title) Efree(d->title); d->title = Estrdup(title); + HintsSetWindowName(d->win, d->title); } void @@ -543,12 +544,6 @@ void DialogArrange(Dialog * d, int resize) { - if (d->title) - { - HintsSetWindowName(d->win, d->title); - HintsSetWindowClass(d->win, d->name, "Enlightenment_Dialog"); - } - if (d->item) DialogItemsRealize(d); @@ -582,6 +577,8 @@ EwinShow(ewin); return; } + + HintsSetWindowClass(d->win, d->name, "Enlightenment_Dialog"); ewin = AddInternalToFamily(d->win, "DIALOG", EWIN_TYPE_DIALOG, d, DialogEwinInit); === RCS file: /cvs/e/e16/e/src/hints.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- hints.c 3 Oct 2006 20:13:45 - 1.70 +++ hints.c 8 Oct 2006 13:01:42 - 1.71 @@ -157,6 +157,9 @@ void HintsSetWindowName(Win win, const char *name) { + if (!name) + name = "NoTitle"; + ecore_x_icccm_title_set(WinGetXwin(win), name); EWMH_SetWindowName(WinGetXwin(win), name); @@ -166,6 +169,11 @@ HintsSetWindowClass(Win win, const char *name, const char *clss) { XClassHint *xch; + + if (!name) + name = "NoName"; + if (!clss) + clss = "NoClass"; xch = XAllocClassHint(); xch->res_name = (char *)name; === RCS file: /cvs/e/e16/e/src/menus.c,v retrieving revision 1.259 retrieving revision 1.260 diff -u -3 -r1.259 -r1.260 --- menus.c 31 Aug 2006 21:33:02 - 1.259 +++ menus.c 8 Oct 2006 13:01:42 - 1.260 @@ -652,6 +652,7 @@ EventCallbackRegister(m->win, 0, MenuHandleEvents, m); if (m->title) HintsSetWindowName(m->win, _(m->title)); + HintsSetWindowClass(m->win, m->name, "Enlightenment_Menu"); } maxh = maxw = 0; === RCS file: /cvs/e/e16/e/src/pager.c,v retrieving revision 1.229 retrieving revision 1.230 diff -u -3 -r1.229 -r1.230 --- pager.c 24 Sep 2006 21:01:56 - 1.229 +++ pager.c 8 Oct 2006 13:01:42 - 1.230 @@ -727,6 +727,8 @@ return; } + Esnprintf(s, sizeof(s), "Pager-%i", p->dsk->num); + HintsSetWindowName(p->win, s); Esnprintf(s, sizeof(s), "%i", p->dsk->num); HintsSetWindowClass(p->win, s, "Enlightenment_Pager"); @@ -1218,15 +1220,12 @@ NewPagerForDesktop(Desk * dsk) { Pager *p; - chars[128]; p = PagerCreate(); if (!p) return; p->dsk = dsk; - Esnprintf(s, sizeof(s), "Pager-%i", dsk->num); - HintsSetWindowName(p->win, s); PagerShow(p); } @@ -2015,6 +2014,8 @@ break; case ESIGNAL_DESK_ADDED: + if (Mode.wm.startup) + break; NewPagerForDesktop(prm); break; case ESIGNAL_DESK_REMOVED: - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas tilman
Enlightenment CVS committal Author : tilman Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/include Modified Files: evas_common.h Log Message: fixed evas_common_hinting_available so it works properly with both freetype 2.1 and 2.2 === RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_common.h,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- evas_common.h 2 Oct 2006 11:24:26 - 1.67 +++ evas_common.h 8 Oct 2006 13:00:26 - 1.68 @@ -33,6 +33,7 @@ #include FT_FREETYPE_H #include FT_GLYPH_H #include FT_SIZES_H +#include FT_MODULE_H #ifdef __GNUC__ # if __GNUC__ >= 4 - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas tilman
Enlightenment CVS committal Author : tilman Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_font_load.c Log Message: fixed evas_common_hinting_available so it works properly with both freetype 2.1 and 2.2 === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- evas_font_load.c6 Sep 2006 07:33:40 - 1.37 +++ evas_font_load.c8 Oct 2006 13:00:26 - 1.38 @@ -1,3 +1,6 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #include "evas_common.h" #include "evas_private.h" @@ -379,23 +382,34 @@ EAPI Evas_Bool evas_common_hinting_available(Font_Hint_Flags hinting) { - if (hinting == FONT_NO_HINT) return 1; - else if (hinting == FONT_AUTO_HINT) + switch (hinting) { -#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING - return 1; -#else - return 1; -#endif - } - else if (hinting == FONT_BYTECODE_HINT) - { -#ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER - return 1; + case FONT_NO_HINT: + case FONT_AUTO_HINT: +/* these two hinting modes are always available */ +return 1; + case FONT_BYTECODE_HINT: +/* Only use the bytecode interpreter if support for the _patented_ + * algorithms is available because the free bytecode + * interpreter's results are too crappy. + * + * On freetyp 2.2+, we can ask the library about support for + * the patented interpreter. On older versions, we need to use + * macros to check for it. + */ +#if FREETYPE_MINOR >= 2 +return FT_Get_TrueType_Engine_Type(evas_ft_lib) >= + FT_TRUETYPE_ENGINE_TYPE_PATENTED; #else - return 1; +# ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER +return 1; +# else +return 0; +# endif #endif } + + /* shouldn't get here - need to add another case statement */ return 0; } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_font_draw.c evas_font_query.c Log Message: remove sub-pixel cursor advance for font rendering === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_draw.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- evas_font_draw.c6 Sep 2006 07:33:40 - 1.28 +++ evas_font_draw.c8 Oct 2006 12:43:31 - 1.29 @@ -174,8 +174,8 @@ if (ext_w <= 0) return; if (ext_h <= 0) return; - pen_x = x << 8; - pen_y = y << 8; + pen_x = x; + pen_y = y; evas_common_font_size_use(fn); use_kerning = FT_HAS_KERNING(fi->src->ft.face); prev_index = 0; @@ -200,7 +200,7 @@ if (FT_Get_Kerning(fi->src->ft.face, prev_index, index, ft_kerning_default, &delta) == 0) - pen_x += delta.x << 2; + pen_x += delta.x >> 6; } pface = fi->src->ft.face; fg = evas_common_font_int_cache_glyph_get(fi, index); @@ -213,8 +213,8 @@ fg->ext_dat_free = dc->font_ext.func.gl_free; } - chr_x = (pen_x + (fg->glyph_out->left << 8)) >> 8; - chr_y = (pen_y + (fg->glyph_out->top << 8)) >> 8; + chr_x = (pen_x + (fg->glyph_out->left)); + chr_y = (pen_y + (fg->glyph_out->top)); if (chr_x < (ext_x + ext_w)) { @@ -335,7 +335,7 @@ } else break; - pen_x += fg->glyph->advance.x >> 8; + pen_x += fg->glyph->advance.x >> 16; prev_index = index; } } === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_font_query.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- evas_font_query.c 6 Sep 2006 07:33:40 - 1.20 +++ evas_font_query.c 8 Oct 2006 12:43:31 - 1.21 @@ -44,7 +44,7 @@ if (FT_Get_Kerning(fi->src->ft.face, prev_index, index, ft_kerning_default, &delta) == 0) { - kern = delta.x << 2; + kern = delta.x >> 6; pen_x += kern; } } @@ -52,14 +52,14 @@ fg = evas_common_font_int_cache_glyph_get(fi, index); if (!fg) continue; -chr_x = (pen_x + (fg->glyph_out->left << 8)) >> 8; - chr_y = (pen_y + (fg->glyph_out->top << 8)) >> 8; +chr_x = (pen_x + (fg->glyph_out->left)); + chr_y = (pen_y + (fg->glyph_out->top)); // chr_w = fg->glyph_out->bitmap.width; - chr_w = fg->glyph_out->bitmap.width + (kern >> 8); + chr_w = fg->glyph_out->bitmap.width + kern; { int advw; -advw = ((fg->glyph->advance.x + (kern << 8)) >> 16); +advw = ((fg->glyph->advance.x + (kern << 16)) >> 16); if (chr_w < advw) chr_w = advw; } @@ -68,7 +68,7 @@ if ((chr_x + chr_w) > end_x) end_x = chr_x + chr_w; - pen_x += fg->glyph->advance.x >> 8; + pen_x += fg->glyph->advance.x >> 16; prev_index = index; } if (w) *w = end_x - start_x; @@ -138,21 +138,21 @@ if (FT_Get_Kerning(fi->src->ft.face, prev_index, index, ft_kerning_default, &delta) == 0) - pen_x += delta.x << 2; + pen_x += delta.x >> 6; } pface = fi->src->ft.face; fg = evas_common_font_int_cache_glyph_get(fi, index); if (!fg) continue; -chr_x = (pen_x + (fg->glyph_out->left << 8)) >> 8; - chr_y = (pen_y + (fg->glyph_out->top << 8)) >> 8; +chr_x = (pen_x + (fg->glyph_out->left)); + chr_y = (pen_y + (fg->glyph_out->top)); chr_w = fg->glyph_out->bitmap.width; - pen_x += fg->glyph->advance.x >> 8; + pen_x += fg->glyph->advance.x >> 16; prev_index = index; } if (v_adv) *v_adv = evas_common_font_get_line_advance(fn); - if (h_adv) *h_adv = (pen_x >> 8) - start_x; + if (h_adv) *h_adv = pen_x - start_x; } /* x y w h for char at char pos */ @@ -202,7 +202,7 @@ if (FT_Get_Kerning(fi->src->ft.face, prev_index, index, ft_kerning_default, &delta) == 0) { - kern = delta.x << 2; + kern = delta.x >> 6; pen_x += kern; } } @@ -211,14 +211,14 @@ if (!fg) continue; if (kern < 0) kern = 0; -chr_x = ((pen_x - kern) + (fg->glyph_out->left << 8)) >> 8; - chr_y = (pen_y + (fg->glyph_out->top << 8)) >> 8; - chr_w = fg->glyph_out->bitmap.width + (kern >> 8); +chr_x = ((pen_x - kern) + (fg->glyph_out->left)); + chr_y = (pen_y + (fg->glyph_out->top)); +
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_iconbox.c etk_popup_window.c Log Message: * [Etk_Iconbox] The steps of the scrolled-view is now adapted to the size of the model's cell. === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_iconbox.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- etk_iconbox.c 6 Oct 2006 17:04:14 - 1.17 +++ etk_iconbox.c 8 Oct 2006 10:30:05 - 1.18 @@ -212,6 +212,11 @@ return; iconbox->current_model = model; + etk_range_increments_set(etk_scrolled_view_hscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)), + model->width * 0.75, model->width * 3.0); + etk_range_increments_set(etk_scrolled_view_vscrollbar_get(ETK_SCROLLED_VIEW(iconbox->scrolled_view)), + model->height * 0.75, model->height * 3.0); + etk_signal_emit_by_name("scroll_size_changed", ETK_OBJECT(iconbox->grid), NULL); etk_widget_redraw_queue(iconbox->grid); } @@ -824,7 +829,8 @@ etk_widget_show(iconbox->grid); iconbox->models = NULL; - iconbox->current_model = etk_iconbox_model_new(iconbox); + iconbox->current_model = NULL; + etk_iconbox_current_model_set(iconbox, etk_iconbox_model_new(iconbox)); iconbox->num_icons = 0; iconbox->first_icon = NULL; === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_popup_window.c 8 Oct 2006 10:04:54 - 1.16 +++ etk_popup_window.c 8 Oct 2006 10:30:05 - 1.17 @@ -373,8 +373,6 @@ { if (!_etk_popup_window_focused_window) return; - if (event_info.key_down.timestamp < _etk_popup_window_popup_timestamp) - return; evas_event_feed_key_down(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas, event_info.key_down.keyname, event_info.key_down.key, event_info.key_down.string, NULL, event_info.key_down.timestamp, NULL); @@ -386,8 +384,6 @@ { if (!_etk_popup_window_focused_window) return; - if (event_info.key_up.timestamp < _etk_popup_window_popup_timestamp) - return; evas_event_feed_key_up(ETK_TOPLEVEL(_etk_popup_window_focused_window)->evas, event_info.key_up.keyname, event_info.key_up.key, event_info.key_up.string, NULL, event_info.key_up.timestamp, NULL); @@ -400,9 +396,6 @@ Etk_Popup_Window *pop; int px, py; - /*if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp) - return;*/ - pop = ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents))); for ( ; pop; pop = pop->popped_child) { @@ -422,12 +415,6 @@ Etk_Popup_Window *pop; Etk_Bool pointer_over_window = ETK_FALSE; - if (event_info.mouse_up.timestamp < _etk_popup_window_popup_timestamp) - { - printf("Up Timestamps: %d %d\n", event_info.mouse_up.timestamp, _etk_popup_window_popup_timestamp); - return; - } - /* If the user clicks on a popped window, we feed the event */ pop = ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents))); for ( ; pop; pop = pop->popped_child) @@ -445,7 +432,7 @@ } /* Otherwise, we pop down the popup windows */ - if (!pointer_over_window + if (!pointer_over_window && event_info.mouse_up.timestamp >= _etk_popup_window_popup_timestamp && (event_info.mouse_up.timestamp - _etk_popup_window_popup_timestamp) >= ETK_POPUP_WINDOW_MIN_POP_TIME) { pop = ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents))); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/bin Modified Files: etk_iconbox_test.c Log Message: Patch from drexil: - Fix a mem leak in Etk_Config - Fix some warnings === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_iconbox_test.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_iconbox_test.c 6 Oct 2006 17:04:13 - 1.9 +++ etk_iconbox_test.c 8 Oct 2006 10:11:59 - 1.10 @@ -42,8 +42,6 @@ { static Etk_Widget *win = NULL; Etk_Widget *iconbox; - Etk_Iconbox_Model *mini_model; - int i; if (win) { - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_config.c Log Message: Patch from drexil: - Fix a mem leak in Etk_Config - Fix some warnings === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_config.c31 Aug 2006 17:33:58 - 1.1 +++ etk_config.c8 Oct 2006 10:11:59 - 1.2 @@ -139,6 +139,18 @@ { FREED(_etk_config_gen_edd); FREED(_etk_config_ver_edd); + if (_etk_config) + { + free(_etk_config->version); + if (_etk_config->general); + { + free(_etk_config->general->widget_theme); + free(_etk_config->general->font); + free(_etk_config->general->engine); + free(_etk_config->general); + } + free(_etk_config); + } } /** @@ -206,9 +218,11 @@ { ETK_WARNING("Your version / configuration of Etk is not valid!"); eet_close(ef); +free(v); _etk_config_defaults_apply(); return ETK_FALSE; } + free(v); } _etk_config->general = eet_data_read(ef, _etk_config_gen_edd, "config/general"); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: ecore_evas.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ecore_evas.c6 Oct 2006 17:04:13 - 1.13 +++ ecore_evas.c8 Oct 2006 10:04:53 - 1.14 @@ -108,6 +108,8 @@ NULL, /* popup_window_popdown */ NULL, /* event_callback_set */ + NULL, /* event_timestamp_get */ + NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_fb Modified Files: ecore_fb.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_fb/ecore_fb.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ecore_fb.c 6 Oct 2006 17:04:14 - 1.9 +++ ecore_fb.c 8 Oct 2006 10:04:53 - 1.10 @@ -113,6 +113,8 @@ NULL, /* popup_window_popdown */ _event_callback_set, + NULL, /* event_timestamp_get */ + _mouse_position_get, _mouse_screen_geometry_get, - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Modified Files: ecore_evas_software_x11.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ecore_evas_software_x11.c 6 Oct 2006 17:04:13 - 1.12 +++ ecore_evas_software_x11.c 8 Oct 2006 10:04:53 - 1.13 @@ -69,6 +69,8 @@ NULL, /* popup_window_popdown */ NULL, /* event_callback_set */ + NULL, /* event_timestamp_get */ + NULL, /* mouse_position_get */ NULL, /* mouse_screen_geometry_get */ - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: ecore_evas_x11.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ecore_evas_x11.c7 Oct 2006 18:45:16 - 1.19 +++ ecore_evas_x11.c8 Oct 2006 10:04:53 - 1.20 @@ -41,9 +41,12 @@ static void _popup_window_popup(Etk_Popup_Window *popup_window); static void _popup_window_popdown(Etk_Popup_Window *popup_window); -/* Event and mouse functions */ +/* Event functions */ static void _event_callback_set(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); +static unsigned int _event_timestamp_get(void); static int _event_input_handler_cb(void *data, int type, void *event); + +/* Mouse functions */ static void _mouse_position_get(int *x, int *y); static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h); @@ -153,6 +156,8 @@ _popup_window_popdown, _event_callback_set, + _event_timestamp_get, + _mouse_position_get, _mouse_screen_geometry_get, @@ -535,6 +540,18 @@ _event_callback = callback; } +/* Gets the current event timestamp */ +static unsigned int _event_timestamp_get(void) +{ + return ecore_x_current_time_get(); +} + +/** + * + * Mouse's functions + * + **/ + /* Gets the position of the mouse pointer */ static void _mouse_position_get(int *x, int *y) { @@ -1176,7 +1193,7 @@ } else { - int cur_num, new_num; + unsigned int cur_num, new_num; int i, j; Ecore_X_Window_State *cur_state, *new_state; Etk_Bool is_set = ETK_FALSE; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_engine.c etk_engine.h etk_popup_window.c Log Message: * [Etk_Engine] Add etk_engine_event_timestamp_get() * [Etk_Popup_Window] Use etk_engine_event_timestamp_get() to fix a bug with Bulgarian X :) === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- etk_engine.c6 Oct 2006 17:04:14 - 1.13 +++ etk_engine.c8 Oct 2006 10:04:54 - 1.14 @@ -745,7 +745,7 @@ /** * @internal - * @brief Sets the callback to call when an input event is emitted + * @brief Calls the engine's method to set the callback to call when an input event is emitted * @param callback the function to call * @param data the data to pass to the callback * @note This function is already used by Etk_Event, you must not use it. Use etk_event_global_callback_add() instead @@ -758,6 +758,17 @@ } /** + * @brief Calls the engine's method to get the current timestamp used by the events + * @return Returns the current event timestamp + */ +unsigned int etk_engine_event_timestamp_get(void) +{ + if (!_engine || !_engine->event_timestamp_get) + return 0; + return _engine->event_timestamp_get(); +} + +/** * @brief Calls the engine's method to get the position of the mouse pointer, relative to the screen * @param x the location where to store the x position of the mouse pointer * @param y the location where to store the y position of the mouse pointer @@ -901,6 +912,8 @@ INHERIT(popup_window_popdown); INHERIT(event_callback_set); + INHERIT(event_timestamp_get); + INHERIT(mouse_position_get); INHERIT(mouse_screen_geometry_get); === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_engine.h6 Oct 2006 17:04:14 - 1.12 +++ etk_engine.h8 Oct 2006 10:04:54 - 1.13 @@ -74,6 +74,8 @@ void (*popup_window_popdown)(Etk_Popup_Window *popup_window); void (*event_callback_set)(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); + unsigned int (*event_timestamp_get)(void); + void (*mouse_position_get)(int *x, int *y); void (*mouse_screen_geometry_get)(int *x, int *y, int *w, int *h); @@ -82,6 +84,7 @@ void (*selection_clear)(Etk_Selection_Type selection); + void (*drag_constructor)(Etk_Drag *drag); void (*drag_begin)(Etk_Drag *drag); }; @@ -141,7 +144,9 @@ void etk_engine_popup_window_popup(Etk_Popup_Window *popup_window); void etk_engine_popup_window_popdown(Etk_Popup_Window *popup_window); -void etk_engine_event_callback_set(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); +void etk_engine_event_callback_set(void (*callback)(Etk_Event_Type event, Etk_Event_Global event_info)); +unsigned int etk_engine_event_timestamp_get(void); + void etk_engine_mouse_position_get(int *x, int *y); void etk_engine_mouse_screen_geometry_get(int *x, int *y, int *w, int *h); === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_popup_window.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- etk_popup_window.c 7 Oct 2006 18:45:16 - 1.15 +++ etk_popup_window.c 8 Oct 2006 10:04:54 - 1.16 @@ -230,7 +230,7 @@ if (!popup_window->parent || !popup_window->parent->popped_up) { _etk_popup_window_popped_parents = evas_list_append(_etk_popup_window_popped_parents, popup_window); - _etk_popup_window_popup_timestamp = etk_current_time_get(); + _etk_popup_window_popup_timestamp = etk_engine_event_timestamp_get(); } if (popup_window->parent) { @@ -400,8 +400,8 @@ Etk_Popup_Window *pop; int px, py; - if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp) - return; + /*if (event_info.mouse_move.timestamp < _etk_popup_window_popup_timestamp) + return;*/ pop = ETK_POPUP_WINDOW(evas_list_data(evas_list_last(_etk_popup_window_popped_parents))); for ( ; pop; pop = pop->popped_child) @@ -529,7 +529,7 @@ /* We feed a mouse-move event since the relative position between the mouse pointer * and the popup window has changed */ etk_engine_mouse_position_get(&mx, &my); - evas_event_feed_mouse_move(ETK_TOPLEVEL(pwin)->evas, mx - x, my - y, etk_current_time_get(), NULL); + evas_event_feed_mouse_move(ETK_TOPLEVEL(pwin)->evas, mx - x, my - y, etk_engine_event_timestamp_get(), NULL); } return 1; - Take S
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.c e_menu.c e_menu.h Log Message: metrics keynav patches in === RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_config_dialog.c 8 Oct 2006 08:04:17 - 1.30 +++ e_config_dialog.c 8 Oct 2006 08:25:08 - 1.31 @@ -91,10 +91,10 @@ { E_Zone *z; +z = e_util_zone_current_get(e_manager_current_get()); e_border_uniconify(cfd->dia->win->border); e_dialog_show(cfd->dia); e_win_raise(cfd->dia->win); -z = e_util_zone_current_get(e_manager_current_get()); if (z->container == cfd->dia->win->border->zone->container) e_border_desk_set(cfd->dia->win->border, e_desk_current_get(z)); else === RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -3 -r1.70 -r1.71 --- e_menu.c8 Oct 2006 06:43:31 - 1.70 +++ e_menu.c8 Oct 2006 08:25:08 - 1.71 @@ -53,6 +53,7 @@ static void _e_menu_item_activate_first (void); static void _e_menu_item_activate_last(void); static void _e_menu_item_activate_nth (int n); +static void _e_menu_item_activate_char(char * key_compose); static void _e_menu_activate_next (void); static void _e_menu_activate_previous (void); static void _e_menu_activate_first(void); @@ -60,6 +61,7 @@ static void _e_menu_activate_nth (int n); static E_Menu *_e_menu_active_get (void); static E_Menu_Item *_e_menu_item_active_get (void); +static Evas_List * _e_menu_list_item_active_get (void); static int _e_menu_outside_bounds_get(int xdir, int ydir); static void _e_menu_scroll_by (int dx, int dy); static void _e_menu_mouse_autoscroll_check(void); @@ -536,6 +538,7 @@ mi = E_OBJECT_ALLOC(E_Menu_Item, E_MENU_ITEM_TYPE, _e_menu_item_free); mi->menu = m; mi->menu->items = evas_list_append(mi->menu->items, mi); + mi->list_position = evas_list_last(mi->menu->items); return mi; } @@ -1941,118 +1944,68 @@ static void _e_menu_item_activate_next(void) { - E_Menu *m; + E_Menu_Item *mi; + Evas_List *ll; - /* FIXME: inefficient. should track active item */ - m = _e_menu_active_get(); - if (m) + ll = _e_menu_list_item_active_get(); + mi = _e_menu_item_active_get(); + if (ll && mi) { - Evas_List *ll; - - for (ll = m->items; ll; ll = ll->next) - { -E_Menu_Item *mi; - + /* Look at the next item and then cycle until we're not on +* a separator. */ + if (!(ll->next)) + ll = mi->menu->items; + else + ll = ll->next; + mi = ll->data; + while (mi->separator) + { +if (!(ll->next)) + ll = mi->menu->items; +else + ll = ll->next; mi = ll->data; -if (mi->active) - { - if (ll->next) - { - ll = ll->next; - mi = ll->data; - while ((mi->separator) && (ll->next)) -{ - ll = ll->next; - mi = ll->data; -} - if ((mi->separator) && (!ll->next)) -{ - ll = m->items; - mi = ll->data; - while ((mi->separator) && (ll->next)) - { -ll = ll->next; -mi = ll->data; - } -} - e_menu_item_active_set(mi, 1); - _e_menu_item_ensure_onscreen(mi); - } - else - { - ll = m->items; - mi = ll->data; - while ((mi->separator) && (ll->next)) -{ - ll = ll->next; - mi = ll->data; -} - e_menu_item_active_set(mi, 1); - _e_menu_item_ensure_onscreen(mi); - } - return; - } } + + e_menu_item_active_set(mi, 1); + _e_menu_item_ensure_onscreen(mi); + return; } + _e_menu_activate_first(); } static void _e_menu_item_activate_previous(void) { - E
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config_dialog.c e_config_dialog.h e_configure.c e_int_config_apps.c e_int_config_cfgdialogs.c e_int_config_color_classes.c e_int_config_cursor.c e_int_config_desklock.c e_int_config_desks.c e_int_config_display.c e_int_config_exebuf.c e_int_config_focus.c e_int_config_fonts.c e_int_config_icon_themes.c e_int_config_intl.c e_int_config_keybindings.c e_int_config_menus.c e_int_config_modules.c e_int_config_mousebindings.c e_int_config_paths.c e_int_config_performance.c e_int_config_shelf.c e_int_config_startup.c e_int_config_theme.c e_int_config_transitions.c e_int_config_wallpaper.c e_int_config_window_display.c e_int_config_window_manipulation.c e_int_config_winlist.c Log Message: only bring up config dialogs once - find the previous one and splash it up if u bring it up again === RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_config_dialog.c 5 Oct 2006 02:57:33 - 1.29 +++ e_config_dialog.c 8 Oct 2006 08:04:17 - 1.30 @@ -16,6 +16,7 @@ static void _e_config_dialog_cb_close(void *data, E_Dialog *dia); /* local subsystem globals */ +static Evas_List *_e_config_dialog_list = NULL; /* externally accessible functions */ @@ -70,15 +71,53 @@ _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC); break; } - + _e_config_dialog_list = evas_list_append(_e_config_dialog_list, cfd); + return cfd; } +EAPI int +e_config_dialog_find(const char *name, const char *class) +{ + Evas_List *l; + E_Config_Dialog *cfd; + + for (l = _e_config_dialog_list; l; l = l->next) + { + cfd = l->data; + + if ((!e_util_strcmp(name, cfd->name)) && + (!e_util_strcmp(class, cfd->class))) + { +E_Zone *z; + +e_border_uniconify(cfd->dia->win->border); +e_dialog_show(cfd->dia); +e_win_raise(cfd->dia->win); +z = e_util_zone_current_get(e_manager_current_get()); +if (z->container == cfd->dia->win->border->zone->container) + e_border_desk_set(cfd->dia->win->border, e_desk_current_get(z)); +else + { + if (!cfd->dia->win->border->sticky) + e_desk_show(cfd->dia->win->border->desk); + ecore_x_pointer_warp(cfd->dia->win->border->zone->container->win, + cfd->dia->win->border->zone->x + (cfd->dia->win->border->zone->w / 2), + cfd->dia->win->border->zone->y + (cfd->dia->win->border->zone->h / 2)); + } +e_border_unshade(cfd->dia->win->border, E_DIRECTION_DOWN); +return 1; + } + } + return 0; +} + /* local subsystem functions */ static void _e_config_dialog_free(E_Config_Dialog *cfd) { + _e_config_dialog_list = evas_list_remove(_e_config_dialog_list, cfd); if (cfd->auto_apply_timer) _e_config_dialog_cb_auto_apply_timer(cfd); if (cfd->title) evas_stringshare_del(cfd->title); if (cfd->name) evas_stringshare_del(cfd->name); === RCS file: /cvs/e/e17/apps/e/src/bin/e_config_dialog.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_config_dialog.h 14 Aug 2006 15:22:44 - 1.13 +++ e_config_dialog.h 8 Oct 2006 08:04:17 - 1.14 @@ -53,6 +53,7 @@ }; EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, const char *title, const char *name, const char *class, const char *icon, int icon_size, E_Config_Dialog_View *view, void *data); - +EAPI int e_config_dialog_find(const char *name, const char *class); + #endif #endif === RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- e_configure.c 3 Oct 2006 05:49:31 - 1.61 +++ e_configure.c 8 Oct 2006 08:04:17 - 1.62 @@ -14,12 +14,37 @@ static void _e_configure_cb_standard(void *data); static void _e_configure_cb_close(void *data, void *data2); +static E_Configure *_e_configure = NULL; + EAPI E_Configure * e_configure_show(E_Container *con) { E_Configure *eco; E_Manager *man; Evas_Coord ew, eh, mw, mh; + + if (_e_configure) + { + E_Zone *z; + + eco = _e_configure; + z = e_util_zone_current_get(e_manager_current_get()); + e_border_uniconify(eco->win->border); + e_win_show(eco->win); + e_win_raise(eco->win); + if (z->container
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/bits Modified Files: scrollbar-groups.edc Log Message: Fix clipping of scrollbar elements. === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/bits/scrollbar-groups.edc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- scrollbar-groups.edc2 Jun 2006 17:03:57 - 1.6 +++ scrollbar-groups.edc8 Oct 2006 07:48:28 - 1.7 @@ -39,7 +39,7 @@ } rel2 { relative: 0.0 0.5; - offset: 16 9; + offset: 15 7; } image { normal: "e17_scrollbar_left_arrow.png"; @@ -139,7 +139,7 @@ } rel2 { relative: 1.0 0.5; - offset: 0 9; + offset: -1 7; } image { normal: "e17_scrollbar_right_arrow.png"; @@ -317,7 +317,7 @@ } rel2 { relative: 0.5 0.0; - offset: 9 16; + offset: 7 15; } image { normal: "e17_scrollbar_top_arrow.png"; @@ -366,7 +366,7 @@ } rel2 { relative: 0.5 1.0; - offset: 9 0; + offset: 7 0; } image { normal: "e17_scrollbar_bottom_arrow.png"; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin Modified Files: main.c Log Message: Fix title bar typo === RCS file: /cvs/e/e17/libs/ewl/src/bin/main.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- main.c 25 Sep 2006 18:39:17 - 1.36 +++ main.c 8 Oct 2006 07:31:35 - 1.37 @@ -115,7 +115,7 @@ { Ewl_Test test; - test.name = "The Enlightend Widget Library Test App"; + test.name = "The Enlightened Widget Library Test App"; test.func = create_main_test_window; test.filename = NULL; test.tip = NULL; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_histogram.c Log Message: Avoid attempting to draw a histogram if there is no usable data from the image. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_histogram.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_histogram.c 26 Sep 2006 18:33:47 - 1.4 +++ ewl_histogram.c 8 Oct 2006 07:06:54 - 1.5 @@ -192,7 +192,9 @@ DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - ewl_histogram_draw(EWL_HISTOGRAM(w)); + /* Only bother drawing if we've seen some usable data. */ + if (EWL_HISTOGRAM(w)->maxv) + ewl_histogram_draw(EWL_HISTOGRAM(w)); DLEAVE_FUNCTION(DLEVEL_STABLE); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs