E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_xinerama.c Log Message: oops +e === RCS file: /cvs/e/e17/apps/e/src/bin/e_xinerama.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_xinerama.c28 Oct 2007 04:03:40 - 1.10 +++ e_xinerama.c28 Oct 2007 04:09:08 - 1.11 @@ -53,7 +53,7 @@ scr = calloc(1, sizeof(E_Screen)); scr->screen = evas_list_count(fake_screens); - scr->escren = scr->screen; + scr->escreen = scr->screen; scr->x = x; scr->y = y; scr->w = w; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_hal.c e_xinerama.c
Log Message:
fake xinerama broken - fixed.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_fm_hal.c 22 Oct 2007 08:10:28 - 1.1
+++ e_fm_hal.c 28 Oct 2007 04:03:40 - 1.2
@@ -326,6 +326,7 @@
if (!v) return NULL;
if (v->mount_point)
{
+ printf("GET MOUNTPOINT = %s\n", v->mount_point);
return strdup(v->mount_point);
}
@@ -340,6 +341,7 @@
static int mount_count = 1;
snprintf(buf, sizeof(buf) - 1, "/media/unknown-%i", mount_count++);
}
+ printf("GET MOUNTPOINT = %s\n", buf);
return strdup(buf);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_xinerama.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_xinerama.c17 Oct 2007 11:06:59 - 1.9
+++ e_xinerama.c28 Oct 2007 04:03:40 - 1.10
@@ -53,6 +53,7 @@
scr = calloc(1, sizeof(E_Screen));
scr->screen = evas_list_count(fake_screens);
+ scr->escren = scr->screen;
scr->x = x;
scr->y = y;
scr->w = w;
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
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_image_main.c
Log Message:
resolved bug from [EMAIL PROTECTED]
===
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- evas_image_main.c 22 Aug 2007 15:06:04 - 1.56
+++ evas_image_main.c 28 Oct 2007 04:01:56 - 1.57
@@ -132,6 +132,8 @@
static int
_evas_common_image_dirty(RGBA_Image* dst, const RGBA_Image* src)
{
+ evas_common_load_image_data_from_file(src);
+ evas_common_image_colorspace_normalize(src);
evas_common_image_colorspace_normalize(dst);
evas_common_image_surface_alloc(dst->image);
evas_common_blit_rectangle(src, dst, 0, 0, src->image->w, src->image->h, 0,
0);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
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_gstreamer.c emotion_xine.c
Log Message:
handle exists too - and it gets written!
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- emotion_gstreamer.c 1 Sep 2007 17:51:40 - 1.25
+++ emotion_gstreamer.c 28 Oct 2007 03:59:23 - 1.26
@@ -220,7 +220,9 @@
em_speed_set, /* speed_set */
em_speed_get, /* speed_get */
em_eject, /* eject */
- em_meta_get /* meta_get */
+ em_meta_get, /* meta_get */
+
+ NULL /* handle */
};
static unsigned char
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- emotion_xine.c 18 Jul 2007 05:13:19 - 1.38
+++ emotion_xine.c 28 Oct 2007 03:59:23 - 1.39
@@ -1463,7 +1463,7 @@
pthread_mutex_unlock(&(ev->get_pos_len_mutex));
}
-const static Emotion_Video_Module em_module =
+static Emotion_Video_Module em_module =
{
em_init, /* init */
em_shutdown, /* shutdown */
@@ -1519,7 +1519,9 @@
em_speed_set, /* speed_set */
em_speed_get, /* speed_get */
em_eject, /* eject */
- em_meta_get /* meta_get */
+ em_meta_get, /* meta_get */
+
+ NULL /* handle */
};
unsigned char
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
Oops bad me. Handle both icons in the icon theme or with the path
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- e_eap_editor.c 27 Oct 2007 15:55:27 - 1.91
+++ e_eap_editor.c 28 Oct 2007 01:54:24 - 1.92
@@ -587,9 +587,16 @@
* files from a dir, or icons in the current theme */
if (cfdata->icon)
{
- icon_path = efreet_icon_path_find(e_config->icon_theme,
- cfdata->icon, "scalable");
- path = ecore_file_dir_get(icon_path);
+ if (ecore_file_exists(cfdata->icon))
+ icon_path = strdup(cfdata->icon);
+ else
+ icon_path = efreet_icon_path_find(e_config->icon_theme, cfdata->icon,
"scalable");
+
+ if (icon_path)
+ {
+path = ecore_file_dir_get(icon_path);
+free(icon_path);
+ }
}
if (path)
@@ -606,7 +613,6 @@
NULL, cfdata, 1);
}
- if (icon_path) free(icon_path);
evas_object_show(o);
editor->icon_fsel = o;
e_widget_min_size_get(o, &mw, &mh);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
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/conf_wallpaper
Modified Files:
e_int_config_wallpaper_import.c
Log Message:
Encode any 'imported' images with a data item so we know if it's
fill/stretch/etc. First stage of allowing changes to imported images.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_wallpaper_import.c 24 Oct 2007 08:37:48 - 1.3
+++ e_int_config_wallpaper_import.c 28 Oct 2007 00:58:17 - 1.4
@@ -156,19 +156,29 @@
of = e_widget_frametable_add(evas, _("Fill and Stretch Options"), 1);
import->frame_fill_obj = of;
rg = e_widget_radio_group_new(&cfdata->method);
- ord = e_widget_radio_icon_add(evas, _("Stretch"),
"enlightenment/wallpaper_stretch", 24, 24, IMPORT_STRETCH, rg);
+ ord = e_widget_radio_icon_add(evas, _("Stretch"),
+"enlightenment/wallpaper_stretch",
+24, 24, IMPORT_STRETCH, rg);
import->fill_stretch_obj = ord;
e_widget_frametable_object_append(of, ord, 0, 0, 1, 1, 1, 0, 1, 0);
- ord = e_widget_radio_icon_add(evas, _("Center"),
"enlightenment/wallpaper_center", 24, 24, IMPORT_CENTER, rg);
+ ord = e_widget_radio_icon_add(evas, _("Center"),
+"enlightenment/wallpaper_center",
+24, 24, IMPORT_CENTER, rg);
import->fill_center_obj = ord;
e_widget_frametable_object_append(of, ord, 1, 0, 1, 1, 1, 0, 1, 0);
- ord = e_widget_radio_icon_add(evas, _("Tile"),
"enlightenment/wallpaper_tile", 24, 24, IMPORT_TILE, rg);
+ ord = e_widget_radio_icon_add(evas, _("Tile"),
+"enlightenment/wallpaper_tile",
+24, 24, IMPORT_TILE, rg);
import->fill_tile_obj = ord;
e_widget_frametable_object_append(of, ord, 2, 0, 1, 1, 1, 0, 1, 0);
- ord = e_widget_radio_icon_add(evas, _("Within"),
"enlightenment/wallpaper_scale_aspect_in", 24, 24, IMPORT_SCALE_ASPECT_IN, rg);
+ ord = e_widget_radio_icon_add(evas, _("Within"),
+"enlightenment/wallpaper_scale_aspect_in",
+24, 24, IMPORT_SCALE_ASPECT_IN, rg);
import->fill_within_obj = ord;
e_widget_frametable_object_append(of, ord, 3, 0, 1, 1, 1, 0, 1, 0);
- ord = e_widget_radio_icon_add(evas, _("Fill"),
"enlightenment/wallpaper_scale_aspect_out", 24, 24, IMPORT_SCALE_ASPECT_OUT,
rg);
+ ord = e_widget_radio_icon_add(evas, _("Fill"),
+"enlightenment/wallpaper_scale_aspect_out",
+24, 24, IMPORT_SCALE_ASPECT_OUT, rg);
import->fill_fill_obj = ord;
e_widget_frametable_object_append(of, ord, 4, 0, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 0);
@@ -178,7 +188,8 @@
ord = e_widget_check_add(evas, _("Use original file"), &(cfdata->external));
import->external_obj = ord;
e_widget_frametable_object_append(of, ord, 0, 0, 1, 1, 1, 0, 1, 0);
- ord = e_widget_slider_add(evas, 1, 0, _("%3.0f%%"), 0.0, 100.0, 1.0, 0,
NULL, &(cfdata->quality), 150);
+ ord = e_widget_slider_add(evas, 1, 0, _("%3.0f%%"), 0.0, 100.0, 1.0, 0,
+NULL, &(cfdata->quality), 150);
import->quality_obj = ord;
e_widget_frametable_object_append(of, ord, 0, 1, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 0);
@@ -190,10 +201,12 @@
edje_object_part_swallow(import->bg_obj, "e.swallow.content", o);
evas_object_show(o);
- import->ok_obj = e_widget_button_add(evas, _("OK"), NULL, _import_cb_ok,
win, cfdata);
+ import->ok_obj = e_widget_button_add(evas, _("OK"), NULL,
+ _import_cb_ok, win, cfdata);
e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
- import->close_obj = e_widget_button_add(evas, _("Cancel"), 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);
@@ -289,11 +302,15 @@
e_widget_fsel_path_get(import->fsel_obj, &fdev, &fpath);
if ((fdev) || (fpath))
{
- if (e_config->wallpaper_import_last_dev)
evas_stringshare_del(e_config->wallpaper_import_last_dev);
- if (fdev) e_config->wallpaper_import_last_dev =
evas_stringshare_add(fdev);
+ if (e_config->wallpaper_import_last_dev)
+ evas_stringshare_del(e_config->wallpaper_import_last_dev);
+ if (fdev)
+ e_config->wallpaper_import_last_dev = evas_stringshare_add(fdev);
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: Ewl.h Makefile.am Added Files: ewl_tree2_view_freebox.c ewl_tree2_view_freebox.h Log Message: patch from Jaime Thomas (bug #250) - add an freebox view for the tree2 === RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- Ewl.h 23 Aug 2007 05:26:50 - 1.30 +++ Ewl.h 27 Oct 2007 23:37:59 - 1.31 @@ -325,6 +325,7 @@ #include #include #include +#include #include #include #include === RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- Makefile.am 4 Jun 2007 18:37:34 - 1.53 +++ Makefile.am 27 Oct 2007 23:37:59 - 1.54 @@ -92,6 +92,7 @@ ewl_tree.h \ ewl_tree2.h \ ewl_tree2_view.h \ + ewl_tree2_view_freebox.h \ ewl_tree2_view_plain.h \ ewl_tree2_view_scrolled.h \ ewl_theme.h \ @@ -179,6 +180,7 @@ ewl_tree.c \ ewl_tree2.c \ ewl_tree2_view.c \ + ewl_tree2_view_freebox.c \ ewl_tree2_view_plain.c \ ewl_tree2_view_scrolled.c \ ewl_toolbar.c \ - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/modules/engines/software_16
Modified Files:
evas_soft16_rectangle.c
Log Message:
Minor cleanup on software_16, evas_soft16_rectangle.c
===
RCS file:
/cvs/e/e17/libs/evas/src/modules/engines/software_16/evas_soft16_rectangle.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_soft16_rectangle.c 25 Oct 2007 16:17:19 - 1.3
+++ evas_soft16_rectangle.c 27 Oct 2007 21:06:58 - 1.4
@@ -83,7 +83,7 @@
Evas_Rectangle dr;
Cutout_Rects *rects;
Cutout_Rect *r;
- int c, cx, cy, cw, ch;
+ struct RGBA_Draw_Context_clip c_bkp;
int i;
/* handle cutouts here! */
@@ -103,14 +103,14 @@
return;
}
- /* save out clip info */
- c = dc->clip.use; cx = dc->clip.x; cy = dc->clip.y; cw = dc->clip.w; ch =
dc->clip.h;
+ c_bkp = dc->clip;
+
evas_common_draw_context_clip_clip(dc, 0, 0, dst->w, dst->h);
evas_common_draw_context_clip_clip(dc, x, y, w, h);
/* our clip is 0 size.. abort */
if ((dc->clip.w <= 0) || (dc->clip.h <= 0))
{
- dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw;
dc->clip.h = ch;
+ dc->clip = c_bkp;
return;
}
rects = evas_common_draw_context_apply_cutouts(dc);
@@ -121,7 +121,6 @@
_soft16_rectangle_draw_int(dst, dc, dr);
}
evas_common_draw_context_apply_clear_cutouts(rects);
- /* restore clip info */
- dc->clip.use = c; dc->clip.x = cx; dc->clip.y = cy; dc->clip.w = cw;
dc->clip.h = ch;
+ dc->clip = c_bkp;
}
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e ravenlock
Enlightenment CVS committal
Author : ravenlock
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
Fix issue with moving from unshaped borders to shaped borders (i.e. Fullscreen
-> default).
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.607
retrieving revision 1.608
diff -u -3 -r1.607 -r1.608
--- e_border.c 5 Oct 2007 12:11:55 - 1.607
+++ e_border.c 27 Oct 2007 19:30:49 - 1.608
@@ -5823,6 +5823,7 @@
}
}
+bd->shaped = 0;
if (ok)
{
const char *shape_option;
@@ -5831,19 +5832,7 @@
shape_option = edje_object_data_get(o, "shaped");
if (shape_option && !strcmp(shape_option, "1"))
{
- if (!bd->shaped)
-{
- bd->shaped = 1;
- ecore_evas_shaped_set(bd->bg_ecore_evas,
bd->shaped);
-}
- }
- else
- {
- if (bd->shaped)
-{
- bd->shaped = 0;
- ecore_evas_shaped_set(bd->bg_ecore_evas,
bd->shaped);
-}
+ bd->shaped = 1;
}
if (bd->client.netwm.name)
@@ -5877,6 +5866,7 @@
ecore_x_e_frame_size_set(bd->client.win, l, r, t, b);
bd->w += (bd->client_inset.l + bd->client_inset.r);
bd->h += (bd->client_inset.t + bd->client_inset.b);
+ecore_evas_shaped_set(bd->bg_ecore_evas, bd->shaped);
bd->changes.size = 1;
ecore_x_window_move(bd->client.shell_win, l, t);
if (bd->bg_object)
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_private.h Log Message: typo === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_private.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ecore_private.h 26 Aug 2007 11:17:21 - 1.44 +++ ecore_private.h 27 Oct 2007 16:22:10 - 1.45 @@ -95,7 +95,7 @@ #define ECORE_MAGIC_CHECK(d, m) ((d) && ((d)->__magic == (m))) #define ECORE_MAGIC_FAIL(d, m, fn) _ecore_magic_fail((d), (d) ? (d)->__magic : 0, (m), (fn)); -/* undef the following, we want out version */ +/* undef the following, we want our version */ #undef FREE #define FREE(ptr) free(ptr); ptr = NULL; - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_fm.c
Log Message:
Fix the fileselector when choosing an icon.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- e_eap_editor.c 7 Oct 2007 21:22:40 - 1.90
+++ e_eap_editor.c 27 Oct 2007 15:55:27 - 1.91
@@ -568,7 +568,7 @@
Evas_Object *o;
Evas_Coord mw, mh;
E_Desktop_Edit *editor;
- char *dir = NULL;
+ char *path = NULL, *icon_path = NULL;
editor = data2;
cfdata = data1;
@@ -586,22 +586,27 @@
/* XXX change this to a generic icon selector (that can do either
* files from a dir, or icons in the current theme */
if (cfdata->icon)
- dir = ecore_file_dir_get(cfdata->icon);
+ {
+ icon_path = efreet_icon_path_find(e_config->icon_theme,
+ cfdata->icon, "scalable");
+ path = ecore_file_dir_get(icon_path);
+ }
- if (dir)
+ if (path)
{
- o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", path, NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
- free(dir);
+ free(path);
}
else
{
- o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
}
+ if (icon_path) free(icon_path);
evas_object_show(o);
editor->icon_fsel = o;
e_widget_min_size_get(o, &mw, &mh);
@@ -626,7 +631,7 @@
Evas_Object *o;
Evas_Coord mw, mh;
E_Desktop_Edit *editor;
- char *dir = NULL;
+ char *path = NULL;
editor = data2;
cfdata = data1;
@@ -642,18 +647,25 @@
/* absolute path to exe */
if (cfdata->exec)
- dir = ecore_file_dir_get(cfdata->exec);
+ {
+ path = ecore_file_dir_get(cfdata->exec);
+ if (path && !ecore_file_exists(path))
+ {
+free(path);
+path = NULL;
+ }
+ }
- if (dir)
+ if (path)
{
- o = e_widget_fsel_add(dia->win->evas, dir, "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", path, NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
- free(dir);
+ free(path);
}
else
{
- o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
+ o = e_widget_fsel_add(dia->win->evas, "/", "~/", NULL, NULL,
_e_desktop_edit_select_cb, cfdata,
NULL, cfdata, 1);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -3 -r1.223 -r1.224
--- e_fm.c 24 Oct 2007 18:25:44 - 1.223
+++ e_fm.c 27 Oct 2007 15:55:27 - 1.224
@@ -451,7 +451,7 @@
{
E_Fm2_Smart_Data *sd;
Evas_List *l;
- const char *realpath;
+ const char *realpath, *extended_path;
sd = evas_object_smart_data_get(obj);
if (!sd || !path) return; // safety
@@ -489,7 +489,12 @@
sd->config->theme.fixed = 0;
}
- realpath = _e_fm2_dev_path_map(dev, path);
+ if (!strcmp(path, "~/"))
+ extended_path = e_user_homedir_get();
+ else
+ extended_path = path;
+
+ realpath = _e_fm2_dev_path_map(dev, extended_path);
/* If the path doesn't exist, popup a dialog */
if (dev && strncmp(dev, "removable:", 10)
&& !ecore_file_exists(realpath))
@@ -530,7 +535,7 @@
sd->order_file = 0;
if (dev) sd->dev = evas_stringshare_add(dev);
- if (path) sd->path = evas_stringshare_add(path);
+ if (path) sd->path = evas_stringshare_add(extended_path);
sd->realpath = realpath;
_e_fm2_queue_free(obj);
_e_fm2_regions_free(obj);
@@ -739,9 +744,11 @@
if (!sd->path) return;
path = strdup(sd->path);
if (sd->dev) dev = strdup(sd->dev);
- p = strrchr(path, '/');
- if (p) *p = 0;
- e_fm2_path_set(obj, dev, path);
+ if ((p = strrchr(path, '/'))) *p = 0;
+ if (*path == 0)
+ e_fm2_path_set(obj, dev, "/");
+ else
+ e_fm2_path_set(obj, dev, path);
E_FREE(dev);
E_FREE(path);
}
@@ -3888,7 +3895,7 @@
ic->info.icon = NULL;
ic->info.link = NULL;
//Hack
- if (!strncmp(ic->info.file, "|storage_serial_", 16)) ecore_file_unlink(buf);
+ if (!strncmp(ic->info.file, "|storage_", 9)) ecore_file_unlink(buf);
return 0;
}
-
This SF.net email is sponsored by: Splunk Inc.
St
E CVS: libs/ecore doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore.c
Log Message:
add ecore_fps_debug feature on Windows. Btw, if someone knows how to use it, I
would be glad to know
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ecore.c 26 Aug 2007 11:17:20 - 1.19
+++ ecore.c 27 Oct 2007 10:58:00 - 1.20
@@ -1,6 +1,10 @@
#include
#ifndef _WIN32
# include
+#else
+# define WIN32_LEAN_AND_MEAN
+# include
+# undef WIN32_LEAN_AND_MEAN
#endif /* _WIN32 */
#include "ecore_private.h"
#include "Ecore.h"
@@ -8,9 +12,7 @@
static const char *_ecore_magic_string_get(Ecore_Magic m);
static int _ecore_init_count = 0;
-#ifndef _WIN32
int _ecore_fps_debug = 0;
-#endif
/** OpenBSD does not define CODESET
* FIXME ??
@@ -54,9 +56,9 @@
printf("WARNING: not a utf8 locale!\n");
}
*/
-#ifndef _WIN32
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
+#ifndef _WIN32
_ecore_signal_init();
_ecore_exe_init();
#endif
@@ -81,9 +83,7 @@
if (--_ecore_init_count)
return _ecore_init_count;
-#ifndef _WIN32
if (_ecore_fps_debug) _ecore_fps_debug_shutdown();
-#endif
_ecore_animator_shutdown();
#ifndef _WIN32
_ecore_exe_shutdown();
@@ -164,22 +164,32 @@
return "";
}
-#ifndef _WIN32
/* fps debug calls - for debugging how much time your app actually spends */
/* "running" (and the inverse being time spent running)... this does not */
/* account for other apps and multitasking... */
static int _ecore_fps_debug_init_count = 0;
+#ifndef _WIN32
static int _ecore_fps_debug_fd = -1;
unsigned int *_ecore_fps_runtime_mmap = NULL;
+#else
+static HANDLE _ecore_fps_debug_fd = NULL;
+static HANDLE _ecore_fps_debug_fm = NULL;
+unsigned int *_ecore_fps_runtime_mmap = NULL;
+#endif /* _WIN32 */
void
_ecore_fps_debug_init(void)
{
char buf[4096];
+#ifdef _WIN32
+ char *tmp;
+#endif /* _WIN32 */
_ecore_fps_debug_init_count++;
if (_ecore_fps_debug_init_count > 1) return;
+
+#ifndef _WIN32
snprintf(buf, sizeof(buf), "/tmp/.ecore_fps_debug-%i", (int)getpid());
_ecore_fps_debug_fd = open(buf, O_CREAT | O_TRUNC | O_RDWR, 0644);
if (_ecore_fps_debug_fd < 0)
@@ -197,6 +207,45 @@
MAP_SHARED,
_ecore_fps_debug_fd, 0);
}
+#else
+ tmp = getenv("TMP");
+ if (!tmp) tmp = getenv("TEMP");
+ if (!tmp) tmp = getenv("USERPROFILE");
+ if (!tmp) tmp = getenv("windir");
+ if (!tmp) tmp = "C:";
+ snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i", tmp,
(int)GetCurrentProcessId());
+ _ecore_fps_debug_fd = CreateFile(buf,
+FILE_READ_DATA | FILE_WRITE_DATA,
+FILE_SHARE_READ | FILE_SHARE_WRITE,
+NULL,
+CREATE_NEW,// | TRUNCATE_EXISTING,
+FILE_ATTRIBUTE_NORMAL,
+NULL);
+ if (_ecore_fps_debug_fd)
+ {
+ unsigned int zero = 0;
+DWORDout;
+
+_ecore_fps_debug_fm = CreateFileMapping(_ecore_fps_debug_fd,
+NULL,
+PAGE_READWRITE,
+0,
+(DWORD)sizeof(unsigned int),
+NULL);
+if (_ecore_fps_debug_fm)
+ {
+ WriteFile(_ecore_fps_debug_fd,
+ &zero, sizeof(unsigned int),
+ &out, NULL);
+ _ecore_fps_runtime_mmap = MapViewOfFile(_ecore_fps_debug_fm,
+ FILE_MAP_WRITE,
+ 0, 0,
+ sizeof(unsigned int));
+ }
+else
+ CloseHandle(_ecore_fps_debug_fd);
+ }
+#endif /* _WIN32 */
}
void
@@ -207,7 +256,26 @@
if (_ecore_fps_debug_fd >= 0)
{
char buf[4096];
+#ifdef _WIN32
+char *tmp;
+tmp = getenv("TMP");
+if (!tmp) tmp = getenv("TEMP");
+if (!tmp) tmp = getenv("USERPROFILE");
+if (!tmp) tmp = getenv("windir");
+if (!tmp) tmp = "C:/";
+ snprintf(buf, sizeof(buf), "%s/.ecore_fps_debug-%i", tmp,
(int)GetCurrentProcessId());
+ if (_ecore_fps_runtime_mmap)
+ {
+UnmapViewOfFile(_ecore_fps_runtime_mmap);
+_ecore_fps_runtime_mmap = NULL;
+ }
+CloseHandle(_ecore_fps_debug_fm);
+
E CVS: libs/ecore doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_time.c
Log Message:
simplify the code of ecore_time_get() on Windows
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_time.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_time.c30 Sep 2007 15:24:51 - 1.12
+++ ecore_time.c27 Oct 2007 10:24:52 - 1.13
@@ -23,56 +23,13 @@
ecore_time_get(void)
{
#ifdef _WIN32
- SYSTEMTIME st;
+ FILETIME ft;
double time;
- intdays_nbr = 0;
- inti;
- GetSystemTime(&st);
- for (i = 1; i < st.wMonth; i++)
- {
- if ((i == 1) ||
- (i == 3) ||
- (i == 5) ||
- (i == 7) ||
- (i == 8) ||
- (i == 10) ||
- (i == 12))
- days_nbr += 31;
- else if ((i == 4) ||
-(i == 6) ||
-(i == 5) ||
-(i == 9) ||
-(i == 11))
- days_nbr += 30;
- else
- {
- /* need to fix that... */
- if ((st.wYear % 4) == 0)
- {
-if ((st.wYear % 400) == 0)
- {
-if ((st.wYear % 1000) == 0)
- days_nbr += 29;
-else
- days_nbr += 28;
- }
-else
- days_nbr += 29;
- }
- else
- days_nbr += 28;
- }
- }
- time =
- (double)st.wMilliseconds / 1000.0 +
- (double)st.wSecond +
- (double)st.wMinute * 60.0 +
- (double)st.wHour * 3600.0 +
- (double)(st.wDay + days_nbr) * 86400.0 +
- (double)(st.wYear - 1970) * 31536000.0;
+ GetSystemTimeAsFileTime(&ft);
+ time = (double)ft.dwLowDateTime + 4294967296.0 * (double)ft.dwHighDateTime;
- return time;
+ return time / 1000;
#else
# ifdef HAVE_GETTIMEOFDAY
struct timeval timev;
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
