E CVS: apps/e ravenlock
Enlightenment CVS committal
Author : ravenlock
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_preview.c
Log Message:
Per Devilhorns:
- Formatting
- Use PATH_MAX where needed
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_preview.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_widget_preview.c 12 May 2007 21:48:59 - 1.10
+++ e_widget_preview.c 25 Mar 2008 02:20:32 - 1.11
@@ -9,9 +9,9 @@
Evas_Object *obj, *o_frame, *img, *o_thumb, *o_extern;
};
+/* local subsystem functions */
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void
*event_info);
-/* local subsystem functions */
/* externally accessible functions */
EAPI Evas_Object *
@@ -20,21 +20,21 @@
Evas_Object *obj, *o;
E_Widget_Data *wd;
Evas_Coord mw, mh;
-
+
obj = e_widget_add(evas);
e_widget_del_hook_set(obj, _e_wid_del_hook);
wd = calloc(1, sizeof(E_Widget_Data));
+ if (!wd) return NULL;
wd->obj = obj;
-
+
o = edje_object_add(evas);
wd->o_frame = o;
- e_theme_edje_object_set(o, "base/theme/widgets",
- "e/widgets/preview");
+ e_theme_edje_object_set(o, "base/theme/widgets", "e/widgets/preview");
evas_object_show(o);
e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o);
-
+
o = e_livethumb_add(evas);
wd->img = o;
e_livethumb_vsize_set(o, minw * 2, minh * 2);
@@ -42,13 +42,13 @@
edje_extern_object_max_size_set(o, minw, minh);
evas_object_show(o);
edje_object_part_swallow(wd->o_frame, "e.swallow.content", o);
-
+
e_widget_data_set(obj, wd);
e_widget_can_focus_set(obj, 0);
edje_object_size_min_calc(wd->o_frame, &mw, &mh);
e_widget_min_size_set(obj, mw, mh);
e_widget_sub_object_add(obj, o);
-
+
return obj;
}
@@ -56,7 +56,7 @@
e_widget_preview_evas_get(Evas_Object *obj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
return e_livethumb_evas_get(wd->img);
}
@@ -65,7 +65,7 @@
e_widget_preview_extern_object_set(Evas_Object *obj, Evas_Object *eobj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
wd->o_extern = eobj;
e_livethumb_thumb_set(wd->img, wd->o_extern);
@@ -75,15 +75,15 @@
e_widget_preview_file_set(Evas_Object *obj, const char *file, const char *key)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
-
if (wd->o_thumb) evas_object_del(wd->o_thumb);
wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img));
e_icon_file_key_set(wd->o_thumb, file, key);
evas_object_show(wd->o_thumb);
e_livethumb_thumb_set(wd->img, wd->o_thumb);
+
return 1;
}
@@ -91,15 +91,14 @@
e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char
*key, int w, int h)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
-
if (wd->img)
{
e_widget_sub_object_del(obj, wd->img);
evas_object_del(wd->img);
}
-
+
wd->img = e_thumb_icon_add(evas_object_evas_get(obj));
e_widget_sub_object_add(obj, wd->img);
if (e_util_glob_case_match(file, "*.edj"))
@@ -117,9 +116,10 @@
evas_object_smart_callback_add(wd->img, "e_thumb_gen",
_e_wid_preview_thumb_gen, wd);
e_thumb_icon_size_set(wd->img, w, h);
e_thumb_icon_begin(wd->img);
-
+
edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
evas_object_show(wd->img);
+
return 1;
}
@@ -145,13 +145,14 @@
{
E_Widget_Data *wd;
int ret;
-
+
wd = e_widget_data_get(obj);
if (wd->o_thumb) evas_object_del(wd->o_thumb);
wd->o_thumb = edje_object_add(e_livethumb_evas_get(wd->img));
ret = edje_object_file_set(wd->o_thumb, file, group);
evas_object_show(wd->o_thumb);
e_livethumb_thumb_set(wd->img, wd->o_thumb);
+
return ret;
}
@@ -159,7 +160,7 @@
_e_wid_del_hook(Evas_Object *obj)
{
E_Widget_Data *wd;
-
+
wd = e_widget_data_get(obj);
free(wd);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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/modules/conf_wallpaper
Modified Files:
e_int_config_wallpaper.c
Log Message:
Per Devilhorns: Whitespace and formatting fixes.
===
RCS file:
/cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_config_wallpaper.c5 Mar 2008 05:35:37 - 1.9
+++ e_int_config_wallpaper.c25 Mar 2008 02:17:55 - 1.10
@@ -4,13 +4,13 @@
#include "e.h"
#include "e_mod_main.h"
-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 (E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-static Evas_Object *_basic_create (E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
-static Evas_Object *_adv_create (E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+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(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _adv_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+static Evas_Object *_adv_create(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
static E_Config_Dialog *_e_int_config_wallpaper_desk(E_Container *con, int
con_num, int zone_num, int desk_x, int desk_y);
@@ -52,6 +52,7 @@
/* advanced */
int all_this_desk_screen;
+
/* dialogs */
E_Win *win_import;
E_Dialog *dia_gradient;
@@ -68,7 +69,7 @@
e_int_config_wallpaper_desk(E_Container *con, const char *params)
{
int con_num, zone_num, desk_x, desk_y;
-
+
if (!params) return NULL;
con_num = zone_num = desk_x = desk_y = -1;
if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &desk_x, &desk_y) !=
4)
@@ -87,9 +88,9 @@
v = E_NEW(E_Config_Dialog_View, 1);
cw = E_NEW(E_Config_Wallpaper, 1);
- v->create_cfdata= _create_data;
- v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply;
+ v->create_cfdata = _create_data;
+ v->free_cfdata = _free_data;
+ v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
if (!(con_num == -1 && zone_num == -1 && desk_x == -1 && desk_y == -1))
@@ -117,8 +118,8 @@
e_int_config_wallpaper_update(E_Config_Dialog *dia, char *file)
{
E_Config_Dialog_Data *cfdata;
- char path[4096];
-
+ char path[PATH_MAX];
+
cfdata = dia->cfdata;
cfdata->fmdir = 1;
e_widget_radio_toggle_set(cfdata->o_personal, 1);
@@ -130,7 +131,8 @@
e_widget_check_checked_set(cfdata->o_theme_bg, cfdata->use_theme_bg);
if (cfdata->o_fm) e_fm2_path_set(cfdata->o_fm, path, "/");
if (cfdata->o_preview)
- e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg,
"e/desktop/background");
+ e_widget_preview_edje_set(cfdata->o_preview, cfdata->bg,
+ "e/desktop/background");
if (cfdata->o_frame) e_widget_change(cfdata->o_frame);
}
@@ -138,7 +140,7 @@
e_int_config_wallpaper_import_done(E_Config_Dialog *dia)
{
E_Config_Dialog_Data *cfdata;
-
+
cfdata = dia->cfdata;
cfdata->win_import = NULL;
}
@@ -147,7 +149,7 @@
e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia)
{
E_Config_Dialog_Data *cfdata;
-
+
cfdata = dia->cfdata;
cfdata->dia_gradient = NULL;
}
@@ -165,7 +167,7 @@
e_int_config_wallpaper_handler_set(Evas_Object *obj, const char *path, void
*data)
{
const char *dev, *fpath;
-
+
if (!path) return;
e_fm2_path_get(obj, &dev, &fpath);
if (dev)
@@ -196,10 +198,9 @@
_cb_button_up(void *data1, void *data2)
{
E_Config_Dialog_Data *cfdata;
-
+
cfdata = data1;
- if (cfdata->o_fm)
- e_fm2_parent_go(cfdata->o_fm);
+ if (cfdata->o_fm) e_fm2_parent_go(cfdata->o_fm);
if (cfdata->o_frame)
e_widget_scrollframe_child_pos_set(cfdata->o_frame, 0, 0);
}
@@ -208,19 +209,13 @@
_cb_files_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
-
+
cfdata = data;
if (!cfdata->o_fm) return;
- if (!e_fm2_has_parent_get(cfdata->o_fm))
- {
- if (cfdata->o_up_button)
- e_widget_disabled_set(cfdata->o_up_button, 1);
- }
- else
- {
- if (cfdata->o_up_button)
- e_widget_disabled_set(cfdata->o_up_button, 0);
- }
+ if (cfdat
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_hal.c
Log Message:
formatting
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_hal.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_fm_hal.c 13 Mar 2008 19:10:27 - 1.5
+++ e_fm_hal.c 24 Mar 2008 14:27:50 - 1.6
@@ -157,11 +157,11 @@
s->volumes = evas_list_append(s->volumes, v);
}
- if ((v->storage)
- && (!v->mount_point
- || (strcmp(v->mount_point, "/")
- && strcmp(v->mount_point, "/home")
- && strcmp(v->mount_point, "/tmp"
+ if ((v->storage) &&
+ ((!v->mount_point) ||
+ (strcmp(v->mount_point, "/") &&
+strcmp(v->mount_point, "/home") &&
+strcmp(v->mount_point, "/tmp"
{
_e_fm2_volume_write(v);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_dnd.c
Log Message:
Check if the gadcon has a shelf set.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_dnd.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- e_dnd.c 26 Feb 2008 09:47:50 - 1.67
+++ e_dnd.c 24 Mar 2008 12:48:33 - 1.68
@@ -613,17 +613,19 @@
static void
_e_drag_win_show(E_Drop_Handler *h)
{
+ E_Shelf *shelf;
+
if (h->obj)
{
switch (h->obj->type)
{
case E_GADCON_TYPE:
-/* FIXME: this is wrong - it ASSUMES the holder is a shelf */
-// e_shelf_toggle(e_gadcon_shelf_get((E_Gadcon *)(h->obj)), 1);
+shelf = e_gadcon_shelf_get((E_Gadcon *)(h->obj));
+if (shelf) e_shelf_toggle(shelf, 1);
break;
case E_GADCON_CLIENT_TYPE:
-/* FIXME: this is wrong - it ASSUMES the holder is a shelf */
-// e_shelf_toggle(e_gadcon_shelf_get(((E_Gadcon_Client
*)(h->obj))->gadcon), 1);
+shelf = e_gadcon_shelf_get(((E_Gadcon_Client *)(h->obj))->gadcon);
+if (shelf) e_shelf_toggle(shelf, 1);
break;
/* FIXME: add more types as needed */
default:
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
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:
E.h backgrounds.c desktops.c ewins.c glwin.c icccm.c pager.c
setup.c
Log Message:
Eliminate redundant RRoot variables.
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.610
retrieving revision 1.611
diff -u -3 -r1.610 -r1.611
--- E.h 24 Mar 2008 09:47:49 - 1.610
+++ E.h 24 Mar 2008 10:24:27 - 1.611
@@ -210,14 +210,10 @@
#include "etypes.h"
typedef struct {
- Window xwin;
Win win;
- Visual *vis;
- int depth;
- Colormapcmap;
- int scr;
- int w, h;
} RealRoot;
+
+#define RROOT RRoot.win
typedef struct {
Window xwin;
===
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -3 -r1.105 -r1.106
--- backgrounds.c 23 Mar 2008 11:54:22 - 1.105
+++ backgrounds.c 24 Mar 2008 10:24:27 - 1.106
@@ -532,7 +532,7 @@
* invalid one from a previous session.
*/
pmap = ECreatePixmap(win, w, h, 0);
- if (win == RRoot.win && pmap == Mode.root.ext_pmap)
+ if (win == RROOT && pmap == Mode.root.ext_pmap)
{
EFreePixmap(pmap);
pmap = ECreatePixmap(win, w, h, 0);
===
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -3 -r1.281 -r1.282
--- desktops.c 23 Mar 2008 11:54:23 - 1.281
+++ desktops.c 24 Mar 2008 10:24:28 - 1.282
@@ -1869,17 +1869,8 @@
if (root)
{
-#if 0
- RRoot.w = DisplayWidth(disp, RRoot.scr);
- RRoot.h = DisplayHeight(disp, RRoot.scr);
-
- if (w != RRoot.w || h != RRoot.h)
- Eprintf
- ("DeskRootResize (root): Screen size mismatch: root=%dx%d
event=%dx%d\n",
- RRoot.w, RRoot.h, w, h);
-#endif
- RRoot.w = w;
- RRoot.h = h;
+ WinGetW(RROOT) = w;
+ WinGetH(RROOT) = h;
}
if (w == VRoot.w && h == VRoot.h)
===
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -3 -r1.224 -r1.225
--- ewins.c 24 Mar 2008 09:47:50 - 1.224
+++ ewins.c 24 Mar 2008 10:24:28 - 1.225
@@ -2190,7 +2190,7 @@
/* This makes E determine the client window stacking at exit */
EwinInstantUnShade(ewin);
- EReparentWindow(EwinGetClientWin(ewin), RRoot.win,
+ EReparentWindow(EwinGetClientWin(ewin), RROOT,
ewin->client.x, ewin->client.y);
}
}
===
RCS file: /cvs/e/e16/e/src/glwin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- glwin.c 23 Mar 2008 11:54:23 - 1.9
+++ glwin.c 24 Mar 2008 10:24:28 - 1.10
@@ -631,7 +631,7 @@
int x, y;
#if 0
- win = RRoot.win;
+ win = RROOT;
#else
win = VRoot.win;
#endif
===
RCS file: /cvs/e/e16/e/src/icccm.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- icccm.c 24 Mar 2008 09:47:50 - 1.142
+++ icccm.c 24 Mar 2008 10:24:28 - 1.143
@@ -283,7 +283,7 @@
ev.xconfigure.y = ewin->client.y;
#endif
if (Mode.wm.window)
- XTranslateCoordinates(disp, VRoot.xwin, RRoot.xwin,
+ ETranslateCoordinates(VRoot.win, RROOT,
ev.xconfigure.x, ev.xconfigure.y,
&ev.xconfigure.x, &ev.xconfigure.y, &child);
ev.xconfigure.width = ewin->client.w;
===
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -3 -r1.262 -r1.263
--- pager.c 23 Mar 2008 11:54:24 - 1.262
+++ pager.c 24 Mar 2008 10:24:28 - 1.263
@@ -1535,7 +1535,7 @@
else if (!in_vroot)
{
/* Move back to real root */
-EwinReparent(ewin, RRoot.win);
+EwinReparent(ewin, RROOT);
}
else
{
===
RCS file: /cvs/e/e16/e/src/setup.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- setup.c 1 Mar 2008 16:38:58 - 1.189
+++ setup.c 24 Mar 2008 10:24:28 - 1.190
@@ -119,23 +119,16 @@
XSetIOErrorHandler((XIOErrorHandler) HandleXIOError);
/* Root defaults */
- RRoot.scr = DefaultScreen(disp);
- RRoot.xwin = DefaultRootWindow(disp);
- RRoot.w = DisplayWidth(disp,
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h borders.h buttons.c ewins.c ewins.h icccm.c ipc.c
windowmatch.c
Log Message:
Eliminate Constraints.
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.609
retrieving revision 1.610
diff -u -3 -r1.609 -r1.610
--- E.h 24 Mar 2008 08:57:50 - 1.609
+++ E.h 24 Mar 2008 09:47:49 - 1.610
@@ -210,10 +210,6 @@
#include "etypes.h"
typedef struct {
- int min, max;
-} Constraints;
-
-typedef struct {
Window xwin;
Win win;
Visual *vis;
===
RCS file: /cvs/e/e16/e/src/borders.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- borders.h 24 Mar 2008 08:57:50 - 1.13
+++ borders.h 24 Mar 2008 09:47:50 - 1.14
@@ -29,6 +29,10 @@
#include "etypes.h"
typedef struct {
+ int min, max;
+} WinLimit;
+
+typedef struct {
int originbox;
struct {
int percent;
@@ -37,7 +41,7 @@
} WinPoint;
typedef struct {
- Constraints width, height;
+ WinLimitwidth, height;
WinPointtopleft, bottomright;
} Geometry;
===
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- buttons.c 23 Mar 2008 11:54:22 - 1.112
+++ buttons.c 24 Mar 2008 09:47:50 - 1.113
@@ -42,7 +42,8 @@
PointerMotionMask)
typedef struct {
- Constraints width, height;
+ int width_min, width_max;
+ int height_min, height_max;
int xorigin, yorigin;
int xabs, xrel;
int yabs, yrel;
@@ -140,10 +141,10 @@
b->tclass = TextclassAlloc(tclass, 1);
b->flags = flags;
- b->geom.width.min = minw;
- b->geom.width.max = maxw;
- b->geom.height.min = minh;
- b->geom.height.max = maxh;
+ b->geom.width_min = minw;
+ b->geom.width_max = maxw;
+ b->geom.height_min = minh;
+ b->geom.height_max = maxh;
b->geom.xorigin = xo;
b->geom.yorigin = yo;
b->geom.xabs = xa;
@@ -236,14 +237,14 @@
w = ((b->geom.xsizerel * VRoot.w) >> 10) + b->geom.xsizeabs;
h = ((b->geom.ysizerel * VRoot.h) >> 10) + b->geom.ysizeabs;
}
- if (w > b->geom.width.max)
- w = b->geom.width.max;
- else if (w < b->geom.width.min)
- w = b->geom.width.min;
- if (h > b->geom.height.max)
- h = b->geom.height.max;
- else if (h < b->geom.height.min)
- h = b->geom.height.min;
+ if (w > b->geom.width_max)
+ w = b->geom.width_max;
+ else if (w < b->geom.width_min)
+ w = b->geom.width_min;
+ if (h > b->geom.height_max)
+ h = b->geom.height_max;
+ else if (h < b->geom.height_min)
+ h = b->geom.height_min;
xo = (w * b->geom.xorigin) >> 10;
yo = (h * b->geom.yorigin) >> 10;
x = ((b->geom.xrel * VRoot.w) >> 10) + b->geom.xabs - xo;
@@ -703,10 +704,10 @@
pbt->flags = flags;
pbt->internal = internal;
pbt->default_show = show;
- pbt->geom.width.min = minw;
- pbt->geom.width.max = maxw;
- pbt->geom.height.min = minh;
- pbt->geom.height.max = maxh;
+ pbt->geom.width_min = minw;
+ pbt->geom.width_max = maxw;
+ pbt->geom.height_min = minh;
+ pbt->geom.height_max = maxh;
pbt->geom.xorigin = xo;
pbt->geom.yorigin = yo;
pbt->geom.xabs = xa;
@@ -853,10 +854,10 @@
fprintf(fs, "11 %s\n", ActionclassGetName(b->aclass));
if (EoGetLayer(b) >= 0)
fprintf(fs, "453 %i\n", EoGetLayer(b));
- fprintf(fs, "456 %i\n", b->geom.width.min);
- fprintf(fs, "457 %i\n", b->geom.width.max);
- fprintf(fs, "468 %i\n", b->geom.height.min);
- fprintf(fs, "469 %i\n", b->geom.height.max);
+ fprintf(fs, "456 %i\n", b->geom.width_min);
+ fprintf(fs, "457 %i\n", b->geom.width_max);
+ fprintf(fs, "468 %i\n", b->geom.height_min);
+ fprintf(fs, "469 %i\n", b->geom.height_max);
fprintf(fs, "528 %i\n", b->geom.xorigin);
fprintf(fs, "529 %i\n", b->geom.yorigin);
fprintf(fs, "530 %i\n", b->geom.xabs);
===
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -3 -r1.223 -r1.224
--- ewins.c 23 Mar 2008 11:54:23 - 1.223
+++ ewins.c 24 Mar 2008 09:47:50 - 1.224
@@ -104,10 +104,10 @@
ewin->icccm.need_input = 1;
- ewin->icccm.width.min = 0;
-
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h aclass.h borders.h buttons.h container.h eimage.c eimage.h
extinitwin.c focus.h hints.h hiwin.h main.c xwin.h
Log Message:
Header file tweaks.
===
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.608
retrieving revision 1.609
diff -u -3 -r1.608 -r1.609
--- E.h 23 Mar 2008 11:54:22 - 1.608
+++ E.h 24 Mar 2008 08:57:50 - 1.609
@@ -37,8 +37,7 @@
#define USE_EXT_INIT_WIN 1
-#include
-#include
+#include
#ifdef HAVE_SM
#define USE_SM 1
===
RCS file: /cvs/e/e16/e/src/aclass.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- aclass.h23 Feb 2008 12:13:28 - 1.8
+++ aclass.h24 Mar 2008 08:57:50 - 1.9
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
#ifndef _ACLASS_H
#define _ACLASS_H
+#include
#include "etypes.h"
/* aclass.c */
===
RCS file: /cvs/e/e16/e/src/borders.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- borders.h 23 Mar 2008 11:54:22 - 1.12
+++ borders.h 24 Mar 2008 08:57:50 - 1.13
@@ -24,6 +24,7 @@
#ifndef _BORDERS_H_
#define _BORDERS_H_
+#include
#include "eimage.h"
#include "etypes.h"
===
RCS file: /cvs/e/e16/e/src/buttons.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- buttons.h 27 Jul 2007 16:59:49 - 1.12
+++ buttons.h 24 Mar 2008 08:57:50 - 1.13
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
#ifndef _BUTTONS_H_
#define _BUTTONS_H_
+#include
#include "eobj.h"
#include "etypes.h"
===
RCS file: /cvs/e/e16/e/src/container.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- container.h 23 Mar 2008 11:54:22 - 1.5
+++ container.h 24 Mar 2008 08:57:50 - 1.6
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various
contributors
- * Copyright (C) 2004-2007 Kim Woelders
+ * Copyright (C) 2004-2008 Kim Woelders
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
#ifndef _CONTAINER_H_
#define _CONTAINER_H_
+#include
#include "eimage.h"
typedef struct _container Container;
===
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- eimage.c24 Jan 2008 18:37:45 - 1.24
+++ eimage.c24 Mar 2008 08:57:50 - 1.25
@@ -33,8 +33,10 @@
static Colormap _default_cmap;
void
-EImageInit(Display * dpy)
+EImageInit(void)
{
+ Display*dpy = disp;
+
imlib_set_cache_size(2048 * 1024);
imlib_set_font_cache_size(512 * 1024);
===
RCS file: /cvs/e/e16/e/src/eimage.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- eimage.h23 Mar 2008 11:54:23 - 1.17
+++ eimage.h24 Mar 2008 08:57:50 - 1.18
@@ -23,7 +23,7 @@
#ifndef _EIMAGE_H_
#define _EIMAGE_H_
-#include
+#include
#include "xwin.h"
typedef voidEImage;
@@ -38,7 +38,7 @@
#define EIMAGE_HIGH_MASK_THR0x0004
#define EIMAGE_ISCALE 0x0f00 /* Intermediate scaling */
-voidEImageInit(Display * dpy);
+voidEImageInit(void);
int EImageSetCacheSize(int size);
EImage *EImageCreate(int w, int h);
===
RCS file: /cvs/e/e16/e/src/extinitwin.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- extinitwin.c22 Mar 2008 14:46:38 - 1.25
+++ extinitwin.c24 Mar 2008 08:57:50 - 1.26
@@ -45,7 +45,7 @@
EGrabServer();
- EImageInit(disp);
+ EImageInit();
attr.backin
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c
Log Message:
Minor simplifications.
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -3 -r1.171 -r1.172
--- ecompmgr.c 23 Mar 2008 11:54:23 - 1.171
+++ ecompmgr.c 24 Mar 2008 08:53:10 - 1.172
@@ -301,11 +301,12 @@
#endif
static XserverRegion
-ERegionCreateFromWindow(Window win)
+ERegionCreateFromWindow(Win win)
{
XserverRegion rgn;
- rgn = XFixesCreateRegionFromWindow(disp, win, WindowRegionBounding);
+ rgn =
+ XFixesCreateRegionFromWindow(disp, WinGetXwin(win),
WindowRegionBounding);
#if DEBUG_REGIONS
n_rgn_c++;
@@ -494,15 +495,14 @@
}
static Picture
-EPictureCreateBuffer(Window win, int w, int h, int depth, Visual * vis,
-Pixmap * ppmap)
+EPictureCreateBuffer(Win win, int w, int h, Pixmap * ppmap)
{
Picture pict;
Pixmap pmap;
XRenderPictFormat *pictfmt;
- pmap = XCreatePixmap(disp, win, w, h, depth);
- pictfmt = XRenderFindVisualFormat(disp, vis);
+ pmap = XCreatePixmap(disp, WinGetXwin(win), w, h, WinGetDepth(win));
+ pictfmt = XRenderFindVisualFormat(disp, WinGetVisual(win));
pict = XRenderCreatePicture(disp, pmap, pictfmt, 0, 0);
if (ppmap)
*ppmap = pmap;
@@ -549,8 +549,7 @@
}
/* Resizing - grab old contents */
- pict = EPictureCreateBuffer(EobjGetXwin(eo), wo, ho, WinGetDepth(eo->win),
- WinGetVisual(eo->win), NULL);
+ pict = EPictureCreateBuffer(EobjGetWin(eo), wo, ho, NULL);
XRenderComposite(disp, PictOpSrc, cw->picture, None, pict, 0, 0, 0, 0, 0, 0,
wo, ho);
@@ -1142,7 +1141,7 @@
if (cw->shape == None)
{
- cw->shape = ERegionCreateFromWindow(EobjGetXwin(eo));
+ cw->shape = ERegionCreateFromWindow(EobjGetWin(eo));
if (WinIsShaped(EobjGetWin(eo)))
{
@@ -1512,7 +1511,7 @@
{
XserverRegion clip;
-clip = ERegionCreateFromWindow(EobjGetXwin(eo));
+clip = ERegionCreateFromWindow(EobjGetWin(eo));
XFixesSetPictureClipRegion(disp, cw->picture, 0, 0, clip);
ERegionDestroy(clip);
}
@@ -2304,8 +2303,7 @@
ECompMgrRootBufferCreate(unsigned int w, unsigned int h)
{
/* Root buffer picture and pixmap */
- rootBuffer = EPictureCreateBuffer(VRoot.xwin, w, h,
-VRoot.depth, VRoot.vis, &VRoot.pmap);
+ rootBuffer = EPictureCreateBuffer(VRoot.win, w, h, &VRoot.pmap);
/* Screen region */
Mode_compmgr.rgn_screen = ERegionCreateRect(0, 0, w, h);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc.h edje_cc_handlers.c edje_cc_mem.c edje_cc_sources.c
edje_decc.h edje_recc
Log Message:
remove trailing spaces
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- edje_cc.h 31 Mar 2007 10:33:23 - 1.29
+++ edje_cc.h 24 Mar 2008 08:22:00 - 1.30
@@ -40,7 +40,7 @@
{
int l1, l2;
char *shared;
- Evas_List *programs;
+ Evas_List *programs;
};
struct _Code_Program
@@ -74,17 +74,17 @@
voiddata_process_lookups(void);
voiddata_process_scripts(void);
voiddata_process_script_lookups(void);
-
+
int is_verbatim(void);
voidtrack_verbatim(int on);
voidset_verbatim(char *s, int l1, int l2);
char *get_verbatim(void);
-int get_verbatim_line1(void);
-int get_verbatim_line2(void);
+int get_verbatim_line1(void);
+int get_verbatim_line2(void);
voidcompile(void);
int is_param(int n);
-int is_num(int n);
+int is_num(int n);
char *parse_str(int n);
int parse_enum(int n, ...);
int parse_int(int n);
@@ -103,7 +103,7 @@
SrcFile_List *source_load(Eet_File *ef);
int source_fontmap_save(Eet_File *ef, Evas_List *fonts);
Font_List *source_fontmap_load(Eet_File *ef);
-
+
void *mem_alloc(size_t size);
char *mem_strdup(const char *s);
#define SZ sizeof
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- edje_cc_handlers.c 15 Mar 2008 00:51:45 - 1.81
+++ edje_cc_handlers.c 24 Mar 2008 08:22:00 - 1.82
@@ -186,10 +186,10 @@
{"collections.styles.style.name", st_styles_style_name}, /* dup */
{"collections.styles.style.base", st_styles_style_base}, /* dup */
{"collections.styles.style.tag", st_styles_style_tag}, /* dup */
- {"collections.color_classes.color_class.name", st_color_class_name}, /*
dup */
- {"collections.color_classes.color_class.color", st_color_class_color}, /*
dup */
- {"collections.color_classes.color_class.color2", st_color_class_color2},
/* dup */
- {"collections.color_classes.color_class.color3", st_color_class_color3},
/* dup */
+ {"collections.color_classes.color_class.name", st_color_class_name}, /*
dup */
+ {"collections.color_classes.color_class.color", st_color_class_color}, /*
dup */
+ {"collections.color_classes.color_class.color2", st_color_class_color2},
/* dup */
+ {"collections.color_classes.color_class.color3", st_color_class_color3},
/* dup */
{"collections.group.name", st_collections_group_name},
{"collections.group.alias", st_collections_group_alias},
{"collections.group.min", st_collections_group_min},
@@ -202,10 +202,10 @@
{"collections.group.styles.style.name", st_styles_style_name}, /* dup */
{"collections.group.styles.style.base", st_styles_style_base}, /* dup */
{"collections.group.styles.style.tag", st_styles_style_tag}, /* dup */
- {"collections.group.color_classes.color_class.name",
st_color_class_name}, /* dup */
- {"collections.group.color_classes.color_class.color",
st_color_class_color}, /* dup */
- {"collections.group.color_classes.color_class.color2",
st_color_class_color2}, /* dup */
- {"collections.group.color_classes.color_class.color3",
st_color_class_color3}, /* dup */
+ {"collections.group.color_classes.color_class.name",
st_color_class_name}, /* dup */
+ {"collections.group.color_classes.color_class.color",
st_color_class_color}, /* dup */
+ {"collections.group.color_classes.color_class.color2",
st_color_class_color2}, /* dup */
+ {"collections.group.color_classes.color_class.color3",
st_color_class_color3}, /* dup */
{"collections.group.parts.image", st_images_image}, /* dup */
{"collections.group.parts.images.image", st_images_image}, /* dup */
{"collections.group.parts.font", st_fonts_font}, /* dup */
@@ -213,10 +213,10 @@
{"collections.group.parts.styles.style.name", st_styles_style_name}, /*
dup */
{"collections.group.parts.styles.style.base", st_styles_style_base}, /*
dup */
{"collections.group.parts.styles.style.tag", st_styles_style_tag}, /* dup
*/
- {"collections.group.parts.color_classes.color_class.name",
st_color_class_name}, /* dup */
- {"collections.group.parts.color_classes.color_class.color",
st_color_class_color}, /* dup */
- {"collections.group.parts.color_classes.color_class.color2",
st_color_class_color2}, /* dup */
- {"collections.group.parts.color_classes.color_class.color3",
st_color_class_color3}, /* dup */
+ {"collections.grou
E CVS: libs/edje doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje_Edit.h edje_calc.c edje_edit.c edje_load.c edje_main.c
edje_private.h edje_text.c edje_util.c
Log Message:
remove trailing spaces
===
RCS file: /cvs/e/e17/libs/edje/src/lib/Edje_Edit.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- Edje_Edit.h 6 Mar 2008 19:48:11 - 1.22
+++ Edje_Edit.h 24 Mar 2008 08:22:00 - 1.23
@@ -24,30 +24,30 @@
# endif
#endif
-/**
+/**
* @file
- * @brief Functions to deal with edje internal object. Don't use in standard
- * situations. The use of any of the edje_edit_* functions can break your
+ * @brief Functions to deal with edje internal object. Don't use in standard
+ * situations. The use of any of the edje_edit_* functions can break your
* theme ability, remember that the program must be separated from the
interface!
*
* The API can be used to query or set every part of an edje object in real
time.
* You can manage every aspect of parts, part states, programs, script and
whatever
- * is contained in the edje file. For a reference of what all parameter means
+ * is contained in the edje file. For a reference of what all parameter means
* look at the complete @ref edcref.
- *
+ *
* All the functions that deals with part states include the state value inside
* the returned strings (ex: "defaut 0.00"). For this reason there aren't
- * functions to set/get a state value, you have to pass the value inside the
+ * functions to set/get a state value, you have to pass the value inside the
* name string (always in the form "state x.xx").
*
* Don't forget to free all the strings and the lists returned by any
edje_edit_*()
* functions using edje_edit_string_free() and edje_edit_string_list_free()
when
* you don't need anymore.
- *
+ *
* Example: print all the part in a loaded edje_object
* @code
* Evas_List *parts, *l;
- *
+ *
* parts = edje_edit_parts_list_get(edje_object);
* while(l = parts; l; l = l->next)
* {
@@ -59,7 +59,7 @@
* Example: Change the color of a rect inside an edje file
* @code
* Evas_Object *edje;
- *
+ *
* edje = edje_object_add(evas);
* edje_object_file_set(edje,"edj/file/name", "group to load");
* edje_edit_state_color_set(edje, "MyRectName", "default 0.00", 255, 255, 0,
255);
@@ -93,7 +93,7 @@
);
/**Save the modified edje object back to his file.
- * Use this function when you are done with your editing, all the change made
+ * Use this function when you are done with your editing, all the change made
* to the current loaded group will be saved back to the original file.
*
* NOTE: for now this as 2 limitations
@@ -105,7 +105,7 @@
Evas_Object *obj///< The edje object to save
);
-/**Print on standard output many information about the internal status
+/**Print on standard output many information about the internal status
* of the edje object.
* This is probably only usefull to debug.
*/
@@ -113,7 +113,7 @@
edje_edit_print_internal_status(
Evas_Object *obj///< The edje object to inspect
);
-
+
//@}
/**/
/** GROUPS API
/
@@ -133,19 +133,19 @@
/**Delete the current group from the given edje.
* You can only delete the currently loaded group.
- * All the parts and the programs inside the group will be deleted as well,
+ * All the parts and the programs inside the group will be deleted as well,
* but not image or font embedded in the edje.
*/
EAPI unsigned char ///@return 1 on success, 0 on failure
edje_edit_group_del(
Evas_Object *obj///< The edje object
);
-
+
/**Check if a group with the given name exist in the edje.
*/
EAPI unsigned char ///< 1 if the group exist, 0 otherwise.
edje_edit_group_exist(
- Evas_Object *obj, ///< The edje object
+ Evas_Object *obj, ///< The edje object
const char *group ///< The name of the group
);
@@ -232,7 +232,7 @@
/**Delete the given part from the edje
* All the reference to this part will be zeroed.
- * A group must have at least one part, so it's not possible to
+ * A group must have at least one part, so it's not possible to
* remove the last remaining part.
*/
EAPI unsigned char ///@return 1 on success, 0 if the part can't be
removed
@@ -245,7 +245,7 @@
*/
EAPI unsigned char ///< 1 if the part exist, 0 otherwise.
edje_edit_part_exist(
- Evas_Object *obj, ///< The edje object
+ Evas_Object *obj, ///< The edje object
const char *part///< The name of the part
);
@@ -359,13 +359,13 @@
);
/**Set mouse_events for part.*/
-EAPI void
+EAPI void
edj
E CVS: libs/edje doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/edje Dir : e17/libs/edje Modified Files: configure.in Log Message: include correctly alloca.h and use ecore_file_mkpath instead of the local implementation === RCS file: /cvs/e/e17/libs/edje/configure.in,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- configure.in25 Jan 2008 03:35:46 - 1.93 +++ configure.in24 Mar 2008 08:09:06 - 1.94 @@ -66,6 +66,7 @@ evas >= 0.9.9 ecore-evas >= 0.9.9 ecore-job >= 0.9.9 + ecore-file >= 0.9.9 eet >= 0.9.10 embryo >= 0.9.1 ]) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje doursse
Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_decc.c edje_decc.h edje_main.h
Log Message:
include correctly alloca.h and use ecore_file_mkpath instead of the local
implementation
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_decc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- edje_decc.c 2 Mar 2008 05:39:51 - 1.24
+++ edje_decc.c 24 Mar 2008 08:09:06 - 1.25
@@ -8,6 +8,7 @@
#include
#include
#include
+#include
#ifdef _WIN32
# include
# include
@@ -26,9 +27,6 @@
intdecomp(void);
void output(void);
-inte_file_is_dir(char *file);
-inte_file_mkdir(char *dir);
-inte_file_mkpath(char *path);
static int compiler_cmd_is_sane();
static int root_filename_is_sane();
@@ -184,7 +182,7 @@
p = strrchr(outdir, '.');
if (p) *p = 0;
- e_file_mkpath(outdir);
+ ecore_file_mkpath(outdir);
ef = eet_open(file_in, EET_FILE_MODE_READ);
@@ -234,7 +232,7 @@
printf("ERROR: potential security violation. attempt to
write in parent dir.\n");
exit(-1);
}
- e_file_mkpath(pp);
+ ecore_file_mkpath(pp);
free(pp);
if (!evas_object_image_save(im, out, NULL, "quality=100
compress=9"))
{
@@ -267,7 +265,7 @@
printf("ERROR: potential security violation. attempt to write in
parent dir.\n");
exit (-1);
}
- e_file_mkpath(pp);
+ ecore_file_mkpath(pp);
free(pp);
if (strstr(out, "../"))
{
@@ -314,7 +312,7 @@
printf("ERROR: potential security violation. attempt to
write in parent dir.\n");
exit (-1);
}
- e_file_mkpath(pp);
+ ecore_file_mkpath(pp);
free(pp);
if (strstr(out, "../"))
{
@@ -360,55 +358,6 @@
"before running it!\n\n");
}
eet_close(ef);
-}
-
-int
-e_file_is_dir(char *file)
-{
- struct stat st;
-
- if (stat(file, &st) < 0) return 0;
- if (S_ISDIR(st.st_mode)) return 1;
- return 0;
-}
-
-int
-e_file_mkdir(char *dir)
-{
-#ifndef _WIN32
- static mode_t default_mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP |
S_IXGRP | S_IROTH | S_IXOTH;
-
- if (mkdir(dir, default_mode) < 0) return 0;
-#else
- if (mkdir(dir) < 0) return 0;
-#endif /* _WIN32 */
- return 1;
-}
-
-int
-e_file_mkpath(char *path)
-{
- char ss[PATH_MAX];
- int i, ii;
-
- ss[0] = 0;
- i = 0;
- ii = 0;
- while (path[i])
- {
- if (ii == sizeof(ss) - 1) return 0;
- ss[ii++] = path[i];
- ss[ii] = 0;
- if (path[i] == '/')
- {
-if (!e_file_is_dir(ss)) e_file_mkdir(ss);
-else if (!e_file_is_dir(ss)) return 0;
- }
- i++;
- }
- if (!e_file_is_dir(ss)) e_file_mkdir(ss);
- else if (!e_file_is_dir(ss)) return 0;
- return 1;
}
static int
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_decc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_decc.h 11 Nov 2005 06:49:57 - 1.3
+++ edje_decc.h 24 Mar 2008 08:09:06 - 1.4
@@ -13,9 +13,6 @@
#include
#include
#include
-#ifdef HAVE_ALLOCA_H
-#include
-#endif
/* types */
typedef struct _Font Font;
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_main.h 21 Jan 2008 01:03:04 - 1.9
+++ edje_main.h 24 Mar 2008 08:09:06 - 1.10
@@ -5,7 +5,6 @@
#include
#endif
-#include
#include
#include
#include
@@ -18,11 +17,26 @@
#include
#include
#include
+#include
#include
#include
#include
+
#ifdef HAVE_ALLOCA_H
-#include
+# include
+#elif defined __GNUC__
+# define alloca __builtin_alloca
+#elif defined _AIX
+# define alloca __alloca
+#elif defined _MSC_VER
+# include
+# define alloca _alloca
+#else
+# include
+# ifdef __cplusplus
+extern "C"
+# endif
+void *alloca (size_t);
#endif
#include "edje_private.h"
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
