E CVS: apps/elation raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/elation
Dir : e17/apps/elation/src/modules
Modified Files:
elation_cd.c elation_disk.c
Log Message:
handle cd's better
===
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_cd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- elation_cd.c24 Jul 2004 05:19:33 - 1.1
+++ elation_cd.c24 Jul 2004 07:19:47 - 1.2
@@ -16,14 +16,10 @@
struct _Elation_Module_Private
{
- Evas_Object *background1;
- Evas_Object *background2;
+ char *device;
+ int track;
+ int track_num;
Evas_Object *video;
-
- double media_fade_in_start;
- Ecore_Timer *media_fade_in_timer;
-
- unsigned char menu_visible : 1;
};
static void shutdown(Elation_Module *em);
@@ -35,15 +31,11 @@
static void action(Elation_Module *em, int action);
static void frame_decode_cb(void *data, Evas_Object *obj, void *event_info);
-static void frame_resize_cb(void *data, Evas_Object *obj, void *event_info);
static void length_change_cb(void *data, Evas_Object *obj, void *event_info);
static void decode_stop_cb(void *data, Evas_Object *obj, void *event_info);
-static void button_num_change_cb(void *data, Evas_Object *obj, void *event_info);
static void title_change_cb(void *data, Evas_Object *obj, void *event_info);
static void progress_change_cb(void *data, Evas_Object *obj, void *event_info);
static void channels_change_cb(void *data, Evas_Object *obj, void *event_info);
-static void ref_change_cb(void *data, Evas_Object *obj, void *event_info);
-static void button_change_cb(void *data, Evas_Object *obj, void *event_info);
static void key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
static int media_play_timer_cb(void *data);
static int media_fade_in_timer_cb(void *data);
@@ -65,33 +57,64 @@
em-unfocus = unfocus;
em-action = action;
- pr-background1 = evas_object_rectangle_add(em-info-evas);
- evas_object_color_set(pr-background1, 0, 0, 0, 255);
- pr-background2 = evas_object_rectangle_add(em-info-evas);
- evas_object_color_set(pr-background2, 0, 0, 0, 255);
+ pr-device = strdup(/dev/cdrom);
pr-video = emotion_object_add(em-info-evas);
evas_object_event_callback_add(pr-video, EVAS_CALLBACK_KEY_DOWN, key_down_cb, em);
evas_object_smart_callback_add(pr-video, frame_decode, frame_decode_cb, em);
- evas_object_smart_callback_add(pr-video, frame_resize, frame_resize_cb, em);
evas_object_smart_callback_add(pr-video, length_change,length_change_cb, em);
evas_object_smart_callback_add(pr-video, decode_stop, decode_stop_cb, em);
- evas_object_smart_callback_add(pr-video, button_num_change,
button_num_change_cb, em);
evas_object_smart_callback_add(pr-video, title_change, title_change_cb, em);
evas_object_smart_callback_add(pr-video, progress_change, progress_change_cb,
em);
evas_object_smart_callback_add(pr-video, channels_change, channels_change_cb,
em);
- evas_object_smart_callback_add(pr-video, ref_change, ref_change_cb, em);
- evas_object_smart_callback_add(pr-video, button_change, button_change_cb, em);
-
- emotion_object_smooth_scale_set(pr-video, 1);
-
- emotion_object_file_set(pr-video, cdda:/1);
- emotion_object_play_set(pr-video, 1);
-
- pr-media_fade_in_timer = ecore_timer_add(1.0 / 30.0, media_fade_in_timer_cb, em);
- pr-media_fade_in_start = ecore_time_get();
+
+ {
+ int fd;
+
+ fd = open(pr-device, O_RDONLY | O_NONBLOCK);
+ if (fd = 0)
+ {
+int ret;
+struct cdrom_tochdr hd;
+
+ret = ioctl(fd, CDROMREADTOCHDR, hd);
+if (ret == 0)
+ {
+ int i;
+
+ pr-track_num = hd.cdth_trk1;
+ printf(hd-cdth_trk0 = %i, hd-cdth_trk1 = %i\n,
+(int)hd.cdth_trk0, (int)hd.cdth_trk1);
+ for (i = 1; i = hd.cdth_trk1; i++)
+ {
+ struct cdrom_tocentry ent;
+
+ ent.cdte_track = i;
+ ent.cdte_format = CDROM_MSF;
+ ret = ioctl(fd, CDROMREADTOCENTRY, ent);
+ if (ret == 0)
+{
+ int sec;
+
+ sec = ent.cdte_addr.msf.minute * 60;
+ sec += ent.cdte_addr.msf.second;
+ printf(TRACK %i = %i sec [f: %i]\n, i, sec,
+ (int)ent.cdte_addr.msf.frame);
+}
+ }
+ }
+close(fd);
+ }
+ }
+ {
+ char buf[256];
+
+ snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
+
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: support fetching of meta-data === RCS file: /cvsroot/enlightenment/e17/libs/emotion/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in15 Jul 2004 19:23:03 - 1.4 +++ configure.in24 Jul 2004 09:53:00 - 1.5 @@ -180,6 +180,10 @@ V=`$ECORE_CONFIG --version` +if [ -z $V ]; then + echo Error. Ecore is not installed or $ECORE_CONFIG cannot be found. Abort. + exit -1 +fi VV=`vser $V` VM=1.0.0_pre7 VVM=`vser $VM` @@ -189,6 +193,10 @@ fi V=`$EVAS_CONFIG --version` +if [ -z $V ]; then + echo Error. Evas is not installed or $EVAS_CONFIG cannot be found. Abort. + exit -1 +fi VV=`vser $V` VM=1.0.0_pre13 VVM=`vser $VM` @@ -198,6 +206,10 @@ fi V=`$EDJE_CONFIG --version` +if [ -z $V ]; then + echo Error. Edje is not installed or $EDJE_CONFIG cannot be found. Abort. + exit -1 +fi VV=`vser $V` VM=0.5.0 VVM=`vser $VM` @@ -207,6 +219,10 @@ fi V=`$XINE_CONFIG --version` +if [ -z $V ]; then + echo Error. Xine is not installed or $XINE_CONFIG cannot be found. Abort. + exit -1 +fi VV=`vser $V` VM=1.0.0 VVM=`vser $VM` --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] 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.h emotion_private.h emotion_smart.c
Log Message:
support fetching of meta-data
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Emotion.h 24 Jun 2004 10:55:43 - 1.3
+++ Emotion.h 24 Jul 2004 09:53:00 - 1.4
@@ -36,7 +36,19 @@
EMOTION_EVENT_10
};
-typedef enum _Emotion_Event Emotion_Event;
+enum _Emotion_Meta_Info
+{
+ EMOTION_META_INFO_TRACK_TITLE,
+ EMOTION_META_INFO_TRACK_ARTIST,
+ EMOTION_META_INFO_TRACK_ALBUM,
+ EMOTION_META_INFO_TRACK_YEAR,
+ EMOTION_META_INFO_TRACK_GENRE,
+ EMOTION_META_INFO_TRACK_COMMENT,
+ EMOTION_META_INFO_TRACK_DISC_ID
+};
+
+typedef enum _Emotion_Event Emotion_Event;
+typedef enum _Emotion_Meta_Info Emotion_Meta_Info;
#define EMOTION_CHANNEL_AUTO -1
#define EMOTION_CHANNEL_DEFAULT 0
@@ -90,5 +102,6 @@
int emotion_object_ref_num_get (Evas_Object *obj);
int emotion_object_spu_button_count_get (Evas_Object *obj);
int emotion_object_spu_button_get(Evas_Object *obj);
-
+const char *emotion_object_meta_info_get (Evas_Object *obj,
Emotion_Meta_Info meta);
+
#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- emotion_private.h 24 Jun 2004 10:55:43 - 1.2
+++ emotion_private.h 24 Jul 2004 09:53:00 - 1.3
@@ -7,6 +7,14 @@
#include config.h
+#define META_TRACK_TITLE 1
+#define META_TRACK_ARTIST 2
+#define META_TRACK_GENRE 3
+#define META_TRACK_COMMENT 4
+#define META_TRACK_ALBUM 5
+#define META_TRACK_YEAR 6
+#define META_TRACK_DISCID 7
+
typedef struct _Emotion_Video_Module Emotion_Video_Module;
struct _Emotion_Video_Module
@@ -57,6 +65,7 @@
void (*speed_set) (void *ef, double speed);
double (*speed_get) (void *ef);
int (*eject) (void *ef);
+ const char * (*meta_get) (void *ef, int meta);
void *handle;
};
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion_smart.c 23 Jul 2004 03:15:30 - 1.7
+++ emotion_smart.c 24 Jul 2004 09:53:00 - 1.8
@@ -694,6 +694,43 @@
return sd-spu.button;
}
+const char *
+emotion_object_meta_info_get(Evas_Object *obj, Emotion_Meta_Info meta)
+{
+ Smart_Data *sd;
+
+ E_SMART_OBJ_GET_RETURN(sd, obj, E_OBJ_NAME, NULL);
+ if (!sd-module) return NULL;
+ if (!sd-video) return NULL;
+ switch (meta)
+ {
+ case EMOTION_META_INFO_TRACK_TITLE:
+ return sd-module-meta_get(sd-video, META_TRACK_TITLE);
+ break;
+ case EMOTION_META_INFO_TRACK_ARTIST:
+ return sd-module-meta_get(sd-video, META_TRACK_ARTIST);
+ break;
+ case EMOTION_META_INFO_TRACK_ALBUM:
+ return sd-module-meta_get(sd-video, META_TRACK_ALBUM);
+ break;
+ case EMOTION_META_INFO_TRACK_YEAR:
+ return sd-module-meta_get(sd-video, META_TRACK_YEAR);
+ break;
+ case EMOTION_META_INFO_TRACK_GENRE:
+ return sd-module-meta_get(sd-video, META_TRACK_GENRE);
+ break;
+ case EMOTION_META_INFO_TRACK_COMMENT:
+ return sd-module-meta_get(sd-video, META_TRACK_COMMENT);
+ break;
+ case EMOTION_META_INFO_TRACK_DISC_ID:
+ return sd-module-meta_get(sd-video, META_TRACK_DISCID);
+ break;
+ default:
+ break;
+ }
+ return NULL;
+}
+
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/elation raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/elation
Dir : e17/apps/elation/data
Modified Files:
theme.edc theme.eet
Log Message:
cd module does more
===
RCS file: /cvsroot/enlightenment/e17/apps/elation/data/theme.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- theme.edc 18 Jul 2004 08:04:21 - 1.1
+++ theme.edc 24 Jul 2004 10:44:23 - 1.2
@@ -25,7 +25,7 @@
}
}
group {
- name: dvd;
+ name: media;
parts {
part {
name: disk;
@@ -191,4 +191,132 @@
}
}
}
+ group {
+ name: cd;
+ parts {
+part {
+ name: disk;
+ mouse_events: 0;
+ description {
+ state: default 0.0;
+ min: 230 130;
+ max: 230 130;
+ align: 1.0 1.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 50 50;
+ }
+ rel2 {
+ relative: 0.0 0.0;
+ offset: 50 50;
+ }
+ image {
+ normal: disk.png;
+ }
+ }
+}
+part {
+ name: track_number;
+ type: TEXT;
+ description {
+ state:default 0.0;
+ align:0.0 1.0;
+ rel1 {
+ relative: 1.0 0.0;
+ offset: -50 50;
+ }
+ rel2 {
+ relative: 1.0 0.0;
+ offset: -50 50;
+ }
+ color: 0 0 0 255;
+ text {
+ text: 00;
+ font: Vera Bold;
+ size: 75;
+ align:0.0 0.0;
+ min: 1 1;
+ }
+ }
+}
+part {
+ name: track_title;
+ type: TEXT;
+ description {
+ state:default 0.0;
+ align:0.0 1.0;
+ rel1 {
+ to_y: disk;
+ relative: 0.0 1.0;
+ offset: 50 0;
+ }
+ rel2 {
+ to_y: disk;
+ relative: 1.0 1.0;
+ offset: -50 0;
+ }
+ color: 0 0 0 255;
+ text {
+ text: Title;
+ font: Vera Bold;
+ size: 24;
+ align:0.0 0.0;
+ min: 0 1;
+ }
+ }
+}
+part {
+ name: track_artist;
+ type: TEXT;
+ description {
+ state:default 0.0;
+ align:0.0 1.0;
+ rel1 {
+ to_y: track_title;
+ relative: 0.0 1.0;
+ offset: 50 0;
+ }
+ rel2 {
+ to_y: track_title;
+ relative: 1.0 1.0;
+ offset: -50 0;
+ }
+ color: 0 0 0 255;
+ text {
+ text: Artist;
+ font: Vera Bold;
+ size: 24;
+ align:0.0 0.0;
+ min: 0 1;
+ }
+ }
+}
+part {
+ name: track_album;
+ type: TEXT;
+ description {
+ state:default 0.0;
+ align:0.0 1.0;
+ rel1 {
+ to_y: track_artist;
+ relative: 0.0 1.0;
+ offset: 50 0;
+ }
+ rel2 {
+ to_y: track_artist;
+ relative: 1.0 1.0;
+ offset: -50 0;
+ }
+ color: 0 0 0 255;
+ text {
+ text: Album;
+ font: Vera Bold;
+ size: 24;
+ align:0.0 0.0;
+ min: 0 1;
+ }
+ }
+}
+ }
+ }
}
===
RCS file: /cvsroot/enlightenment/e17/apps/elation/data/theme.eet,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsqMZJDQ and /tmp/cvsR5K7ua differ
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/elation raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/elation
Dir : e17/apps/elation/src/modules
Modified Files:
elation_cd.c elation_dvd.c elation_media.c elation_vcd.c
Log Message:
cd module does more
===
RCS file: /cvsroot/enlightenment/e17/apps/elation/src/modules/elation_cd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- elation_cd.c24 Jul 2004 07:19:47 - 1.2
+++ elation_cd.c24 Jul 2004 10:44:23 - 1.3
@@ -20,6 +20,7 @@
int track;
int track_num;
Evas_Object *video;
+ Evas_Object *overlay;
};
static void shutdown(Elation_Module *em);
@@ -37,9 +38,8 @@
static void progress_change_cb(void *data, Evas_Object *obj, void *event_info);
static void channels_change_cb(void *data, Evas_Object *obj, void *event_info);
static void key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info);
-static int media_play_timer_cb(void *data);
-static int media_fade_in_timer_cb(void *data);
-
+static void new_track(Elation_Module *em, int track);
+
void *
init(Elation_Module *em)
{
@@ -56,6 +56,8 @@
em-focus = focus;
em-unfocus = unfocus;
em-action = action;
+
+ em-data = pr;
pr-device = strdup(/dev/cdrom);
@@ -108,14 +110,12 @@
close(fd);
}
}
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
- emotion_object_file_set(pr-video, buf);
- emotion_object_play_set(pr-video, 1);
- }
+ pr-overlay = edje_object_add(em-info-evas);
+ edje_object_file_set(pr-overlay, PACKAGE_DATA_DIR/data/theme.eet, cd);
+ edje_object_signal_emit(pr-overlay, media, 1);
+
+ new_track(em, 0);
return pr;
}
@@ -126,6 +126,7 @@
pr = em-data;
evas_object_del(pr-video);
+ evas_object_del(pr-overlay);
free(pr);
}
@@ -140,6 +141,9 @@
evas_object_move(pr-video, 0, 0);
evas_object_resize(pr-video, w, h);
+
+ evas_object_move(pr-overlay, 0, 0);
+ evas_object_resize(pr-overlay, w, h);
}
static void
@@ -148,6 +152,7 @@
Elation_Module_Private *pr;
pr = em-data;
+ evas_object_show(pr-overlay);
}
static void
@@ -156,6 +161,7 @@
Elation_Module_Private *pr;
pr = em-data;
+ evas_object_hide(pr-overlay);
}
static void
@@ -185,27 +191,10 @@
switch (action)
{
case ELATION_ACT_NEXT:
- pr-track++;
- if (pr-track = pr-track_num) pr-track = 0;
- printf(next to %i\n, pr-track);
- {
-char buf[256];
-
-snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
-emotion_object_file_set(pr-video, buf);
-emotion_object_play_set(pr-video, 1);
- }
+ new_track(em, pr-track + 1);
break;
case ELATION_ACT_PREV:
- pr-track--;
- if (pr-track 0) pr-track = pr-track_num - 1;
- {
-char buf[256];
-
-snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
-emotion_object_file_set(pr-video, buf);
-emotion_object_play_set(pr-video, 1);
- }
+ new_track(em, pr-track - 1);
break;
case ELATION_ACT_SELECT:
if (emotion_object_play_get(pr-video))
@@ -298,15 +287,7 @@
printf(EL video stop\n);
// emotion_object_position_set(pr-video, 0.0);
// emotion_object_play_set(pr-video, 1);
- pr-track++;
- if (pr-track = pr-track_num) pr-track = 0;
- {
- char buf[256];
-
- snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
- emotion_object_file_set(pr-video, buf);
- emotion_object_play_set(pr-video, 1);
- }
+ new_track(em, pr-track + 1);
}
static void
@@ -379,3 +360,38 @@
else if (!strcmp(ev-keyname, k)) action = ELATION_ACT_SKIP;
em-action(em, action);
}
+
+static void
+new_track(Elation_Module *em, int track)
+{
+ Elation_Module_Private *pr;
+ char buf[256];
+
+ pr = em-data;
+ pr-track = track;
+ while (pr-track = pr-track_num) pr-track -= pr-track_num;
+ while (pr-track 0) pr-track += pr-track_num;
+
+ snprintf(buf, sizeof(buf), cdda:/%i, pr-track + 1);
+ emotion_object_file_set(pr-video, buf);
+ emotion_object_play_set(pr-video, 1);
+ snprintf(buf, sizeof(buf), %i, pr-track + 1);
+ edje_object_part_text_set(pr-overlay,
+track_number,
+buf);
+ edje_object_part_text_set(pr-overlay,
+track_title,
+emotion_object_meta_info_get(pr-video,
EMOTION_META_INFO_TRACK_TITLE));
+ edje_object_part_text_set(pr-overlay,
+track_artist,
+emotion_object_meta_info_get(pr-video,
EMOTION_META_INFO_TRACK_ARTIST));
+ edje_object_part_text_set(pr-overlay,
+
E CVS: libs/ecore handyande
Enlightenment CVS committal
Author : handyande
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_config
Modified Files:
Ecore_Config.h ecore_config.c
Log Message:
Added ecore_config_system_[init|shutdown] for libs (ewl etc) that only want access to
system properties
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/Ecore_Config.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- Ecore_Config.h 25 May 2004 18:52:20 - 1.32
+++ Ecore_Config.h 24 Jul 2004 17:03:47 - 1.33
@@ -182,6 +182,9 @@
int ecore_config_init(char *name);
int ecore_config_shutdown(void);
+ int ecore_config_system_init(void);
+ int ecore_config_system_shutdown(void);
+
int ecore_config_load(void);
int ecore_config_file_load(char *file);
int ecore_config_save(void);
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_config/ecore_config.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ecore_config.c 15 Jul 2004 13:43:14 - 1.38
+++ ecore_config.c 24 Jul 2004 17:03:47 - 1.39
@@ -20,9 +20,12 @@
Ecore_Config_Server *__ecore_config_server_local = NULL;
Ecore_Config_Bundle *__ecore_config_bundle_local = NULL;
char*__ecore_config_app_name = NULL;
+int __ecore_config_system_init = 0;
Ecore_Config_Server *_ecore_config_ipc_init(char *name);
int _ecore_config_ipc_exit(void);
+static int _ecore_config_system_init_no_load(void);
+static int _ecore_config_system_load(void);
static char*_ecore_config_type[] =
{ undefined, integer, float, string, colour, theme };
@@ -1243,7 +1246,8 @@
/**
* Initializes the Enlightened Property Library.
*
- * This function must be run before any other function in the
+ * This function (or @ref ecore_config_system_init)
+ * must be run before any other function in the
* Enlightened Property Library, even if you have run @ref ecore_init .
* The name given is used to determine the default configuration to
* load.
@@ -1256,24 +1260,15 @@
int
ecore_config_init(char *name)
{
- char *buf, *p, *path;
- Ecore_Config_Prop *sys;
-
- DEBUG = -1;
- if ((p = getenv(ECORE_CONFIG_DEBUG)) strlen(p) 0)
- {
- DEBUG = atoi(p);
- }
+ char *path;
+ _ecore_config_system_init_no_load();
__ecore_config_app_name = strdup(name);
__ecore_config_server_local = ecore_config_init_local(name);
if (!__ecore_config_server_local)
return ECORE_CONFIG_ERR_FAIL;
- __ecore_config_server_global =
- ecore_config_init_global(ECORE_CONFIG_GLOBAL_ID);
- if (!__ecore_config_server_global)
- return ECORE_CONFIG_ERR_FAIL;
+ /* FIXME should free __ecore_config_bundle_local */
__ecore_config_bundle_local =
ecore_config_bundle_new(__ecore_config_server_local, config);
@@ -1285,8 +1280,76 @@
free(path);
}
+ return _ecore_config_system_load();
+}
+
+/**
+ * Frees memory and shuts down the library.
+ * @return @c ECORE_CONFIG_ERR_IGNORED
+ * @ingroup Ecore_Config_Lib_Group
+ */
+int
+ecore_config_shutdown(void)
+{
+ return ecore_config_system_shutdown();
+}
+
+/**
+ * Initializes the Enlightened Property Library (call from libraries i.e. ewl - NOT
applications).
+ *
+ * This function (or ecore_config_init)
+ * must be run before any other function in the
+ * Enlightened Property Library, even if you have run @ref ecore_init .
+ * The name given is used to determine the default configuration to
+ * load.
+ *
+ * @param name Application name
+ * @return @c ECORE_CONFIG_ERR_SUCC if the library is successfully set up.
+ * @c ECORE_CONFIG_ERR_FAIL otherwise.
+ * @ingroup Ecore_Config_Lib_Group
+ */
+int
+ecore_config_system_init(void)
+{
+ _ecore_config_system_init_no_load();
+ return _ecore_config_system_load();
+}
+
+staticint
+_ecore_config_system_init_no_load(void)
+{
+ char *p;
+
+ __ecore_config_system_init++;
+ if (__ecore_config_system_init 1)
+ return ECORE_CONFIG_ERR_IGNORED;
+
+ DEBUG = -1;
+ if ((p = getenv(ECORE_CONFIG_DEBUG)) strlen(p) 0)
+ {
+ DEBUG = atoi(p);
+ }
+
+ __ecore_config_server_global =
+ ecore_config_init_global(ECORE_CONFIG_GLOBAL_ID);
+ if (!__ecore_config_server_global)
+ return ECORE_CONFIG_ERR_FAIL;
+
+ __ecore_config_bundle_local =
+ ecore_config_bundle_new(__ecore_config_server_global, system);
+
+ return ECORE_CONFIG_ERR_SUCC;
+}
+
+
+static int
+_ecore_config_system_load(void)
+{
+ char *buf, *p;
+ Ecore_Config_Prop *sys;
+
if ((p
E CVS: apps/examine handyande
Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/examine
Dir : e17/apps/examine/src
Modified Files:
examine.c
Log Message:
Fix multiple instances of a theme appearing when there are multiple copies
===
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- examine.c 20 Jul 2004 14:58:06 - 1.19
+++ examine.c 24 Jul 2004 19:02:28 - 1.20
@@ -4,6 +4,7 @@
/* Modified for ecore_config by HandyAndE */
#include Ecore_Config.h
+#include Ecore_Data.h
#include limits.h
#include stdio.h
@@ -295,8 +296,12 @@
char *search_path, *path, *ptr, *end;
char *file;
int file_len;
+ Ecore_List *themes;
+ int theme_seen;
+ char *theme_item;
entries[1] = ewl_hbox_new();
+ themes = ecore_list_new();
search_path = strdup(__examine_client_theme_search_path);
ptr = search_path;
@@ -317,46 +322,63 @@
while (next = readdir(dp)) {
if (!strcmp(next-d_name, .) || !strcmp(next-d_name, ..))
continue;
- file = malloc(strlen(path) + strlen(next-d_name) + 2); /* 2=/+\0 */
- strcpy(file, path);
- strcat(file, /);
- strcat(file, next-d_name);
-
- tmp = ewl_image_new(file, (char *) prop_item-data);
- ewl_object_set_preferred_size(EWL_OBJECT(tmp), 60, 60);
- ewl_object_set_fill_policy(EWL_OBJECT(tmp), EWL_FLAG_FILL_NONE);
- ewl_object_set_alignment(EWL_OBJECT(tmp), EWL_FLAG_ALIGN_CENTER);
- ewl_widget_show(tmp);
- free(file);
-
- file_len = strlen(next-d_name) - 4; /* 4 = .eet*/
- file = malloc(file_len + 1);
- strncpy(file, next-d_name, file_len);
- *(file + file_len) = '\0';
- tmp_text = ewl_text_new(file);
- ewl_object_set_alignment(EWL_OBJECT(tmp_text), EWL_FLAG_ALIGN_CENTER);
-
- ewl_widget_show(tmp_text);
- free(file);
-
- tmp_col = ewl_vbox_new();
- ewl_widget_show(tmp_col);
-
- ewl_container_append_child(EWL_CONTAINER(tmp_col), tmp);
- ewl_container_append_child(EWL_CONTAINER(tmp_col), tmp_text);
- ewl_container_append_child(EWL_CONTAINER(entries[1]), tmp_col);
- ewl_callback_append(tmp_col, EWL_CALLBACK_CLICKED, cb_choose_theme,
- prop_item);
+
+ theme_seen = 0;
+ ecore_list_goto_first(themes);
+ while((theme_item = (char*)ecore_list_next(themes)) != NULL) {
+if (!strcmp(theme_item, next-d_name)) {
+ theme_seen = 1;
+ break;
+}
+ }
+
+ if (!theme_seen) {
+ecore_list_append(themes, next-d_name);
+
+file = malloc(strlen(path) + strlen(next-d_name) + 2); /* 2=/+\0 */
+strcpy(file, path);
+strcat(file, /);
+strcat(file, next-d_name);
+
+tmp = ewl_image_new(file, (char *) prop_item-data);
+ewl_object_set_preferred_size(EWL_OBJECT(tmp), 60, 60);
+ewl_object_set_fill_policy(EWL_OBJECT(tmp), EWL_FLAG_FILL_NONE);
+ewl_object_set_alignment(EWL_OBJECT(tmp), EWL_FLAG_ALIGN_CENTER);
+ewl_widget_show(tmp);
+free(file);
+
+file_len = strlen(next-d_name) - 4; /* 4 = .eet*/
+file = malloc(file_len + 1);
+strncpy(file, next-d_name, file_len);
+*(file + file_len) = '\0';
+tmp_text = ewl_text_new(file);
+ewl_object_set_alignment(EWL_OBJECT(tmp_text),
+ EWL_FLAG_ALIGN_CENTER);
+
+ewl_widget_show(tmp_text);
+free(file);
+
+tmp_col = ewl_vbox_new();
+ewl_widget_show(tmp_col);
+
+ewl_container_append_child(EWL_CONTAINER(tmp_col), tmp);
+ewl_container_append_child(EWL_CONTAINER(tmp_col), tmp_text);
+ewl_container_append_child(EWL_CONTAINER(entries[1]), tmp_col);
+ewl_callback_append(tmp_col, EWL_CALLBACK_CLICKED, cb_choose_theme,
+prop_item);
- ewl_container_set_redirect(EWL_CONTAINER(tmp_col),
- EWL_CONTAINER(tmp_text));
- ewl_object_set_padding(EWL_OBJECT(tmp_col), 2, 2, 0, 0);
- ewl_object_set_minimum_h(EWL_OBJECT(tmp_col), 60);
+ewl_container_set_redirect(EWL_CONTAINER(tmp_col),
+ EWL_CONTAINER(tmp_text));
+ewl_object_set_padding(EWL_OBJECT(tmp_col), 2, 2, 0, 0);
+ewl_object_set_minimum_h(EWL_OBJECT(tmp_col), 60);
+ }
}
ptr++;
- path = ptr;
+path = ptr;
}
+
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
e.spec ChangeLog
Log Message:
Sun Jul 25 01:27:12 CEST 2004
(Kim)
0.16.7
===
RCS file: /cvsroot/enlightenment/e16/e/e.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- e.spec 23 Jul 2004 20:38:34 - 1.155
+++ e.spec 24 Jul 2004 23:29:48 - 1.156
@@ -1,7 +1,7 @@
Summary: The Enlightenment window manager.
Name: enlightenment
Version: 0.16.7
-Release: 0.99.6.1
+Release: 1
License: BSD
Group: User Interface/Desktops
Source0:
http://prdownloads.sourceforge.net/enlightenment/%{name}-%{version}.tar.gz
===
RCS file: /cvsroot/enlightenment/e16/e/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- ChangeLog 23 Jul 2004 20:38:34 - 1.155
+++ ChangeLog 24 Jul 2004 23:29:48 - 1.156
@@ -3014,3 +3014,10 @@
Fix image class transparency (correctly this time!).
Fix focuslist trouble.
+
+---
+
+Sun Jul 25 01:27:12 CEST 2004
+(Kim)
+
+0.16.7
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: ewler werkt
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler/data/schemas Modified Files: widgets.xml Log Message: Layouts, selected, and enums are now in the tree. === RCS file: /cvsroot/enlightenment/misc/ewler/data/schemas/widgets.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- widgets.xml 6 Jul 2004 03:38:11 - 1.3 +++ widgets.xml 25 Jul 2004 01:01:48 - 1.4 @@ -30,7 +30,29 @@ elem type=int get=ewl_object_top_insets index=2t/elem elem type=int get=ewl_object_bottom_insets index=3b/elem /elem - elem type=unsigned int get=ewl_object_get_flagsflags/elem + elem type=structflags + elem type=enum get=ewl_object_get_fill_policy set=ewl_object_set_fill_policyfill_policy + elem type=enum_val value=0x id=EWL_FLAG_FILL_NONE/elem + elem type=enum_val value=0x1000 id=EWL_FLAG_FILL_HSHRINK/elem + elem type=enum_val value=0x2000 id=EWL_FLAG_FILL_VSHRINK/elem + elem type=enum_val value=0x3000 id=EWL_FLAG_FILL_SHRINK/elem + elem type=enum_val value=0x4000 id=EWL_FLAG_FILL_HFILL/elem + elem type=enum_val value=0x8000 id=EWL_FLAG_FILL_VFILL/elem + elem type=enum_val value=0xC000 id=EWL_FLAG_FILL_FILL/elem + elem type=enum_val value=0xF000 id=EWL_FLAG_FILL_ALL/elem + /elem + elem type=enum get=ewl_object_get_alignment set=ewl_object_set_alignmentalignment + elem type=enum_val value=0x0 id=EWL_FLAG_ALIGN_CENTER/elem + elem type=enum_val value=0x1 id=EWL_FLAG_ALIGN_LEFT/elem + elem type=enum_val value=0x2 id=EWL_FLAG_ALIGN_RIGHT/elem + elem type=enum_val value=0x4 id=EWL_FLAG_ALIGN_TOP/elem + elem type=enum_val value=0x8 id=EWL_FLAG_ALIGN_BOTTOM/elem + elem type=enum_val value=0x5 id=EWL_FLAG_ALIGN_LEFT|EWL_FLAG_ALIGN_TOP/elem + elem type=enum_val value=0x6 id=EWL_FLAG_ALIGN_RIGHT|EWL_FLAG_ALIGN_TOP/elem + elem type=enum_val value=0x9 id=EWL_FLAG_ALIGN_LEFT|EWL_FLAG_ALIGN_BOTTOM/elem + elem type=enum_val value=0xa id=EWL_FLAG_ALIGN_RIGHT|EWL_FLAG_ALIGN_BOTTOM/elem + /elem + /elem /class class name=Ewl_Widget super=Ewl_Object elem type=Ewl_Widget * set=ewl_widget_set_parentparent/elem @@ -50,6 +72,10 @@ /class class name=Ewl_Box super=Ewl_Container ctor=ewl_box_new nargs=0 elem type=intspacing/elem + elem type=enum get=ewl_box_get_orientation set=ewl_box_set_orientation default=0orientation + elem type=enum_val value=0 id=EWL_ORIENTATION_HORIZONTAL/elem + elem type=enum_val value=1 id=EWL_ORIENTATION_VERTICAL/elem + /elem elem type=unsigned inthomogeneous/elem /class class name=Ewl_Button super=Ewl_Box ctor=ewl_button_new nargs=1 @@ -100,4 +126,36 @@ class name=Ewl_Combo super=Ewl_Box ctor=ewl_combo_new nargs=1 elem type=string set=ewl_combo_set_selected get=ewl_combo_get_selectedselected/elem /class + class name=Ewl_Check super=Ewl_Widget ctor=ewl_check_new nargs=0 + elem type=int set=ewl_check_set_checked get=ewl_check_is_checkedchecked/elem + /class + class name=Ewl_Filedialog super=Ewl_Box ctor=ewl_filedialog_new nargs=1 + elem type=string set=ewl_filedialog_set_directorydirectory/elem + /class + class name=Ewl_Fileselector super=Ewl_Box ctor=ewl_fileselector_new nargs=0 + elem type=string set=ewl_fileselector_set_directory get=ewl_fileselector_get_directorydirectory/elem + /class + class name=Ewl_Image super=Ewl_Image ctor=ewl_image_new nargs=2 + elem type=string set=ewl_image_set_filefile/elem + elem type=int set=ewl_image_set_proportional default=0proportional/elem + /class + class name=Ewl_Menu_Item super=Ewl_Container + /class + class name=Ewl_Menu_Base super=Ewl_Menu_Item + /class + class name=Ewl_Imenu super=Ewl_Menu_Base ctor=ewl_imenu_new nargs=2 + /class + class name=Ewl_Password super=Ewl_Entry ctor=ewl_password_new nargs=1 + elem type=string set=ewl_password_set_text get=ewl_password_get_texttext/elem + elem type=int
E CVS: ewler werkt
Enlightenment CVS committal
Author : werkt
Project : misc
Module : ewler
Dir : misc/ewler/src
Modified Files:
Makefile.am ewler.c form.c form.h inspector.c main.c project.c
selected.c selected.h widgets.c widgets.h
Removed Files:
ewl_button_stock.c ewl_button_stock.h ewl_dialog.c
ewl_dialog.h ewl_filedialog_stock.c ewl_filedialog_stock.h
ewl_stock.c ewl_stock.h
Log Message:
Layouts, selected, and enums are now in the tree.
===
RCS file: /cvsroot/enlightenment/misc/ewler/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 6 Jul 2004 03:38:12 - 1.3
+++ Makefile.am 25 Jul 2004 01:01:49 - 1.4
@@ -7,10 +7,6 @@
bin_PROGRAMS = ewler
ewler_SOURCES = \
- ewl_button_stock.c ewl_button_stock.h \
- ewl_dialog.c ewl_dialog.h \
- ewl_filedialog_stock.c ewl_filedialog_stock.h \
- ewl_stock.c ewl_stock.h \
ewler.c ewler.h \
form.c form.h \
form_file.c form_file.h \
@@ -18,6 +14,7 @@
main.c \
project.c project.h \
selected.c selected.h \
- widgets.c widgets.h
+ widgets.c widgets.h \
+ layout.c
ewler_LDADD = @ewl_libs@ @xml2_libs@
===
RCS file: /cvsroot/enlightenment/misc/ewler/src/ewler.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewler.c 6 Jul 2004 05:19:54 - 1.3
+++ ewler.c 25 Jul 2004 01:01:49 - 1.4
@@ -2,10 +2,6 @@
#include stdio.h
#include Ewl.h
-#include ewl_dialog.h
-#include ewl_stock.h
-#include ewl_filedialog_stock.h
-
#include ewler.h
#include form.h
#include widgets.h
@@ -48,23 +44,28 @@
__open_form_cb( Ewl_Widget *w, void *ev_data, void *user_data )
{
char *filename = ev_data;
+ Ewl_Widget *window = user_data;
if( filename ) {
ewler_open_file( filename );
- ewl_widget_destroy( w );
+ ewl_widget_destroy( window );
}
}
static void
__open_form( Ewl_Widget *w, void *ev_data, void *user_data )
{
- Ewl_Widget *dialog;
+ Ewl_Widget *window, *dialog;
+
+ window = ewl_window_new();
+ ewl_widget_show( window );
- dialog = ewl_filedialog_stock_new( EWL_FILEDIALOG_TYPE_OPEN );
+ dialog = ewl_filedialog_new( EWL_FILEDIALOG_TYPE_OPEN );
+ ewl_container_append_child( EWL_CONTAINER(window), dialog );
ewl_callback_append( dialog, EWL_CALLBACK_VALUE_CHANGED,
-
__open_form_cb, NULL );
- ewl_callback_append( dialog, EWL_CALLBACK_DELETE_WINDOW,
-
__destroy_dialog, dialog );
+
__open_form_cb, window );
+ ewl_callback_append( window, EWL_CALLBACK_DELETE_WINDOW,
+
__destroy_dialog, window );
ewl_widget_show( dialog );
}
@@ -192,7 +193,7 @@
void
tool_set_name( Ewl_Widget *w, void *ev_data, void *user_data )
{
- active_tool = ewl_button_get_label( EWL_TEXT(w) );
+ active_tool = ewl_button_get_label( EWL_BUTTON(w) );
}
void
@@ -231,11 +232,12 @@
tool_set_name, NULL );
} else
text[0] = ewl_text_new( class );
- ewl_object_set_fill_policy( text[0], EWL_FLAG_FILL_NONE );
+ ewl_object_set_fill_policy( EWL_OBJECT(text[0]),
EWL_FLAG_FILL_NONE );
ewl_widget_show( text[0] );
row = ewl_tree_add_row( EWL_TREE(tool_tree), EWL_ROW(prow),
text );
ewl_object_set_fill_policy( EWL_OBJECT(row-parent),
EWL_FLAG_FILL_FILL );
+ ewl_tree_set_row_expand( EWL_ROW(row), EWL_TREE_NODE_EXPANDED
);
add_tools_with_parent( class, row );
ewl_widget_show( row );
===
RCS file: /cvsroot/enlightenment/misc/ewler/src/form.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- form.c 6 Jul 2004 05:19:54 - 1.8
+++ form.c 25 Jul 2004 01:01:49 - 1.9
@@ -5,10 +5,6 @@
*/
#include Ewl.h
-#include ewl_stock.h
-#include ewl_dialog.h
-#include ewl_filedialog_stock.h
-
#include ewler.h
#include widgets.h
#include form.h
@@ -16,9 +12,12 @@
#include project.h
#include inspector.h
#include selected.h
+#include layout.h
Ecore_List *forms;
static int widget_selected
E CVS: ewler werkt
Enlightenment CVS committal Author : werkt Project : misc Module : ewler Dir : misc/ewler Modified Files: TODO Log Message: Layouts, selected, and enums are now in the tree. === RCS file: /cvsroot/enlightenment/misc/ewler/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- TODO8 Jun 2004 18:30:04 - 1.1 +++ TODO25 Jul 2004 01:01:48 - 1.2 @@ -1,6 +1,9 @@ todo - o Completely implement the Ewl object hierarchy in widgets.dat - o Design an edje for selected objects + o Completely implement the Ewl object hierarchy in widgets.xml o Makefile generator for project files o Documentation and help + +done + + o Design an edje for selected widgets --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: ewler werkt
Enlightenment CVS committal
Author : werkt
Project : misc
Module : ewler
Dir : misc/ewler/data/themes/ewler/bits
Modified Files:
selected-groups.edc selected-programs.edc
Log Message:
Layouts, selected, and enums are now in the tree.
===
RCS file:
/cvsroot/enlightenment/misc/ewler/data/themes/ewler/bits/selected-groups.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- selected-groups.edc 10 Jun 2004 23:32:24 - 1.2
+++ selected-groups.edc 25 Jul 2004 01:01:49 - 1.3
@@ -8,6 +8,34 @@
}
parts {
part {
+ name, bg;
+ type, RECT;
+ description {
+ state, default 0.0;
+ color, 0 0 0 0;
+ rel1 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 1.0 1.0;
+ offset, -1 -1;
+ }
+ }
+ description {
+ state, deselect 0.0;
+ color, 192 192 192 255;
+ rel1 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 1.0 1.0;
+ offset, -1 -1;
+ }
+ }
+ }
+ part {
name, top_left;
type, RECT;
mouse_events, 1;
@@ -23,6 +51,18 @@
offset, 4 4;
}
}
+ description {
+ state, deselect 0.0;
+ color, 0 0 0 0;
+ rel1 {
+ relative, 0.0, 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ }
}
part {
name, top_middle;
@@ -40,6 +80,18 @@
offset, 2 4;
}
}
+ description {
+ state, deselect 0.0;
+ color, 0 0 0 0;
+ rel1 {
+ relative, 0.0, 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ }
}
part {
name, top_right;
@@ -57,6 +109,18 @@
offset, -1 4;
}
}
+ description {
+ state, deselect 0.0;
+ color, 0 0 0 0;
+ rel1 {
+ relative, 0.0, 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ }
}
part {
name, middle_right;
@@ -74,6 +138,18 @@
offset, -1 2;
}
}
+ description {
+ state, deselect 0.0;
+ color, 0 0 0 0;
+ rel1 {
+ relative, 0.0, 0.0;
+ offset, 0 0;
+ }
+ rel2 {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ }
+ }
}
part {
name, bottom_right;
@@
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/data Removed Files: colors.db Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/data/fonts Removed Files: Vera.ttf andover.ttf cinema.ttf grunge.ttf morpheus.ttf nationff.ttf notepad.ttf Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/src Removed Files: .cvsignore Estyle.h Estyle_private.h Makefile.am estyle.c estyle_color.c estyle_color.h estyle_heap.c estyle_heap.h estyle_style.c estyle_style.h Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle Removed Files: .cvsignore AUTHORS COPYING ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in estyle-config.in estyle.m4 estyle.spec Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/data/styles Removed Files: bold.style.db outline.style.db plain.style.db raised.style.db shadow.style.db soft_shadow.style.db Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/test/img Removed Files: .cvsignore Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/doc Removed Files: .cvsignore Makefile.am html-customizations.dsl.in kernel-doc.in manual.raw stylesheet.css Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/test Removed Files: .cvsignore Makefile.am estyle_test_simple.c Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/estyle mej
Enlightenment CVS committal Author : mej Project : e17 Module : libs/estyle Dir : e17/libs/estyle/debian Removed Files: .cvsignore Makefile.am changelog control copyright libestyle0-dev.files libestyle0.files rules Log Message: Sat Jul 24 21:34:08 2004Michael Jennings (mej) Begone, outdated sludge! -- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etox vacuum
Enlightenment CVS committal Author : vacuum Project : e17 Module : libs/etox Dir : e17/libs/etox/src/style Modified Files: etox_style_style.c Log Message: sprintf-snprintf === RCS file: /cvsroot/enlightenment/e17/libs/etox/src/style/etox_style_style.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etox_style_style.c 11 Jun 2004 14:19:05 - 1.2 +++ etox_style_style.c 25 Jul 2004 04:03:00 - 1.3 @@ -733,36 +733,36 @@ layer = (Etox_Style_Style_Layer *)calloc(sizeof(Etox_Style_Style_Layer), 1); - sprintf(key, /layers/%d/stack, i); + snprintf(key, sizeof(key)-1, /layers/%d/stack, i); e_db_int_get(info-style_db, key, layer-stack); - sprintf(key, /layers/%d/size_change, i); + snprintf(key, sizeof(key)-1, /layers/%d/size_change, i); e_db_int_get(info-style_db, key, layer-size_change); - sprintf(key, /layers/%d/x_offset, i); + snprintf(key, sizeof(key)-1, /layers/%d/x_offset, i); e_db_float_get(info-style_db, key, x_offset); layer-x_offset = x_offset; - sprintf(key, /layers/%d/y_offset, i); + snprintf(key, sizeof(key)-1, /layers/%d/y_offset, i); e_db_float_get(info-style_db, key, y_offset); layer-y_offset = y_offset; - sprintf(key, /layers/%d/relative_color, i); + snprintf(key, sizeof(key)-1, /layers/%d/relative_color, i); e_db_int_get(info-style_db, key, layer-relative_color); - sprintf(key, /layers/%d/blend_alpha, i); + snprintf(key, sizeof(key)-1, /layers/%d/blend_alpha, i); e_db_int_get(info-style_db, key, layer-blend_alpha); - sprintf(key, /layers/%d/color/a, i); + snprintf(key, sizeof(key)-1, /layers/%d/color/a, i); e_db_int_get(info-style_db, key, layer-a); - sprintf(key, /layers/%d/color/r, i); + snprintf(key, sizeof(key)-1, /layers/%d/color/r, i); e_db_int_get(info-style_db, key, layer-r); - sprintf(key, /layers/%d/color/g, i); + snprintf(key, sizeof(key)-1, /layers/%d/color/g, i); e_db_int_get(info-style_db, key, layer-g); - sprintf(key, /layers/%d/color/b, i); + snprintf(key, sizeof(key)-1, /layers/%d/color/b, i); e_db_int_get(info-style_db, key, layer-b); /* --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/embryo vacuum
Enlightenment CVS committal
Author : vacuum
Project : e17
Module : libs/embryo
Dir : e17/libs/embryo/src/bin
Modified Files:
embryo_cc_sc1.c embryo_cc_sc2.c
Log Message:
sprintf - snprintf
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc1.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- embryo_cc_sc1.c 11 Jul 2004 09:50:42 - 1.12
+++ embryo_cc_sc1.c 25 Jul 2004 04:40:16 - 1.13
@@ -19,7 +19,7 @@
* must not be misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source
* distribution.
- * Version: $Id: embryo_cc_sc1.c,v 1.12 2004/07/11 09:50:42 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc1.c,v 1.13 2004/07/25 04:40:16 vacuum Exp $
*/
#include assert.h
#include ctype.h
@@ -2151,7 +2151,7 @@
{
tag = TAGMASK;
assert(tag = 0);
- sprintf(dest, 0%x, tag);
+ snprintf(dest, sizeof(dest)-1, 0%x, tag);
return isdigit(dest[1]) ? dest[1] : dest;
}
@@ -2165,12 +2165,12 @@
assert(numtags = 1 numtags = 2);
opertok = (opername[1] == '\0') ? opername[0] : 0;
if (opertok == '=')
- sprintf(symname, %s%s%s, tag2str(tagstr1, resulttag), opername,
+ snprintf(symname, sizeof(symname)-1, %s%s%s, tag2str(tagstr1, resulttag),
opername,
tag2str(tagstr2, tag1));
else if (numtags == 1 || opertok == '~')
- sprintf(symname, %s%s, opername, tag2str(tagstr1, tag1));
+ snprintf(symname, sizeof(symname)-1, %s%s, opername, tag2str(tagstr1, tag1));
else
- sprintf(symname, %s%s%s, tag2str(tagstr1, tag1), opername,
+ snprintf(symname, sizeof(symname)-1, %s%s%s, tag2str(tagstr1, tag1), opername,
tag2str(tagstr2, tag2));
return symname;
}
@@ -2226,7 +2226,7 @@
assert(tagsym[1] != NULL);
if (unary)
{
- sprintf(dest, operator%s(%s:), opname, tagsym[1]-name);
+ snprintf(dest, sizeof(dest)-1, operator%s(%s:), opname, tagsym[1]-name);
}
else
{
@@ -2234,11 +2234,11 @@
/* special case: the assignment operator has the return value
* as the 2nd tag */
if (opname[0] == '=' opname[1] == '\0')
- sprintf(dest, %s:operator%s(%s:), tagsym[0]-name, opname,
- tagsym[1]-name);
+ snprintf(dest, sizeof(dest)-1, %s:operator%s(%s:), tagsym[0]-name,
+ opname, tagsym[1]-name);
else
- sprintf(dest, operator%s(%s:,%s:), opname, tagsym[0]-name,
- tagsym[1]-name);
+ snprintf(dest, sizeof(dest)-1, operator%s(%s:,%s:), opname,
+ tagsym[0]-name, tagsym[1]-name);
} /* if */
return dest;
}
===
RCS file: /cvsroot/enlightenment/e17/libs/embryo/src/bin/embryo_cc_sc2.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- embryo_cc_sc2.c 11 Jul 2004 09:50:42 - 1.8
+++ embryo_cc_sc2.c 25 Jul 2004 04:40:16 - 1.9
@@ -18,7 +18,7 @@
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
*
- * Version: $Id: embryo_cc_sc2.c,v 1.8 2004/07/11 09:50:42 tsauerbeck Exp $
+ * Version: $Id: embryo_cc_sc2.c,v 1.9 2004/07/25 04:40:16 vacuum Exp $
*/
#include assert.h
#include stdio.h
@@ -1196,7 +1196,7 @@
extern char*sc_tokens[];/* forward declaration
*/
if (tok 256)
- sprintf(s2, %c, (char)tok);
+ snprintf(s2, sizeof(s2)-1, %c, (char)tok);
else
strcpy(s2, sc_tokens[tok - tFIRST]);
error(1, sc_tokens[tSYMBOL - tFIRST], s2);
@@ -2139,13 +2139,13 @@
/* token already pushed back */
assert(_pushed);
if (token 256)
- sprintf(s1, %c, (char)token); /* single character token */
+ snprintf(s1, sizeof(s1)-1, %c, (char)token); /* single character
token */
else
strcpy(s1, sc_tokens[token - tFIRST]); /* multi-character symbol */
if (!freading)
strcpy(s2, -end of file-);
else if (_lextok 256)
- sprintf(s2, %c, (char)_lextok);
+ snprintf(s2, sizeof(s1)-1, %c, (char)_lextok);
else
strcpy(s2, sc_tokens[_lextok - tFIRST]);
error(1, s1, s2); /* expected ..., but found ... */
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
E CVS: apps/examine vacuum
Enlightenment CVS committal
Author : vacuum
Project : e17
Module : apps/examine
Dir : e17/apps/examine/src
Modified Files:
examine_client.c ecore_config_client.c
Log Message:
sprintf - snprintf
===
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/examine_client.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- examine_client.c20 Jul 2004 14:58:06 - 1.13
+++ examine_client.c25 Jul 2004 04:50:00 - 1.14
@@ -470,11 +470,11 @@
switch (target-type) {
case PT_INT:
valstr = malloc(1000); /* ### FIXME */
-sprintf(valstr, %d, target-value.val);
+snprintf(valstr, sizeof(valstr)-1, %d, target-value.val);
break;
case PT_FLT:
valstr = malloc(1000); /* ### FIXME */
-sprintf(valstr, %f, target-value.fval);
+snprintf(valstr, sizeof(valstr)-1, %f, target-value.fval);
break;
default: /* PT_STR, PT_RGB */
valstr = target-value.ptr;
===
RCS file: /cvsroot/enlightenment/e17/apps/examine/src/ecore_config_client.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_config_client.c 10 May 2004 22:12:05 - 1.6
+++ ecore_config_client.c 25 Jul 2004 04:50:00 - 1.7
@@ -111,15 +111,15 @@
return ECORE_CONFIG_ERR_IGNORED;
if ((p = getenv(HOME))) { /* debug-only ### FIXME */
-sprintf(str, %s/.ecore/%s/.global, p, pipe_name);
+snprintf(str, PATH_MAX -1, %s/.ecore/%s/.global, p, pipe_name);
if (stat(str, st))
global = FALSE;
else
global = TRUE;
-sprintf(str, %s/.ecore/%s/, p, pipe_name);
-snprintf(buf, PATH_MAX, str);
+snprintf(str, PATH_MAX -1, %s/.ecore/%s/, p, pipe_name);
+snprintf(buf, PATH_MAX -1, str);
if ((dir = opendir(buf))) {
connected = 0;
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
