E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines Modified Files: Evas_Engine_Buffer.h Log Message: 1. buffer test really wqasnt being very fair - time to be fair. 2. be able to skip a copy in certain cases when scaling - should improve speed in several situations - evas is defintiely not optimal :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/Evas_Engine_Buffer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Evas_Engine_Buffer.h14 Jan 2006 12:13:36 - 1.1 +++ Evas_Engine_Buffer.h23 Jan 2006 07:57:30 - 1.2 @@ -5,6 +5,7 @@ #define EVAS_ENGINE_BUFFER_DEPTH_BGRA32 1 #define EVAS_ENGINE_BUFFER_DEPTH_RGB24 2 #define EVAS_ENGINE_BUFFER_DEPTH_BGR24 3 +#define EVAS_ENGINE_BUFFER_DEPTH_RGB32 4 typedef struct _Evas_Engine_Info_Buffer Evas_Engine_Info_Buffer; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_blend_pixel_pixel.c evas_scale_sample.c evas_scale_smooth_scaler_downx.c evas_scale_smooth_scaler_downx_downy.c evas_scale_smooth_scaler_downy.c evas_scale_smooth_scaler_up.c Log Message: 1. buffer test really wqasnt being very fair - time to be fair. 2. be able to skip a copy in certain cases when scaling - should improve speed in several situations - evas is defintiely not optimal :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_pixel.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- evas_blend_pixel_pixel.c22 Jan 2006 10:48:51 - 1.24 +++ evas_blend_pixel_pixel.c23 Jan 2006 07:57:30 - 1.25 @@ -277,7 +277,7 @@ evas_common_copy_pixels_rgba_to_rgba_sse(DATA32 *src, DATA32 *dst, int len) { DATA32 *src_ptr, *dst_ptr, *dst_end_ptr; - + dst_end_ptr = dst + len; dst_end_ptr -= 15; src_ptr = src; === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_scale_sample.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_scale_sample.c 22 May 2005 02:49:49 - 1.3 +++ evas_scale_sample.c 23 Jan 2006 07:57:30 - 1.4 @@ -351,10 +351,6 @@ } else { -/* a scanline buffer */ -buf = malloc(dst_clip_w * sizeof(DATA32)); -if (!buf) goto no_buf; - /* fill scale tables */ for (x = 0; x < dst_clip_w; x++) lin_ptr[x] = (((x + dst_clip_x - dst_region_x) * src_region_w) / dst_region_w) + src_region_x; @@ -363,20 +359,46 @@ + src_region_y) * src_w); /* scale to dst */ dptr = dst_ptr; -for (y = 0; y < dst_clip_h; y++) +#ifdef DIRECT_SCALE +if ((!(src->flags & RGBA_IMAGE_HAS_ALPHA)) && +(!(dst->flags & RGBA_IMAGE_HAS_ALPHA))) { - dst_ptr = buf; - for (x = 0; x < dst_clip_w; x++) + for (y = 0; y < dst_clip_h; y++) + { + dst_ptr = dptr; + for (x = 0; x < dst_clip_w; x++) +{ + ptr = row_ptr[y] + lin_ptr[x]; + *dst_ptr = *ptr; + dst_ptr++; +} + /* * blend here [clip_w *] buf -> dptr * */ +//func(buf, dptr, dst_clip_w); + dptr += dst_w; + } + } +else +#endif + { + /* a scanline buffer */ + buf = malloc(dst_clip_w * sizeof(DATA32)); + if (!buf) goto no_buf; + + for (y = 0; y < dst_clip_h; y++) { - ptr = row_ptr[y] + lin_ptr[x]; - *dst_ptr = *ptr; - dst_ptr++; + dst_ptr = buf; + for (x = 0; x < dst_clip_w; x++) +{ + ptr = row_ptr[y] + lin_ptr[x]; + *dst_ptr = *ptr; + dst_ptr++; +} + /* * blend here [clip_w *] buf -> dptr * */ + func(buf, dptr, dst_clip_w); + dptr += dst_w; } - /* * blend here [clip_w *] buf -> dptr * */ - func(buf, dptr, dst_clip_w); - dptr += dst_w; + free(buf); } -free(buf); } } === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_scale_smooth_scaler_downx.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_scale_smooth_scaler_downx.c3 Dec 2005 09:27:52 - 1.3 +++ evas_scale_smooth_scaler_downx.c23 Jan 2006 07:57:30 - 1.4 @@ -95,71 +95,149 @@ } else { - while (dst_clip_h--) +#ifdef DIRECT_SCALE +if ((!(src->flags & RGBA_IMAGE_HAS_ALPHA)) && + (!(dst->flags & RGBA_IMAGE_HAS_ALPHA)) && + (!dc->mod.use) && (!dc->mul.use)) { -while (dst_clip_w--) +while (dst_clip_h--) { - Cx = *xapp >> 16; - xap = *xapp & 0x; - pix = *yp + *xp + pos; - - r = (R_VAL(pix) * xap) >> 10; - g = (G_VAL(pix) * xap) >> 10; -
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/bin Modified Files: evas_buffer_main.c Log Message: 1. buffer test really wqasnt being very fair - time to be fair. 2. be able to skip a copy in certain cases when scaling - should improve speed in several situations - evas is defintiely not optimal :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_buffer_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- evas_buffer_main.c 14 Jan 2006 12:13:34 - 1.3 +++ evas_buffer_main.c 23 Jan 2006 07:57:30 - 1.4 @@ -25,7 +25,7 @@ einfo = (Evas_Engine_Info_Buffer *) evas_engine_info_get(evas); /* the following is specific to the engine */ - einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_BGR24; + einfo->info.depth_type = EVAS_ENGINE_BUFFER_DEPTH_RGB32; img_buf = malloc(win_w * win_h * 3); einfo->info.dest_buffer = img_buf; einfo->info.dest_buffer_row_bytes = win_w * 3; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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/include Modified Files: evas_options.h Log Message: 1. buffer test really wqasnt being very fair - time to be fair. 2. be able to skip a copy in certain cases when scaling - should improve speed in several situations - evas is defintiely not optimal :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_options.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_options.h 8 Nov 2002 08:02:15 - 1.1 +++ evas_options.h 23 Jan 2006 07:57:30 - 1.2 @@ -65,4 +65,6 @@ # define _GNU_SOURCE #endif +#define DIRECT_SCALE + #endif --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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/modules/engines/buffer Modified Files: evas_engine.c evas_engine.h evas_outbuf.c Log Message: 1. buffer test really wqasnt being very fair - time to be fair. 2. be able to skip a copy in certain cases when scaling - should improve speed in several situations - evas is defintiely not optimal :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/buffer/evas_engine.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- evas_engine.c 15 Jan 2006 06:21:04 - 1.2 +++ evas_engine.c 23 Jan 2006 07:57:30 - 1.3 @@ -290,6 +290,8 @@ dep = OUTBUF_DEPTH_BGR_24BPP_888_888; if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_ARGB32) + dep = OUTBUF_DEPTH_ARGB_32BPP__; + else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_RGB32) dep = OUTBUF_DEPTH_RGB_32BPP_888_; else if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_BGRA32) dep = OUTBUF_DEPTH_BGR_32BPP_888_; === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/buffer/evas_engine.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_engine.h 14 Jan 2006 12:13:37 - 1.1 +++ evas_engine.h 23 Jan 2006 07:57:30 - 1.2 @@ -8,6 +8,7 @@ enum _Outbuf_Depth { OUTBUF_DEPTH_NONE, + OUTBUF_DEPTH_ARGB_32BPP__, OUTBUF_DEPTH_RGB_32BPP_888_, OUTBUF_DEPTH_BGR_32BPP_888_, OUTBUF_DEPTH_RGB_24BPP_888_888, === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/modules/engines/buffer/evas_outbuf.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- evas_outbuf.c 14 Jan 2006 12:13:37 - 1.1 +++ evas_outbuf.c 23 Jan 2006 07:57:30 - 1.2 @@ -42,7 +42,7 @@ buf->func.new_update_region = new_update_region; buf->func.free_update_region = free_update_region; - if ((buf->depth == OUTBUF_DEPTH_RGB_32BPP_888_) && + if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP__) && (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32 { buf->priv.back_buf = evas_common_image_new(); @@ -53,6 +53,16 @@ buf->priv.back_buf->image->no_free = 1; buf->priv.back_buf->flags |= RGBA_IMAGE_HAS_ALPHA; } + else if ((buf->depth == OUTBUF_DEPTH_RGB_32BPP_888_) && + (buf->dest) && (buf->dest_row_bytes == (buf->w * sizeof(DATA32 + { + buf->priv.back_buf = evas_common_image_new(); + buf->priv.back_buf->image = evas_common_image_surface_new(buf->priv.back_buf); + buf->priv.back_buf->image->w = w; + buf->priv.back_buf->image->h = h; + buf->priv.back_buf->image->data = buf->dest; + buf->priv.back_buf->image->no_free = 1; + } return buf; } @@ -85,8 +95,11 @@ im = evas_common_image_create(w, h); if (im) { -im->flags |= RGBA_IMAGE_HAS_ALPHA; -memset(im->image->data, 0, w * h * sizeof(DATA32)); +if ((buf->depth == OUTBUF_DEPTH_ARGB_32BPP__)) + { + im->flags |= RGBA_IMAGE_HAS_ALPHA; + memset(im->image->data, 0, w * h * sizeof(DATA32)); + } } } return im; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas monkeyiq
Enlightenment CVS committal Author : monkeyiq Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/canvas Modified Files: evas_object_main.c Log Message: gaurd access to layer->objects->last to check if layer->objects == 0 === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- evas_object_main.c 6 Jan 2006 23:05:17 - 1.43 +++ evas_object_main.c 23 Jan 2006 06:54:04 - 1.44 @@ -1,6 +1,14 @@ #include "evas_common.h" #include "evas_private.h" +static Evas_Object_List* get_layer_objects_last( Evas_Layer* l ) +{ + if( !l || !l->objects ) + return NULL; + + return ((Evas_Object_List *)(l->objects))->last; +} + /* evas internal stuff */ Evas_Object * evas_object_new(void) @@ -939,7 +947,7 @@ Evas_Layer *lay; lay = (Evas_Layer *)l; - for (l2 = ((Evas_Object_List *)(lay->objects))->last; l2; l2 = l2->prev) + for (l2 = get_layer_objects_last(lay); l2; l2 = l2->prev) { Evas_Object *obj; @@ -995,7 +1003,7 @@ Evas_Layer *lay; lay = (Evas_Layer *)l; - for (l2 = ((Evas_Object_List *)(lay->objects))->last; l2; l2 = l2->prev) + for (l2 = get_layer_objects_last(lay); l2; l2 = l2->prev) { Evas_Object *obj; @@ -1036,7 +1044,7 @@ Evas_Layer *lay; lay = (Evas_Layer *)l; - for (l2 = ((Evas_Object_List *)(lay->objects))->last; l2; l2 = l2->prev) + for (l2 = get_layer_objects_last(lay); l2; l2 = l2->prev) { Evas_Object *obj; @@ -1081,7 +1089,7 @@ Evas_Layer *lay; lay = (Evas_Layer *)l; - for (l2 = ((Evas_Object_List *)(lay->objects))->last; l2; l2 = l2->prev) + for (l2 = get_layer_objects_last(lay); l2; l2 = l2->prev) { Evas_Object *obj; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: need 1.1.2 - i KNOW 1.1.2 works. don't know about 1.1.1 === RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- configure.in22 Jan 2006 08:51:17 - 1.27 +++ configure.in23 Jan 2006 06:19:52 - 1.28 @@ -137,7 +137,7 @@ [enable_xine=$enableval],[enable_xine=auto]) HAVE_XINE="no" if test "$enable_xine" != "no" ; then - AC_PATH_GENERIC(xine, 1.0.0, [HAVE_XINE="yes"]) + AC_PATH_GENERIC(xine, 1.1.2, [HAVE_XINE="yes"]) if test "$HAVE_XINE" = "yes" ; then requirements="$requirements libxine" --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: gevas2 monkeyiq
Enlightenment CVS committal Author : monkeyiq Project : misc Module : gevas2 Dir : misc/gevas2/src Modified Files: gevas.c Log Message: Do an evas_init() for the user. === RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevas.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- gevas.c 4 Aug 2005 04:12:15 - 1.16 +++ gevas.c 23 Jan 2006 05:34:18 - 1.17 @@ -352,6 +352,18 @@ __gevas_mouse_move(void *_data, Evas* _e, Evas_Object* _o, void *event_info ) { Evas_Event_Mouse_Move* ev = (Evas_Event_Mouse_Move*)event_info; +if( !ev ) +return; + +if( !_e ) +{ +if( !_o ) +return; + +GtkObject* gobj = EVASO_TO_GTKO( _o ); +GtkgEvas* gevas = gevasobj_get_gevas( gobj ); +_e = EVAS( gevas ); +} int _b = ev->buttons; int _x = ev->cur.output.x; int _y = ev->cur.output.y; @@ -594,6 +606,8 @@ GTK_WIDGET_SET_FLAGS(GTK_WIDGET(ev), GTK_CAN_FOCUS); /* printf("gevas_init() 1\n"); */ +evas_init(); + ev->current_idle = 0; ev->evas_render_call_count = 0; ev->ecore_timer_id = 0; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c e_int_config_background_import.c Log Message: Rename the buttons === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- e_int_config_background.c 23 Jan 2006 04:35:03 - 1.34 +++ e_int_config_background.c 23 Jan 2006 04:52:37 - 1.35 @@ -114,7 +114,7 @@ e_widget_table_object_append(ot, il, 0, 0, 1, 2, 1, 1, 1, 1); /* Add import Button */ - o = e_widget_button_add(evas, _("Import An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL); + o = e_widget_button_add(evas, _("Select An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL); e_widget_table_object_append(ot, o, 0, 2, 1, 1, 1, 0, 0, 0); of = e_widget_framelist_add(evas, _("Background Preview"), 0); @@ -180,7 +180,7 @@ e_widget_table_object_append(ot, il, 0, 0, 1, 3, 1, 1, 1, 1); /* Add import Button */ - o = e_widget_button_add(evas, _("Import An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL); + o = e_widget_button_add(evas, _("Select An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL); e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 0, 0, 0); of = e_widget_framelist_add(evas, _("Background Preview"), 0); === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_background_import.c23 Jan 2006 02:56:01 - 1.6 +++ e_int_config_background_import.c23 Jan 2006 04:52:37 - 1.7 @@ -199,11 +199,11 @@ edje_object_part_swallow(import->bg_obj, "content_swallow", o); evas_object_show(o); - import->ok_obj = e_widget_button_add(evas, _("Import"), NULL, _import_cb_ok, win, cfdata); + import->ok_obj = e_widget_button_add(evas, _("Ok"), NULL, _import_cb_ok, win, cfdata); e_widget_disabled_set(import->ok_obj, 1); e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5); - import->close_obj = e_widget_button_add(evas, _("Close"), NULL, _import_cb_close, win, NULL); + import->close_obj = e_widget_button_add(evas, _("Cancel"), NULL, _import_cb_close, win, NULL); e_widget_list_object_append(import->box_obj, import->close_obj, 1, 0, 0.5); e_win_centered_set(win, 1); @@ -374,19 +374,32 @@ Evas *evas; E_Win *win; E_Config_Dialog_Data *cfdata; + Bg_Import_Window *import; win = data; + import = win->data; cfdata = data2; + + if (!cfdata->file[0]) + { + if (import) e_widget_disabled_set(import->ok_obj, 1); + return; + } - if (!cfdata->file[0]) return; f = e_fm_file_new(cfdata->file); if (!f) return; - if (!e_fm_file_is_image(f)) return; + if (!e_fm_file_is_image(f)) + { + if (import) e_widget_disabled_set(import->ok_obj, 1); + return; + } + free(f); evas = e_win_evas_get(win); _bg_edj_gen(evas, cfdata->file, cfdata->method); + if (import) e_widget_disabled_set(import->ok_obj, 1); } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c Log Message: Keep the selected bg across basic/advanced switching. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- e_int_config_background.c 23 Jan 2006 02:56:01 - 1.33 +++ e_int_config_background.c 23 Jan 2006 04:35:03 - 1.34 @@ -97,8 +97,6 @@ Evas_Object *o, *ot, *of, *il, *im; char path[4096]; - _fill_data(cfdata); - ot = e_widget_table_add(evas, 0); il = e_widget_ilist_add(evas, 48, 48, &(cfdata->bg)); @@ -167,8 +165,6 @@ E_Radio_Group *rg; char path[4096]; - _fill_data(cfdata); - ot = e_widget_table_add(evas, 0); il = e_widget_ilist_add(evas, 48, 48, &(cfdata->bg)); cfdata->il = il; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/lib Modified Files: emotion_smart.c Log Message: less segv's === RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- emotion_smart.c 4 Nov 2005 08:21:28 - 1.19 +++ emotion_smart.c 23 Jan 2006 03:00:35 - 1.20 @@ -131,7 +131,7 @@ handle = mod->handle; module_close = dlsym(handle, "module_close"); - if (module_close) module_close(mod, video); + if ((module_close) && (video)) module_close(mod, video); dlclose(handle); } @@ -190,6 +190,7 @@ if ((file) && (file[0] != 0)) { int w, h; + sd->file = strdup(file); if (sd->module) { @@ -210,6 +211,7 @@ { sd->module->file_close(sd->video); sd->video = NULL; +printf("VIDEO -> NULL\n"); evas_object_image_size_set(sd->obj, 0, 0); } } @@ -1023,7 +1025,7 @@ rows, &rows[ps.h], &rows[ps.h + (ps.h / 2)])) - evas_object_image_pixels_import(obj, &ps); + evas_object_image_pixels_import(obj, &ps); evas_object_image_pixels_dirty_set(obj, 0); free(ps.rows); } @@ -1088,8 +1090,9 @@ Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return; + printf("DEL: sd->video = %p\n", sd->video); if (sd->video) sd->module->file_close(sd->video); - if (sd->module) _emotion_module_close(sd->module, sd->video); + _emotion_module_close(sd->module, sd->video); evas_object_del(sd->obj); if (sd->file) free(sd->file); if (sd->job) ecore_job_del(sd->job); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/emotion Dir : e17/libs/emotion/src/modules Modified Files: emotion_xine.c Log Message: less segv's === RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- emotion_xine.c 21 Jan 2006 14:13:51 - 1.26 +++ emotion_xine.c 23 Jan 2006 03:00:35 - 1.27 @@ -360,7 +360,7 @@ Emotion_Xine_Video *ev; ev = (Emotion_Xine_Video *)ef; - + if (!ev) return; printf("EX pause end...\n"); if (!emotion_object_play_get(ev->obj)) // if (xine_get_param(ev->stream, XINE_PARAM_SPEED) == XINE_SPEED_PAUSE) --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c e_int_config_background_import.h e_int_config_background_import.c Log Message: Rewrite the import dialog. Should behave better now === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_int_config_background.c 22 Jan 2006 22:45:44 - 1.32 +++ e_int_config_background.c 23 Jan 2006 02:56:01 - 1.33 @@ -3,6 +3,7 @@ */ #include "e.h" +//#include #define BG_SET_DEFAULT_DESK 0 #define BG_SET_THIS_DESK 1 @@ -21,6 +22,9 @@ static int _bg_dialog_close(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _bg_file_added (void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path); +static void _import_cb_closed(void *obj); +static int import_open = 0; + static Ecore_File_Monitor *_bg_file_monitor; struct _E_Config_Dialog_Data @@ -28,8 +32,9 @@ char *bg, *current_bg; int bg_method; E_Config_Dialog *cfd; - E_Config_Dialog *import; Evas_Object *il; + + E_Win *import; }; EAPI E_Config_Dialog * @@ -406,13 +411,23 @@ _bg_config_dialog_cb_import(void *data, void *data2) { E_Config_Dialog *parent; - E_Config_Dialog *import; + E_Win *import; parent = data; if (!parent) return; import = e_int_config_background_import(parent); - parent->cfdata->import = import; + if (import) + { + parent->cfdata->import = import; + import_open = 1; + e_object_del_attach_func_set(E_OBJECT(import), _import_cb_closed); + } + else + { + parent->cfdata->import = NULL; + import_open = 0; + } } static void @@ -452,19 +467,18 @@ static int _bg_dialog_close(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) -{ - E_Dialog *dia; - E_Border *bd; - +{ if (!cfd) return 0; if (!cfdata) return 0; if (!cfdata->import) return 1; - if (!cfdata->import->dia) return 1; - - dia = cfdata->import->dia; - bd = e_border_find_by_window(dia->win->evas_win); - if (!bd) return 1; + if (!import_open) return 1; - e_object_del(E_OBJECT(cfdata->import->dia)); + e_object_del(E_OBJECT(cfdata->import)); return 1; } + +static void +_import_cb_closed(void *obj) +{ + import_open = 0; +} === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_background_import.h22 Jan 2006 14:11:15 - 1.1 +++ e_int_config_background_import.h23 Jan 2006 02:56:01 - 1.2 @@ -3,7 +3,7 @@ #ifndef E_INT_CONFIG_BACKGROUND_IMPORT_H #define E_INT_CONFIG_BACKGROUND_IMPORT_H -EAPI E_Config_Dialog *e_int_config_background_import(E_Config_Dialog *parent); +EAPI E_Win *e_int_config_background_import(E_Config_Dialog *parent); #endif #endif === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_int_config_background_import.c22 Jan 2006 18:14:51 - 1.5 +++ e_int_config_background_import.c23 Jan 2006 02:56:01 - 1.6 @@ -79,131 +79,171 @@ static Ecore_Event_Handler *_edj_exe_exit_handler = NULL; -static void*_create_data (E_Config_Dialog *cfd); -static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void _fill_data (E_Config_Dialog_Data *cfdata); static void _efm_hilite_cb (Evas_Object *obj, char *file, void *data); static void _bg_edj_gen(Evas *evas, char *filename, int method); static int _edj_exe_exit_cb (void *data, int type, void *event); -struct _E_Config_Dialog_Data -{ - char *file; - int method; -}; +static void _import_cb_delete(E_Win *win); +static void _import_cb_resize(E_Win *win); +static void _import_cb_close(void *data, void *data2); +static void _import_cb_ok(void *data, void *data2); +static void _import_cb_wid_on_focus(void *data, Evas_Object *obj); +static void _import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event); -EAPI E_Config_Dialog * -e_int_config_background_import(E_Config_Dialog *parent) +typedef struct _Bg_Import_Win
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: remove dupes === RCS file: /cvsroot/enlightenment/e17/apps/e/AUTHORS,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- AUTHORS 20 Jan 2006 04:08:16 - 1.18 +++ AUTHORS 23 Jan 2006 00:32:51 - 1.19 @@ -8,5 +8,4 @@ Aleksej Struk <[EMAIL PROTECTED]> Christopher Michael <[EMAIL PROTECTED]> Brian Mattern <[EMAIL PROTECTED]> -Aleksej Struk <[EMAIL PROTECTED]> Viktor Kojouharov <[EMAIL PROTECTED]> --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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 Log Message: Unselect client window events on withdraw. This fixes trouble with certain kde(?) systray apps when not using the e16 systray. Thanks to Peter Hyman for going on about this :) === RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -3 -r1.142 -r1.143 --- ewins.c 22 Jan 2006 18:25:39 - 1.142 +++ ewins.c 22 Jan 2006 22:47:49 - 1.143 @@ -1025,6 +1025,9 @@ EGrabServer(); + ESelectInput(_EwinGetClientXwin(ewin), NoEventMask); + XShapeSelectInput(disp, _EwinGetClientXwin(ewin), NoEventMask); + /* Park the client window on the root */ x = ewin->client.x; y = ewin->client.y; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c Log Message: Another try at a fix for bg close. Try to get the border of the import dialog to see if it exists or not, before trying to delete it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- e_int_config_background.c 22 Jan 2006 15:51:51 - 1.31 +++ e_int_config_background.c 22 Jan 2006 22:45:44 - 1.32 @@ -453,11 +453,18 @@ static int _bg_dialog_close(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { + E_Dialog *dia; + E_Border *bd; + if (!cfd) return 0; if (!cfdata) return 0; if (!cfdata->import) return 1; if (!cfdata->import->dia) return 1; + dia = cfdata->import->dia; + bd = e_border_find_by_window(dia->win->evas_win); + if (!bd) return 1; + e_object_del(E_OBJECT(cfdata->import->dia)); return 1; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e maiurana
Enlightenment CVS committal Author : maiurana Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: it.po Log Message: === RCS file: /cvsroot/enlightenment/e17/apps/e/po/it.po,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- it.po 15 Jan 2006 18:16:23 - 1.29 +++ it.po 22 Jan 2006 20:14:10 - 1.30 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-01-14 18:40+0100\n" -"PO-Revision-Date: 2006-01-13 21:01+0100\n" +"POT-Creation-Date: 2006-01-22 16:11+0100\n" +"PO-Revision-Date: 2006-01-22 16:24+0100\n" "Last-Translator: Massimo Maiurana <[EMAIL PROTECTED]>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -17,8 +17,8 @@ #: src/bin/e_int_config_general.c:32 src/bin/e_int_config_general.c:96 #: src/bin/e_int_config_general.c:149 src/bin/e_configure.c:68 #: src/bin/e_int_config_winlist.c:122 src/bin/e_int_config_performance.c:85 -#: src/bin/e_int_config_performance.c:121 src/modules/clock/e_mod_config.c:80 -#: src/modules/pager/e_mod_config.c:96 src/modules/pager/e_mod_config.c:151 +#: src/bin/e_int_config_performance.c:121 src/modules/clock/e_mod_config.c:82 +#: src/modules/pager/e_mod_config.c:98 src/modules/pager/e_mod_config.c:161 msgid "General Settings" msgstr "Impostazioni generali" @@ -247,13 +247,14 @@ msgstr "File" #: src/bin/e_int_menus.c:149 src/bin/e_module.c:489 -#: src/modules/ibar/e_mod_main.c:296 src/modules/ibar/e_mod_main.c:653 -#: src/modules/ibox/e_mod_main.c:259 src/modules/ibox/e_mod_main.c:464 -#: src/modules/clock/e_mod_main.c:188 src/modules/clock/e_mod_main.c:355 -#: src/modules/pager/e_mod_main.c:407 src/modules/pager/e_mod_main.c:542 -#: src/modules/temperature/e_mod_main.c:220 -#: src/modules/temperature/e_mod_main.c:363 -#: src/modules/battery/e_mod_main.c:250 src/modules/battery/e_mod_main.c:373 +#: src/modules/ibar/e_mod_main.c:299 src/modules/ibar/e_mod_main.c:662 +#: src/modules/ibox/e_mod_main.c:262 src/modules/ibox/e_mod_main.c:473 +#: src/modules/clock/e_mod_main.c:194 src/modules/clock/e_mod_main.c:369 +#: src/modules/itray/e_mod_main.c:441 src/modules/pager/e_mod_main.c:412 +#: src/modules/pager/e_mod_main.c:556 src/modules/start/e_mod_main.c:175 +#: src/modules/start/e_mod_main.c:270 src/modules/temperature/e_mod_main.c:225 +#: src/modules/temperature/e_mod_main.c:376 +#: src/modules/battery/e_mod_main.c:255 src/modules/battery/e_mod_main.c:384 msgid "Configuration" msgstr "Configurazione" @@ -290,11 +291,11 @@ msgstr "Ordina Finestre" #: src/bin/e_int_menus.c:752 src/bin/e_gadget.c:208 -#: src/modules/ibar/e_mod_main.c:658 src/modules/ibox/e_mod_main.c:469 -#: src/modules/cpufreq/e_mod_main.c:937 src/modules/clock/e_mod_main.c:360 -#: src/modules/pager/e_mod_main.c:546 src/modules/start/e_mod_main.c:229 -#: src/modules/temperature/e_mod_main.c:368 -#: src/modules/battery/e_mod_main.c:378 +#: src/modules/ibar/e_mod_main.c:667 src/modules/ibox/e_mod_main.c:478 +#: src/modules/cpufreq/e_mod_main.c:999 src/modules/clock/e_mod_main.c:374 +#: src/modules/itray/e_mod_main.c:446 src/modules/pager/e_mod_main.c:560 +#: src/modules/start/e_mod_main.c:274 src/modules/temperature/e_mod_main.c:381 +#: src/modules/battery/e_mod_main.c:389 msgid "Edit Mode" msgstr "Modalità modifica" @@ -310,14 +311,42 @@ msgid "Theme Selector" msgstr "Selettore temi" -#: src/bin/e_apps.c:412 src/bin/e_apps.c:1841 src/bin/e_zone.c:607 -#: src/bin/e_fileman_file.c:340 src/bin/e_fileman_file.c:391 -#: src/bin/e_fileman_file.c:419 src/bin/e_utils.c:223 +#: src/bin/e_apps_error.c:37 +msgid "Run error, wtf? That sux." +msgstr "Errore d'esecuzione." + +#: src/bin/e_apps_error.c:184 src/bin/e_apps_error.c:252 +msgid "There was no error message." +msgstr "Non ci sono messaggi d'errore." + +#: src/bin/e_apps_error.c:210 +msgid "Exit code" +msgstr "Codice d'uscita" + +#: src/bin/e_apps_error.c:218 +msgid "Signal" +msgstr "Segnale" + +#: src/bin/e_apps_error.c:235 +msgid "Output" +msgstr "Output" + +#: src/bin/e_apps_error.c:236 +msgid "There was no output." +msgstr "Non ci sono output." + +#: src/bin/e_apps_error.c:251 src/bin/e_fileman_smart.c:856 +msgid "Error" +msgstr "Errore" + +#: src/bin/e_apps.c:428 src/bin/e_apps.c:1865 src/bin/e_zone.c:607 +#: src/bin/e_fileman_file.c:329 src/bin/e_fileman_file.c:377 +#: src/bin/e_fileman_file.c:405 src/bin/e_utils.c:223 msgid "Run Error" msgstr "Errore di esecuzione" -#: src/bin/e_apps.c:413 src/bin/e_zone.c:608 src/bin/e_fileman_file.c:341 -#: src/bin/e_fileman_file.c:392 src/bin/e_fileman_file.c:420 +#: src/bin/e_apps.c:429 src/bin/e_zone.c:608 src/bin/e_fileman_file.c:330 +#: src/bin/e_fileman_file.c:378 src/bin/e_fileman_file.c:406 #: src/bin/e_utils.c:224 #, c-format msgid "" @@ -332,7 +361,7 @@ "%s\n" "\n" -#: src/bin/e_apps.c:1842 +#: src/bin/e_apps.c:1866 #, c-format msgid
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: eobj.c Log Message: Warning--. === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- eobj.c 22 Jan 2006 18:31:31 - 1.65 +++ eobj.c 22 Jan 2006 18:37:39 - 1.66 @@ -451,7 +451,9 @@ void EobjShapeUpdate(EObj * eo, int propagate) { +#if USE_COMPOSITE int was_shaped = eo->shaped; +#endif if (propagate) eo->shaped = EShapePropagate(eo->win) != 0; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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: eobj.c Log Message: Oops - Fix. === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- eobj.c 22 Jan 2006 18:25:39 - 1.64 +++ eobj.c 22 Jan 2006 18:31:31 - 1.65 @@ -455,10 +455,10 @@ if (propagate) eo->shaped = EShapePropagate(eo->win) != 0; -#if USE_COMPOSITE else eo->shaped = EShapeCheck(eo->win) != 0; +#if USE_COMPOSITE if (was_shaped <= 0 && eo->shaped <= 0) return; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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: eobj.c eobj.h ewins.c ipc.c warp.c x.c xwin.h Log Message: Track top-level window shepedness. === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- eobj.c 14 Jan 2006 14:30:51 - 1.63 +++ eobj.c 22 Jan 2006 18:25:39 - 1.64 @@ -112,6 +112,7 @@ EobjSetLayer(eo, eo->layer); } +#if 1 /* FIXME - Remove */ int EobjIsShaped(const EObj * eo) { @@ -123,6 +124,7 @@ return ((EWin *) eo)->state.shaped; } } +#endif void EobjInit(EObj * eo, int type, Window win, int x, int y, int w, int h, @@ -148,6 +150,7 @@ eo->y = y; eo->w = w; eo->h = h; + eo->shaped = -1; if (type == EOBJ_TYPE_EXT) eo->name = ecore_x_icccm_title_get(win); @@ -277,6 +280,7 @@ #if 1 /* FIXME - TBD */ if (type == EOBJ_TYPE_EXT) { + eo->shaped = 0; /* FIXME - Assume unshaped for now */ EobjSetFloating(eo, 1); EobjSetLayer(eo, 4); } @@ -311,6 +315,9 @@ if (eo->stacked <= 0 || raise > 1) DeskRestack(eo->desk); + if (eo->shaped < 0) + EobjShapeUpdate(eo, 0); + EMapWindow(eo->win); #if USE_COMPOSITE ECompMgrWinMap(eo); @@ -442,13 +449,22 @@ } void -EobjChangeShape(EObj * eo) +EobjShapeUpdate(EObj * eo, int propagate) { + int was_shaped = eo->shaped; + + if (propagate) + eo->shaped = EShapePropagate(eo->win) != 0; #if USE_COMPOSITE + else + eo->shaped = EShapeCheck(eo->win) != 0; + + if (was_shaped <= 0 && eo->shaped <= 0) + return; + + /* Shape may still be unchanged. Well ... */ if (eo->shown && eo->cmhook) ECompMgrWinChangeShape(eo); -#else - eo = NULL; #endif } === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- eobj.h 14 Jan 2006 14:30:51 - 1.22 +++ eobj.h 22 Jan 2006 18:25:39 - 1.23 @@ -37,6 +37,7 @@ int x, y; int w, h; signed char stacked; + signed char shaped; charsticky; charfloating; unsignedexternal:1; @@ -119,7 +120,7 @@ #define EoReparent(eo, d, x, y) EobjReparent(EoObj(eo), d, x, y) #define EoRaise(eo) EobjRaise(EoObj(eo)) #define EoLower(eo) EobjLower(EoObj(eo)) -#define EoChangeShape(eo) EobjChangeShape(EoObj(eo)) +#define EoShapeUpdate(eo, p)EobjShapeUpdate(EoObj(eo), p) /* eobj.c */ voidEobjInit(EObj * eo, int type, Window win, int x, int y, @@ -143,7 +144,7 @@ voidEobjReparent(EObj * eo, EObj * dst, int x, int y); int EobjRaise(EObj * eo); int EobjLower(EObj * eo); -voidEobjChangeShape(EObj * eo); +voidEobjShapeUpdate(EObj * eo, int propagate); voidEobjsRepaint(void); Pixmap EobjGetPixmap(const EObj * eo); voidEobjChangeOpacity(EObj * eo, unsigned int opacity); === RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -3 -r1.141 -r1.142 --- ewins.c 22 Jan 2006 18:12:03 - 1.141 +++ ewins.c 22 Jan 2006 18:25:39 - 1.142 @@ -640,8 +640,7 @@ Eprintf("EwinPropagateShapes %#lx frame=%#lx shaped=%d\n", _EwinGetClientXwin(ewin), EoGetWin(ewin), ewin->state.shaped); - EShapePropagate(EoGetWin(ewin)); - EoChangeShape(ewin); + EoShapeUpdate(ewin, 1); ewin->update.shape = 0; } === RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v retrieving revision 1.252 retrieving revision 1.253 diff -u -3 -r1.252 -r1.253 --- ipc.c 7 Jan 2006 07:20:58 - 1.252 +++ ipc.c 22 Jan 2006 18:25:40 - 1.253 @@ -1061,19 +1061,21 @@ lst = EobjListStackGet(&num); - IpcPrintf("Numwindow T V D S F L pos sizeC R Name\n"); + IpcPrintf + ("Numwindow T V Sh Dsk S F L pos sizeC R Name\n"); for (i = 0; i < num; i++) { eo = lst[i]; - IpcPrintf(" %2d %#9lx %d %d %2d %d %d %3d %5d,%5d %4dx%4d %d %d %s\n", - i, eo->win, eo->type, eo->shown, eo->desk->num, eo->sticky, - eo->floating, eo->ilayer, eo->x, eo->y, eo->w, eo->h, + IpcPrintf + (" %2d %#9lx %d %d %2d %3d %d %d %3d %5d,%5d %4dx%4d %d %d %s\n", + i, eo->win, eo->type, eo->shown, eo
E CVS: engage onefang
Enlightenment CVS committal Author : onefang Project : misc Module : engage Dir : misc/engage/src/module Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/misc/engage/src/module/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 8 Jan 2006 13:00:28 - 1.2 +++ e_mod_config.c 22 Jan 2006 18:20:59 - 1.3 @@ -29,20 +29,24 @@ void _engage_module_config(E_Container *con, Engage_Bar *eb) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; if (eb->cfd) return; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; - - cfd = e_config_dialog_new(con, "Engage Configuration", NULL, 0, &v, eb); - eb->cfd = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, "Engage Configuration", NULL, 0, v, eb); + eb->cfd = cfd; + } } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: calendar onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : calendar Dir : e_modules/calendar/src Modified Files: add_event_dialog.c add_todo_dialog.c main_editor.c otherfonts_editor.c today_editor.c weekday_editor.c weekend_editor.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e_modules/calendar/src/add_event_dialog.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- add_event_dialog.c 14 Jan 2006 15:48:35 - 1.3 +++ add_event_dialog.c 22 Jan 2006 18:18:34 - 1.4 @@ -33,17 +33,19 @@ add_event_show(void *con,void *DayToFix) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _add_event_create_data; - v.free_cfdata = _add_event_free_data; - v.basic.apply_cfdata = _add_event_basic_apply_data; - v.basic.create_widgets= _add_event_basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* create config diaolg */ - cfd = e_config_dialog_new(con, _("Font Editor"), NULL, 0, &v, DayToFix); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _add_event_create_data; + v->free_cfdata = _add_event_free_data; + v->basic.apply_cfdata = _add_event_basic_apply_data; + v->basic.create_widgets= _add_event_basic_create_widgets; + /* create config diaolg */ + cfd = e_config_dialog_new(con, _("Font Editor"), NULL, 0, v, DayToFix); + } } /* local subsystem functions */ === RCS file: /cvsroot/enlightenment/e_modules/calendar/src/add_todo_dialog.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- add_todo_dialog.c 14 Jan 2006 15:48:35 - 1.3 +++ add_todo_dialog.c 22 Jan 2006 18:18:34 - 1.4 @@ -32,17 +32,19 @@ add_todo_show(void *con,void *DayToFix) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _add_todo_create_data; - v.free_cfdata = _add_todo_free_data; - v.basic.apply_cfdata = _add_todo_basic_apply_data; - v.basic.create_widgets= _add_todo_basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* create config diaolg */ - cfd = e_config_dialog_new(con, _("Font Editor"), NULL, 0, &v, DayToFix); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _add_todo_create_data; + v->free_cfdata = _add_todo_free_data; + v->basic.apply_cfdata = _add_todo_basic_apply_data; + v->basic.create_widgets= _add_todo_basic_create_widgets; + /* create config diaolg */ + cfd = e_config_dialog_new(con, _("Font Editor"), NULL, 0, v, DayToFix); + } } /* local subsystem functions */ === RCS file: /cvsroot/enlightenment/e_modules/calendar/src/main_editor.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- main_editor.c 14 Jan 2006 15:48:36 - 1.6 +++ main_editor.c 22 Jan 2006 18:18:34 - 1.7 @@ -35,17 +35,22 @@ e_int_config_calendar(void *con, void *calendar) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = _color_edit_advanced_apply_data; - v.advanced.create_widgets = _color_edit_advanced_create_widgets; + E_Config_Dialog_View *v; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Calendar Settings"), NULL, 0, &v, calendar); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets= _basic_create_widgets; + v->advanced.apply_cfdata = _color_edit_advanced_apply_data; + v->advanced.create_widgets = _color_edit_advanced_create_widgets; + + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(con, _("Calendar Settings"), NULL, 0, v, calendar); + } } /*** / Function: === RCS
E CVS: tclock onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config.c 22 Jan 2006 14:17:43 - 1.7 +++ e_mod_config.c 22 Jan 2006 18:18:34 - 1.8 @@ -33,8 +33,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, v, f); } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : slideshow Dir : e_modules/slideshow Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e_modules/slideshow/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 22 Jan 2006 14:16:59 - 1.11 +++ e_mod_config.c 22 Jan 2006 18:18:34 - 1.12 @@ -40,8 +40,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets= _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* create config diaolg */ cfd = e_config_dialog_new(con, _("Slideshow Configuration"), NULL, 0, v, s); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rain onefang
Enlightenment CVS committal Author : onefang Project : e_modules Module : rain Dir : e_modules/rain Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 15 Jan 2006 08:24:00 - 1.10 +++ e_mod_config.c 22 Jan 2006 18:18:34 - 1.11 @@ -31,17 +31,19 @@ _config_rain_module(E_Container *con, Rain *r) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - - cfd = e_config_dialog_new(con, _("Rain Module"), NULL, 0, &v, r); - r->config_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(con, _("Rain Module"), NULL, 0, v, r); + r->config_dialog = cfd; + } } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c e_fileman_smart.c e_int_border_border.c e_int_border_locks.c e_int_border_remember.c e_int_config_background_import.c e_int_config_modules.c e_int_config_theme.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- e_eap_editor.c 14 Jan 2006 21:05:43 - 1.21 +++ e_eap_editor.c 22 Jan 2006 18:14:50 - 1.22 @@ -60,7 +60,7 @@ e_eap_edit_show(E_Container *con, E_App *a) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; E_App_Edit *editor; if (!con) return; @@ -71,15 +71,19 @@ editor->eap = a; editor->img = NULL; - /* methods */ - v.create_cfdata = _e_eap_edit_create_data; - v.free_cfdata = _e_eap_edit_free_data; - v.basic.apply_cfdata = _e_eap_edit_basic_apply_data; - v.basic.create_widgets= _e_eap_edit_basic_create_widgets; - v.advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; - v.advanced.create_widgets = _e_eap_edit_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, &v, editor); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_eap_edit_create_data; + v->free_cfdata = _e_eap_edit_free_data; + v->basic.apply_cfdata = _e_eap_edit_basic_apply_data; + v->basic.create_widgets= _e_eap_edit_basic_create_widgets; + v->advanced.apply_cfdata = _e_eap_edit_advanced_apply_data; + v->advanced.create_widgets = _e_eap_edit_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(con, _("Eap Editor"), NULL, 0, v, editor); + } } /* local subsystem functions */ === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -3 -r1.120 -r1.121 --- e_fileman_smart.c 14 Jan 2006 21:05:44 - 1.120 +++ e_fileman_smart.c 22 Jan 2006 18:14:50 - 1.121 @@ -1332,19 +1332,23 @@ { E_Fm_Icon *icon; E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; icon = data; - /* methods */ - v.create_cfdata = _e_fm_icon_prop_create_data; - v.free_cfdata = _e_fm_icon_prop_free_data; - v.basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; - v.basic.create_widgets= _e_fm_icon_prop_basic_create_widgets; - v.advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; - v.advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; - /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, &v, icon); + v = E_NEW(E_Config_Dialog_View, 1); + if (v) + { + /* methods */ + v->create_cfdata = _e_fm_icon_prop_create_data; + v->free_cfdata = _e_fm_icon_prop_free_data; + v->basic.apply_cfdata = _e_fm_icon_prop_basic_apply_data; + v->basic.create_widgets= _e_fm_icon_prop_basic_create_widgets; + v->advanced.apply_cfdata = _e_fm_icon_prop_advanced_apply_data; + v->advanced.create_widgets = _e_fm_icon_prop_advanced_create_widgets; + /* create config diaolg for NULL object/data */ + cfd = e_config_dialog_new(icon->sd->win->container, _("Properties"), NULL, 0, v, icon); + } } static void === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_border.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_int_border_border.c 14 Jan 2006 16:05:35 - 1.7 +++ e_int_border_border.c 22 Jan 2006 18:14:51 - 1.8 @@ -31,19 +31,21 @@ e_int_border_border(E_Border *bd) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; - /* create config diaolg for bd object/data */ - cfd = e_config_dialog_new(bd->zone->container, -_("Window Border Selection"), NULL, 0, &v, bd); - bd->border_bor
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_config.c 22 Jan 2006 14:13:04 - 1.13 +++ e_mod_config.c 22 Jan 2006 18:14:51 - 1.14 @@ -36,8 +36,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; /* Create The Dialog */ cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, v, c); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/dropshadow Modified Files: e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 22 Jan 2006 14:13:20 - 1.6 +++ e_mod_config.c 22 Jan 2006 18:14:51 - 1.7 @@ -38,8 +38,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, v, ds); ds->config_dialog = cfd; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: .cvsignore e_mod_config.c Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 1 Jun 2005 14:28:57 - 1.1 +++ .cvsignore 22 Jan 2006 18:14:51 - 1.2 @@ -1,5 +1,5 @@ module.la -e_mod_main.lo +*.lo Makefile.in Makefile .libs === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 22 Jan 2006 14:15:13 - 1.3 +++ e_mod_config.c 22 Jan 2006 18:14:52 - 1.4 @@ -34,8 +34,6 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; - v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, v, start); } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/itray Added Files: .cvsignore Log Message: When changing API semantics, grep is your friend. My policy - if I break it, I fix it. --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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 Log Message: Fix potential missing server ungrab. === RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v retrieving revision 1.140 retrieving revision 1.141 diff -u -3 -r1.140 -r1.141 --- ewins.c 20 Jan 2006 22:04:49 - 1.140 +++ ewins.c 22 Jan 2006 18:12:03 - 1.141 @@ -690,7 +690,7 @@ else ewin = EwinCreate(win, EWIN_TYPE_NORMAL); if (!ewin) - return; + goto done; if (EwinGetAttributes(ewin)) { --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Modified Files: tree.edc Log Message: * Add the checkbox tree model: the cells of a tree can now contain a checkbox === RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- tree.edc26 Dec 2005 15:11:49 - 1.10 +++ tree.edc22 Jan 2006 16:31:56 - 1.11 @@ -239,3 +239,93 @@ } } } +group { + name: "tree_checkbox"; + min: 20 20; + parts { + part { + name: "checkbox"; + description { +state: "default" 0.0; +rel1 { + relative: 0.0 0.5; + offset: 2 -8; +} +rel2 { + relative: 0.0 0.5; + offset: 17 7; +} +image { + normal: "checkbox_off.png"; +} +fill { + smooth: 0; +} + } + description { +state: "on" 0.0; +inherit: "default" 0.0; +image { + normal: "checkbox_on.png"; +} + } + } + part { + name: "checkbox_down"; + description { +state: "default" 0.0; +visible: 0; +rel1 { + relative: 0.0 0.5; + offset: 2 -8; +} +rel2 { + relative: 0.0 0.5; + offset: 17 7; +} +image { + normal: "checkbox_down.png"; +} +fill { + smooth: 0; +} + } + description { +state: "down" 0.0; +inherit: "default" 0.0; +visible: 1; + } + } + } + programs { + program { + name: "tree_checkbox_activated"; + signal: "activated"; + source: ""; + action: STATE_SET "on" 0.0; + target: "checkbox"; + } + program { + name: "tree_checkbox_desactivated"; + signal: "deactivated"; + source: ""; + action: STATE_SET "default" 0.0; + target: "checkbox"; + } + program { + name: "tree_checkbox_down"; + signal: "mouse,down,1"; + source: "checkbox"; + action: STATE_SET "down" 0.0; + target: "checkbox_down"; + } + program { + name: "tree_checkbox_up"; + signal: "mouse,up,1"; + source: "checkbox"; + action: STATE_SET "default" 0.0; + target: "checkbox_down"; + } + } +} + --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/bin Modified Files: etk_tree_test.c Log Message: * Add the checkbox tree model: the cells of a tree can now contain a checkbox === RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- etk_tree_test.c 15 Jan 2006 11:07:16 - 1.20 +++ etk_tree_test.c 22 Jan 2006 16:31:57 - 1.21 @@ -6,6 +6,7 @@ static void _etk_test_tree_add_items(Etk_Tree *tree, int n); static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row, void *data); static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row *row, void *data); +static void _etk_test_tree_checkbox_toggled_cb(Etk_Object *object, Etk_Tree_Row *row, void *data); static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data); static void _etk_test_tree_add_5_cb(Etk_Object *object, void *data); static void _etk_test_tree_add_50_cb(Etk_Object *object, void *data); @@ -22,7 +23,7 @@ static Etk_Widget *win = NULL; Etk_Widget *tree; Etk_Tree_Row *row; - Etk_Tree_Col *col1, *col2, *col3; + Etk_Tree_Col *col1, *col2, *col3, *col4; Etk_Widget *table; Etk_Widget *label; Etk_Widget *frame; @@ -57,17 +58,19 @@ etk_tree_col_expand_set(col1, ETK_TRUE); col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), etk_tree_model_double_new(ETK_TREE(tree)), 60); col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60); + col4 = etk_tree_col_new(ETK_TREE(tree), _("Column 4"), etk_tree_model_checkbox_new(ETK_TREE(tree)), 40); etk_tree_build(ETK_TREE(tree)); + etk_signal_connect("cell_value_changed", ETK_OBJECT(col4), ETK_CALLBACK(_etk_test_tree_checkbox_toggled_cb), NULL); etk_tree_freeze(ETK_TREE(tree)); for (i = 0; i < 1000; i++) { row = etk_tree_append(ETK_TREE(tree), col1, etk_theme_icon_theme_get(), "places/user-home_16", _("Row1"), - col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", NULL); + col2, 10.0, col3, PACKAGE_DATA_DIR "/images/1star.png", col4, ETK_FALSE, NULL); row = etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(), "places/folder_16", _("Row2"), - col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", NULL); + col2, 20.0, col3, PACKAGE_DATA_DIR "/images/2stars.png", col4, ETK_FALSE, NULL); etk_tree_append_to_row(row, col1, etk_theme_icon_theme_get(), "mimetypes/text-x-generic_16", _("Row3"), - col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", NULL); + col2, 30.0, col3, PACKAGE_DATA_DIR "/images/3stars.png", col4, ETK_TRUE, NULL); } etk_tree_thaw(ETK_TREE(tree)); @@ -174,6 +177,22 @@ printf(_("Row unselected %p %p\n"), object, row); } +/* Called when a checkbox of the tree is toggled */ +static void _etk_test_tree_checkbox_toggled_cb(Etk_Object *object, Etk_Tree_Row *row, void *data) +{ + Etk_Bool checked; + Etk_Tree_Col *col; + + if (!(col = ETK_TREE_COL(object)) || !row) + return; + + etk_tree_row_fields_get(row, col, &checked, NULL); + if (checked) + printf(_("Checkbox activated\n")); + else + printf(_("Checkbox deactivated\n")); +} + /* Called when the "Clear" button is clicked */ static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data) { --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_tree.c etk_tree_model.c etk_tree_model.h Log Message: * Add the checkbox tree model: the cells of a tree can now contain a checkbox === RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- etk_tree.c 15 Jan 2006 11:07:16 - 1.27 +++ etk_tree.c 22 Jan 2006 16:31:57 - 1.28 @@ -66,6 +66,12 @@ ETK_TREE_ROW_HEIGHT_PROPERTY }; +enum _Etk_Tree_Col_Signal_Id +{ + ETK_TREE_COL_CELL_VALUE_CHANGED, + ETK_TREE_COL_NUM_SIGNALS +}; + enum _Etk_Tree_Col_Property_Id { ETK_TREE_COL_TITLE_PROPERTY, @@ -114,6 +120,7 @@ static int _etk_tree_rows_draw(Etk_Tree *tree, Etk_Tree_Row *first_row, Evas_List **items_objects, int x, int w, int h, int xoffset, int yoffset, int first_row_id, int first_row_color); static Etk_Tree_Row *_etk_tree_row_new_valist(Etk_Tree *tree, Etk_Tree_Row *row, va_list args); +static void _etk_tree_row_fields_set_valist_full(Etk_Tree_Row *row, va_list args, Etk_Bool emit_value_changed_signal); static Etk_Tree_Row_Objects *_etk_tree_row_objects_new(Etk_Tree *tree); static void _etk_tree_row_objects_free(Etk_Tree_Row_Objects *row_objects, Etk_Tree *tree); static void _etk_tree_row_free(Etk_Tree_Row *row); @@ -127,6 +134,7 @@ static void _etk_tree_heapify(Etk_Tree *tree, Etk_Tree_Row **heap, int root, int size, int (*compare_cb)(Etk_Tree *tree, Etk_Tree_Row *row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data), int asc, Etk_Tree_Col *col, void *data); static Etk_Signal *_etk_tree_signals[ETK_TREE_NUM_SIGNALS]; +static Etk_Signal *_etk_tree_col_signals[ETK_TREE_COL_NUM_SIGNALS]; /** * @@ -186,6 +194,8 @@ { tree_col_type = etk_type_new("Etk_Tree_Col", ETK_OBJECT_TYPE, sizeof(Etk_Tree_Col), ETK_CONSTRUCTOR(_etk_tree_col_constructor), ETK_DESTRUCTOR(_etk_tree_col_destructor)); + _etk_tree_col_signals[ETK_TREE_COL_CELL_VALUE_CHANGED] = etk_signal_new("cell_value_changed", tree_col_type, -1, etk_marshaller_VOID__POINTER, NULL, NULL); + etk_type_property_add(tree_col_type, "title", ETK_TREE_COL_TITLE_PROPERTY, ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL)); etk_type_property_add(tree_col_type, "width", ETK_TREE_COL_WIDTH_PROPERTY, ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_TREE_MIN_HEADER_WIDTH)); etk_type_property_add(tree_col_type, "min_width", ETK_TREE_COL_MIN_WIDTH_PROPERTY, ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(-1)); @@ -215,8 +225,13 @@ Etk_Tree_Col *new_col; Etk_Widget *new_header; - if (!tree) + if (!tree || !model) + return NULL; + if (model->col) + { + ETK_WARNING("The tree model to use for that column is already used for another column"); return NULL; + } tree->columns = realloc(tree->columns, sizeof(Etk_Tree_Col *) * (tree->num_cols + 1)); new_col = ETK_TREE_COL(etk_object_new(ETK_TREE_COL_TYPE, "title", title, "width", width, "visible", ETK_TRUE, "resizable", ETK_TRUE, NULL)); @@ -227,6 +242,7 @@ etk_object_notify(ETK_OBJECT(new_col), "place"); new_col->tree = tree; new_col->model = model; + new_col->model->col = new_col; /* Creates the header widget */ new_header = etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "tree_header", "label", title, "xalign", 0.0, "repeat_events", ETK_TRUE, "visibility_locked", ETK_TRUE, NULL); @@ -987,24 +1003,9 @@ */ void etk_tree_row_fields_set_valist(Etk_Tree_Row *row, va_list args) { - Etk_Tree_Col *col; - va_list args2; - - if (!row) - return; - - va_copy(args2, args); - while ((col = va_arg(args2, Etk_Tree_Col *))) - { - if (col->model->cell_data_set) - col->model->cell_data_set(col->model, row->cells_data[col->id], &args2); - } - va_end(args2); - - if (!row->tree->frozen) - etk_widget_redraw_queue(ETK_WIDGET(row->tree->grid)); + _etk_tree_row_fields_set_valist_full(row, args, ETK_TRUE); } - + /** * @brief Gets the different values of the cells of the row * @param row a row @@ -2235,7 +2236,7 @@ geometry.y = item_y + tree->cell_margins[2]; geometry.w = tree->columns[j]->visible_width - tree->cell_margins[0] - tree->cell_margins[1]; geometry.h = tree->row_height - tree->cell_margins[2] - tree->cell_margins[3]; -tree->columns[j]->model->render(tree->columns[j]->model, geometry, row->cells_data[j], row_objects->cells_objects[j].objects); +tree->columns[j]->model->render(tree->columns[j]->model, row, geometry, row->cells_data[j], row_objects->cells_objects[j].objects);
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c e_int_config_background_import.c Log Message: Fix for bg dialog crash. Make resize work on import. Code cleanups. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_int_config_background.c 22 Jan 2006 15:33:04 - 1.30 +++ e_int_config_background.c 22 Jan 2006 15:51:51 - 1.31 @@ -456,10 +456,8 @@ if (!cfd) return 0; if (!cfdata) return 0; if (!cfdata->import) return 1; - if (!cfdata->import->dia) return 0; - - e_object_del_attach_func_set(E_OBJECT(cfd->dia), NULL); - e_object_del(E_OBJECT(cfdata->import->dia)); + if (!cfdata->import->dia) return 1; + e_object_del(E_OBJECT(cfdata->import->dia)); return 1; } === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_background_import.c22 Jan 2006 15:33:32 - 1.3 +++ e_int_config_background_import.c22 Jan 2006 15:51:51 - 1.4 @@ -83,8 +83,6 @@ static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static void _fill_data (E_Config_Dialog_Data *cfdata); static void _efm_hilite_cb (Evas_Object *obj, char *file, void *data); static void _bg_edj_gen(Evas *evas, char *filename, int method); @@ -144,7 +142,7 @@ if (!cfdata->file[0]) return 0; f = e_fm_file_new(cfdata->file); - if (!f) return; + if (!f) return 0; if (!e_fm_file_is_image(f)) return 0; free(f); @@ -157,88 +155,32 @@ static Evas_Object * _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) { - Evas_Object *o, *ot, *of, *ofm; + Evas_Object *o, *of, *ofm, *ol; E_Dialog *dia; E_Radio_Group *rg; _fill_data(cfdata); dia = cfd->dia; - - ot = e_widget_table_add(evas, 0); - - of = e_widget_framelist_add(evas, _("Image To Import"), 0); + ol = e_widget_list_add(evas, 0, 0); + of = e_widget_framelist_add(evas, _("Image To Import"), 0); ofm = e_widget_fileman_add(evas, (&(cfdata->file))); e_widget_fileman_hilite_callback_add(ofm, _efm_hilite_cb, dia); + e_widget_framelist_object_append(of, ofm); + e_widget_list_object_append(ol, of, 1, 1, 0.5); - e_widget_framelist_object_append(of, ofm); - e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1); - - of = e_widget_framelist_add(evas, _("Options"), 0); + of = e_widget_frametable_add(evas, _("Options"), 0); rg = e_widget_radio_group_new(&cfdata->method); o = e_widget_radio_add(evas, _("Center"), E_BG_CENTER, rg); - e_widget_framelist_object_append(of, o); + e_widget_frametable_object_append(of, o, 0, 0, 1, 1, 1, 0, 1, 0); o = e_widget_radio_add(evas, _("Scale"), E_BG_SCALE, rg); - e_widget_framelist_object_append(of, o); + e_widget_frametable_object_append(of, o, 0, 1, 1, 1, 1, 0, 1, 0); o = e_widget_radio_add(evas, _("Tile"), E_BG_TILE, rg); - e_widget_framelist_object_append(of, o); - e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 0, 1, 0); - - return ot; -} - -static int -_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) -{ - E_Fm_File *f; - Evas *evas; - - if (!cfdata->file[0]) return 0; + e_widget_frametable_object_append(of, o, 0, 2, 1, 1, 1, 0, 1, 0); - f = e_fm_file_new(cfdata->file); - if (!f) return; - - if (!e_fm_file_is_image(f)) return 0; - free(f); - - evas = e_win_evas_get(cfd->dia->win); - _bg_edj_gen(evas, cfdata->file, cfdata->method); - return 1; -} - -static Evas_Object * -_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) -{ - Evas_Object *o, *ot, *of, *ofm; - E_Dialog *dia; - E_Radio_Group *rg; - - _fill_data(cfdata); - - dia = cfd->dia; - - ot = e_widget_table_add(evas, 0); - - of = e_widget_framelist_add(evas, _("Image To Import"), 0); - - ofm = e_widget_fileman_add(evas, (&(cfdata->file))); - e_widget_fileman_hilite_callback_add(ofm, _efm_hilite_cb, dia); - - e_widget_framelist_o
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background_import.c Log Message: Make import dialog resizable === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_int_config_background_import.c22 Jan 2006 14:44:49 - 1.2 +++ e_int_config_background_import.c22 Jan 2006 15:33:32 - 1.3 @@ -113,6 +113,7 @@ v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(parent->con, _("Import An Image"), NULL, 0, v, NULL); + e_dialog_resizable_set(cfd->dia, 1); ecore_x_icccm_transient_for_set(cfd->dia->win->evas_win, parent->dia->win->evas_win); return cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c Log Message: Check for import being null on dialog close cb === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- e_int_config_background.c 22 Jan 2006 14:44:49 - 1.29 +++ e_int_config_background.c 22 Jan 2006 15:33:04 - 1.30 @@ -178,6 +178,10 @@ e_widget_ilist_go(il); e_widget_table_object_append(ot, il, 0, 0, 1, 3, 1, 1, 1, 1); + /* Add import Button */ + o = e_widget_button_add(evas, _("Import An Image"), NULL, _bg_config_dialog_cb_import, cfd, NULL); + e_widget_table_object_append(ot, o, 0, 3, 1, 1, 1, 0, 0, 0); + of = e_widget_framelist_add(evas, _("Background Preview"), 0); e_widget_min_size_set(of, 320, 240); e_widget_table_object_append(ot, of, 1, 0, 1, 2, 1, 1, 1, 1); @@ -451,6 +455,7 @@ { if (!cfd) return 0; if (!cfdata) return 0; + if (!cfdata->import) return 1; if (!cfdata->import->dia) return 0; e_object_del_attach_func_set(E_OBJECT(cfd->dia), NULL); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_background.c e_int_config_background_import.c Log Message: Remove printfs and extra comments. I'd like to thank onefang and CodeWarrior for there help with the import dialog. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- e_int_config_background.c 22 Jan 2006 14:11:15 - 1.28 +++ e_int_config_background.c 22 Jan 2006 14:44:49 - 1.29 @@ -434,7 +434,6 @@ file = (char *)ecore_file_get_file((char *)path); if (event == ECORE_FILE_EVENT_CREATED_FILE) { - printf("File Added: %s\n", path); if (e_util_edje_collection_exists((char *)path, "desktop/background")) { if (!e_thumb_exists((char *)path)) === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background_import.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_background_import.c22 Jan 2006 14:11:15 - 1.1 +++ e_int_config_background_import.c22 Jan 2006 14:44:49 - 1.2 @@ -4,13 +4,6 @@ #define E_BG_TILE 1 #define E_BG_CENTER 2 -/* TODO: - * Currently the bg config dialog needs to be reloaded in order - * to display new images created from here. - * - * If you close the bg config dialog, before closing this then SEGV. -*/ - /* Personally I hate having to define this twice, but Tileing needs a fill */ #define IMG_EDC_TMPL_TILE \ "images {\n" \ @@ -116,8 +109,8 @@ v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets= _basic_create_widgets; - v->advanced.apply_cfdata = NULL; //_advanced_apply_data; - v->advanced.create_widgets = NULL;//_advanced_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; cfd = e_config_dialog_new(parent->con, _("Import An Image"), NULL, 0, v, NULL); ecore_x_icccm_transient_for_set(cfd->dia->win->evas_win, parent->dia->win->evas_win); --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c e_config_dialog.c e_config_dialog.h Log Message: Allocate and free the view struct as per discussion. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_apps_error.c 22 Jan 2006 13:01:40 - 1.4 +++ e_apps_error.c 22 Jan 2006 14:18:20 - 1.5 @@ -24,18 +24,19 @@ E_Config_Dialog *cfd; E_Config_Dialog_View *v; - v = E_NEW(E_Config_Dialog_View, 1); /* FIXME: Currenly this never gets free'd, awaiting the outcome of mailing list discussion. */ - /* Dialog Methods */ - v->create_cfdata = _e_app_error_dialog_create_data; - v->free_cfdata = _e_app_error_dialog_free_data; -// v->basic.apply_cfdata = NULL; - v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; -// v->advanced.apply_cfdata = NULL; - v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; - - /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); - app->error_dialog = cfd; + v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog. */ + if (v) + { + /* Dialog Methods */ + v->create_cfdata = _e_app_error_dialog_create_data; + v->free_cfdata = _e_app_error_dialog_free_data; + v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; + v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; + + /* Create The Dialog */ + cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); + app->error_dialog = cfd; + } } static void === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- e_config_dialog.c 21 Jan 2006 12:44:48 - 1.18 +++ e_config_dialog.c 22 Jan 2006 14:18:20 - 1.19 @@ -25,14 +25,7 @@ cfd = E_OBJECT_ALLOC(E_Config_Dialog, E_CONFIG_DIALOG_TYPE, _e_config_dialog_free); - cfd->view = *view; - /* Seems that every user of this allocates view it on the stack and doesn't clear it, -* so I can't rely on this being NULL. I currently set it to NULL in e_config_dialog_new() -* and if you want to use it, set it in create_widgets(); -* I suspect that allocating a structure on the stack that lives beyond the function -* call is just asking for trouble. -*/ - cfd->view.close_cfdata = NULL; + cfd->view = view; cfd->con = con; cfd->title = evas_stringshare_add(title); if (icon) @@ -43,7 +36,7 @@ cfd->data = data; cfd->hide_buttons = 1; - if ((cfd->view.basic.apply_cfdata) || (cfd->view.advanced.apply_cfdata)) + if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata)) cfd->hide_buttons = 0; _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC); @@ -60,7 +53,7 @@ if (cfd->icon) evas_stringshare_del(cfd->icon); if (cfd->cfdata) { - cfd->view.free_cfdata(cfd, cfd->cfdata); + cfd->view->free_cfdata(cfd, cfd->cfdata); cfd->cfdata = NULL; } if (cfd->dia) @@ -69,6 +62,7 @@ e_object_del(E_OBJECT(cfd->dia)); cfd->dia = NULL; } + E_FREE(cfd->view); free(cfd); } @@ -87,14 +81,14 @@ e_dialog_title_set(cfd->dia, cfd->title); if (cfd->icon) e_dialog_icon_set(cfd->dia, cfd->icon, cfd->icon_size); - if (!cfd->cfdata) cfd->cfdata = cfd->view.create_cfdata(cfd); + if (!cfd->cfdata) cfd->cfdata = cfd->view->create_cfdata(cfd); if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC) { - if (cfd->view.advanced.create_widgets) + if (cfd->view->advanced.create_widgets) { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); -ob = cfd->view.basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); +ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), _("Advanced"), "widget/new_dialog", @@ -102,14 +96,14 @@ e_widget_list_object_append(o, ob, 0, 0, 1.0); } else - o = cfd->view.basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); } else { - if (cfd->view.basic.create_widgets) + if (cfd->view->basic.create_widgets) { o = e_widge
E CVS: snow devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : snow Dir : e_modules/snow Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 15 Jan 2006 08:40:00 - 1.10 +++ e_mod_config.c 22 Jan 2006 14:17:16 - 1.11 @@ -31,16 +31,18 @@ _config_snow_module(E_Container *con, Snow *s) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; - cfd = e_config_dialog_new(con, _("Snow Configuration"), NULL, 0, &v, s); + cfd = e_config_dialog_new(con, _("Snow Configuration"), NULL, 0, v, s); s->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : tclock Dir : e_modules/tclock Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/tclock/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 15 Jan 2006 08:42:32 - 1.6 +++ e_mod_config.c 22 Jan 2006 14:17:43 - 1.7 @@ -25,16 +25,18 @@ _config_tclock_module(E_Container *con, TClock_Face *f) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, &v, f); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; + + cfd = e_config_dialog_new(con, _("Tclock Configuration"), NULL, 0, v, f); } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : slideshow Dir : e_modules/slideshow Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/slideshow/e_mod_config.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_mod_config.c 15 Jan 2006 08:35:42 - 1.10 +++ e_mod_config.c 22 Jan 2006 14:16:59 - 1.11 @@ -31,18 +31,20 @@ _config_slideshow_module(E_Container *con, Slide *s) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets= _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; /* create config diaolg */ - cfd = e_config_dialog_new(con, _("Slideshow Configuration"), NULL, 0, &v, s); + cfd = e_config_dialog_new(con, _("Slideshow Configuration"), NULL, 0, v, s); s->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mount devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mount Dir : e_modules/mount Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 15 Jan 2006 08:19:25 - 1.6 +++ e_mod_config.c 22 Jan 2006 14:16:25 - 1.7 @@ -30,16 +30,18 @@ _config_mount_module(E_Container *con, Mount *m) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Mount Configuration"), NULL, 0, &v, m); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Mount Configuration"), NULL, 0, v, m); m->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_mod_config.c 15 Jan 2006 08:32:19 - 1.9 +++ e_mod_config.c 22 Jan 2006 14:16:44 - 1.10 @@ -62,18 +62,20 @@ _config_screenshot_module(E_Container *con, Screen *s) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets= _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* create config diaolg */ - cfd = e_config_dialog_new(con, _("Screenshot Configuration"), NULL, 0, &v, s); + cfd = e_config_dialog_new(con, _("Screenshot Configuration"), NULL, 0, v, s); s->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: monitor devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : monitor Dir : e_modules/monitor Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config.c 15 Jan 2006 08:05:09 - 1.6 +++ e_mod_config.c 22 Jan 2006 14:16:08 - 1.7 @@ -45,16 +45,18 @@ _config_monitor_module(E_Container *con, Monitor_Face *f) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, &v, f); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Monitor Configuration"), NULL, 0, v, f); } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: flame devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : flame Dir : e_modules/flame Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_config.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_config.c 15 Jan 2006 07:27:40 - 1.14 +++ e_mod_config.c 22 Jan 2006 14:15:52 - 1.15 @@ -29,16 +29,18 @@ _config_flame_module(E_Container *con, Flame *fl) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Flame Configuration"), NULL, 0, &v, fl); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Flame Configuration"), NULL, 0, v, fl); fl->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/start Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/start/e_mod_config.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_config.c 20 Jan 2006 11:14:12 - 1.2 +++ e_mod_config.c 22 Jan 2006 14:15:13 - 1.3 @@ -26,16 +26,18 @@ _config_start_module(E_Container *con, Start *start) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, &v, start); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; + + cfd = e_config_dialog_new(con, _("Start Module Configuration"), NULL, 0, v, start); } static void --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_mod_config.c 20 Jan 2006 04:04:14 - 1.13 +++ e_mod_config.c 22 Jan 2006 14:15:30 - 1.14 @@ -55,16 +55,18 @@ _config_temperature_module(E_Container *con, Temperature *temp) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, &v, temp); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Temperature Configuration"), NULL, 0, v, temp); temp->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 20 Jan 2006 04:06:37 - 1.11 +++ e_mod_config.c 22 Jan 2006 14:14:47 - 1.12 @@ -32,16 +32,18 @@ _config_pager_module(E_Container *con, Pager *pager) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Pager Configuration"), NULL, 0, &v, pager); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Pager Configuration"), NULL, 0, v, pager); pager->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/itray Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/itray/e_mod_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_config.c 20 Jan 2006 04:04:13 - 1.1 +++ e_mod_config.c 22 Jan 2006 14:14:24 - 1.2 @@ -35,18 +35,20 @@ _config_itray_module(E_Container *con, ITray *itray) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* Dialog Methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("ITray Configuration"), NULL, 0, &v, itray); + cfd = e_config_dialog_new(con, _("ITray Configuration"), NULL, 0, v, itray); itray->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_mod_config.c 20 Jan 2006 04:04:13 - 1.15 +++ e_mod_config.c 22 Jan 2006 14:13:58 - 1.16 @@ -33,18 +33,20 @@ _config_ibox_module(E_Container *con, IBox *ibox) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); + /* Dialog Methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, &v, ibox); + cfd = e_config_dialog_new(con, _("IBox Configuration"), NULL, 0, v, ibox); ibox->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/dropshadow Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/dropshadow/e_mod_config.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config.c 14 Jan 2006 16:10:56 - 1.5 +++ e_mod_config.c 22 Jan 2006 14:13:20 - 1.6 @@ -30,16 +30,18 @@ _config_dropshadow_module(E_Container *con, Dropshadow *ds) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, &v, ds); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; + + cfd = e_config_dialog_new(con, _("Dropshadow Configuration"), NULL, 0, v, ds); ds->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibar Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibar/e_mod_config.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_config.c 20 Jan 2006 04:04:13 - 1.14 +++ e_mod_config.c 22 Jan 2006 14:13:41 - 1.15 @@ -33,18 +33,20 @@ _config_ibar_module(E_Container *con, IBar *ibar) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog Methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, &v, ibar); + cfd = e_config_dialog_new(con, _("IBar Configuration"), NULL, 0, v, ibar); ibar->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/clock Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/clock/e_mod_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_mod_config.c 20 Jan 2006 04:04:12 - 1.12 +++ e_mod_config.c 22 Jan 2006 14:13:04 - 1.13 @@ -27,18 +27,20 @@ _config_clock_module(E_Container *con, Clock_Face *c) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* Dialog Methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = NULL; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = NULL; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, &v, c); + cfd = e_config_dialog_new(con, _("Clock Configuration"), NULL, 0, v, c); c->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_config.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 20 Jan 2006 04:04:12 - 1.11 +++ e_mod_config.c 22 Jan 2006 14:12:48 - 1.12 @@ -31,16 +31,18 @@ _config_battery_module(E_Container *con, Battery *bat) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, &v, bat); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("Battery Configuration"), NULL, 0, v, bat); bat->config_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_includes.h e_int_config_background.c Added Files: e_int_config_background_import.c e_int_config_background_import.h Log Message: Added import function to bg config dialog === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.95 retrieving revision 1.96 diff -u -3 -r1.95 -r1.96 --- Makefile.am 21 Jan 2006 15:39:03 - 1.95 +++ Makefile.am 22 Jan 2006 14:11:15 - 1.96 @@ -121,6 +121,7 @@ e_int_config_window_manipulation.h \ e_int_config_window_display.h \ e_int_config_background.h \ +e_int_config_background_import.h \ e_int_config_theme.h \ e_int_config_menus.h \ e_int_config_general.h \ @@ -233,6 +234,7 @@ e_int_config_window_manipulation.c \ e_int_config_window_display.c \ e_int_config_background.c \ +e_int_config_background_import.c \ e_int_config_theme.c \ e_int_config_menus.c \ e_int_config_general.c \ === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_includes.h12 Jan 2006 02:12:21 - 1.78 +++ e_includes.h22 Jan 2006 14:11:15 - 1.79 @@ -101,6 +101,7 @@ #include "e_int_config_window_manipulation.h" #include "e_int_config_window_display.h" #include "e_int_config_background.h" +#include "e_int_config_background_import.h" #include "e_int_config_theme.h" #include "e_int_config_menus.h" #include "e_int_config_general.h" === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_int_config_background.c 20 Jan 2006 11:09:14 - 1.27 +++ e_int_config_background.c 22 Jan 2006 14:11:15 - 1.28 @@ -1,41 +1,54 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 */ + #include "e.h" #define BG_SET_DEFAULT_DESK 0 #define BG_SET_THIS_DESK 1 #define BG_SET_ALL_DESK 2 -static void*_create_data (E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _advanced_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static void_load_bgs (E_Config_Dialog *cfd, Evas_Object *il); -void _ilist_cb_bg_selected (void *data); +static void*_create_data(E_Config_Dialog *cfd); +static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_data (E_Config_Dialog_Data *cfdata); +static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); +static void _load_bgs (E_Config_Dialog *cfd, Evas_Object *il); +void_ilist_cb_bg_selected (void *data); +static void _bg_config_dialog_cb_import (void *data, void *data2); +static int _bg_dialog_close(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _bg_file_added (void *data, Ecore_File_Monitor *monitor, Ecore_File_Event event, const char *path); + +static Ecore_File_Monitor *_bg_file_monitor; struct _E_Config_Dialog_Data { char *bg, *current_bg; int bg_method; + E_Config_Dialog *cfd; + E_Config_Dialog *import; + Evas_Object *il; }; EAPI E_Config_Dialog * e_int_config_background(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); + + v->create_cfdata = _create_data; + v->free_cfdata
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_desks.c e_int_config_focus.c e_int_config_general.c e_int_config_menus.c e_int_config_modules.c e_int_config_performance.c e_int_config_theme.c e_int_config_window_display.c e_int_config_window_manipulation.c e_int_config_winlist.c Log Message: Fixes for E_Config_Dialog_View === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_desks.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_int_config_desks.c14 Jan 2006 16:05:35 - 1.10 +++ e_int_config_desks.c22 Jan 2006 14:12:17 - 1.11 @@ -30,17 +30,19 @@ e_int_config_desks(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets= _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Desktop Settings"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Desktop Settings"), NULL, 0, v, NULL); return cfd; } === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_focus.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_int_config_focus.c14 Jan 2006 16:05:35 - 1.8 +++ e_int_config_focus.c22 Jan 2006 14:12:17 - 1.9 @@ -30,17 +30,19 @@ e_int_config_focus(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + + v = E_NEW(E_Config_Dialog_View, 1); /* methods */ - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets= _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets= _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; /* create config diaolg for NULL object/data */ - cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, &v, NULL); + cfd = e_config_dialog_new(con, _("Focus Settings"), NULL, 0, v, NULL); return cfd; } === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_general.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_int_config_general.c 14 Jan 2006 16:05:35 - 1.9 +++ e_int_config_general.c 22 Jan 2006 14:12:17 - 1.10 @@ -20,16 +20,18 @@ e_int_config_general(E_Container *con) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; - v.create_cfdata = _create_data; - v.free_cfdata = _free_data; - v.basic.apply_cfdata = _basic_apply_data; - v.basic.create_widgets = _basic_create_widgets; - v.advanced.apply_cfdata = _advanced_apply_data; - v.advanced.create_widgets = _advanced_create_widgets; + v = E_NEW(E_Config_Dialog_View, 1); - cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, &v, NULL); + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + v->advanced.apply_cfdata = _advanced_apply_data; + v->advanced.create_widgets = _advanced_create_widgets; + + cfd = e_config_dialog_new(con, _("General Settings"), NULL, 0, v, NULL); return cfd; } === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_menus.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_menus.c14 Jan 2006 16:05:35 - 1.3 +++ e_int_config_menus.c22 Jan 2006 14:12:17 - 1.4 @@ -25,16 +25,18 @@ e_int_config_menus(E_Container *con) { E
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps_error.c Log Message: After complaining about this, I realized I was guilty of cut'n'paste as much as anyone. === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_apps_error.c 21 Jan 2006 18:15:23 - 1.3 +++ e_apps_error.c 22 Jan 2006 13:01:40 - 1.4 @@ -22,18 +22,19 @@ _e_app_error_dialog(E_Container *con, E_App_Autopsy *app) { E_Config_Dialog *cfd; - E_Config_Dialog_View v; + E_Config_Dialog_View *v; + v = E_NEW(E_Config_Dialog_View, 1); /* FIXME: Currenly this never gets free'd, awaiting the outcome of mailing list discussion. */ /* Dialog Methods */ - v.create_cfdata = _e_app_error_dialog_create_data; - v.free_cfdata = _e_app_error_dialog_free_data; - v.basic.apply_cfdata = NULL; - v.basic.create_widgets = _e_app_error_dialog_basic_create_widgets; - v.advanced.apply_cfdata = NULL; - v.advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; + v->create_cfdata = _e_app_error_dialog_create_data; + v->free_cfdata = _e_app_error_dialog_free_data; +// v->basic.apply_cfdata = NULL; + v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets; +// v->advanced.apply_cfdata = NULL; + v->advanced.create_widgets = _e_app_error_dialog_advanced_create_widgets; /* Create The Dialog */ - cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, &v, app); + cfd = e_config_dialog_new(con, _("Run error, wtf? That sux."), NULL, 0, v, app); app->error_dialog = cfd; } --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_blend_pixel_pixel.c Log Message: oops - missed fixup of end ptr. :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_pixel.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- evas_blend_pixel_pixel.c22 Jan 2006 06:54:18 - 1.23 +++ evas_blend_pixel_pixel.c22 Jan 2006 10:48:51 - 1.24 @@ -288,6 +288,7 @@ src_ptr+=16; dst_ptr+=16; } + dst_end_ptr = dst + len; while (dst_ptr < dst_end_ptr) { *dst_ptr = *src_ptr; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion jcwong
Enlightenment CVS committal Author : jcwong Project : e17 Module : libs/emotion Dir : e17/libs/emotion Modified Files: configure.in Log Message: Make autogen work again. === RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- configure.in13 Nov 2005 04:44:39 - 1.26 +++ configure.in22 Jan 2006 08:51:17 - 1.27 @@ -205,7 +205,6 @@ src/Makefile src/lib/Makefile src/modules/Makefile -src/modules/xine/Makefile src/bin/Makefile data/Makefile emotion-config --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs