E CVS: docs dresb
Enlightenment CVS committal Author : dresb Project : e17 Module : docs Dir : e17/docs/devwithedje/xml Modified Files: bookoverview.xml foundations_at_practice.xml interacting_with_the_objects.xml intro_to_edje.xml intro_to_gui.xml Added Files: introduction_to_widgets.xml Log Message: fixed several errors and began a new chapter. === RCS file: /cvs/e/e17/docs/devwithedje/xml/bookoverview.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- bookoverview.xml15 Jan 2008 02:33:41 - 1.1 +++ bookoverview.xml20 Jan 2008 14:23:53 - 1.2 @@ -53,46 +53,67 @@ formalpara titleIII. The foundations in practice/title -This is a practical example of the simplest approach to setting up an Evas -canvas for display. +A practical example of setting up an Evas canvas with the simplest +approach, Ecore_Evas. /formalpara para emphasisIII.I Working with the canvas/emphasis -Another example dealing with the inclusion of an Edje object. +Including new Edje objects inside the previously setup canvas can be +explained with this simple example. /para para emphasisIII.II Interacting with the objects/emphasis -A practical guide through both Edje and plain Ecore's event system. +There are different channels for the application to interact with the +interface. For the sake of brevity I will include an example of each one to +serve as an introduction for the pratical examples to come in the next +chapters. /para !-- New Chapter -- formalpara titleIV. Introduction to widgets/title -A simple description of what a widget is and what it is useful for along with -the limitations presented by common toolkits. +Interfaces need to resolve two problems, presenting information to users +and taking orders from them. The past chapters presented enough information +to solve the first. In the following chapters we will review the second. +The widget iself can be seen as a small application inside our interfaces. +As an example let's examine the structure of a common widget, the combox. /formalpara para emphasisIV.I. The common widget design/emphasis -A generic vision of the way the different toolkits design the structure of -widgets with the corresponding diagram. +Revisar el diseño de los widget combox en varias librerias, mostrar las +pattern usadas y concluir porque MVC es la mejor (si es que lo es). /para para emphasisIV.II. Widget design with Edje/emphasis -An explanation about where does Edje fits in the structure mentioned before, -and the shortcuts it provides. +If the Model View Controller pattern is the choice for developing +a widget the place Edje ocuppies becomes quite clear. Mostrar el papel +que ocupa Edje, Ecore_Evas y Ecore_ en cada parte del diseño del widget. +/para + +para +emphasisIV.III. The Enlightenment Widget Library/emphasis +Añadir una introduccion a EWL y añadir mi vision sobre como debeira ser +usado en conjunto con Edje destacando claramente que es una opinion +personal. +/para + +para +emphasisIV.III. The Enlightenment ToolKit/emphasis +Añadir una introduccion a ETK y añadir mi vision sobre como debeira ser +usado en conjunto con Edje destacando claramente que es una opinion +personal. /para !-- New Chapter -- formalpara -titleV. Implementing a widget with Edje/title -A brief resume of the previous chapter and the introduction of names specific -to Evas, Ecore_Evas and Edje. +titleV. Implementacion del widget/title +Presentar estrucutura inicial del codigo paralelizandola con IV.II /formalpara para === RCS file: /cvs/e/e17/docs/devwithedje/xml/foundations_at_practice.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- foundations_at_practice.xml 15 Jan 2008 02:33:41 - 1.1 +++ foundations_at_practice.xml 20 Jan 2008 14:23:53 - 1.2 @@ -22,14 +22,14 @@ button.file_set(theme.edj,button) /programlisting - Altough the difference between the code snippets could be written off - as sintactic sugar it serves to demonstrate the structure the EFL C - API follow. If we dissected the last function call we could split it - into three groups. First, the class of the object to manipulate, - codeedje_object/code, second, the method to call codefile_set/code - and third the pointer to the object instance code(button,/code - along with the parameters codetheme.edj,button)/code. In - more generic terms: codeclass_method(instance,parameters)/code./para + The differences between the code snippets could be written off as +
E CVS: docs dresb
Enlightenment CVS committal Author : dresb Project : e17 Module : docs Dir : e17/docs/devwithedje/img Modified Files: graphical_application_components.svg Added Files: custom_music_player_sources.png custom_music_player_sources.svg graphical_application_components_widget.png graphical_application_components_widget.svg Log Message: fixed several errors and began a new chapter. === RCS file: /cvs/e/e17/docs/devwithedje/img/graphical_application_components.svg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- graphical_application_components.svg17 Jan 2008 00:07:49 - 1.2 +++ graphical_application_components.svg20 Jan 2008 14:23:53 - 1.3 @@ -14,7 +14,7 @@ sodipodi:version=0.32 inkscape:version=0.45.1 version=1.0 - sodipodi:docbase=/home/andres/desarollo/e.org/fuentes/docs/devwithedje/img + sodipodi:docbase=/home/andres/desarollo/e.org/cvs/e17/docs/devwithedje/img sodipodi:docname=graphical_application_components.svg inkscape:output_extension=org.inkscape.output.svg.inkscape inkscape:export-filename=/home/andres/desarollo/e.org/fuentes/docs/devwithedje/img/graphical_application_components.png @@ -30,8 +30,8 @@ inkscape:pageopacity=1 inkscape:pageshadow=2 inkscape:zoom=1 - inkscape:cx=247.06849 - inkscape:cy=251.3 + inkscape:cx=371.06849 + inkscape:cy=217.8 inkscape:document-units=px inkscape:current-layer=layer1 width=640px @@ -48,10 +48,10 @@ inkscape:guide-bbox=true showguides=true inkscape:object-paths=false - inkscape:window-width=811 - inkscape:window-height=680 - inkscape:window-x=0 - inkscape:window-y=158 + inkscape:window-width=993 + inkscape:window-height=771 + inkscape:window-x=157 + inkscape:window-y=0 gridspacingx=1px gridspacingy=1px gridempspacing=0 - 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: docs dresb
Enlightenment CVS committal Author : dresb Project : e17 Module : docs Dir : e17/docs/devwithedje/pre-rendered Modified Files: devwithedje.pdf Log Message: fixed several errors and began a new chapter. === RCS file: /cvs/e/e17/docs/devwithedje/pre-rendered/devwithedje.pdf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 Binary files /tmp/cvsMLpx88 and /tmp/cvspNEFfw differ - 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: docs dresb
Enlightenment CVS committal Author : dresb Project : e17 Module : docs Dir : e17/docs/devwithedje Modified Files: devwithedje.xml Log Message: fixed several errors and began a new chapter. === RCS file: /cvs/e/e17/docs/devwithedje/devwithedje.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- devwithedje.xml 15 Jan 2008 02:33:41 - 1.1 +++ devwithedje.xml 20 Jan 2008 14:23:52 - 1.2 @@ -8,6 +8,7 @@ !ENTITY foundations_at_practice SYSTEM xml/foundations_at_practice.xml !ENTITY working_with_the_canvas SYSTEM xml/working_with_the_canvas.xml !ENTITY interacting_with_the_objects SYSTEM xml/interacting_with_the_objects.xml +!ENTITY introduction_to_widgets SYSTEM xml/introduction_to_widgets.xml ] book @@ -16,4 +17,5 @@ intro_to_gui; intro_to_edje; foundations_at_practice; +introduction_to_widgets; /book - 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: docs dresb
Enlightenment CVS committal
Author : dresb
Project : e17
Module : docs
Dir : e17/docs/devwithedje/src
Modified Files:
api_basics.c
Log Message:
fixed several errors and began a new chapter.
===
RCS file: /cvs/e/e17/docs/devwithedje/src/api_basics.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- api_basics.c17 Jan 2008 00:07:49 - 1.2
+++ api_basics.c20 Jan 2008 14:23:53 - 1.3
@@ -34,8 +34,10 @@
Evas_Coord x,y;
evas_pointer_canvas_xy_get(evas,x,y);
if(x 255) x = 255;
-if(y 255) y = 255;
-edje_color_class_set(main color, 190, x, y, 255, 255, 255, 255, 255,
255, 255, 255, 255);
+if(y 255) y = 255; //R, G, B, A,
+edje_color_class_set(main color, 190, x, y, 255,
+ 255, 255, 255, 255,
+ 255, 255, 255, 255);
}
int main() {
-
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/ewl jethomas
Enlightenment CVS committal Author : jethomas Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_combo.c ewl_scrollpane.c Log Message: Fix compiler warnings and send more signals to the combo. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- ewl_combo.c 20 Nov 2007 03:46:13 - 1.65 +++ ewl_combo.c 20 Jan 2008 16:15:31 - 1.66 @@ -256,6 +256,8 @@ ewl_widget_state_set(combo-button, expanded, EWL_STATE_PERSISTENT); + ewl_widget_state_set(EWL_WIDGET(combo), expanded, + EWL_STATE_PERSISTENT); if (!ewl_mvc_dirty_get(EWL_MVC(combo))) DRETURN(DLEVEL_STABLE); @@ -289,6 +291,8 @@ combo = EWL_COMBO(data); ewl_widget_state_set(combo-button, collapsed, EWL_STATE_PERSISTENT); + ewl_widget_state_set(EWL_WIDGET(combo), collapsed, + EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_scrollpane.c20 Jan 2008 05:06:12 - 1.30 +++ ewl_scrollpane.c20 Jan 2008 16:15:31 - 1.31 @@ -4,6 +4,7 @@ #include ewl_scrollpane.h #include ewl_box.h #include ewl_scrollbar.h +#include ewl_range.h #include ewl_macros.h #include ewl_private.h #include ewl_debug.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: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: tempget.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/tempget.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- tempget.c 12 Jan 2008 07:58:56 - 1.2 +++ tempget.c 20 Jan 2008 18:41:13 - 1.3 @@ -398,8 +398,8 @@ init(); if (poller) ecore_poller_del(poller); - poller= ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, - poll_cb, NULL); + poller = ecore_poller_add(ECORE_POLLER_CORE, cur_poll_interval, +poll_cb, NULL); poll_cb(NULL); ecore_main_loop_begin(); - 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/modules Modified Files: Makefile.am Log Message: Only link tempget with needed libs. === RCS file: /cvs/e/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- Makefile.am 25 Sep 2007 14:26:36 - 1.41 +++ Makefile.am 20 Jan 2008 19:42:38 - 1.42 @@ -5,7 +5,6 @@ clock \ pager \ battery \ -temperature \ cpufreq \ ibox \ start \ @@ -51,3 +50,7 @@ conf_exebuf \ conf_paths \ conf_mime + +if HAVE_TEMPERATURE +SUBDIRS += temperature +endif - 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 Modified Files: configure.in Log Message: Only link tempget with needed libs. === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.198 retrieving revision 1.199 diff -u -3 -r1.198 -r1.199 --- configure.in11 Jan 2008 07:33:54 - 1.198 +++ configure.in20 Jan 2008 19:42:37 - 1.199 @@ -185,7 +185,6 @@ ecore-ipc ecore-con ecore-job - ecore-txt ecore-imf ecore-imf-evas edje @@ -195,11 +194,17 @@ efreet-mime ]) -# ecore-txt is really only needed by the temperature module, -# so we check for it separately. -# in a perfect world, we'd also disable the temperate module here -# if ecore-txt isn't available. -PKG_CHECK_MODULES(ECORE_TXT, ecore-txt) +PKG_CHECK_MODULES(ECORE_TXT, [ + ecore-txt +], [ + have_temp=yes + # This test will succeed as these modules are also checked before + PKG_CHECK_MODULES(TEMPERATURE, [ +ecore +ecore-file + ]) +], [ have_temp=no]) +AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) - 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 raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_config.c
Log Message:
actions added patch - config limit ping to min of 2 secs. :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -3 -r1.110 -r1.111
--- e_actions.c 13 Sep 2007 21:09:11 - 1.110
+++ e_actions.c 21 Jan 2008 01:22:00 - 1.111
@@ -1105,6 +1105,84 @@
}
}
+
+
+#define DESK_ACTION_ALL(zone, act) \
+ E_Zone *zone; \
+ Evas_List *lm, *lc, *lz;\
+ E_Container *con; \
+ E_Manager *man; \
+ \
+ for (lm = e_manager_list(); lm; lm = lm-next) { \
+man = lm-data; \
+for (lc = man-containers; lc; lc = lc-next) { \
+ con = lc-data; \
+ for (lz = con-zones; lz; lz = lz-next) { \
+ zone = lz-data; \
+ act; \
+ } \
+} \
+ }
+
+
+/***/
+ACT_FN_GO(desk_flip_by_all)
+{
+ if (params)
+{
+ int dx = 0, dy = 0;
+
+ if (sscanf(params, %i %i, dx, dy) == 2)
+ {
+ DESK_ACTION_ALL(zone, e_zone_desk_flip_by(zone, dx, dy));
+ }
+}
+}
+
+/***/
+ACT_FN_GO(desk_flip_to_all)
+{
+ if (params)
+{
+ int dx = 0, dy = 0;
+
+ if (sscanf(params, %i %i, dx, dy) == 2)
+ {
+ DESK_ACTION_ALL(zone, e_zone_desk_flip_to(zone, dx, dy));
+ }
+}
+}
+
+/***/
+ACT_FN_GO(desk_linear_flip_by_all)
+{
+ if (params)
+{
+ int dx = 0;
+
+ if (sscanf(params, %i, dx) == 1)
+ {
+ DESK_ACTION_ALL(zone, e_zone_desk_linear_flip_by(zone, dx));
+ }
+}
+}
+
+/***/
+ACT_FN_GO(desk_linear_flip_to_all)
+{
+ if (params)
+{
+ int dx = 0;
+
+ if (sscanf(params, %i, dx) == 1)
+ {
+ DESK_ACTION_ALL(zone, e_zone_desk_linear_flip_to(zone, dx));
+ }
+}
+}
+
+
+
/***/
ACT_FN_GO(screen_send_to)
{
@@ -2072,6 +2150,63 @@
e_action_predef_name_set(_(Desktop), _(Switch To Desktop...),
desk_linear_flip_to, NULL,
syntax: N, example: 1, 1);
+
+ /* desk_flip_by_all */
+ ACT_GO(desk_flip_by_all);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop Left (All
Screens)),
+ desk_flip_by_all, -1 0, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop Right (All
Screens)),
+ desk_flip_by_all, 1 0, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop Up (All Screens)),
+ desk_flip_by_all, 0 -1, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop Down (All
Screens)),
+ desk_flip_by_all, 0 1, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop By... (All
Screens)),
+ desk_flip_by_all, NULL,
+ syntax: X-offset Y-offset, example: -1 0, 1);
+
+ /* desk_flip_to_all */
+ ACT_GO(desk_flip_to_all);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop To... (All
Screens)),
+ desk_flip_to_all, NULL,
+ syntax: X Y, example: 1 2, 1);
+
+ /* desk_linear_flip_by_all */
+ ACT_GO(desk_linear_flip_by_all);
+ e_action_predef_name_set(_(Desktop), _(Flip Desktop Linearly... (All
Screens)),
+ desk_linear_flip_by_all,
+ NULL, syntax: N-offset, example: -2, 1);
+
+ /* desk_linear_flip_to_all */
+ ACT_GO(desk_linear_flip_to_all);
+ e_action_predef_name_set(_(Desktop), _(Switch To Desktop 0 (All
Screens)),
+ desk_linear_flip_to_all, 0, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Switch To Desktop 1 (All
Screens)),
+ desk_linear_flip_to_all, 1, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Switch To Desktop 2 (All
Screens)),
+ desk_linear_flip_to_all, 2, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Switch To Desktop 3 (All
Screens)),
+ desk_linear_flip_to_all, 3, NULL, 0);
+ e_action_predef_name_set(_(Desktop), _(Switch To Desktop 4 (All
Screens)),
+
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c edje_main.h
Log Message:
edje data file patches in - not fill though.
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- edje_cc_handlers.c 23 Nov 2007 16:43:03 - 1.79
+++ edje_cc_handlers.c 21 Jan 2008 01:03:04 - 1.80
@@ -48,6 +48,7 @@
static void st_fonts_font(void);
static void st_data_item(void);
+static void st_data_file(void);
static void ob_styles_style(void);
static void st_styles_style_name(void);
@@ -167,6 +168,7 @@
{images.image, st_images_image},
{fonts.font, st_fonts_font},
{data.item, st_data_item},
+ {data.file, st_data_file},
{styles.style.name, st_styles_style_name},
{styles.style.base, st_styles_style_base},
{styles.style.tag, st_styles_style_tag},
@@ -699,6 +701,92 @@
di-key = parse_str(0);
di-value = parse_str(1);
edje_file-data = evas_list_append(edje_file-data, di);
+}
+
+/**
+@page edcref
+@block
+data
+@context
+data {
+file: arbitraryname filename;
+file: othername otherfilename;
+..
+}
+@description
+The data block is used to pass arbitrary parameters from the theme to
+the application. Unlike the images and fonts blocks, additional
+data blocks can only be included inside the group block.
+@endblock
+
+@property
+file
+@parameters
+[parameter name] [parameter filename]
+@effect
+Defines each additional parameter.
+@endproperty
+ */
+static void
+st_data_file(void)
+{
+ const char *data;
+ const char *over;
+ Edje_Data *di;
+ char *filename;
+ char *value;
+ int fd;
+ int i;
+ struct stat buf;
+
+ check_arg_count(2);
+
+ di = mem_alloc(SZ(Edje_Data));
+ di-key = parse_str(0);
+ filename = parse_str(1);
+
+ fd = open(filename, O_RDONLY);
+ if (fd 0)
+ {
+fprintf(stderr, %s: Error. %s:%i when opening file \%s\: \%s\\n,
+progname, file_in, line, filename, strerror(errno));
+exit(-1);
+ }
+
+ if (fstat(fd, buf))
+ {
+fprintf(stderr, %s: Error. %s:%i when stating file \%s\: \%s\\n,
+progname, file_in, line, filename, strerror(errno));
+exit(-1);
+ }
+
+ data = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
+ if (!data)
+ {
+fprintf(stderr, %s: Error. %s:%i when mapping file \%s\: \%s\\n,
+progname, file_in, line, filename, strerror(errno));
+exit(-1);
+ }
+
+ over = data;
+ for (i = 0; i buf.st_size; ++i, ++over)
+ if (*over == '\0')
+ {
+ fprintf(stderr, %s: Error. %s:%i file \%s\ is a binary file.\n,
+ progname, file_in, line, filename);
+ exit(-1);
+ }
+
+ value = malloc(sizeof (char) * buf.st_size + 1);
+ snprintf(value, buf.st_size + 1, %s, data);
+
+ munmap((void*)data, buf.st_size);
+ close(fd);
+
+ di-value = value;
+ edje_file-data = evas_list_append(edje_file-data, di);
+
+ free(filename);
}
/**
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje_main.h 27 Aug 2007 11:52:04 - 1.8
+++ edje_main.h 21 Jan 2008 01:03:04 - 1.9
@@ -5,6 +5,7 @@
#include config.h
#endif
+#include sys/mman.h
#include Evas.h
#include Ecore.h
#include Ecore_Evas.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/eet raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
Eet.h eet_data.c eet_image.c eet_lib.c
Log Message:
cedric's eet race patch
===
RCS file: /cvs/e/e17/libs/eet/src/lib/Eet.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Eet.h 20 Dec 2007 07:22:52 - 1.42
+++ Eet.h 21 Jan 2008 01:09:51 - 1.43
@@ -253,7 +253,7 @@
* If the eet file handle is not valid NULL is returned and size_ret is
* filled with 0.
*/
- EAPI void*eet_read_direct (Eet_File *ef, const char *name, int
*size_ret);
+ EAPI const void *eet_read_direct(Eet_File *ef, const char *name, int
*size_ret);
/**
* Write a specified entry to an eet file handle
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- eet_data.c 18 Jan 2008 18:29:29 - 1.59
+++ eet_data.c 21 Jan 2008 01:09:51 - 1.60
@@ -906,7 +906,7 @@
eet_data_read(Eet_File *ef, Eet_Data_Descriptor *edd, const char *name)
{
void *data_dec;
- void *data;
+ const void *data;
int size;
int required_free = 0;
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_image.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- eet_image.c 25 Nov 2006 15:37:45 - 1.10
+++ eet_image.c 21 Jan 2008 01:09:51 - 1.11
@@ -733,7 +733,7 @@
unsigned int *d = NULL;
int free_data = 0;
- data = eet_read_direct (ef, name, size);
+ data = (void*) eet_read_direct (ef, name, size);
if (!data)
{
data = eet_read(ef, name, size);
@@ -759,7 +759,7 @@
int d;
int free_data = 0;
- data = eet_read_direct (ef, name, size);
+ data = (void*) eet_read_direct (ef, name, size);
if (!data)
{
data = eet_read(ef, name, size);
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- eet_lib.c 14 Dec 2007 05:57:16 - 1.83
+++ eet_lib.c 21 Jan 2008 01:09:51 - 1.84
@@ -23,20 +23,20 @@
struct _Eet_File
{
- char*path;
- FILE*fp;
- Eet_File_Header *header;
- unsigned char *data;
-
- int magic;
- int references;
-
- Eet_File_Modemode;
- int data_size;
- time_t mtime;
+ char *path;
+ FILE *fp;
+ Eet_File_Header *header;
+ const unsigned char *data;
+
+ int magic;
+ int references;
+
+ Eet_File_Mode mode;
+ int data_size;
+ time_tmtime;
- unsigned charwrites_pending : 1;
- unsigned chardelete_me_now : 1;
+ unsigned char writes_pending : 1;
+ unsigned char delete_me_now : 1;
};
struct _Eet_File_Header
@@ -448,21 +448,211 @@
num++;
}
}
-
+
for (i = 0; i num; i++)
eet_close(closelist[i]);
}
}
+static Eet_File*
+eet_internal_read (Eet_File *ef)
+{
+ const unsigned char *dyn_buf = NULL;
+ const unsigned char *p = NULL;
+ int index = 0;
+ int num_entries;
+ int byte_entries;
+ int i;
+
+ if (eet_test_close((ef-data == (void *)-1) || (ef-data == NULL), ef))
+ return NULL;
+
+ if (eet_test_close(ef-data_size sizeof(int) * 3, ef))
+ return NULL;
+
+ /* build header table if read mode */
+ /* geat header */
+ index += sizeof(int);
+ if (eet_test_close((int)ntohl(*((int *)ef-data)) != EET_MAGIC_FILE, ef))
+ return NULL;
+
+#define EXTRACT_INT(Value, Pointer, Index) \
+{ \
+ int tmp; \
+ memcpy(tmp, Pointer + Index, sizeof(int)); \
+ Value = ntohl(tmp); \
+ Index += sizeof(int); \
+}
+
+ /* get entries count and byte count */
+ EXTRACT_INT(num_entries, ef-data, index);
+ EXTRACT_INT(byte_entries, ef-data, index);
+
+ /* we cant have = 0 values here - invalid */
+ if (eet_test_close((num_entries = 0) || (byte_entries = 0), ef))
+ return NULL;
+
+ /* we can't have more entires than minimum bytes for those! invalid! */
+ if (eet_test_close((num_entries * 20) byte_entries, ef))
+ return NULL;
+
+ /* allocate header */
+ ef-header = calloc(1, sizeof(Eet_File_Header));
+ if (eet_test_close(!ef-header, ef))
+ return NULL;
+
+ ef-header-magic = EET_MAGIC_FILE_HEADER;
+
+ /* allocate directory block in ram */
+ ef-header-directory = calloc(1, sizeof(Eet_File_Directory));
+
E CVS: apps/e ravenlock
Enlightenment CVS committal Author : ravenlock Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_config.c e_mod_main.c Log Message: Allow ibox to show the border caption. This was not garunteed with the previously available options. === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_config.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_mod_config.c 16 Sep 2007 00:02:53 - 1.32 +++ e_mod_config.c 21 Jan 2008 06:11:56 - 1.33 @@ -102,6 +102,8 @@ e_widget_framelist_object_append(of, ob); ob = e_widget_radio_add(evas, _(Display Icon Name), 3, rg); e_widget_framelist_object_append(of, ob); + ob = e_widget_radio_add(evas, _(Display Border Caption), 4, rg); + e_widget_framelist_object_append(of, ob); e_widget_list_object_append(o, of, 1, 1, 0.5); === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- e_mod_main.c31 Oct 2007 12:23:14 - 1.90 +++ e_mod_main.c21 Jan 2008 06:11:56 - 1.91 @@ -576,6 +576,9 @@ if (!label) label = ic-border-client.icccm.icon_name; break; + case 4: + label = e_border_name_get(ic-border); + break; } if (!label) label = ?; - 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
