date:20070312

E CVS: libs/etk-perl leviathan

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : leviathan
Project : e17
Module  : libs/etk-perl

Dir : e17/libs/etk-perl


Modified Files:
Etk.xs EtkTypes.c typemap 


Log Message:
Combobox changes

===
RCS file: /cvs/e/e17/libs/etk-perl/Etk.xs,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- Etk.xs  8 Mar 2007 19:12:32 -   1.82
+++ Etk.xs  12 Mar 2007 14:11:24 -  1.83
@@ -1184,15 +1184,13 @@
LastItemGet=1
 
 Etk_Combobox_Item *
-etk_combobox_item_prev_get(combobox, item)
-   Etk_Combobox * combobox
+etk_combobox_item_prev_get(item)
Etk_Combobox_Item * item
ALIAS:
ItemPrevGet=1
 
 Etk_Combobox_Item *
-etk_combobox_item_next_get(combobox, item)
-   Etk_Combobox * combobox
+etk_combobox_item_next_get(item)
Etk_Combobox_Item * item
ALIAS:
ItemNextGet=1
@@ -1353,6 +1351,31 @@
OUTPUT:
RETVAL

+Etk_Bool
+etk_dialog_action_area_homogeneous_get(dialog)
+   Etk_Dialog *dialog
+   ALIAS:
+   ActionAreaHomogeneousGet=1
+
+void
+etk_dialog_action_area_homogeneous_set(dialog, homogeneous)
+   Etk_Dialog *dialog
+   Etk_Boolhomogeneous
+   ALIAS:
+   ActionAreaHomogeneousSet=1
+
+void
+etk_dialog_action_area_alignment_set(dialog, align)
+   Etk_Dialog *dialog
+   float   align
+   ALIAS:
+   ActionAreaAlignmentSet=1
+
+float
+etk_dialog_action_area_alignment_get(dialog)
+   Etk_Dialog *dialog
+   ALIAS:
+   ActionAreaAlignmentGet=1
 
 Etk_Bool
 etk_dialog_has_separator_get(dialog)
@@ -1367,6 +1390,32 @@
   ALIAS:
HasSeparatorSet=1
 
+Etk_Widget *
+etk_dialog_main_area_vbox_get(dialog)
+   Etk_Dialog *dialog
+   ALIAS:
+   MainAreaVboxGet=1
+
+Etk_Widget *
+etk_dialog_action_area_hbox_get(dialog)
+   Etk_Dialog *dialog
+   ALIAS:
+   MainAreaHboxGet=1
+
+void
+etk_dialog_button_response_id_set(dialog, button, response_id)
+   Etk_Dialog *dialog
+   Etk_Button *button
+   int response_id
+   ALIAS:
+   ButtonResponseIdSet=1
+
+int
+etk_dialog_button_response_id_get(button)
+   Etk_Button *button
+   ALIAS:
+   ButtonResponseIdGet=1
+   
 Etk_Dialog *
 new(class)
SV  * class
@@ -1376,36 +1425,33 @@
RETVAL
 
 void
-etk_dialog_pack_button_in_action_area(dialog, button, response_id, expand, 
fill, padding, pack_at_end)
+etk_dialog_pack_button_in_action_area(dialog, button, response_id, group, 
fill_policy, padding)
Etk_Dialog *dialog
Etk_Button *button
int response_id
-   Etk_Boolexpand
-   Etk_Boolfill
+   Etk_Box_Group   group
+   Etk_Box_Fill_Policy fill_policy
int padding
-   Etk_Boolpack_at_end
   ALIAS:
PackButtonInActionArea=1
 
 void
-etk_dialog_pack_in_main_area(dialog, widget, expand, fill, padding, 
pack_at_end)
+etk_dialog_pack_in_main_area(dialog, widget, group, fill_policy, padding)
Etk_Dialog *dialog
Etk_Widget *widget
-   Etk_Boolexpand
-   Etk_Boolfill
+   Etk_Box_Group   group
+   Etk_Box_Fill_Policy fill_policy
int padding
-   Etk_Boolpack_at_end
   ALIAS:
PackInMainArea=1
 
 void
-etk_dialog_pack_widget_in_action_area(dialog, widget, expand, fill, padding, 
pack_at_end)
+etk_dialog_pack_widget_in_action_area(dialog, widget, group, fill_policy, 
padding)
Etk_Dialog *dialog
Etk_Widget *widget
-   Etk_Boolexpand
-   Etk_Boolfill
+   Etk_Box_Group   group
+   Etk_Box_Fill_Policy fill_policy
int padding
-   Etk_Boolpack_at_end
   ALIAS:
PackWidgetInActionArea=1
 
===
RCS file: /cvs/e/e17/libs/etk-perl/EtkTypes.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- EtkTypes.c  21 Jan 2007 01:12:44 -  1.20
+++ EtkTypes.c  12 Mar 2007 14:11:24 -  1.21
@@ -147,6 +147,7 @@
__(Etk_Viewport,  Etk::Viewport);
__(Etk_Widget,Etk::Widget);
__(Etk_Window,Etk::Window);
+   __(Etk_Box_Cell,  Etk::BoxCell);
 
__(Ecore_Timer,   Etk::Timer);
__(Evas,  Evas);
@@ -161,6 +162,7 @@
__(Tree::Col, Object);
__(Widget, Object);
 
+   __(BoxCell, Widget);
__(Colorpicker, Widget);
__(Combobox, Widget);
__(Combobox::Item, Widget);
===
RCS file: /cvs/e/e17/libs/etk-perl/typemap,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- typemap 8

E CVS: libs/etk-perl leviathan

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : leviathan
Project : e17
Module  : libs/etk-perl

Dir : e17/libs/etk-perl/lib/Etk


Modified Files:
Constants.pm 


Log Message:
Combobox changes

===
RCS file: /cvs/e/e17/libs/etk-perl/lib/Etk/Constants.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- Constants.pm22 Feb 2007 15:59:49 -  1.15
+++ Constants.pm12 Mar 2007 14:11:24 -  1.16
@@ -278,8 +278,8 @@
 
 # entry
 use constant {
-   ImagePrimary=1,
-   ImageSecondary=2
+   ImagePrimary=0,
+   ImageSecondary=1
 };
 
 # popup window



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e


Modified Files:
xnest.sh 


Log Message:
Patch from morlenxus to allow setting enlightenment options directly as
xnest.sh arguments.

===
RCS file: /cvs/e/e17/apps/e/xnest.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- xnest.sh19 Nov 2006 15:43:58 -  1.14
+++ xnest.sh12 Mar 2007 14:29:56 -  1.15
@@ -7,24 +7,23 @@
 disp_num=:1 # Which display do you want the xnest to be on?
 
 main=$DISPLAY
-display= -display $disp_num
 tmp=`mktemp` || exit 1
-/bin/echo -e run\nbt\nq\ny  $tmp
+echo -e run\nbt\nq\ny  $tmp
 
-case $@ in
-   ) action=gdb -x $tmp ; main=$disp_num ; display=  ;;
-   -b)   action=gdb -x $tmp ; main=$disp_num ; display=  ;;
-   -c)   action=cgdb ; main=$disp_num ; display=  ;;
-   -d)   action=ddd -display $main ; display= ;;
-   -e)   action= ;;
-   -g)   action=gdb ; main=$disp_num ; display=  ;;
+case $1 in
+   ) action=gdb -x $tmp --args ; main=$disp_num ;;
+   -b)   action=gdb -x $tmp --args ; main=$disp_num ;;
+   -c)   action=cgdb ; main=$disp_num ;;
+   -d)   action=ddd -display $main --args ;;
+   -e)   action= ; e_args=-display $disp_num ;;
+   -g)   action=gdb --args ; main=$disp_num ;;
-l)   action=valgrind --tool=memcheck --leak-check=yes 
--show-reachable=yes --log-file=valgrind_log ;;
-m)   action=valgrind --tool=memcheck --log-file=valgrind_log ;;
-   -p)   action=memprof --display=$main ; main=$disp_num ; display= 
;;
-   -r)   action=memprof_raster --display=$main ; main=$disp_num ; 
display= ;;
+   -p)   action=memprof --display=$main ; main=$disp_num ;;
+   -r)   action=memprof_raster --display=$main ; main=$disp_num ;;
-s)   action=strace -F -o strace_log ;;
-   -v)   action=valkyrie -display $main ; main=$disp_num ; display= 
;;
-   *)  echo -e Usage : xnest.sh [option]
+   -v)   action=valkyrie -display $main ; main=$disp_num ;;
+   *)  echo -e Usage : xnest.sh [debugger] ([enlightenment options])
echo -e \tdefault option is -b
echo -e \t-b use text debugger with auto backtrace\tgdb
echo -e \t-c use curses debugger\t\t\t\tcgdb
@@ -38,19 +37,18 @@
echo -e \t-s show syscalls\t\t\t\tstrace
echo -e \t-v GUI memory check\t\t\t\tvalkyrie
echo -e 
-   echo -e You need to add \-display $disp_num\ as the run 
arguments for the GUI debugger.
echo -e When you have finished with the text debugger, use the 
q command to quit.
echo -e The valgrind options will leave a log file with a name 
beginning with valgrind_log
exit
;;
 esac
-
+e_args=`echo -- $@ | cut -d' ' -f2-` $e_args
 
 Xnest $disp_num -ac 
 
 sleep 2   # Someone reported that it starts E before X has started properly.
 
-export DISPLAY=$main; export E_START=enlightenment_start; $action 
enlightenment $display
+export DISPLAY=$main; export E_START=enlightenment_start; $action 
enlightenment $e_args
 
 rm -f $tmp
 killall -TERM Xnest



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_main.c 


Log Message:
Small patch from morlenxus to show the user a dialog when a problem module
causes crashes. I modified a bit so that the message still gets sent to
stdout  shows the dialog.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -3 -r1.201 -r1.202
--- e_main.c2 Mar 2007 17:00:20 -   1.201
+++ e_main.c12 Mar 2007 14:46:05 -  1.202
@@ -742,6 +742,13 @@
 modules from your configuration. The modulebr
 configuration dialog should let you select yourbr
 modules again.));
+   e_util_dialog_show
+ (_(Enlightenment crashed early on start and has been restarted),
+  _(Enlightenment crashed early on start and has been restarted.br
+All modules have been disabled and will not be loaded to helpbr
+remove any problem modules from your configuration.brbr
+The module configuration dialog should let you select yourbr
+modules again.));
e_config_save_queue();
  }
TS(gadcon);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_apps_error.c 


Log Message:
Add a label telling user where the error log will be saved.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_apps_error.c  28 Dec 2006 14:15:10 -  1.21
+++ e_apps_error.c  12 Mar 2007 15:32:36 -  1.22
@@ -17,11 +17,11 @@
 static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data 
*cfdata);
 static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, 
E_Config_Dialog_Data *cfdata);
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, 
E_Config_Dialog_Data *cfdata);
+static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, 
Ecore_Exe_Event_Data_Line *lines);
+static void _dialog_save_cb(void *data, void *data2);
 #if 0
 static void _dialog_resize(void *data, Evas *e, Evas_Object *obj, void 
*event_info);
 #endif
-static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, 
Ecore_Exe_Event_Data_Line *lines);
-static void _dialog_save_cb(void *data, void *data2);
 
 EAPI void
 e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
@@ -228,6 +228,7 @@
 static Evas_Object *
 _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data 
*cfdata)
 {
+   char buf[4096];
int error_length = 0;
Evas_Object *o, *ob, *os;
E_App_Autopsy *app;
@@ -253,8 +254,14 @@
e_widget_list_object_append(o, ob, 1, 1, 0.5);
  }
 
-   ob = e_widget_button_add(evas, _(Save This Message), enlightenment/run, 
_dialog_save_cb, app, cfdata);
+   ob = e_widget_button_add(evas, _(Save This Message), enlightenment/run, 
+   _dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
+   
+   snprintf(buf, sizeof(buf), _(This error log will be saved as %s/%s.log), 
+   e_user_homedir_get(), app-app-name);
+   ob = e_widget_label_add(evas, buf);
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
 
return o;
 }
@@ -262,6 +269,7 @@
 static Evas_Object *
 _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, 
E_Config_Dialog_Data *cfdata)
 {
+   char buf[4096];
int read_length = 0;
int error_length = 0;
Evas_Object *o, *of, *ob, *ot;
@@ -329,6 +337,11 @@
 
ob = e_widget_button_add(evas, _(Save This Message), enlightenment/run, 
_dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
+
+   snprintf(buf, sizeof(buf), _(This error log will be saved as %s/%s.log), 
+   e_user_homedir_get(), app-app-name);
+   ob = e_widget_label_add(evas, buf);
+   e_widget_list_object_append(o, ob, 1, 1, 0.5);
 
return o;
 }



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_int_config_dpms.c 


Log Message:
No need to set resizable to 0 explicitly as all config dialogs are
non-resizable by default unless told otherwise.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_dpms.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_dpms.c 11 Mar 2007 05:54:07 -  1.4
+++ e_int_config_dpms.c 12 Mar 2007 15:41:54 -  1.5
@@ -46,9 +46,10 @@
if (ecore_x_dpms_capable_get()) return 1;

if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
-   dpms_dialog = 
e_dialog_new(e_container_current_get(e_manager_current_get()), E, 
_dpms_dialog);
+   dpms_dialog = 
e_dialog_new(e_container_current_get(e_manager_current_get()), 
+ E, _dpms_dialog);
if (!dpms_dialog) return 0;
-  
+
e_dialog_title_set(dpms_dialog, _(Display Power Management Signaling));
e_dialog_text_set(dpms_dialog, _(The current display server does not br
have the DPMS extension.));
@@ -186,8 +187,6 @@
e_widget_framelist_object_append(of, ob);
 
e_widget_list_object_append(o, of, 1, 1, 0.5);
-   
-   e_dialog_resizable_set(cfd-dia, 0);
return o;   
 }
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/engrave davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/engrave

Dir : e17/libs/engrave/src/lib


Modified Files:
engrave_canvas.c 


Log Message:
Make engrave change font again

===
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- engrave_canvas.c19 Jan 2007 08:44:59 -  1.10
+++ engrave_canvas.c12 Mar 2007 21:13:26 -  1.11
@@ -442,7 +442,7 @@
 {
int r, g, b, a;
const char *font_key;
-   const char *font_name;
+   char font_name[4096];
Engrave_Part *ep = (eps ? eps-parent : NULL);
Engrave_Group *eg = (ep ? ep-parent : NULL);
Engrave_File *ef = (eg ? eg-parent : NULL);
@@ -452,10 +452,9 @@
 
   font_key = engrave_part_state_text_font_get(eps);
   efont = engrave_file_font_by_name_find(ef, font_key);
-  font_name = engrave_font_path_get(efont);
-
-   }else 
-  font_name = Vera.ttf;
+  snprintf(font_name,4096,%s/%s,engrave_file_font_dir_get(ef),
+   engrave_font_path_get(efont));
+   }
 
evas_object_text_text_set(ep-object, 
  engrave_part_state_text_text_get(eps));



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl ningerso

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_tree2.h 


Log Message:
Make tree nodes inherit from MVC as they were duplicating most of the fields.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- ewl_tree2.h 4 Mar 2007 00:52:01 -   1.42
+++ ewl_tree2.h 12 Mar 2007 22:22:36 -  1.43
@@ -221,14 +221,12 @@
  */
 struct Ewl_Tree2_Node
 {
-   Ewl_Container container;
+   Ewl_MVC mvc;
 
Ewl_Widget *tree;   /** The parent tree */
Ewl_Widget *row;/** The row this node is for */
Ewl_Widget *handle; /** the expansion handle */
 
-   Ewl_Model *model;   /** The model used to make this row */
-   void *data; /** The data that this nodes row comes 
from */
unsigned int row_num;   /** The row number of this row */
Ewl_Tree_Node_Flags expanded;
 };



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl ningerso

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_misc.c 


Log Message:
Combine the embed lookup with the parent configure check traversal.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- ewl_misc.c  5 Mar 2007 14:12:58 -   1.87
+++ ewl_misc.c  12 Mar 2007 22:26:04 -  1.88
@@ -737,31 +737,38 @@
 * Widget scheduled for destruction, configuration, or is being called
 * within a configure callback.
 */
-   /*
-   if (ewl_object_queued_has(o, EWL_FLAG_QUEUED_DSCHEDULED) ||
-   ewl_object_queued_has(o, EWL_FLAG_QUEUED_CSCHEDULED) ||
-   ewl_object_queued_has(o, EWL_FLAG_QUEUED_CPROCESS))
-   */
-   if (ewl_object_queued_has(o, EWL_FLAG_QUEUED_DSCHEDULED |
+   if (ewl_object_queued_has(o, (EWL_FLAG_QUEUED_DSCHEDULED |
EWL_FLAG_QUEUED_CSCHEDULED |
-   EWL_FLAG_QUEUED_CPROCESS))
-   DRETURN(DLEVEL_STABLE);
-
-   emb = ewl_embed_widget_find(w);
-   if (!emb)
+   EWL_FLAG_QUEUED_CPROCESS)))
DRETURN(DLEVEL_STABLE);
 
/*
-* Check for any parent scheduled for configuration.
+* Check for any parent scheduled for configuration, and look for the
+* top level widget in this branch.
 */
search = w;
-   while ((search = search-parent)) {
+   while (search-parent) {
+   search = search-parent;
if (ewl_object_queued_has(EWL_OBJECT(search),
EWL_FLAG_QUEUED_CSCHEDULED))
DRETURN(DLEVEL_TESTING);
}
 
/*
+* Verify top level widget is not queued for configure.
+*/
+   if (ewl_object_queued_has(EWL_OBJECT(search),
+   EWL_FLAG_QUEUED_CSCHEDULED))
+   DRETURN(DLEVEL_TESTING);
+
+   /*
+* Stop processing if this widget doesn't have a valid embed parent.
+*/
+   if (!ewl_object_toplevel_get(EWL_OBJECT(search)))
+   DRETURN(DLEVEL_STABLE);
+   emb = EWL_EMBED(search);
+
+   /*
 * No parent of this widget is queued so add it to the queue. All
 * children widgets should have been removed by this point.
 */
@@ -806,8 +813,7 @@
 {
DENTER_FUNCTION(DLEVEL_STABLE);
 
-   if (ewl_object_flags_get(EWL_OBJECT(w),
-EWL_FLAG_PROPERTY_TOPLEVEL)) {
+   if (ewl_object_toplevel_get(EWL_OBJECT(w))) {
ewl_object_size_request(EWL_OBJECT(w),
ewl_object_current_w_get(EWL_OBJECT(w)),
ewl_object_current_h_get(EWL_OBJECT(w)));



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ewl dj2

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_tree2.c 


Log Message:
- only show the expansion node if the model is expandable

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- ewl_tree2.c 12 Mar 2007 22:23:02 -  1.64
+++ ewl_tree2.c 12 Mar 2007 22:36:28 -  1.65
@@ -1261,10 +1261,15 @@
 void
 ewl_tree2_node_expandable_set(Ewl_Tree2_Node *node, void *data)
 {
+   Ewl_Model *model;
+
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(node, node);
 
-   if (!node-handle)
+   model = ewl_mvc_model_get(EWL_MVC(node));
+   /* we only create the handle if it doesn't exist and the model has
+* a function to query for expandability */
+   if (!node-handle  model-expansion.is)
{
node-handle = ewl_expansion_new();
ewl_object_fill_policy_set(EWL_OBJECT(node-handle),
@@ -1274,19 +1279,23 @@
ewl_container_child_prepend(EWL_CONTAINER(node), node-handle);
ewl_widget_show(node-handle);
}
-   if (data)
-   {
-   ewl_callback_append(node-handle, EWL_CALLBACK_VALUE_CHANGED,
-   ewl_tree2_cb_node_toggle, node);
-   ewl_widget_enable(node-handle);
-   ewl_expansion_expandable_set(EWL_EXPANSION(node-handle), TRUE);
-   }
-   else if (node-handle  !data)
+
+   if (node-handle)
{
-   ewl_callback_del(node-handle, EWL_CALLBACK_VALUE_CHANGED,
-   ewl_tree2_cb_node_toggle);
-   ewl_widget_disable(node-handle);
-   ewl_expansion_expandable_set(EWL_EXPANSION(node-handle), 
FALSE);
+   if (data)
+   {
+   ewl_callback_append(node-handle, 
EWL_CALLBACK_VALUE_CHANGED,
+   
ewl_tree2_cb_node_toggle, node);
+   ewl_widget_enable(node-handle);
+   
ewl_expansion_expandable_set(EWL_EXPANSION(node-handle), TRUE);
+   }
+   else 
+   {
+   ewl_callback_del(node-handle, 
EWL_CALLBACK_VALUE_CHANGED,
+   
ewl_tree2_cb_node_toggle);
+   ewl_widget_disable(node-handle);
+   
ewl_expansion_expandable_set(EWL_EXPANSION(node-handle), FALSE);
+   }
}
 
DLEAVE_FUNCTION(DLEVEL_STABLE);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/ephoto titan

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
ephoto_list_view.c ephoto_main.c 


Log Message:
Make thumbnails larger.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_list_view.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ephoto_list_view.c  11 Mar 2007 01:14:47 -  1.10
+++ ephoto_list_view.c  13 Mar 2007 00:52:16 -  1.11
@@ -97,7 +97,7 @@
image_pixels_int_get(image, width, height);

img = add_image(w, image, 1, NULL, NULL);
-   ewl_image_constrain_set(EWL_IMAGE(img), 48);
+   ewl_image_constrain_set(EWL_IMAGE(img), 64);
ewl_widget_name_set(w, image);

size = ecore_file_size(image);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_main.c   11 Mar 2007 09:19:53 -  1.11
+++ ephoto_main.c   13 Mar 2007 00:52:16 -  1.12
@@ -204,6 +204,7 @@
 imagef = ecore_dlist_current(em-images);
 
 thumb = add_image(em-fbox, imagef, 1, set_info, NULL);
+   ewl_image_constrain_set(EWL_IMAGE(thumb), 64);
ewl_object_alignment_set(EWL_OBJECT(thumb), 
EWL_FLAG_ALIGN_CENTER);
ewl_widget_name_set(thumb, imagef);
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore pfritz

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : pfritz
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore


Modified Files:
Ecore_Str.h ecore_str.c 


Log Message:
add ecore_str_split(), thanks to rookmoot

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore_Str.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Ecore_Str.h 17 Feb 2007 06:25:53 -  1.4
+++ Ecore_Str.h 13 Mar 2007 01:17:33 -  1.5
@@ -46,7 +46,9 @@
 EAPI int ecore_str_has_prefix(const char *str, const char *prefix);
 
 EAPI int ecore_str_has_suffix(const char *str, const char *suffix);
-
+EAPI char **ecore_str_split(const char *string, const char *delimiter, 
+int max_tokens);
+EAPI void ecore_str_vector_free(char **str_array);
 
 #ifdef __cplusplus
 }
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_str.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_str.c 17 Feb 2007 06:25:53 -  1.5
+++ ecore_str.c 13 Mar 2007 01:17:33 -  1.6
@@ -20,7 +20,8 @@
 #include sys/types.h
 #include string.h
 
-# include ecore_private.h
+#include ecore_private.h
+#include Ecore_Data.h
 
 /*
  * Copy src to string dst of size siz.  At most siz-1 characters
@@ -129,3 +130,95 @@
 
return (strncmp(str + str_len - suffix_len, suffix, suffix_len) == 0);
 }
+
+/**
+ * Splits a string into a maximum of max_tokens pieces, using the given
+ * delimiter. If max_tokens is reached, the final string in the returned
+ * string array contains the remainder of string.
+ *
+ * @param string  A string to split.
+ * @param delimiter   A string which specifies the places at which to split 
the 
+ *string. The delimiter is not included in any of the 
+ *resulting strings, unless max_tokens is reached.
+ * @param max_tokens  The maximum number of strings to split string into. 
+ *If this is less than 1, the string is split completely.
+ * @returnA newly-allocated NULL-terminated array of strings.
+ *Use ecore_str_vector_free() to free it.
+ */
+char**
+ecore_str_split(const char *string, const char *delimiter, int max_tokens)
+{
+   char **str_array = NULL;
+   char *s;
+   size_t n = 0;
+   int max = max_tokens;
+   const char *remainder;
+   size_t delimiter_len;   
+
+   CHECK_PARAM_POINTER_RETURN(string, string, NULL);
+   CHECK_PARAM_POINTER_RETURN(delimiter, delimiter, NULL);
+  
+  /* on the first run we just count the number of the strings we'll finally
+   * have */ 
+   remainder = string;
+   s = strstr(remainder, delimiter);
+   if (s)
+   {
+   delimiter_len = strlen(delimiter);   
+   while (--max_tokens  s)
+   {
+ remainder = s + delimiter_len;
+ s = strstr(remainder, delimiter);
+ n++;
+   }
+   }
+   if (*string != '\0') n++;
+   
+   str_array = malloc(sizeof(char *)*(n + 1));
+   str_array[n] = NULL;
+
+   /* reset to the initial values */
+   n = 0;
+   max_tokens = max;
+   remainder = string;
+   s = strstr(remainder, delimiter);
+   if (s)
+   {
+   while (--max_tokens  s)
+   {
+ size_t len; 
+ char *new_string;
+
+ len = s - remainder;
+ new_string = malloc(sizeof(char)*(len + 1));
+ memcpy(new_string, remainder, len);
+ new_string[len] = 0;
+ str_array[n++] = new_string;
+
+ remainder = s + delimiter_len;
+ s = strstr(remainder, delimiter);
+   }
+   }
+   if (*string != '\0') str_array[n] = strdup(remainder);
+
+   return str_array;
+}
+
+/**
+ * Free an array of strings and the array itself
+ *
+ * @param str_array An NULL-terminated array of strings to free.
+ */
+void
+ecore_str_vector_free(char **str_array)
+{
+   CHECK_PARAM_POINTER(str_array, str_array);
+   int i;
+
+   for(i=0; str_array[i] != NULL; i++)
+   {
+   FREE(str_array[i]);
+   }
+   FREE(str_array);
+}
+



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore_file


Modified Files:
ecore_file.c 


Log Message:


fix realpath

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- ecore_file.c1 Mar 2007 16:17:04 -   1.55
+++ ecore_file.c13 Mar 2007 02:28:18 -  1.56
@@ -238,7 +238,7 @@
char  buf[PATH_MAX];
struct stat st;
 
-   if (!realpath(file, buf) || stat(buf, st)) return strdup();
+   if (!realpath(file, buf)) return strdup();
return strdup(buf);
 }
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_gstreamer.c emotion_xine.c emotion_xine.h 
emotion_xine_vo_out.c 


Log Message:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- emotion_gstreamer.c 18 Jul 2006 19:04:38 -  1.19
+++ emotion_gstreamer.c 13 Mar 2007 02:30:14 -  1.20
@@ -16,7 +16,8 @@
 /* Interface */
 
 static unsigned char  em_init (Evas_Object *obj,
-   void   
**emotion_video);
+   void   
**emotion_video,
+  Emotion_Module_Options *opt);
 
 static intem_shutdown (void   *video);
 
@@ -224,7 +225,8 @@
 
 static unsigned char
 em_init(Evas_Object  *obj,
-   void**emotion_video)
+   void**emotion_video,
+   Emotion_Module_Options *opt)
 {
Emotion_Gstreamer_Video *ev;
GError  *error;
@@ -1249,7 +1251,8 @@
 unsigned char
 module_open(Evas_Object   *obj,
Emotion_Video_Module **module,
-   void **video)
+   void **video,
+   Emotion_Module_Options *opt)
 {
if (!module)
   return 0;
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- emotion_xine.c  3 Jan 2007 06:24:25 -   1.31
+++ emotion_xine.c  13 Mar 2007 02:30:14 -  1.32
@@ -2,228 +2,395 @@
 #include emotion_private.h
 #include emotion_xine.h
 
-static unsigned char em_init(Evas_Object *obj, void **emotion_video);
-static int em_shutdown(void *video);
-static unsigned char em_file_open(const char *file, Evas_Object *obj, void 
*video);
-static void em_file_close(void *ef);
-static void em_play(void *ef, double pos);
-static void em_stop(void *ef);
-static void em_size_get(void *ef, int *w, int *h);
-static void em_pos_set(void *ef, double pos);
-static void em_vis_set(void  *video, Emotion_Vis vis);
-static double em_len_get(void *ef);
-static int em_fps_num_get(void *ef);
-static int em_fps_den_get(void *ef);
-static double em_fps_get(void *ef);
-static double em_pos_get(void *ef);
-static Emotion_Vis em_vis_get(void *video);
-static double em_ratio_get(void *ef);
-static int em_seekable(void *ef);
-static void em_frame_done(void *ef);
-static Emotion_Format em_format_get(void *ef);
-static void em_video_data_size_get(void *ef, int *w, int *h);
-static int em_yuv_rows_get(void *ef, int w, int h, unsigned char **yrows, 
unsigned char **urows, unsigned char **vrows);
-static int em_bgra_data_get(void *ef, unsigned char **bgra_data);
-static void em_event_feed(void *ef, int event);
-static void em_event_mouse_button_feed(void *ef, int button, int x, int y);
-static void em_event_mouse_move_feed(void *ef, int x, int y);
-static int em_video_channel_count(void *ef);
-static void em_video_channel_set(void *ef, int channel);
-static int em_video_channel_get(void *ef);
-static const char *em_video_channel_name_get(void *ef, int channel);
-static void em_video_channel_mute_set(void *ef, int mute);
-static int em_video_channel_mute_get(void *ef);
-static int em_audio_channel_count(void *ef);
-static void em_audio_channel_set(void *ef, int channel);
-static int em_audio_channel_get(void *ef);
-static const char *em_audio_channel_name_get(void *ef, int channel);
-static void em_audio_channel_mute_set(void *ef, int mute);
-static int em_audio_channel_mute_get(void *ef);
-static void em_audio_channel_volume_set(void *ef, double vol);
-static double em_audio_channel_volume_get(void *ef);
-static int em_spu_channel_count(void *ef);
-static void em_spu_channel_set(void *ef, int channel);
-static int em_spu_channel_get(void *ef);
-static const char *em_spu_channel_name_get(void *ef, int channel);
-static void em_spu_channel_mute_set(void *ef, int mute);
-static int em_spu_channel_mute_get(void *ef);
-static int em_chapter_count(void *ef);
-static void em_chapter_set(void *ef, int chapter);
-static int em_chapter_get(void *ef);
-static const char *em_chapter_name_get(void *ef, int chapter);
-static void em_speed_set(void *ef, double speed);
-static double em_speed_get(void *ef);
-static int em_eject(void *ef);
-static const char *em_meta_get(Emotion_Xine_Video *ev, int meta);
-
-static void *_em_seek(void *par);
-static int   _em_fd_active   (void *data, Ecore_Fd_Handler *fdh);
-static void  _em_event   (void *data, const xine_event_t *event);

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

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:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/lib/Emotion.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- Emotion.h   6 Sep 2006 07:12:24 -   1.11
+++ Emotion.h   13 Mar 2007 02:30:14 -  1.12
@@ -87,6 +87,7 @@

 /* api calls available */
 EAPI Evas_Object *emotion_object_add   (Evas *evas);
+EAPI void emotion_object_module_option_set (Evas_Object *obj, 
const char *opt, const char *val);
 EAPI Evas_Boolemotion_object_init  (Evas_Object *obj, 
const char *module_filename);
 EAPI void emotion_object_file_set  (Evas_Object *obj, 
const char *filename);
 EAPI const char  *emotion_object_file_get  (Evas_Object *obj);
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- emotion_private.h   14 May 2006 14:32:02 -  1.12
+++ emotion_private.h   13 Mar 2007 02:30:14 -  1.13
@@ -23,6 +23,7 @@
 typedef enum _Emotion_Format Emotion_Format;
 typedef enum _Emotion_Vis Emotion_Vis;
 typedef struct _Emotion_Video_Module Emotion_Video_Module;
+typedef struct _Emotion_Module_Options Emotion_Module_Options;
 
 enum _Emotion_Format
 {
@@ -55,9 +56,15 @@
   EMOTION_VIS_LIBVISUAL_PLASMA
 };
 
+struct _Emotion_Module_Options
+{
+   unsigned char no_video : 1;
+   unsigned char no_audio : 1;
+};
+
 struct _Emotion_Video_Module
 {
-   unsigned char (*init) (Evas_Object *obj, void **video);
+   unsigned char (*init) (Evas_Object *obj, void **video, 
Emotion_Module_Options *opt);
int(*shutdown) (void *video);
unsigned char  (*file_open) (const char *file, Evas_Object *obj, void 
*video);
void   (*file_close) (void *ef);
===
RCS file: /cvs/e/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- emotion_smart.c 3 Jan 2007 06:24:25 -   1.24
+++ emotion_smart.c 13 Mar 2007 02:30:14 -  1.25
@@ -62,6 +62,8 @@
   int button_num;
   int button;
} spu;
+
+   Emotion_Module_Options module_options;
 };
 
 static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void 
*event_info);
@@ -95,18 +97,20 @@
 {
void *handle;
char buf[4096];
+   Smart_Data *sd;

+   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
snprintf(buf, sizeof(buf), %s%s, PACKAGE_LIB_DIR/emotion/,
name);
handle = dlopen(buf, RTLD_NOW | RTLD_GLOBAL);
if (handle)
  {
-   unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module 
**, void **);
+   unsigned char (*func_module_open)(Evas_Object *, Emotion_Video_Module 
**, void **, Emotion_Module_Options *);

func_module_open = dlsym(handle, module_open);
if (func_module_open)
  {
-if (func_module_open(obj, mod, video))
+if (func_module_open(obj, mod, video, (sd-module_options)))
   {
  (*mod)-handle = handle;
  return 1;
@@ -132,7 +136,12 @@
handle = mod-handle;
module_close = dlsym(handle, module_close);
if ((module_close)  (video)) module_close(mod, video);
-   dlclose(handle);
+   /* FIXME: we can't go dlclosing here as a thread still may be running from
+* the module - this in theory will leak- but it shouldnt be too bad and
+* mean that once a module is dlopened() it cant be closed - its refcount
+* will just keep going up
+*/
+//   dlclose(handle);
 }
 
 /***/
@@ -148,6 +157,23 @@
return evas_object_smart_add(evas, smart);   
 }
 
+EAPI void
+emotion_object_module_option_set(Evas_Object *obj, const char *opt, const char 
*val)
+{
+   Smart_Data *sd;
+   
+   E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
+   if ((!opt) || (!val)) return;
+   if (!strcmp(opt, video))
+ {
+   if (!strcmp(val, off)) sd-module_options.no_video = 1;
+ }
+   else if (!strcmp(opt, audio))
+ {
+   if (!strcmp(val, off)) sd-module_options.no_audio = 1;
+ }
+}
+
 EAPI Evas_Bool
 emotion_object_init(Evas_Object *obj, const char *module_filename)
 {
@@ -172,10 +198,12 @@
sd-seek_pos = 0;
sd-len = 0;
 
-   if (!sd-module || !sd-video)
- if (!_emotion_module_open(module_filename, obj, sd-module, sd-video))
-   return 0;
-
+   if ((!sd-module) || (!sd-video))
+ {
+   if (!_emotion_module_open(module_filename, obj,
+ sd-module, sd-video))
+

E CVS: libs/emotion raster

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/bin


Modified Files:
emotion_test_main.c 


Log Message:


move emotion to fix latency on video load, deadlocks on stop/shutdown etc.

===
RCS file: /cvs/e/e17/libs/emotion/src/bin/emotion_test_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- emotion_test_main.c 30 Sep 2006 10:18:31 -  1.14
+++ emotion_test_main.c 13 Mar 2007 02:30:14 -  1.15
@@ -477,7 +477,7 @@
emotion_object_size_get(obj, iw, ih);
ratio = emotion_object_ratio_get(obj);
printf(HANDLE %ix%i @ %3.3f\n, iw, ih, ratio);
-   if (ratio  0.0) iw = ih * ratio;
+   if (ratio  0.0) iw = (ih * ratio) + 0.5;
edje_extern_object_min_size_set(obj, iw, ih);
edje_object_part_swallow(oe, video_swallow, obj);
edje_object_size_min_calc(oe, w, h);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: e kwo

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
desktops.c 


Log Message:
Fix various updates when external background changes (was disabled?).

===
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -3 -r1.255 -r1.256
--- desktops.c  17 Jan 2007 01:10:42 -  1.255
+++ desktops.c  13 Mar 2007 03:11:30 -  1.256
@@ -1973,7 +1973,9 @@
   ev-xany.window, pmap);
if (ev-xany.window != VRoot.xwin)
   return;
+#if 0  /* FIXME - Remove? Or was this here for a 
reason? */
dsk-bg.pmap_set = pmap;
+#endif
if (pmap == dsk-bg.pmap)
   return;
if (pmap == Mode.root.ext_pmap)



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/engrave davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/engrave

Dir : e17/libs/engrave/src/lib


Modified Files:
engrave_canvas.c 


Log Message:
Better solaris compatibility

===
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_canvas.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- engrave_canvas.c12 Mar 2007 21:13:26 -  1.11
+++ engrave_canvas.c13 Mar 2007 03:53:55 -  1.12
@@ -442,18 +442,21 @@
 {
int r, g, b, a;
const char *font_key;
-   char font_name[4096];
+   char font_name[PATH_MAX];
Engrave_Part *ep = (eps ? eps-parent : NULL);
Engrave_Group *eg = (ep ? ep-parent : NULL);
Engrave_File *ef = (eg ? eg-parent : NULL);
 
-   if (ef) {
-  Engrave_Font * efont;
+   if (ef)
+   {
+  Engrave_Font * efont = NULL;
 
   font_key = engrave_part_state_text_font_get(eps);
   efont = engrave_file_font_by_name_find(ef, font_key);
-  snprintf(font_name,4096,%s/%s,engrave_file_font_dir_get(ef),
+  snprintf(font_name,PATH_MAX,%s/%s,engrave_file_font_dir_get(ef),
engrave_font_path_get(efont));
+   }else{
+  strcpy(font_name,Vera.ttf);
}
 
evas_object_text_text_set(ep-object, 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: proto davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto

Dir : e17/proto/edje_editor/src/bin


Modified Files:
callbacks.c evas.c interface.c interface.h main.c main.h 


Log Message:
 * All new loading and saving routines of edj file
 * Reflect etk_combobox api change
 * Reflect etk_dialog api change
 * Re-enable image/font insert/manage
 * I have to test and review all this :)


===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- callbacks.c 5 Feb 2007 07:44:18 -   1.15
+++ callbacks.c 13 Mar 2007 04:10:33 -  1.16
@@ -38,23 +38,20 @@
{
   case TOOLBAR_NEW:
  printf(Clicked signal on Toolbar Button 'New' EMITTED\n);
- //ShowFilechooser(FILECHOOSER_NEW);
- ShowAlert(Not yet implemented);
+ system(edje_editor );
  break;
   case TOOLBAR_OPEN:
  printf(Clicked signal on Toolbar Button 'Open' EMITTED\n);
  //ShowAlert(Not yet implemented);
  ShowFilechooser(FILECHOOSER_OPEN);
  break;
-  case TOOLBAR_SAVE:
+  case TOOLBAR_SAVE_EDC:
  printf(Clicked signal on Toolbar Button 'Save' EMITTED\n);
- //SaveEDC(NULL);
- ShowAlert(Not yet implemented);
+ ShowFilechooser(FILECHOOSER_SAVE_EDC);
  break;
-  case TOOLBAR_SAVE_AS:
- printf(Clicked signal on Toolbar Button 'Save as' EMITTED\n);
- //ShowFilechooser(FILECHOOSER_SAVE_AS);
- ShowAlert(Not yet implemented);
+  case TOOLBAR_SAVE_EDJ:
+ printf(Clicked signal on Toolbar Button 'Save edj' EMITTED\n);
+ ShowFilechooser(FILECHOOSER_SAVE_EDJ);
  break;
   case TOOLBAR_ADD:
  printf(Clicked signal on Toolbar Button 'Add' EMITTED\n);
@@ -108,16 +105,12 @@
  //printf(ZOOM: %d %d - %d %d\n,x,y,w,h);
  break;
   case TOOLBAR_IMAGE_FILE_ADD:
- ShowAlert(Not yet implemented =));
- //printf(INSERT IMAGE\n);
- //if (EDCFile-len  0) ShowFilechooser(FILECHOOSER_IMAGE);
- //e   lse ShowAlert(You have to save the file once for insert 
image.);
-break;
+ if (engrave_file_image_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_IMAGE);
+ else ShowAlert(You have to save the file once for insert image.);
+ break;
   case TOOLBAR_FONT_FILE_ADD:
- ShowAlert(Not yet implemented =));
- //printf(INSERT FONT\n);
- //i   f (EDCFile-len  0) ShowFilechooser(FILECHOOSER_FONT);
- //else ShowAlert(You have to save the file once for insert font.);
+ if (engrave_file_font_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_FONT);
+ else ShowAlert(You have to save the file once for insert font.);
  break;
}
 }
@@ -240,7 +233,7 @@
   ev_resize_fake(w,h);
   edje_object_part_text_set (EV_fakewin, title, Cur.eg-name);
 
-  engrave_canvas_current_group_set (ecanvas, Cur.eg);
+  engrave_canvas_current_group_set (engrave_canvas, Cur.eg);
}
ev_redraw();
 }
@@ -580,22 +573,20 @@
 }
 
 /* Text Frame Callbacks */
-void on_FontComboBox_changed(Etk_Combobox *combobox, void *data){
+void 
+on_FontComboBox_changed(Etk_Combobox *combobox, void *data)
+{
printf(Changed Signal on FontComboBox EMITTED \n);
-/*char* font;
-   if ((font = etk_combobox_item_data_get(etk_combobox_active_item_get 
(combobox{
+   Engrave_Font *ef;
+   if ((ef = 
etk_combobox_item_data_get(etk_combobox_active_item_get(combobox{
   //Set an existing font
-  if (selected_desc){
-   g_string_printf(selected_desc-text_font,%s,font);
-   ev_draw_part(selected_part);
-
+  if (Cur.eps){
+ printf(selected font: %s\n, engrave_font_name_get (ef));
+ engrave_part_state_text_font_set(Cur.eps,engrave_font_name_get(ef));
+ printf(changed font: %s\n, 
engrave_part_state_text_font_get(Cur.eps));
+ ev_redraw();
   }
}
-   else{
-  //Insert a new font in EDC
-  printf(INSERT FONT\n);
-  ShowFilechooser(FILECHOOSER_FONT);
-   } */
 }
 
 void 
@@ -618,9 +609,7 @@
 on_FontSizeSpinner_value_changed(Etk_Range *range, double value, void *data)
 {
printf(Value Changed Signal on FontSizeSpinner EMITTED (value: 
%d)\n,(int)etk_range_value_get(range));
-
engrave_part_state_text_size_set(Cur.eps,(int)etk_range_value_get(range));
-
ev_redraw();
 }
 
@@ -628,10 +617,7 @@
 on_TextEntry_text_changed(Etk_Object *object, void *data)
 {
printf(Text Changed Signal on TextEntry EMITTED (value 
%s)\n,etk_entry_text_get(ETK_ENTRY(object)));
-

engrave_part_state_text_text_set(Cur.eps,etk_entry_text_get(ETK_ENTRY(object)));
-
-
ev_redraw();
 }
 
@@ -671,7 +657,7 @@
   etk_widget_hide(UI_DurationLabel);
   etk_widget_show(UI_Param1Entry);
   etk_widget_show(UI_Param1Label);
-

E CVS: proto davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto

Dir : e17/proto/edje_editor/src/bin


Modified Files:
callbacks.c interface.c interface.h main.h 


Log Message:
 Small fixes.

===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- callbacks.c 13 Mar 2007 04:10:33 -  1.16
+++ callbacks.c 13 Mar 2007 04:43:18 -  1.17
@@ -45,8 +45,15 @@
  //ShowAlert(Not yet implemented);
  ShowFilechooser(FILECHOOSER_OPEN);
  break;
-  case TOOLBAR_SAVE_EDC:
+  case TOOLBAR_SAVE:
  printf(Clicked signal on Toolbar Button 'Save' EMITTED\n);
+ if (Cur.open_file_name)
+engrave_edj_output(Cur.ef,Cur.open_file_name);   
+ else
+ShowFilechooser(FILECHOOSER_SAVE_EDJ);
+ break;
+  case TOOLBAR_SAVE_EDC:
+ printf(Clicked signal on Toolbar Button 'Save edc' EMITTED\n);
  ShowFilechooser(FILECHOOSER_SAVE_EDC);
  break;
   case TOOLBAR_SAVE_EDJ:
@@ -96,13 +103,6 @@
  break;
   case TOOLBAR_DEBUG:
  DebugInfo(FALSE);
- //ZOOM TEST :(
- //int x,y,w,h;
- //evas_output_size_get (etk_widget_toplevel_evas_get (ETK_canvas), 
w, h);
- //evas_output_size_set (etk_widget_toplevel_evas_get (ETK_canvas), 
w+10, h+10);
- //evas_output_viewport_get (etk_widget_toplevel_evas_get 
(ETK_canvas), x, y, w, h);
- //evas_output_viewport_set (etk_widget_toplevel_evas_get 
(ETK_canvas), x+20, y+20, w+10, h+10);
- //printf(ZOOM: %d %d - %d %d\n,x,y,w,h);
  break;
   case TOOLBAR_IMAGE_FILE_ADD:
  if (engrave_file_image_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_IMAGE);
===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- interface.c 13 Mar 2007 04:10:34 -  1.19
+++ interface.c 13 Mar 2007 04:43:18 -  1.20
@@ -793,16 +793,6 @@
  ETK_CALLBACK(on_Param2Entry_text_changed));
 }
 
-void UpdateWindowTitle(void){
-/*GString *str;
-   if (EDCFile){
-  str = g_string_new();
-  g_string_printf(str,Edje Editor - %s,EDCFile-str);
-  etk_window_title_set(ETK_WINDOW(UI_MainWin), str-str);
-  g_string_free(str,TRUE);
-   } */
-}
-
 void
 ShowFilechooser(int FileChooserType)
 {
@@ -814,18 +804,23 @@
  etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose an EDJ 
or EDC file to open);
  etk_widget_hide(UI_FilechooserFileNameLabel);
  etk_widget_hide(UI_FilechooserFileNameEntry);
+ etk_widget_hide(UI_FilechooserSaveButton);
   break;
   case FILECHOOSER_IMAGE:
  etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose an 
image to import);
+ etk_widget_hide(UI_FilechooserSaveButton);
   break;
   case FILECHOOSER_FONT:
  etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose an 
font to import);
+ etk_widget_hide(UI_FilechooserSaveButton);
   break;
   case FILECHOOSER_SAVE_EDJ:
-  etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose the 
new edje name);
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose the 
new edje name);
+ etk_widget_hide(UI_FilechooserLoadButton);
   break;
   case FILECHOOSER_SAVE_EDC:
-  etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose the 
new edc name);
+ etk_window_title_set(ETK_WINDOW(UI_FileChooserDialog), Choose the 
new edc name);
+ etk_widget_hide(UI_FilechooserLoadButton);
   break;
   default:
   break;
@@ -901,7 +896,7 @@
//etk_signal_connect(row_selected, ETK_OBJECT(fav_tree), 
ETK_CALLBACK(on_FileChooser_row_selected), NULL);
 
//label
-   UI_FilechooserFileNameLabel = etk_label_new(bFile/b);
+   UI_FilechooserFileNameLabel = etk_label_new(bFull file name/b);
etk_object_properties_set (ETK_OBJECT(UI_FilechooserFileNameLabel), 
xalign,1.0,NULL);

etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),UI_FilechooserFileNameLabel,
   ETK_BOX_START, ETK_BOX_NONE,0);
@@ -911,8 +906,10 @@
etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
   UI_FilechooserFileNameEntry, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
 
-   etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
+   UI_FilechooserLoadButton = 
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
   ETK_STOCK_DOCUMENT_OPEN ,ETK_RESPONSE_OK );
+   UI_FilechooserSaveButton = 
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
+  ETK_STOCK_DOCUMENT_SAVE ,ETK_RESPONSE_OK );
etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
   ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL );
 
@@ -977,18 +974,26 @@

E CVS: proto davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto

Dir : e17/proto/edje_editor/src/bin


Modified Files:
callbacks.c interface.c main.c 


Log Message:
 Small fixs again.

===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- callbacks.c 13 Mar 2007 04:43:18 -  1.17
+++ callbacks.c 13 Mar 2007 05:27:11 -  1.18
@@ -13,12 +13,16 @@
 int current_color_object;
 
 /* Called when the window is destroyed */
-void etk_main_quit_cb(void *data){
+void 
+etk_main_quit_cb(void *data)
+{
etk_main_quit();
 }
 
 /* Called when the canvas change size */
-void on_canvas_geometry_changed(Etk_Object *canvas, const char *property_name, 
void *data){
+void 
+on_canvas_geometry_changed(Etk_Object *canvas, const char *property_name, void 
*data)
+{
int cx, cy, cw, ch;
//printf(Geometry Changed Signal on Canvas\n);
//resize canvas bg
@@ -33,7 +37,7 @@
 void
 on_AllButton_click(Etk_Button *button, void *data)
 {
-   //GList *current,*prev;
+   char cmd[1024];
switch ((int)data)
{
   case TOOLBAR_NEW:
@@ -97,9 +101,14 @@
  break;
   case TOOLBAR_PLAY:
  printf(Clicked signal on Toolbar Button 'Play' EMITTED\n);
- ShowAlert(Not yet implemented);
- //SaveEDC(NULL);
- //PlayEDC();
+ if (Cur.open_file_name) 
+ {
+snprintf(cmd,1024,edje_viewer %s ,Cur.open_file_name);
+printf(TEST IN VIEWER. cmd: %s\n,cmd);
+system(cmd);
+ }else{
+ShowAlert(You need to save the file before testing it.);
+ }
  break;
   case TOOLBAR_DEBUG:
  DebugInfo(FALSE);
@@ -1011,7 +1020,6 @@
 AddStateToTree(new_state);
 
 Cur.ep = part;
-//Cur.eps = new_state;
 
 etk_tree_row_select(ecore_hash_get(hash,new_state));
 etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1037,7 +1045,6 @@
 AddStateToTree(new_state);
 
 Cur.ep = part;
-//Cur.eps = new_state;
 
 etk_tree_row_select(ecore_hash_get(hash,new_state));
 etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1059,11 +1066,12 @@
 engrave_part_state_name_set(new_state, default, 0.0);
 engrave_part_state_rel1_relative_set(new_state, 0.1, 0.1);
 engrave_part_state_rel2_relative_set(new_state, 0.9, 0.9);
+engrave_part_state_text_size_set(new_state,16);
+engrave_part_state_text_text_set(new_state,something to say...);
 engrave_part_state_add(part,new_state);
 AddStateToTree(new_state);
 
 Cur.ep = part;
-//Cur.eps = new_state;
 
 etk_tree_row_select(ecore_hash_get(hash,new_state));
 etk_tree_row_unfold(ecore_hash_get(hash,Cur.eg));
@@ -1081,8 +1089,6 @@
 engrave_part_state_name_set(new_state, state, 0.0);
 engrave_part_state_add(Cur.ep,new_state);
 AddStateToTree(new_state);
-
-//Cur.eps = new_state;
 
 etk_tree_row_select(ecore_hash_get(hash,new_state));
 etk_tree_row_unfold(ecore_hash_get(hash,Cur.ep));
===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/interface.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- interface.c 13 Mar 2007 04:43:18 -  1.20
+++ interface.c 13 Mar 2007 05:27:11 -  1.21
@@ -453,7 +453,6 @@
//int alpha;
int r, g, b;
Etk_Combobox_Item *item = NULL;
-   char* font;
Engrave_Font *ef;
 
if (Cur.eps){
@@ -986,14 +985,12 @@
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect(clicked, ETK_OBJECT(button), 
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDJ);
 
-   
-   //SaveEDCButton
+/*//SaveEDCButton
button = etk_tool_button_new_from_stock(ETK_STOCK_DOCUMENT_SAVE);
etk_object_properties_set(ETK_OBJECT(button),label,Export edc,NULL);
etk_toolbar_append(ETK_TOOLBAR(ToolBar), button);
etk_signal_connect(clicked, ETK_OBJECT(button), 
ETK_CALLBACK(on_AllButton_click), (void*)TOOLBAR_SAVE_EDC);
-   
-   
+ */   
sep = etk_hseparator_new();
etk_toolbar_append(ETK_TOOLBAR(ToolBar), sep);
sep = etk_vseparator_new();
@@ -1020,6 +1017,7 @@
etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item), ETK_IMAGE(image));
etk_signal_connect(activated, ETK_OBJECT(menu_item), 
ETK_CALLBACK(on_AddMenu_item_activated),(void*) NEW_IMAGE);
etk_menu_shell_append(ETK_MENU_SHELL(UI_AddMenu), ETK_MENU_ITEM(menu_item));
+   
//New Text
menu_item = etk_menu_item_image_new_with_label(Text);
image = etk_image_new_from_edje(EdjeFile,TEXT.PNG);
@@ -1088,7 +1086,7 @@
//Compile Button
button =

E CVS: proto davemds

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto

Dir : e17/proto/edje_editor


Modified Files:
README TODO 


Log Message:
 Small fixs again.

===
RCS file: /cvs/e/e17/proto/edje_editor/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- README  8 Jan 2007 20:01:52 -   1.3
+++ README  13 Mar 2007 05:27:11 -  1.4
@@ -5,7 +5,7 @@
 Introduction
 ===
 
-edje_editor is an editor for the edc file based on efl
+edje_editor is an visual editor for edje file.
 This is a prealpha state, don't expect nothing.
 
 
===
RCS file: /cvs/e/e17/proto/edje_editor/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- TODO5 Feb 2007 07:44:18 -   1.5
+++ TODO13 Mar 2007 05:27:11 -  1.6
@@ -1,19 +1,15 @@
 TODO edje_editor (not a complete list...only the first in my mind)
 ===
 
+* Better save routines
+
 * Tooltips EVERYWERE  :)
 
 * Up and Down buttons must move the selected part/description up and down
(have to wait a way to move the row of the tree)
 
-* RelSpinner don't have to stop at 1.0 an 0 but ?? (maybe 100 -100)
-
-* make the interface fit well ats 1024x768
-
 * A new object add must be take a progressive (and unique) number (newrect1, 
newrect2...etc)
 
 * Text object: GLOW? GLOW2? FAR? ... does edje suport this?
 
 * Make the visible checkbox work (should the visibility apply to the EDC also? 
not only in the editor?)
-
-* Image: border don't do nothing...why?



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore pfritz

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : pfritz
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore


Modified Files:
ecore_str.c Ecore_Str.h 


Log Message:
speed up ecore_str_split(); thanks to mej

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_str.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_str.c 13 Mar 2007 01:17:33 -  1.6
+++ ecore_str.c 13 Mar 2007 06:46:14 -  1.7
@@ -136,89 +136,45 @@
  * delimiter. If max_tokens is reached, the final string in the returned
  * string array contains the remainder of string.
  *
- * @param string  A string to split.
- * @param delimiter   A string which specifies the places at which to split 
the 
+ * @param str A string to split.
+ * @param delim   A string which specifies the places at which to split 
the 
  *string. The delimiter is not included in any of the 
  *resulting strings, unless max_tokens is reached.
  * @param max_tokens  The maximum number of strings to split string into. 
  *If this is less than 1, the string is split completely.
  * @returnA newly-allocated NULL-terminated array of strings.
- *Use ecore_str_vector_free() to free it.
+ *To free it: free the first element of the array
+ *and the array itself.
  */
-char**
-ecore_str_split(const char *string, const char *delimiter, int max_tokens)
+char **
+ecore_str_split(const char *str, const char *delim, int max_tokens)
 {
-   char **str_array = NULL;
-   char *s;
-   size_t n = 0;
-   int max = max_tokens;
-   const char *remainder;
-   size_t delimiter_len;   
-
-   CHECK_PARAM_POINTER_RETURN(string, string, NULL);
-   CHECK_PARAM_POINTER_RETURN(delimiter, delimiter, NULL);
-  
-  /* on the first run we just count the number of the strings we'll finally
-   * have */ 
-   remainder = string;
-   s = strstr(remainder, delimiter);
-   if (s)
-   {
-   delimiter_len = strlen(delimiter);   
-   while (--max_tokens  s)
-   {
- remainder = s + delimiter_len;
- s = strstr(remainder, delimiter);
- n++;
-   }
-   }
-   if (*string != '\0') n++;
-   
-   str_array = malloc(sizeof(char *)*(n + 1));
-   str_array[n] = NULL;
-
-   /* reset to the initial values */
-   n = 0;
-   max_tokens = max;
-   remainder = string;
-   s = strstr(remainder, delimiter);
-   if (s)
-   {
-   while (--max_tokens  s)
-   {
- size_t len; 
- char *new_string;
+   char *s, *sep, **str_array;
+   size_t len, dlen;
+   int i;
 
- len = s - remainder;
- new_string = malloc(sizeof(char)*(len + 1));
- memcpy(new_string, remainder, len);
- new_string[len] = 0;
- str_array[n++] = new_string;
+   CHECK_PARAM_POINTER_RETURN(str, str, NULL);
+   CHECK_PARAM_POINTER_RETURN(delim, delim, NULL);
 
- remainder = s + delimiter_len;
- s = strstr(remainder, delimiter);
-   }
-   }
-   if (*string != '\0') str_array[n] = strdup(remainder);
+   if (*delim == '\0')
+  return NULL;
 
+   max_tokens = ((max_tokens = 0) ? (INT_MAX) : (max_tokens - 1));
+   len = strlen(str);
+   dlen = strlen(delim);
+   s = strdup(str);
+   str_array = malloc(sizeof(char *) * (len + 1));
+   for (i = 0; (i  max_tokens)  (sep = strstr(s, delim)); i++) 
+  {
+  str_array[i] = s;
+  s = sep + dlen;
+  *sep = 0;
+  }
+
+   str_array[i++] = s;
+   str_array = realloc(str_array, sizeof(char *) * (i + 1));
+   str_array[i] = NULL;
+ 
return str_array;
-}
-
-/**
- * Free an array of strings and the array itself
- *
- * @param str_array An NULL-terminated array of strings to free.
- */
-void
-ecore_str_vector_free(char **str_array)
-{
-   CHECK_PARAM_POINTER(str_array, str_array);
-   int i;
-
-   for(i=0; str_array[i] != NULL; i++)
-   {
-   FREE(str_array[i]);
-   }
-   FREE(str_array);
 }
 
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore_Str.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Ecore_Str.h 13 Mar 2007 01:17:33 -  1.5
+++ Ecore_Str.h 13 Mar 2007 06:46:14 -  1.6
@@ -48,7 +48,6 @@
 EAPI int ecore_str_has_suffix(const char *str, const char *suffix);
 EAPI char **ecore_str_split(const char *string, const char *delimiter, 
 int max_tokens);
-EAPI void ecore_str_vector_free(char **str_array);
 
 #ifdef __cplusplus
 }



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash

E CVS: apps/ephoto titan

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : titan
Project : e17
Module  : apps/ephoto

Dir : e17/apps/ephoto/src/bin


Modified Files:
Makefile.am ephoto.h ephoto_main.c 
Added Files:
ephoto_slideshow.c 


Log Message:
Slideshow now works.

===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 24 Feb 2007 23:30:49 -  1.2
+++ Makefile.am 13 Mar 2007 07:35:09 -  1.3
@@ -13,6 +13,7 @@
  ephoto_main.c \
  ephoto_nls.c \
  ephoto_normal_view.c \
+ ephoto_slideshow.c \
  ephoto_utils.c
 
 ephoto_CFLAGS = @ewl_cflags@ -Wall -Werror
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto.h11 Mar 2007 01:14:47 -  1.7
+++ ephoto.h13 Mar 2007 07:35:09 -  1.8
@@ -2,6 +2,7 @@
 #define _EPHOTO_H_
 
 #include config.h
+#include Ecore.h
 #include Ecore_Data.h
 #include Ecore_File.h
 #include Evas.h
@@ -85,8 +86,8 @@
 Ewl_Widget *add_normal_view(Ewl_Widget *c);
 void set_info(Ewl_Widget *w, void *event, void *data);
 
-/* Ephoto Thumbnail */
-void generate_thumbnail(Ewl_Widget *image, char *path);
+/* Ephoto Slideshow */
+void start_slideshow(Ewl_Widget *w, void *event, void *data);
 
 /* Ephoto Utilities*/
 const char *file_size_get(int size);
===
RCS file: /cvs/e/e17/apps/ephoto/src/bin/ephoto_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_main.c   13 Mar 2007 00:52:16 -  1.12
+++ ephoto_main.c   13 Mar 2007 07:35:09 -  1.13
@@ -143,12 +143,11 @@
 button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/get_exif.png, display_exif_dialog, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
ewl_attach_tooltip_text_set(button, View Exif Data);
-
 button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/stock_fullscreen.png, window_fullscreen, NULL);
 ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 
30);
ewl_attach_tooltip_text_set(button, Toggle Fullscreen);
 
-button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/x-office-presentation.png, NULL, NULL);
+button = add_button(em-toolbar, NULL, PACKAGE_DATA_DIR 
/images/x-office-presentation.png, start_slideshow, NULL);
ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)-image_object), 30, 30);
ewl_attach_tooltip_text_set(button, Start a Slideshow);
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore_x


Modified Files:
ecore_x_dpms.c 


Log Message:
Fix up ecore_x_dpms...formatting, removed the static int's for dpms version
as they are not used anywhere other than the init function. Added traps for
dpms_available before calling any dpms functions.

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dpms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_x_dpms.c  9 Mar 2007 01:11:09 -   1.2
+++ ecore_x_dpms.c  13 Mar 2007 09:30:17 -  1.3
@@ -4,17 +4,14 @@
 
 #include ecore_x_private.h
 
-
 static int _dpms_available;
-#ifdef ECORE_XDPMS
-static int _dpms_major, _dpms_minor;
-#endif
-
 
 void
 _ecore_x_dpms_init(void)
 {
 #ifdef ECORE_XDPMS
+   int _dpms_major, _dpms_minor;
+
_dpms_major = 1;
_dpms_minor = 0;
 
@@ -27,15 +24,12 @@
 #endif
 }
 
-
 /**
  * @defgroup Ecore_X_DPMS_Group X DPMS Extension Functions
  *
  * Functions related to the X DPMS extension.
  */
 
-
-
 /**
  * Checks if the X DPMS extension is available on the server.
  * @return @c 1 if the X DPMS extension is available, @c 0 otherwise.
@@ -55,10 +49,10 @@
 EAPI int
 ecore_x_dpms_capable_get(void)
 {
+   if (!_dpms_available) return 0;
return DPMSCapable(_ecore_x_disp);
 }
 
-
 /**
  * Checks the DPMS state of the display.
  * @return @c 1 if DPMS is enabled, @c 0 otherwise.
@@ -70,11 +64,11 @@
unsigned char state;
unsigned short power_lvl;
 
+   if (!_dpms_available) return 0;
DPMSInfo(_ecore_x_disp, power_lvl, state);
return state;
 }
 
-
 /**
  * Sets the DPMS state of the display.
  * @param enabled @c 0 to disable DPMS characteristics of the server, enable 
it otherwise.
@@ -83,13 +77,13 @@
 EAPI void
 ecore_x_dpms_enabled_set(int enabled)
 {
+   if (!_dpms_available) return;
if (enabled)
-  DPMSEnable(_ecore_x_disp);
+ DPMSEnable(_ecore_x_disp);
else
-  DPMSDisable(_ecore_x_disp);
+ DPMSDisable(_ecore_x_disp);
 }
 
-
 /**
  * Gets the timeouts. The values are in unit of seconds.
  * @param standby Amount of time of inactivity before standby mode will be 
invoked.
@@ -100,10 +94,11 @@
 EAPI void
 ecore_x_dpms_timeouts_get(unsigned int *standby, unsigned int *suspend, 
unsigned int *off)
 {
-   DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, (unsigned short 
*)suspend, (unsigned short *)off);
+   if (!_dpms_available) return;
+   DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, 
+  (unsigned short *)suspend, (unsigned short *)off);
 }
 
-
 /**
  * Sets the timeouts. The values are in unit of seconds.
  * @param standby Amount of time of inactivity before standby mode will be 
invoked.
@@ -114,13 +109,10 @@
 EAPI int
 ecore_x_dpms_timeouts_set(unsigned int standby, unsigned int suspend, unsigned 
int off)
 {
-   return DPMSSetTimeouts(_ecore_x_disp,
-  standby,
-  suspend,
-  off);
+   if (!_dpms_available) return 0;
+   return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off);
 }
 
-
 /**
  * Returns the amount of time of inactivity before standby mode is invoked.
  * @return The standby timeout value.
@@ -131,11 +123,11 @@
 {
unsigned short standby, suspend, off;
 
+   if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, standby, suspend, off);
return standby;
 }
 
-
 /**
  * Returns the amount of time of inactivity before the second level of
  * power saving is invoked.
@@ -147,11 +139,11 @@
 {
unsigned short standby, suspend, off;
 
+   if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, standby, suspend, off);
return suspend;
 }
 
-
 /**
  * Returns the amount of time of inactivity before the third and final
  * level of power saving is invoked.
@@ -163,11 +155,11 @@
 {
unsigned short standby, suspend, off;
 
+   if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, standby, suspend, off);
return off;
 }
 
-
 /**
  * Sets the standby timeout (in unit of seconds).
  * @param new_standby Amount of time of inactivity before standby mode will be 
invoked.
@@ -178,14 +170,11 @@
 {
unsigned short standby, suspend, off;
 
+   if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, standby, suspend, off);
-   DPMSSetTimeouts(_ecore_x_disp,
-   new_timeout,
-   suspend,
-   off);
+   DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off);
 }
 
-
 /**
  * Sets the suspend timeout (in unit of seconds).
  * @param suspend Amount of time of inactivity before the screen is placed 
into suspend mode.
@@ -196,14 +185,11 @@
 {
unsigned short standby, suspend, off;
 
+   if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, standby, suspend, off);
-

E CVS: libs/ecore devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore


Modified Files:
configure.in 


Log Message:
Added checks for dpms available in X so we know to build ecore_x_dpms or
not. Added a fallback check that looks in the Xext if not found in Xdpms.

===
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- configure.in10 Mar 2007 22:12:01 -  1.166
+++ configure.in13 Mar 2007 09:31:22 -  1.167
@@ -481,6 +481,51 @@
   AC_SUBST(Xdamage_cflags)
   AC_SUBST(Xdamage_libs)
 
+  Xdpms_libs=
+  Xdpms_cflags=
+  use_Xdpms=no
+  PCFLAGS=$CFLAGS
+  CFLAGS=$x_cflags $x_includes
+  AC_CHECK_HEADER(X11/extensions/dpms.h,
+[
+  AC_CHECK_LIB(Xdpms, DPMSQueryExtension,
+[
+  AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS])
+  Xdpms_cflags=
+  Xdpms_libs=-lXdpms
+  use_Xdpms=yes
+], [
+ AC_CHECK_LIB(Xext, DPMSQueryExtension,
+   [
+  AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS])
+  Xdpms_cflags=
+  Xdpms_libs=-lXext
+  use_Xdpms=yes  
+   ], [
+  Xdpms_cflags=
+  Xdpms_libs=
+  use_Xdpms=no
+   ], [
+ $x_libs
+   ]
+ )
+], [
+  $x_libs
+]
+  )
+], [
+  Xdpms_cflags=
+  Xdpms_libs=
+  use_Xdpms=no
+], [
+  #include X11/Xlib.h
+]
+  )
+  CFLAGS=$PCFLAGS
+
+  AC_SUBST(Xdpms_cflags)
+  AC_SUBST(Xdpms_libs)
+
 fi
 
 AC_SUBST(ecore_x_cflags)
@@ -1287,7 +1332,7 @@
 echo   Ecore_Job: $have_ecore_job
 echo   Ecore_Con: $have_ecore_con (OpenSSL: $use_openssl)
 echo   Ecore_Txt: $have_ecore_txt
-echo   Ecore_X..: $have_ecore_x (Xcursor: $use_Xcursor) 
(Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) 
(Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) 
(Xdamage: $use_Xdamage)
+echo   Ecore_X..: $have_ecore_x (Xcursor: $use_Xcursor) 
(Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) 
(Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) 
(Xdamage: $use_Xdamage) (Xdpms: $use_Xdpms)
 echo   Ecore_FB.: $have_ecore_fb
 echo   Ecore_DFB: $have_ecore_dfb
 echo   Ecore_Evas...: $have_ecore_evas



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: apps/e devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_int_config_dpms.c 


Log Message:
Dpms patch from ravenlock: adds a dialog to let user know that dpms is not
available (if it is not).

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_dpms.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_dpms.c 12 Mar 2007 15:41:54 -  1.5
+++ e_int_config_dpms.c 13 Mar 2007 09:34:29 -  1.6
@@ -9,6 +9,9 @@
 static void _cb_suspend_slider_change(void *data, Evas_Object *obj);
 static void _cb_off_slider_change(void *data, Evas_Object *obj);
 
+static int _e_int_config_dpms_available();
+static int _e_int_config_dpms_capable();
+
 struct _E_Config_Dialog_Data
 {
E_Config_Dialog *cfd;
@@ -47,7 +50,28 @@

if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
dpms_dialog = 
e_dialog_new(e_container_current_get(e_manager_current_get()), 
- E, _dpms_dialog);
+ E, _dpms_capable_dialog);
+   if (!dpms_dialog) return 0;
+
+   e_dialog_title_set(dpms_dialog, _(Display Power Management Signaling));
+   e_dialog_text_set(dpms_dialog, _(The current display server is not br
+   DPMS capable.));
+   e_dialog_icon_set(dpms_dialog, enlightenment/dpms, 64);
+   e_dialog_button_add(dpms_dialog, _(OK), NULL, _cb_dpms_dialog_ok, NULL);
+   e_dialog_button_focus_num(dpms_dialog, 1);
+   e_win_centered_set(dpms_dialog-win, 1);
+   e_dialog_show(dpms_dialog);
+   return 0;
+}
+
+static int
+_e_int_config_dpms_available()
+{
+   if (ecore_x_dpms_query()) return 1;
+   
+   if (dpms_dialog) e_object_del(E_OBJECT(dpms_dialog));
+   dpms_dialog = 
e_dialog_new(e_container_current_get(e_manager_current_get()), 
+ E, _dpms_available_dialog);
if (!dpms_dialog) return 0;
 
e_dialog_title_set(dpms_dialog, _(Display Power Management Signaling));
@@ -67,7 +91,8 @@
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;

-   if ((e_config_dialog_find(E, _config_dpms_dialog)) || 
+   if ((e_config_dialog_find(E, _config_dpms_dialog)) ||
+   (!_e_int_config_dpms_available()) ||   
(!_e_int_config_dpms_capable()))
  return NULL;
 



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore


Modified Files:
configure.in 


Log Message:
Fix minor typo..should be ECORE_XDPMS, thanks ravenlock :)

===
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- configure.in13 Mar 2007 09:31:22 -  1.167
+++ configure.in13 Mar 2007 09:45:00 -  1.168
@@ -490,14 +490,14 @@
 [
   AC_CHECK_LIB(Xdpms, DPMSQueryExtension,
 [
-  AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS])
+  AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS])
   Xdpms_cflags=
   Xdpms_libs=-lXdpms
   use_Xdpms=yes
 ], [
  AC_CHECK_LIB(Xext, DPMSQueryExtension,
[
-  AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS])
+  AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS])
   Xdpms_cflags=
   Xdpms_libs=-lXext
   use_Xdpms=yes  



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/ecore devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : libs/ecore

Dir : e17/libs/ecore/src/lib/ecore_x


Modified Files:
ecore_x_dpms.c 


Log Message:
Call correct DPMSGetVersion function.

===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dpms.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_x_dpms.c  13 Mar 2007 09:30:17 -  1.3
+++ ecore_x_dpms.c  13 Mar 2007 11:14:44 -  1.4
@@ -15,7 +15,7 @@
_dpms_major = 1;
_dpms_minor = 0;
 
-   if (DpmsGetVersion(_ecore_x_disp, _dpms_major, _dpms_minor))
+   if (DPMSGetVersion(_ecore_x_disp, _dpms_major, _dpms_minor))
  _dpms_available = 1;
else
  _dpms_available = 0;



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/emotion devilhorns

2007-03-12 Thread Enlightenment CVS

Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : libs/emotion

Dir : e17/libs/emotion/src/modules


Modified Files:
emotion_gstreamer.c emotion_gstreamer.h 


Log Message:
Fix recent emotion_gstreamer breakage...someone forgot to update the
function proto  change the module.init call :)

===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- emotion_gstreamer.c 13 Mar 2007 02:30:14 -  1.20
+++ emotion_gstreamer.c 13 Mar 2007 11:43:21 -  1.21
@@ -1257,7 +1257,7 @@
if (!module)
   return 0;
 
-   if (!em_module.init(obj, video))
+   if (!em_module.init(obj, video, opt))
   return 0;
 
*module = em_module;
===
RCS file: /cvs/e/e17/libs/emotion/src/modules/emotion_gstreamer.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emotion_gstreamer.h 21 May 2006 11:13:05 -  1.7
+++ emotion_gstreamer.h 13 Mar 2007 11:43:21 -  1.8
@@ -72,9 +72,9 @@
   unsigned char audio_mute : 1;
 };
 
-unsigned char module_open  (Evas_Object   *obj,
-Emotion_Video_Module **module,
-void **video);
+unsigned char module_open(Evas_Object *obj,
+   Emotion_Video_Module **module,
+   void **video, Emotion_Module_Options *opt);
 
 void  module_close (Emotion_Video_Module  *module,
 void  *video);



-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT  business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

E CVS: libs/etk-perl leviathan

E CVS: libs/etk-perl leviathan

E CVS: apps/e devilhorns

E CVS: apps/e devilhorns

E CVS: apps/e devilhorns

E CVS: apps/e devilhorns

E CVS: libs/engrave davemds

E CVS: libs/ewl ningerso

E CVS: libs/ewl ningerso

E CVS: libs/ewl dj2

E CVS: apps/ephoto titan

E CVS: libs/ecore pfritz

E CVS: libs/ecore raster

E CVS: libs/emotion raster

E CVS: libs/emotion raster

E CVS: libs/emotion raster

E CVS: e kwo

E CVS: libs/engrave davemds

E CVS: proto davemds

E CVS: proto davemds

E CVS: proto davemds

E CVS: proto davemds

E CVS: libs/ecore pfritz

E CVS: apps/ephoto titan

E CVS: libs/ecore devilhorns

E CVS: libs/ecore devilhorns

E CVS: apps/e devilhorns

E CVS: libs/ecore devilhorns

E CVS: libs/ecore devilhorns

E CVS: libs/emotion devilhorns

30 matches

Site Navigation

Mail list logo

Footer information