Enlightenment

Log:
  comments for stuff to do to make this hover stuff actually useful soon.
  
  

Author:       raster
Date:         2008-10-08 01:48:09 -0700 (Wed, 08 Oct 2008)
New Revision: 36518

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-08 08:15:20 UTC (rev 36517)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-08 08:48:09 UTC (rev 36518)
@@ -511,17 +511,14 @@
    elm_button_label_set(bt, "Top 1");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
-   
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Top 2");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
-   
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Top 3");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
-   
    evas_object_show(bx);
    elm_hover_content_set(hv, "top", bx);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h	2008-10-08 08:15:20 UTC (rev 36517)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h	2008-10-08 08:48:09 UTC (rev 36518)
@@ -174,6 +174,8 @@
    EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
    EAPI void         elm_hover_target_set(Evas_Object *obj, Evas_Object *target);
    EAPI void         elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
+   EAPI void         elm_hover_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
+       
    /* smart callbacks elm_win objects will call:
     */
    
@@ -182,13 +184,17 @@
 // * scroller could do with page up/down/left/right buttons and and idea of
 //   a page size
 // * tab widget focusing (not useful for touchscreen tho...)
+// * icon should optionally be able to collect events and call clicked
+//   callbacks
+// * hover needs a way to animate show/hide (slide out slots) and have some
+//   graphics for around middle
+// * hover needs to track move/resize and del of parent
+// * hover needs to be able to use custom hover style
+// * frame needs to be able to use custom frame style
+// * all widgets need a way to use a custom style
 //    
 // FIXME: immediate hitlist for widgets:
-// HOVER: select a widget (any) and attach a hover to it - the over will hover
-//        on top of the hover target and accept child widgets. haver may
-//        optionally place something to cover the window (under the hover
-//        widget, above everything else)
-// POPSEL: a buttont that when pressed uses a hover to display a h/v box or
+// POPSEL: a button that when pressed uses a hover to display a h/v box or
 //         a table of options surrounding the button with scroll butons at
 //         the end and the ability to drag and scroll

Log:
  ok icon too in hover test. looks nice. :)
  
  

Author:       raster
Date:         2008-10-08 08:21:14 -0700 (Wed, 08 Oct 2008)
New Revision: 36529

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_hover.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-08 15:09:00 UTC (rev 36528)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-08 15:21:14 UTC (rev 36529)
@@ -473,7 +473,7 @@
 static void
 my_bt_11(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *bx, *bt, *hv;
+   Evas_Object *win, *bg, *bx, *bt, *hv, *ic;
    char buf[PATH_MAX];
    
    win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
@@ -507,6 +507,12 @@
 
    bx = elm_box_add(win);
    
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_icon_scale_set(ic, 0, 0);
+   elm_box_pack_end(bx, ic);
+   evas_object_show(ic);
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Top 1");
    elm_box_pack_end(bx, bt);

Modified: trunk/TMP/st/elementary/src/lib/elm_hover.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_hover.c	2008-10-08 15:09:00 UTC (rev 36528)
+++ trunk/TMP/st/elementary/src/lib/elm_hover.c	2008-10-08 15:21:14 UTC (rev 36529)
@@ -28,6 +28,7 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   elm_hover_target_set(obj, NULL);
    elm_hover_parent_set(obj, NULL);
    while (wd->subs)
      {
@@ -120,6 +121,13 @@
 }
 
 static void
+_target_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   wd->target = NULL;
+}
+
+static void
 _signal_dismiss(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -143,7 +151,6 @@
 _parent_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   evas_object_show(wd->cov);
 }
 
 static void
@@ -211,9 +218,17 @@
 elm_hover_target_set(Evas_Object *obj, Evas_Object *target)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->target)
+     {
+	evas_object_event_callback_del(wd->target, EVAS_CALLBACK_DEL, _target_del);
+     }
    wd->target = target;
-   elm_widget_hover_object_set(target, obj);
-   _sizing_eval(obj);
+   if (wd->target)
+     {
+	evas_object_event_callback_add(wd->target, EVAS_CALLBACK_DEL, _target_del, obj);
+	elm_widget_hover_object_set(target, obj);
+	_sizing_eval(obj);
+     }
 }
 
 EAPI void

Log:
  use edje entry stuff more
  
  
Author:       raster
Date:         2008-10-16 02:17:57 -0700 (Thu, 16 Oct 2008)
New Revision: 36710

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-16 09:17:44 UTC (rev 36709)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-16 09:17:57 UTC (rev 36710)
@@ -633,21 +633,38 @@
 my_entry_bt_1(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *en = data;
+   elm_entry_entry_set(en, "");
 }
 
 static void
 my_entry_bt_2(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *en = data;
-   printf("TEXT:\n");
-   printf("%s\n",
-	  elm_entry_entry_get(en));
+   const char *s = elm_entry_entry_get(en);
+   printf("ENTRY:\n");
+   if (s) printf("%s\n", s);
 }
 
 static void
+my_entry_bt_3(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *en = data;
+   const char *s = elm_entry_selection_get(en);
+   printf("SELECTION:\n");
+   if (s) printf("%s\n", s);
+}
+
+static void
+my_entry_bt_4(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *en = data;
+   elm_entry_entry_insert(en, "Insert some <b>BOLD</> text");
+}
+
+static void
 my_bt_13(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *bx, *bt, *en;
+   Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
    char buf[PATH_MAX];
    
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
@@ -664,30 +681,59 @@
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
-   bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clear");
-   evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en);
-   elm_box_pack_end(bx, bt);
-   evas_object_show(bt);
-
    en = elm_entry_add(win);
    elm_entry_entry_set(en,
 		       "This is an entry widget in this window that<br>"
-		       "uses markup <b>like this</b> for styling and<br>"
-		       "formatting <em>like this</em>, as well as<br>"
-		       "<a href=X><link>links in the text</link></a>, so enter text<br>"
+		       "uses markup <b>like this</> for styling and<br>"
+		       "formatting <em>like this</>, as well as<br>"
+		       "<+a href=X><link>links in the text</></>, so enter text<br>"
 		       "in here to edit it.");
    evas_object_size_hint_weight_set(en, 1.0, 1.0);
    evas_object_size_hint_align_set(en, -1.0, -1.0);
    elm_box_pack_end(bx, en);
    evas_object_show(en);
+
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
    
    bt = elm_button_add(win);
+   elm_button_label_set(bt, "Clear");
+   evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+
+   bt = elm_button_add(win);
    elm_button_label_set(bt, "Print");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en);
-   elm_box_pack_end(bx, bt);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
    
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Selection");
+   evas_object_smart_callback_add(bt, "clicked", my_entry_bt_3, en);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Insert");
+   evas_object_smart_callback_add(bt, "clicked", my_entry_bt_4, en);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
+   // HACK! not exposed! (should expose some later?)
    elm_widget_focus_set(en, 1);
    
    evas_object_show(win);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h	2008-10-16 09:17:44 UTC (rev 36709)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h	2008-10-16 09:17:57 UTC (rev 36710)
@@ -181,8 +181,12 @@
     */
 
    EAPI Evas_Object *elm_entry_add(Evas_Object *parent);
-   EAPI void elm_entry_entry_set(Evas_Object *obj, const char *entry);
-   EAPI const char *elm_entry_entry_get(Evas_Object *obj);
+   EAPI void         elm_entry_entry_set(Evas_Object *obj, const char *entry);
+   EAPI const char  *elm_entry_entry_get(Evas_Object *obj);
+   EAPI const char  *elm_entry_selection_get(Evas_Object *obj);
+   EAPI void         elm_entry_entry_insert(Evas_Object *obj, const char *entry);
+   /* smart callbacks called:
+    */
        
 // FIXME: fixes to do
 // * current sizing tree inefficient

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2008-10-16 09:17:44 UTC (rev 36709)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2008-10-16 09:17:57 UTC (rev 36710)
@@ -10,6 +10,15 @@
 
 static void _del_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
+static void _on_focus_hook(void *data, Evas_Object *obj);
+static void _signal_entry_changed(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_selection_start(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_selection_changed(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_selection_cleared(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_entry_paste_request(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_entry_copy_notify(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_entry_cut_notify(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _signal_cursor_changed(void *data, Evas_Object *obj, const char *emission, const char *source);
 
 static void
 _del_hook(Evas_Object *obj)
@@ -36,6 +45,70 @@
    evas_object_focus_set(wd->ent, 1);
 }
 
+static void
+_signal_entry_changed(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "changed", NULL);
+   _sizing_eval(data);
+}
+
+static void
+_signal_selection_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "selection,start", NULL);
+   // FIXME: x clipboard/copy & paste - do
+}
+
+static void
+_signal_selection_changed(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "selection,changed", NULL);
+   // FIXME: x clipboard/copy & paste - do
+}
+
+static void
+_signal_selection_cleared(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "selection,cleared", NULL);
+   // FIXME: x clipboard/copy & paste - do
+}
+
+static void
+_signal_entry_paste_request(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   // FIXME: x clipboard/copy and paste - request
+}
+
+static void
+_signal_entry_copy_notify(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "changed", NULL);
+   // FIXME: x clipboard/copy & paste - do
+}
+
+static void
+_signal_entry_cut_notify(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "changed", NULL);
+   // FIXME: x clipboard/copy & paste - do
+}
+
+static void
+_signal_cursor_changed(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   evas_object_smart_callback_call(data, "cursor,changed", NULL);
+   // FIXME: handle auto-scroll within parent (get cursor - if not visible
+   // jump so it is)
+}
+
 EAPI Evas_Object *
 elm_entry_add(Evas_Object *parent)
 {
@@ -53,6 +126,14 @@
    
    wd->ent = edje_object_add(e);
    _elm_theme_set(wd->ent, "entry", "base", "default");
+   edje_object_signal_callback_add(wd->ent, "entry,changed", "elm.text", _signal_entry_changed, obj);
+   edje_object_signal_callback_add(wd->ent, "selection,start", "elm.text", _signal_selection_start, obj);
+   edje_object_signal_callback_add(wd->ent, "selection,changed", "elm.text", _signal_selection_changed, obj);
+   edje_object_signal_callback_add(wd->ent, "selection,cleared", "elm.text", _signal_selection_cleared, obj);
+   edje_object_signal_callback_add(wd->ent, "entry,paste,request", "elm.text", _signal_entry_paste_request, obj);
+   edje_object_signal_callback_add(wd->ent, "entry,copy,notify", "elm.text", _signal_entry_copy_notify, obj);
+   edje_object_signal_callback_add(wd->ent, "entry,cut,notify", "elm.text", _signal_entry_cut_notify, obj);
+   edje_object_signal_callback_add(wd->ent, "cursor,changed", "elm.text", _signal_cursor_changed, obj);
    elm_widget_resize_object_set(obj, wd->ent);
    return obj;
 }
@@ -71,3 +152,19 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    return edje_object_part_text_get(wd->ent, "elm.text");
 }
+
+EAPI const char *
+elm_entry_selection_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return edje_object_part_text_selection_get(wd->ent, "elm.text");
+}
+
+EAPI void
+elm_entry_entry_insert(Evas_Object *obj, const char *entry)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   edje_object_part_text_insert(wd->ent, "elm.text", entry);
+   _sizing_eval(obj);
+}
+

Log:
  and some final touches on signals from entry widget
  
  
Author:       raster
Date:         2008-10-17 07:51:17 -0700 (Fri, 17 Oct 2008)
New Revision: 36755

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-17 14:40:54 UTC (rev 36754)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-17 14:51:17 UTC (rev 36755)
@@ -731,7 +731,7 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // HACK! not exposed! (should expose some later?)
+   // FIXME: HACK! not exposed! (should expose some later?)
    elm_widget_focus_set(en, 1);
    
    evas_object_show(win);
@@ -763,6 +763,7 @@
    elm_box_pack_end(bx, sc);
    
    en = elm_entry_add(win);
+   // FIXME: HACK! not exposed!
    evas_object_propagate_events_set(en, 0);
    elm_entry_entry_set(en,
 		       "This is an entry widget in this window that<br>"
@@ -819,7 +820,7 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // HACK! not exposed! (should expose some later?)
+   // FIXME: HACK! not exposed! (should expose some later?)
    elm_widget_focus_set(en, 1);
 
    evas_object_resize(win, 320, 300);

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2008-10-17 14:40:54 UTC (rev 36754)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2008-10-17 14:51:17 UTC (rev 36755)
@@ -130,7 +130,6 @@
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Coord cx, cy, cw, ch;
    evas_object_smart_callback_call(data, "cursor,changed", NULL);
-   
    // FIXME: handle auto-scroll within parent (get cursor - if not visible
    // jump so it is)
    edje_object_part_text_cursor_geometry_get(wd->ent, "elm.text", &cx, &cy, &cw, &ch);
@@ -149,7 +148,28 @@
 _signal_anchor_up(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Widget_Data *wd = elm_widget_data_get(data);
+   char *buf, *buf2, *p, *p2, *n;
+   int buflen;
    printf("UP %s\n", emission);
+   p = strchr(emission, ',');
+   if (p)
+     {
+	n = p + 1;
+	buflen = 200 + strlen(n);
+	buf = alloca(buflen);
+	p2 = p -1;
+	while (p2 >= emission)
+	  {
+	     if (*p2 == ',') break;
+	     p2--;
+	  }
+	p2++;
+	buf2 = alloca(5 + p - p2);
+	strncpy(buf2, p2, p - p2);
+	buf2[p - p2] = 0;
+	snprintf(buf, buflen, "anchor,%s,clicked,*s", buf2, n);
+	evas_object_smart_callback_call(data, buf, NULL);
+     }
 }
 
 static void

Log:
  and now focus works right! excellent.
  
  
Author:       raster
Date:         2008-10-22 05:08:39 -0700 (Wed, 22 Oct 2008)
New Revision: 36969

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elc_notepad.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-22 12:04:16 UTC (rev 36968)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-22 12:08:39 UTC (rev 36969)
@@ -731,9 +731,8 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // FIXME: HACK! not exposed! (should expose some later?)
-   elm_widget_focus_set(en, 1);
-   
+   // FIXME: not exported
+   elm_widget_focus_set(win, 1);
    evas_object_show(win);
 }
 
@@ -850,11 +849,10 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // FIXME: HACK! not exposed! (should expose some later?)
-   elm_widget_focus_set(en, 1);
-
    evas_object_resize(win, 320, 300);
    
+   // FIXME: not exported
+   elm_widget_focus_set(win, 1);
    evas_object_show(win);
 }
 
@@ -948,11 +946,10 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // FIXME: HACK! not exposed! (should expose some later?)
-   elm_widget_focus_set(np, 1);
-
    evas_object_resize(win, 320, 300);
    
+   // FIXME: not exported
+   elm_widget_focus_set(win, 1);
    evas_object_show(win);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_notepad.c	2008-10-22 12:04:16 UTC (rev 36968)
+++ trunk/TMP/st/elementary/src/lib/elc_notepad.c	2008-10-22 12:08:39 UTC (rev 36969)
@@ -46,7 +46,7 @@
 _on_focus_hook(void *data, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   elm_widget_focus_set(wd->entry, 1);
+   elm_widget_focus_steal(wd->entry);
 }
 
 static char *

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2008-10-22 12:04:16 UTC (rev 36968)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2008-10-22 12:08:39 UTC (rev 36969)
@@ -62,18 +62,8 @@
 {
    Smart_Data *sd = data;
    Evas_Object *op, *op2;
-	
-   op = elm_widget_parent_get(obj);
-   while (op)
-     {
-	op2 = elm_widget_parent_get(op);
-	if (!op2) break;
-	op = op2;
-     }
-   printf("focus off %p\n", op);
-   if (op) elm_widget_focused_object_clear(op);
-   printf("focus %p\n", sd->obj);
-   elm_widget_focus_set(sd->obj, 0);
+
+   elm_widget_focus_steal(sd->obj);
 }
 
 /* externally accessible functions */

Log:
  and final focus fixes.
  
  
Author:       raster
Date:         2008-10-22 05:47:12 -0700 (Wed, 22 Oct 2008)
New Revision: 36973

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elc_notepad.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-10-22 12:42:27 UTC (rev 36972)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-10-22 12:47:12 UTC (rev 36973)
@@ -894,18 +894,21 @@
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
 
+   printf("win = %p, bx = %p\n", win, bx);
    np = elm_notepad_add(win);
    elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8);
    evas_object_size_hint_weight_set(np, 1.0, 1.0);
    evas_object_size_hint_align_set(np, -1.0, -1.0);
    elm_box_pack_end(bx, np);
    evas_object_show(np);
+   printf("np = %p\n", np);
    
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);
    elm_box_homogenous_set(bx2, 1);
    evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
    evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   printf("bx2 = %p\n", bx2);
    
    bt = elm_button_add(win);
    ic = elm_icon_add(win);
@@ -918,6 +921,7 @@
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
+   printf("bt = %p\n", bt);
    
    bt = elm_button_add(win);
    ic = elm_icon_add(win);
@@ -930,6 +934,7 @@
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
+   printf("bt = %p\n", bt);
    
    bt = elm_button_add(win);
    ic = elm_icon_add(win);
@@ -942,6 +947,7 @@
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
+   printf("bt = %p\n", bt);
    
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);

Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_notepad.c	2008-10-22 12:42:27 UTC (rev 36972)
+++ trunk/TMP/st/elementary/src/lib/elc_notepad.c	2008-10-22 12:47:12 UTC (rev 36973)
@@ -356,7 +356,7 @@
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
    elm_widget_data_set(obj, wd);
    elm_widget_del_hook_set(obj, _del_hook);
-   elm_widget_can_focus_set(obj, 0);
+   elm_widget_can_focus_set(obj, 1);
    
    wd->scroller = elm_scroller_add(parent);
    elm_widget_resize_object_set(obj, wd->scroller);

Log:
  notes++
  
  
Author:       raster
Date:         2008-11-15 06:07:15 -0800 (Sat, 15 Nov 2008)
New Revision: 37664

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-11-15 14:04:34 UTC (rev 37663)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-11-15 14:07:15 UTC (rev 37664)
@@ -767,8 +767,8 @@
    en = elm_entry_add(win);
    elm_entry_single_line_set(en, 1);
    elm_entry_entry_set(en, "This is a single line");
-   evas_object_size_hint_weight_set(en, 1.0, 1.0);
-   evas_object_size_hint_align_set(en, -1.0, -1.0);
+   evas_object_size_hint_weight_set(en, 1.0, 0.0);
+   evas_object_size_hint_align_set(en, -1.0, 0.0);
    elm_scroller_content_set(sc, en);
    evas_object_show(en);
 
@@ -783,8 +783,8 @@
    en = elm_entry_add(win);
    elm_entry_password_set(en, 1);
    elm_entry_entry_set(en, "Password here");
-   evas_object_size_hint_weight_set(en, 1.0, 1.0);
-   evas_object_size_hint_align_set(en, -1.0, -1.0);
+   evas_object_size_hint_weight_set(en, 1.0, 0.0);
+   evas_object_size_hint_align_set(en, -1.0, 0.0);
    elm_scroller_content_set(sc, en);
    evas_object_show(en);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h	2008-11-15 14:04:34 UTC (rev 37663)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h	2008-11-15 14:07:15 UTC (rev 37664)
@@ -313,4 +313,8 @@
 // * tiled image + zoom widget (tiled map viewer)
 // * dialpad widget - need one with a phone dialpad
 // * scale property from e - watch for changes. also allow for env var option
+// * on the fly theme changes - test
+// * single line entry on scale change adds newlines
+// * scale change for hover doesnt seem to do new size alloc nicely
+// * click + drag on button in scrollvie leaves pressed glow
 #endif

Log:
  tests for hoversel (and photo) and toolbar and more complete toolbar.
  
  
Author:       raster
Date:         2008-12-18 20:26:24 -0800 (Thu, 18 Dec 2008)
New Revision: 38222

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elc_hoversel.c trunk/TMP/st/elementary/src/lib/elm_toolbar.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2008-12-19 02:41:06 UTC (rev 38221)
+++ trunk/TMP/st/elementary/src/bin/test.c	2008-12-19 04:26:24 UTC (rev 38222)
@@ -1248,9 +1248,48 @@
 }
 
 static void
+tb_1(void *data, Evas_Object *obj, void *event_info)
+{
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/images/panel_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(data, buf);
+}
+
+static void
+tb_2(void *data, Evas_Object *obj, void *event_info)
+{
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(data, buf);
+}
+
+static void
+tb_3(void *data, Evas_Object *obj, void *event_info)
+{
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/images/wood_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(data, buf);
+}
+
+static void
+tb_4(void *data, Evas_Object *obj, void *event_info)
+{
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(data, buf);
+}
+
+static void
+tb_5(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_photo_file_set(data, NULL);
+}
+
+static void
 my_bt_18(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *bx, *tb, *ic;
+   Evas_Object *win, *bg, *bx, *tb, *ic, *ph;
+   Evas_Object *ph1, *ph2, *ph3, *ph4;
    char buf[PATH_MAX];
    
    win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
@@ -1270,41 +1309,181 @@
    tb = elm_toolbar_add(win);
    evas_object_size_hint_weight_set(tb, 0.0, 0.0);
    evas_object_size_hint_align_set(tb, -1.0, 0.0);
+
+   ph1 = elm_photo_add(win);
+   ph2 = elm_photo_add(win);
+   ph3 = elm_photo_add(win);
+   ph4 = elm_photo_add(win);
    
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   elm_toolbar_item_add(tb, ic, "Hello", NULL, NULL);
+   elm_toolbar_item_add(tb, ic, "Hello", tb_1, ph1);
    
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   elm_toolbar_item_add(tb, ic, "World", NULL, NULL);
+   elm_toolbar_item_add(tb, ic, "World", tb_2, ph1);
    
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   elm_toolbar_item_add(tb, ic, "Here", NULL, NULL);
+   elm_toolbar_item_add(tb, ic, "Here", tb_3, ph4);
    
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   elm_toolbar_item_add(tb, ic, "Comes", NULL, NULL);
+   elm_toolbar_item_add(tb, ic, "Comes", tb_4, ph4);
    
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-   elm_toolbar_item_add(tb, ic, "Elementary", NULL, NULL);
+   elm_toolbar_item_add(tb, ic, "Elementary", tb_5, ph4);
    
    elm_box_pack_end(bx, tb);
    evas_object_show(tb);
+
+   tb = elm_table_add(win);
+//   elm_table_homogenous_set(tb, 1);
+   evas_object_size_hint_weight_set(tb, 0.0, 1.0);
+   evas_object_size_hint_align_set(tb, -1.0, -1.0);
    
+   ph = ph1;
+   elm_photo_size_set(ph, 40);
+   snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 0, 0, 1, 1);
+   evas_object_show(ph);
+   
+   ph = ph2;
+   elm_photo_size_set(ph, 80);
+   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 1, 0, 1, 1);
+   evas_object_show(ph);
+   
+   ph = ph3;
+   elm_photo_size_set(ph, 20);
+   snprintf(buf, sizeof(buf), "%s/images/sky_01.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 0, 1, 1, 1);
+   evas_object_show(ph);
+   
+   ph = ph4;
+   elm_photo_size_set(ph, 60);
+   snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
+   elm_photo_file_set(ph, buf);
+   evas_object_size_hint_weight_set(ph, 1.0, 1.0);
+   evas_object_size_hint_align_set(ph, 0.5, 0.5);
+   elm_table_pack(tb, ph, 1, 1, 1, 1);
+   evas_object_show(ph);
+   
+   elm_box_pack_end(bx, tb);
+   evas_object_show(tb);
+   
    evas_object_resize(win, 320, 300);
    
    evas_object_show(win);
 }
 
 static void
+my_bt_19(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *bx, *bt, *ic;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Hoversel");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   elm_win_resize_object_add(win, bx);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   evas_object_show(bx);
+
+   bt = elm_hoversel_add(win);
+   elm_hoversel_hover_parent_set(bt, win);
+   elm_hoversel_label_set(bt, "Labels");
+   elm_hoversel_item_add(bt, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 2", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 3", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4", NULL, ELM_ICON_NONE, NULL, NULL);
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_hoversel_add(win);
+   elm_hoversel_hover_parent_set(bt, win);
+   elm_hoversel_label_set(bt, "Some Icons");
+   elm_hoversel_item_add(bt, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 2", NULL, ELM_ICON_NONE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4", "close", ELM_ICON_STANDARD, NULL, NULL);
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_hoversel_add(win);
+   elm_hoversel_hover_parent_set(bt, win);
+   elm_hoversel_label_set(bt, "All Icons");
+   elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 2", "arrow_down", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4", "close", ELM_ICON_STANDARD, NULL, NULL);
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_hoversel_add(win);
+   elm_hoversel_hover_parent_set(bt, win);
+   elm_hoversel_label_set(bt, "All Icons");
+   elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
+   snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
+   elm_hoversel_item_add(bt, "Item 2", buf, ELM_ICON_FILE, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4", "close", ELM_ICON_STANDARD, NULL, NULL);
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_hoversel_add(win);
+   elm_hoversel_hover_parent_set(bt, win);
+   elm_hoversel_label_set(bt, "Icon + Label");
+
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_hoversel_icon_set(bt, ic);
+   evas_object_show(ic);
+   
+   elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 2", "arrow_down", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
+   elm_hoversel_item_add(bt, "Item 4", "close", ELM_ICON_STANDARD, NULL, NULL);
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   evas_object_resize(win, 320, 300);
+   
+   evas_object_show(win);
+}
+
+static void
 my_win_main(void)
 {
   Evas_Object *win, *bg, *bx0, *lb, *bx, *bt, *sc, *fr;
@@ -1523,6 +1702,13 @@
   elm_box_pack_end(bx, bt);
   evas_object_show(bt);
   
+  bt = elm_button_add(win);
+  elm_button_label_set(bt, "Hoversel");
+  evas_object_smart_callback_add(bt, "clicked", my_bt_19, NULL);
+  evas_object_size_hint_align_set(bt, -1.0, 0.0);
+  elm_box_pack_end(bx, bt);
+  evas_object_show(bt);
+  
   /* set an initial window size */
   evas_object_resize(win, 320, 520);
   /* show the window */

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2008-12-19 02:41:06 UTC (rev 38221)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2008-12-19 04:26:24 UTC (rev 38222)
@@ -380,6 +380,9 @@
    EAPI Elm_Hoversel_Item *elm_hoversel_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
    EAPI void         elm_hoversel_item_del(Elm_Hoversel_Item *item);
    /* smart callbacks called:
+    * "clicked" - the user clicked the hoversel button and popped up the sel
+    * "selected" - an item in the hoversel list is selected
+    * "dismissed" - the hover is dismissed
     */
    
    typedef struct _Elm_Toolbar_Item Elm_Toolbar_Item;
@@ -389,6 +392,7 @@
    EAPI void         elm_toolbar_item_select(Elm_Toolbar_Item *item);
    EAPI void         elm_toolbar_scrollable_set(Evas_Object *obj, Evas_Bool scrollable);
    /* smart callbacks called:
+    * "clicked" - when the user clicks on a toolbar item and becomes selected
     */
 
   ////////////////////////////////////////////////////////////////////////////
@@ -400,12 +404,11 @@
 // * left/right arrow broken with password mode for entry + utf8 chars...
 // * entry signal "changed" not called when deleting
 // * bubble doesnt handle child size changes right
+// * table doesnt do homogenous properly
 // 
 //// (incomplete - medium priority)
 // * entry selection conflicts with finger scroll (make selection start/stop work on signals?)
-// 
-// * add test for photo widget
-// * add test for hoversel
+
 // * disabled not supported
 // * tab widget focusing (not useful for touchscreen tho...)
 // * on the fly theme changes - test (should work)
@@ -436,6 +439,10 @@
 // * dialpad widget - need one with a phone dialpad
 // 
 //// (improvements - low priority)
+// * use evas's new box instead of a box smart
+// * use evas's table instead of a table smart
+// * use ecore_evas_object_associate for win widget
+// * use stack for win widget
 // * somehow a pdf(ps) viewer widget that doesnt make it gpl (lgpl)
 // * emotion widget?
 // * ewebkit widget

Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_hoversel.c	2008-12-19 02:41:06 UTC (rev 38221)
+++ trunk/TMP/st/elementary/src/lib/elc_hoversel.c	2008-12-19 04:26:24 UTC (rev 38222)
@@ -72,6 +72,7 @@
    Item *it = data;
    Evas_Object *obj2 = it->obj;
    if (it->func) it->func(it->data, obj2, NULL);
+   evas_object_smart_callback_call(obj2, "selected", NULL);
    elm_hoversel_hover_end(obj2);
 }
 
@@ -121,6 +122,7 @@
    evas_object_show(bx);
    
    evas_object_show(wd->hover);
+   evas_object_smart_callback_call(data, "clicked", NULL);
 }
 
 static void
@@ -185,6 +187,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (wd->hover) evas_object_del(wd->hover);
    wd->hover = NULL;
+   evas_object_smart_callback_call(obj, "dismissed", NULL);
 }
 
 EAPI Elm_Hoversel_Item *

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2008-12-19 02:41:06 UTC (rev 38221)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2008-12-19 04:26:24 UTC (rev 38222)
@@ -26,7 +26,6 @@
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
-static void _mouse_up(void *data, Evas_Object *obj, void *event_info);
 
 static void
 _item_show(Item *it)
@@ -40,6 +39,32 @@
 }
 
 static void
+_item_select(Item *it)
+{
+   Item *it2;
+   Widget_Data *wd = elm_widget_data_get(it->obj);
+   Evas_Object *obj2;
+   Eina_List *l;
+   if (it->selected) return;
+   for (l = wd->items; l; l = l->next)
+     {
+        it2 = l->data;
+        if (it2->selected)
+          {
+             it2->selected = 0;
+             edje_object_signal_emit(it2->base, "elm,state,unselected", "elm");
+             break;
+          }
+     }
+   it->selected = 1;
+   edje_object_signal_emit(it->base, "elm,state,selected", "elm");
+   _item_show(it);
+   obj2 = it->obj;
+   if (it->func) it->func(it->data, it->obj, NULL);
+   evas_object_smart_callback_call(obj2, "clicked", NULL);
+}
+
+static void
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -49,7 +74,28 @@
 static void
 _theme_hook(Evas_Object *obj)
 {
-   // FIXME: re-eval icon and all min sizes
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Eina_List *l;
+   Item *it;
+   Evas_Coord mw, mh;
+   for (l = wd->items; l; l = l->next)
+     {
+        it = l->data;
+        if (it->selected)
+          edje_object_signal_emit(it->base, "elm,state,selected", "elm");
+        _elm_theme_set(it->base, "toolbar", "item", "default");
+        if (it->icon)
+          {
+             edje_extern_object_min_size_set(it->icon, 
+                                             (double)wd->icon_size * _elm_config->scale, 
+                                             (double)wd->icon_size * _elm_config->scale);
+             edje_object_part_swallow(it->base, "elm.swallow.icon", it->icon);
+          }
+        edje_object_part_text_set(it->base, "elm.text", it->label);
+        edje_object_size_min_calc(it->base, &mw, &mh);
+        evas_object_size_hint_min_set(it->base, mw, mh);
+        evas_object_size_hint_max_set(it->base, 9999, mh);
+     }
    _sizing_eval(obj);
 }
 
@@ -80,12 +126,6 @@
 }
 
 static void
-_mouse_up(void *data, Evas_Object *obj, void *event_info)
-{
-   evas_object_smart_callback_call(data, "clicked", NULL);
-}
-
-static void
 _resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(data);
@@ -115,24 +155,7 @@
 static void
 _select(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-   Item *it = data, *it2;
-   Widget_Data *wd = elm_widget_data_get(it->obj);
-   Eina_List *l;
-   if (it->selected) return;
-   for (l = wd->items; l; l = l->next)
-     {
-        it2 = l->data;
-        if (it2->selected)
-          {
-             it2->selected = 0;
-             edje_object_signal_emit(it2->base, "elm,state,unselected", "elm");
-             break;
-          }
-          }
-   it->selected = 1;
-   edje_object_signal_emit(it->base, "elm,state,selected", "elm");
-   _item_show(it);
-   if (it->func) it->func(it->data, it->obj, NULL);
+   _item_select(data);
 }
 
 EAPI Evas_Object *
@@ -191,16 +214,16 @@
    _elm_theme_set(it->base, "toolbar", "item", "default");
    edje_object_signal_callback_add(it->base, "elm,action,click", "elm",
                                    _select, it);
-   if (icon)
+   if (it->icon)
      {
-        edje_extern_object_min_size_set(icon, 
+        edje_extern_object_min_size_set(it->icon, 
                                         (double)wd->icon_size * _elm_config->scale, 
                                         (double)wd->icon_size * _elm_config->scale);
-        edje_object_part_swallow(it->base, "elm.swallow.icon", icon);
-        evas_object_show(icon);
+        edje_object_part_swallow(it->base, "elm.swallow.icon", it->icon);
+        evas_object_show(it->icon);
         elm_widget_sub_object_add(obj, it->icon);
      }
-   edje_object_part_text_set(it->base, "elm.text", label);
+   edje_object_part_text_set(it->base, "elm.text", it->label);
    edje_object_size_min_calc(it->base, &mw, &mh);
    evas_object_size_hint_weight_set(it->base, 0.0, 0.0);
    evas_object_size_hint_align_set(it->base, -1.0, -1.0);
@@ -216,14 +239,21 @@
 EAPI void
 elm_toolbar_item_del(Elm_Toolbar_Item *item)
 {
-   // FIXME: remove item
+   Item *it = (Item *)item;
+   Widget_Data *wd = elm_widget_data_get(it->obj);
+   Evas_Object *obj2 = it->obj;
+   wd->items = eina_list_remove(wd->items, it);
+   eina_stringshare_del(it->label);
+   if (it->icon) evas_object_del(it->icon);
+   evas_object_del(it->base);
+   free(it);
+   _theme_hook(obj2);
 }
 
 EAPI void
 elm_toolbar_item_select(Elm_Toolbar_Item *item)
 {
-   // FIXME select item   
-   //   Widget_Data *wd = elm_widget_data_get(obj);
+   _item_select(item);
 }
 
 EAPI void

Log:
  list is pretty functional now.
  
  
Author:       raster
Date:         2009-01-08 23:35:52 -0800 (Thu, 08 Jan 2009)
New Revision: 38509

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-01-09 03:03:36 UTC (rev 38508)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-01-09 07:35:52 UTC (rev 38509)
@@ -1593,6 +1593,7 @@
    elm_win_resize_object_add(win, li);
    evas_object_size_hint_weight_set(li, 1.0, 1.0);
    elm_list_horizontal_mode_set(li, ELM_LIST_LIMIT);
+   elm_list_multi_select_set(li, 1);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-09 03:03:36 UTC (rev 38508)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-09 07:35:52 UTC (rev 38509)
@@ -198,6 +198,7 @@
    EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
    EAPI void         elm_scroller_content_set(Evas_Object *obj, Evas_Object *child);
    EAPI void         elm_scroller_content_min_limit(Evas_Object *obj, Evas_Bool w, Evas_Bool h);
+   EAPI void         elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    /* smart callbacks called:
     */
 
@@ -409,8 +410,26 @@
    typedef struct _Elm_List_Item Elm_List_Item;
    EAPI Evas_Object *elm_list_add(Evas_Object *parent);
    EAPI Elm_List_Item *elm_list_item_append(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_List_Item *elm_list_item_prepend(Evas_Object *obj, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_List_Item *elm_list_item_insert_before(Evas_Object *obj, Elm_List_Item *before, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI Elm_List_Item *elm_list_item_insert_after(Evas_Object *obj, Elm_List_Item *after, const char *label, Evas_Object *icon, Evas_Object *end, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
+   EAPI void         elm_list_go(Evas_Object *obj);
+   EAPI void         elm_list_multi_select_set(Evas_Object *obj, Evas_Bool multi);
+   EAPI void         elm_list_horizontal_mode_set(Evas_Object *obj, Elementary_List_Mode mode);
+   EAPI const Eina_List     *elm_list_items_get(Evas_Object *obj);
+   EAPI const Elm_List_Item *elm_list_selected_item_get(Evas_Object *obj);
+   EAPI const Eina_List     *elm_list_selected_items_get(Evas_Object *obj);
+   EAPI void         elm_list_item_selected_set(Elm_List_Item *item, Evas_Bool selected);
+   EAPI void         elm_list_item_show(Elm_List_Item *item);
+   EAPI void         elm_list_item_del(Elm_List_Item *item);
+   EAPI const void  *elm_list_item_data_get(Elm_List_Item *item);
+   EAPI Evas_Object *elm_list_item_icon_get(Elm_List_Item *item);
+   EAPI Evas_Object *elm_list_item_end_get(Elm_List_Item *item);
+       
    /* smart callbacks called:
     * "clicked" - when the user double-clicked an item
+    * "selected" - when the user selected an item
+    * "unselected" - when the user selected an item
     */
        
   ////////////////////////////////////////////////////////////////////////////

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-01-09 03:03:36 UTC (rev 38508)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-01-09 07:35:52 UTC (rev 38509)
@@ -10,8 +10,9 @@
    Eina_List *items;
    Eina_List *selected;
    Elementary_List_Mode mode;
+   Evas_Coord minw[2], minh[2];
    Evas_Bool on_hold : 1;
-   Evas_Coord minw[2], minh[2];
+   Evas_Bool multi : 1;
 };
 
 struct _Item
@@ -38,6 +39,20 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   while (wd->items)
+     {
+        Item *it = wd->items->data;
+        wd->items = eina_list_remove_list(wd->items, wd->items);
+        eina_stringshare_del(it->label);
+        if (!it->fixed)
+          {
+             if (it->icon) evas_object_del(it->icon);
+             if (it->end) evas_object_del(it->end);
+          }
+        if (it->base) evas_object_del(it->base);
+        free(it);
+     }
+   eina_list_free(wd->selected);
    free(wd);
 }
 
@@ -76,6 +91,7 @@
 static void
 _item_select(Item *it)
 {
+   Widget_Data *wd = elm_widget_data_get(it->obj);
    const char *selectraise;
    if (it->selected) return;
    edje_object_signal_emit(it->base, "elm,state,selected", "elm");
@@ -83,12 +99,15 @@
    if ((selectraise) && (!strcmp(selectraise, "on")))
      evas_object_raise(it->base);
    it->selected = 1;
+   wd->selected = eina_list_append(wd->selected, it);
    if (it->func) it->func((void *)it->data, it->obj, it);
+   evas_object_smart_callback_call(it->obj, "selected", it);
 }
 
 static void
 _item_unselect(Item *it)
 {
+   Widget_Data *wd = elm_widget_data_get(it->obj);
    const char *stacking, *selectraise;
    if (!it->selected) return;
    edje_object_signal_emit(it->base, "elm,state,unselected", "elm");
@@ -100,6 +119,8 @@
           evas_object_lower(it->base);
      }
    it->selected = 0;
+   wd->selected = eina_list_remove(wd->selected, it);
+   evas_object_smart_callback_call(it->obj, "unselected", it);
 }
 
 static void
@@ -116,12 +137,20 @@
         wd->on_hold = 0;
         return;
      }
-   for (l = wd->items; l; l = l->next)
+   if (wd->multi)
      {
-        Item *it2 = l->data;
-        if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+        if (!it->selected) _item_select(it);
+        else _item_unselect(it);
      }
-   if (!it->selected) _item_select(it);
+   else
+     {
+        for (l = wd->items; l; l = l->next)
+          {
+             Item *it2 = l->data;
+             if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+          }
+        if (!it->selected) _item_select(it);
+     }
 }
 
 static Item *
@@ -337,7 +366,7 @@
 elm_list_multi_select_set(Evas_Object *obj, Evas_Bool multi)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   // FIXME: implement
+   wd->multi = multi;
 }
 
 EAPI void
@@ -352,21 +381,26 @@
      elm_scroller_content_min_limit(wd->scroller, 0, 0);
 }
 
+EAPI const Eina_List *
+elm_list_items_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->items;
+}
+
 EAPI const Elm_List_Item *
 elm_list_selected_item_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   // FIXME: implement
+   if (wd->selected) return wd->selected->data;
    return NULL;
 }
 
 EAPI const Eina_List *
-elm_list_items_get(Evas_Object *obj)
+elm_list_selected_items_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (wd->selected) return wd->selected;
-   // FIXME: implement
-   return wd->items;
+   return wd->selected;
 }
 
 EAPI void
@@ -375,25 +409,45 @@
    Item *it = (Item *)item;
    Widget_Data *wd = elm_widget_data_get(it->obj);
    Eina_List *l;
-   if (it->selected) return;
-   for (l = wd->items; l; l = l->next)
+   if (selected)
      {
-        Item *it2 = l->data;
-        if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+        if (!wd->multi)
+          {
+             Item *it2 = l->data;
+             if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+          }
+        if (!it->selected) _item_select(it);
      }
-   _item_select(it);
+   else if (it->selected)
+     _item_unselect(it);
 }
 
 EAPI void
 elm_list_item_show(Elm_List_Item *item)
 {
-   // FIXME: implement
+   Item *it = (Item *)item;
+   Widget_Data *wd = elm_widget_data_get(it->obj);
+   Evas_Coord bx, by, bw, bh;
+   Evas_Coord x, y, w, h;
+   evas_object_geometry_get(wd->box, &bx, &by, &bw, &bh);
+   evas_object_geometry_get(it->base, &x, &y, &w, &h);
+   x -= bx;
+   y -= by;
+   elm_scroller_region_show(wd->scroller, x, y, w, h);
 }
 
 EAPI void
 elm_list_item_del(Elm_List_Item *item)
 {
-   // FIXME: implement
+   Item *it = (Item *)item;
+   Widget_Data *wd = elm_widget_data_get(it->obj);
+   if (it->selected) _item_unselect(it);
+   wd->items = eina_list_remove(wd->items, it);
+   eina_stringshare_del(it->label);
+   if (it->icon) evas_object_del(it->icon);
+   if (it->end) evas_object_del(it->end);
+   if (it->base) evas_object_del(it->base);
+   free(it);
 }
 
 EAPI const void *

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-01-09 03:03:36 UTC (rev 38508)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-01-09 07:35:52 UTC (rev 38509)
@@ -70,7 +70,6 @@
    edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
    if (wd->min_w) w = vmw + minw;
    if (wd->min_h) h = vmh + minh;
-   printf("%i : %i + %i\n",wd->min_w, vmw, minw); 
    evas_object_size_hint_min_set(obj, w, h);
 }
 
@@ -155,3 +154,10 @@
    wd->min_h = h;
    _sizing_eval(obj);
 }
+
+EAPI void
+elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
+}

Log:
  provide a #defined macro for the standard main() for elementary apps.
  
  
Author:       raster
Date:         2009-01-09 03:34:55 -0800 (Fri, 09 Jan 2009)
New Revision: 38510

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-01-09 07:35:52 UTC (rev 38509)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-01-09 11:34:55 UTC (rev 38510)
@@ -2017,16 +2017,5 @@
    /* exit code */
    return 0;
 }
-
-int
-main(int argc, char **argv)
-{
-   /* init Elementary (all Elementary calls begin with elm_ and all data
-    * types, enums and macros will be Elm_ and ELM_ etc.) */
-   elm_init(argc, argv);
-   /* this must be called right after elm_init(). this function is used for
-    * fast-starting elementary apps by caching a pre-init and x connect etc.
-    * in elm_init(). the ONLY call allowed to be done before elm_main() is
-    * elm_init() and nothing else. */
-   return elm_main(argc, argv);
-}
+/* all emeentary apps should use this. but it right after elm_main() */
+ELM_MAIN()

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-09 07:35:52 UTC (rev 38509)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-09 11:34:55 UTC (rev 38510)
@@ -130,6 +130,8 @@
           ELM_WIN_KEYBOARD_TERMINAL,
           ELM_WIN_KEYBOARD_PASSWORD
      } Elm_Win_Keyboard_Mode;
+
+#define ELM_MAIN() int main(int argc, char **argv) {elm_init(argc, argv); return elm_main(argc, argv);}
    
 /**************************************************************************/   
    /* General calls */
@@ -425,7 +427,6 @@
    EAPI const void  *elm_list_item_data_get(Elm_List_Item *item);
    EAPI Evas_Object *elm_list_item_icon_get(Elm_List_Item *item);
    EAPI Evas_Object *elm_list_item_end_get(Elm_List_Item *item);
-       
    /* smart callbacks called:
     * "clicked" - when the user double-clicked an item
     * "selected" - when the user selected an item

Log:
  export markup<->plain utf8 conversion calls and use them too.
  
  
Author:       raster
Date:         2009-01-26 16:44:29 -0800 (Mon, 26 Jan 2009)
New Revision: 38803

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elc_notepad.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-01-26 23:49:33 UTC (rev 38802)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-01-27 00:44:29 UTC (rev 38803)
@@ -898,7 +898,7 @@
    evas_object_show(bx);
 
    np = elm_notepad_add(win);
-   elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_PLAIN_UTF8);
+   elm_notepad_file_set(np, "note.txt", ELM_TEXT_FORMAT_MARKUP_UTF8);
    evas_object_size_hint_weight_set(np, 1.0, 1.0);
    evas_object_size_hint_align_set(np, -1.0, -1.0);
    elm_box_pack_end(bx, np);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-26 23:49:33 UTC (rev 38802)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-01-27 00:44:29 UTC (rev 38803)
@@ -306,6 +306,8 @@
    EAPI void         elm_entry_editable_set(Evas_Object *obj, Evas_Bool editable);
    EAPI void         elm_entry_select_none(Evas_Object *obj);
    EAPI void         elm_entry_select_all(Evas_Object *obj);
+   EAPI char        *elm_entry_markup_to_utf8(const char *s);
+   EAPI char        *elm_entry_utf8_to_markup(const char *s);
        
    /* smart callbacks called:
     * "changed" - the text content changed

Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_notepad.c	2009-01-26 23:49:33 UTC (rev 38802)
+++ trunk/TMP/st/elementary/src/lib/elc_notepad.c	2009-01-27 00:44:29 UTC (rev 38803)
@@ -71,7 +71,7 @@
 }
 
 static char *
-_load_markup_utf8(const char *file)
+_load_file(const char *file)
 {
    FILE *f;
    size_t size;
@@ -82,69 +82,26 @@
    if (!f) return NULL;
    while (size = fread(buf, 1, sizeof(buf), f))
      {
-	pos = 0;
 	buf[size] = 0;
-	while (pos < size)
-	  {
-	     int ch;
-	     char str[2];
-	     
-	     ch = buf[pos];
-	     if (ch != '\n')
-	       {
-		  str[0] = ch;
-		  str[1] = 0;
-		  text = _buf_append(text, str, &len, &alloc);
-	       }
-	     pos++;
-	  }
+        text = _buf_append(text, buf, &len, &alloc);
      }
    fclose(f);
    return text;
 }
 
 static char *
-_load_plain_utf8(const char *file)
+_load_plain(const char *file)
 {
-   FILE *f;
-   size_t size;
-   int alloc = 0, len = 0, pos;
-   char *text = NULL, buf[4096];
+   char *text, *text2;
    
-   f = fopen(file, "r");
-   if (!f) return NULL;
-   while (size = fread(buf, 1, sizeof(buf), f))
+   text = _load_file(file);
+   if (text)
      {
-	pos = 0;
-	buf[size] = 0;
-	while (pos < size)
-	  {
-	     int ch, ppos;
-	     
-	     ppos = pos;
-	     ch = evas_common_font_utf8_get_next(buf, &pos);
-	     if (ch == '\n')
-	       text = _buf_append(text, "<br>", &len, &alloc);
-	     else
-	       {
-		  int stlen = 0;
-		  const char *escape;
-		  char str[16];
-		  
-		  escape = evas_textblock_string_escape_get(buf + ppos, &stlen);
-		  if (escape)
-		    text = _buf_append(text, escape, &len, &alloc);
-		  else
-		    {
-		       strncpy(str, buf + ppos, pos - ppos);
-		       str[pos - ppos] = 0;
-		       text = _buf_append(text, str, &len, &alloc);
-		    }
-	       }
-	  }
+        text2 = elm_entry_utf8_to_markup(text);
+        free(text);
+        return text2;
      }
-   fclose(f);
-   return text;
+   return NULL;
 }
 
 static void
@@ -161,10 +118,10 @@
    switch (wd->format)
      {
       case ELM_TEXT_FORMAT_PLAIN_UTF8:
-	text = _load_plain_utf8(wd->file);
+	text = _load_plain(wd->file);
 	break;
       case ELM_TEXT_FORMAT_MARKUP_UTF8:
-	text = _load_markup_utf8(wd->file);
+	text = _load_file(wd->file);
 	break;
       default:
 	elm_entry_entry_set(wd->entry, "Unknown Text Format");
@@ -196,112 +153,20 @@
 	return;
      }
    fputs(text, f); // FIXME: catch error
-   fputs("\n", f); // FIXME: catch error
    fclose(f);
 }
 
 static void
 _save_plain_utf8(const char *file, const char *text)
 {
-   FILE *f;
-   char *s, *p;
-   char *tag_start, *tag_end, *esc_start, *esc_end;
-
-   if ((!text) || (text[0] == 0))
+   char *text2;
+   
+   text2 = elm_entry_markup_to_utf8(text);
+   if (text2)
      {
-	ecore_file_unlink(file);
-	return;
+        _save_markup_utf8(file, text2);
+        free(text2);
      }
-   f = fopen(file, "w");
-   if (!f)
-     {
-	// FIXME: report a write error
-	return;
-     }
-   tag_start = tag_end = esc_start = esc_end = NULL;
-   p = (char *)text;
-   s = p;
-   for (;;)
-     {
-	if ((*p == 0) ||
-	    (tag_end) || (esc_end) ||
-	    (tag_start) || (esc_start))
-	  {
-	     if (tag_end)
-	       {
-		  char *ttag, *match;
-		  
-		  ttag = malloc(tag_end - tag_start);
-		  if (ttag)
-		    {
-		       strncpy(ttag, tag_start + 1, tag_end - tag_start - 1);
-		       ttag[tag_end - tag_start - 1] = 0;
-		       if (!strcmp(ttag, "br")) fputs("\n", f); // FIXME: catch error
-		       free(ttag);
-		    }
-		  tag_start = tag_end = NULL;
-	       }
-	     else if (esc_end)
-	       {
-		  char tesc[256];
-		  char *str;
-		  
-		  if ((esc_end - esc_start) < (sizeof(tesc) - 2))
-		    {
-		       strncpy(tesc, esc_start, esc_end - esc_start + 1);
-		       tesc[esc_end - esc_start + 1] = 0;
-		    }
-		  str = evas_textblock_escape_string_get(tesc);
-		  if (str) fputs(str, f); // FIXME: catch error
-		  esc_start = esc_end = NULL;
-	       }
-	     else if (*p == 0)
-	       {
-		  fwrite(s, p - s, 1, f); // FIXME: catch error
-		  s = NULL;
-	       }
-	     if (*p == 0)
-	       break;
-	  }
-	if (*p == '<')
-	  {
-	     if (!esc_start)
-	       {
-		  tag_start = p;
-		  tag_end = NULL;
-		  fwrite(s, p - s, 1, f); // FIXME: catch error
-		  s = NULL;
-	       }
-	  }
-	else if (*p == '>')
-	  {
-	     if (tag_start)
-	       {
-		  tag_end = p;
-		  s = p + 1;
-	       }
-	  }
-	else if (*p == '&')
-	  {
-	     if (!tag_start)
-	       {
-		  esc_start = p;
-		  esc_end = NULL;
-		  fwrite(s, p - s, 1, f); // FIXME: catch error
-		  s = NULL;
-	       }
-	  }
-	else if (*p == ';')
-	  {
-	     if (esc_start)
-	       {
-		  esc_end = p;
-		  s = p + 1;
-	       }
-	  }
-	p++;
-     }
-   fclose(f);
 }
 
 static void

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-01-26 23:49:33 UTC (rev 38802)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-01-27 00:44:29 UTC (rev 38803)
@@ -791,3 +791,15 @@
    wd->have_selection = 1;
    edje_object_part_text_select_all(wd->ent, "elm.text");
 }
+
+EAPI char *
+elm_entry_markup_to_utf8(const char *s)
+{
+   return _mkup_to_text(s);
+}
+
+EAPI char *
+elm_entry_utf8_to_markup(const char *s)
+{
+   return _text_to_mkup(s);
+}

Log:
  allow for all widgets.objects to have different scaling factors.
  add tests for these
  add tests for inheriting scaling factor from parent
  fix test app to use list now instead of box+buttons (cleaner)
  
  
Author:       raster
Date:         2009-02-02 21:09:03 -0800 (Mon, 02 Feb 2009)
New Revision: 38909

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_bg.c trunk/TMP/st/elementary/src/lib/elm_bubble.c trunk/TMP/st/elementary/src/lib/elm_button.c trunk/TMP/st/elementary/src/lib/elm_carousel.c trunk/TMP/st/elementary/src/lib/elm_clock.c trunk/TMP/st/elementary/src/lib/elm_entry.c trunk/TMP/st/elementary/src/lib/elm_frame.c trunk/TMP/st/elementary/src/lib/elm_hover.c trunk/TMP/st/elementary/src/lib/elm_icon.c trunk/TMP/st/elementary/src/lib/elm_label.c trunk/TMP/st/elementary/src/lib/elm_layout.c trunk/TMP/st/elementary/src/lib/elm_main.c trunk/TMP/st/elementary/src/lib/elm_photo.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_toggle.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -733,8 +733,7 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
-   // FIXME: not exported
-   elm_widget_focus_set(win, 1);
+   elm_object_focus(win);
    evas_object_show(win);
 }
 
@@ -854,8 +853,7 @@
 
    evas_object_resize(win, 320, 300);
    
-   // FIXME: not exported
-   elm_widget_focus_set(win, 1);
+   elm_object_focus(win);
    evas_object_show(win);
 }
 
@@ -951,8 +949,7 @@
 
    evas_object_resize(win, 320, 300);
    
-   // FIXME: not exported
-   elm_widget_focus_set(win, 1);
+   elm_object_focus(win);
    evas_object_show(win);
 }
 
@@ -1056,8 +1053,7 @@
 
    evas_object_resize(win, 320, 300);
    
-   // FIXME: not exported
-   elm_widget_focus_set(win, 1);
+   elm_object_focus(win);
    evas_object_show(win);
 }
 
@@ -1242,8 +1238,7 @@
 
    evas_object_resize(win, 320, 300);
    
-   // FIXME: not exported
-   elm_widget_focus_set(win, 1);
+   elm_object_focus(win);
    evas_object_show(win);
 }
 
@@ -1770,263 +1765,305 @@
 }
 
 static void
+my_bt_24(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *inwin, *lb;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Inwin");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+   
+   inwin = elm_win_inwin_add(win);
+   evas_object_show(inwin);
+   
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "This is an \"inwin\" - a window in a<br>"
+                       "window. This is handy for quick popups<br>"
+                       "you want centered, taking over the window<br>"
+                       "until dismissed somehow. Unlike hovers they<br>"
+                       "don't hover over their target.");
+   elm_win_inwin_content_set(inwin, lb);
+   evas_object_show(lb);
+   
+   evas_object_resize(win, 320, 240);
+   evas_object_show(win);
+}
+
+static void
+my_bt_25(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *inwin, *lb;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Inwin");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+   
+   inwin = elm_win_inwin_add(win);
+   elm_win_inwin_style_set(inwin, "minimal_vertical");
+   evas_object_show(inwin);
+   
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "This is an \"inwin\" - a window in a<br>"
+                       "window. This is handy for quick popups<br>"
+                       "you want centered, taking over the window<br>"
+                       "until dismissed somehow. Unlike hovers they<br>"
+                       "don't hover over their target.<br>"
+                       "<br>"
+                       "This inwin style compacts itself vertically<br>"
+                       "to the size of its contents minimum size.");
+   elm_win_inwin_content_set(inwin, lb);
+   evas_object_show(lb);
+   
+   evas_object_resize(win, 320, 240);
+   evas_object_show(win);
+}
+
+static void
+my_bt_26(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *bx, *bt;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Scaling");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 0.5");
+   elm_object_scale_set(bt, 0.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 0.75");
+   elm_object_scale_set(bt, 0.75);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 1.0");
+   elm_object_scale_set(bt, 1.0);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 1.5");
+   elm_object_scale_set(bt, 1.5);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 2.0");
+   elm_object_scale_set(bt, 2.0);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Scale: 3.0");
+   elm_object_scale_set(bt, 3.0);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+   
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
+static void
+my_bt_27(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *bx, *fr, *lb;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Scaling");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
+   fr = elm_frame_add(win);
+   elm_object_scale_set(fr, 0.5);
+   elm_frame_label_set(fr, "Scale: 0.5");
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "Parent frame scale<br>"
+                       "is 0.5. Child should<br>"
+                       "inherit it.");
+   elm_frame_content_set(fr, lb);
+   evas_object_show(lb);
+   elm_box_pack_end(bx, fr);
+   evas_object_show(fr);
+   
+   fr = elm_frame_add(win);
+   elm_frame_label_set(fr, "Scale: 1.0");
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "Parent frame scale<br>"
+                       "is 1.0. Child should<br>"
+                       "inherit it.");
+   elm_frame_content_set(fr, lb);
+   evas_object_show(lb);
+   elm_object_scale_set(fr, 1.0);
+   elm_box_pack_end(bx, fr);
+   evas_object_show(fr);
+   
+   fr = elm_frame_add(win);
+   elm_frame_label_set(fr, "Scale: 2.0");
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "Parent frame scale<br>"
+                       "is 2.0. Child should<br>"
+                       "inherit it.");
+   elm_frame_content_set(fr, lb);
+   evas_object_show(lb);
+   elm_object_scale_set(fr, 2.0);
+   elm_box_pack_end(bx, fr);
+   evas_object_show(fr);
+   
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
+static void
 my_win_main(void)
 {
-  Evas_Object *win, *bg, *bx0, *lb, *bx, *bt, *sc, *fr;
+   Evas_Object *win, *bg, *bx0, *lb, *li, *fr;
   
-  /* 1 create an elm window - it returns an evas object. this is a little
-   * special as the object lives in the canvas that is inside the window
-   * so what is returned is really inside the window, but as you manipulate
-   * the evas object returned - the window will respond. elm_win makes sure
-   * of that so you can blindly treat it like any other evas object
-   * pretty much, just as long as you know it has special significance */
-  /* the first parameter is a "parent" window - eg for a dialog you want to
-   * have a main window it is related to, here it is NULL meaning there
-   * is no parent. "main" is the name of the window - used by the window
-   * manager for identifying the window uniquely amongst all the windows
-   * within this application (and all instances of the application). the
-   * type is a basic window (the final parameter) */
-  win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
-  /* set the title of the window - this is in the titlebar */
-  elm_win_title_set(win, "Elementary Tests");
-  
-  /* set a callback on the window when "delete-request" is emitted as
-   * a callback. when this happens my_win_del() is called and the 
-   * data pointer (first param) is passed the final param here (in this
-   * case it is NULL). This is how you can pass specific things to a
-   * callback like objects or data layered on top */
-  evas_object_smart_callback_add(win, "delete-request", my_win_del, NULL);
-  
-  /* add a background to our window. this just uses the standard theme set
-   * background. without a backgorund, you could make a window seem
-   * transparent with elm_win_alpha_set(win, 1); for example. if you have
-   * a compositor running this will make the window able to be
-   * semi-transparent and any space not filled by object/widget pixels will
-   * be transparent or translucent based on alpha. if you do not have a
-   * comnpositor running this should fall back to using shaped windows
-   * (which have a mask). both these features will be slow and rely on
-   * a lot more resources, so only use it if you need it. */
-  bg = elm_bg_add(win);
-  /* set weight to 1.0 x 1.0 == expand in both x and y direction */
-  evas_object_size_hint_weight_set(bg, 1.0, 1.0);
-  /* tell the window that this object is to be resized along with the window.
-   * also as a result this object will be one of several objects that
-   * controls the minimum/maximum size of the window */
-  elm_win_resize_object_add(win, bg);
-  /* and show the background */
-  evas_object_show(bg);
-  
-  /* add a box layout widget to the window */
-  bx0 = elm_box_add(win);
-  /* allow base box (bx0) to expand in x and y */
-  evas_object_size_hint_weight_set(bx0, 1.0, 1.0);
-  /* tell the window that the box affects window size and also will be 
-   * resized when the window is */
-  elm_win_resize_object_add(win, bx0);
-  evas_object_show(bx0);
-  
-  fr = elm_frame_add(win);
-  elm_frame_label_set(fr, "Information");
-  elm_box_pack_end(bx0, fr);
-  evas_object_show(fr);
-  
-  lb = elm_label_add(win);
-  elm_label_label_set(lb, 
-                      "Please slect a test from the list below<br>"
-                      "by clicking the test button to show the<br>"
-                      "test window.");
-  elm_frame_content_set(fr, lb);
-  evas_object_show(lb);
-  
-  /* add a scroller object - anything inside is scrollable */
-  sc = elm_scroller_add(win);
-  /* add scroller to main box */
-  evas_object_size_hint_weight_set(sc, 1.0, 1.0);
-  evas_object_size_hint_align_set(sc, -1.0, -1.0);
-  elm_box_pack_end(bx0, sc);
-  evas_object_show(sc);
-  
-  /* add a box layout widget to the window */
-  bx = elm_box_add(win);
-  /* set weight to 1.0 x 0.0 == expand in x and not in y) */
-  evas_object_size_hint_weight_set(bx, 1.0, 0.0);
-  
-  /* set the box ad the content in the scrolled view*/
-  elm_scroller_content_set(sc, bx);
-  /* show the box, scroller and main box */
-  evas_object_show(bx);
-  
-  /* create a button */
-  bt = elm_button_add(win);
-  /* set the button label */
-  elm_button_label_set(bt, "Bg Plain");
-  /* add a callback to be run when the button is clicked */
-  evas_object_smart_callback_add(bt, "clicked", my_bt_1, NULL);
-  /* the button should fill any space it is given horizontally */
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  /* put the button at the end of the box */
-  elm_box_pack_end(bx, bt);
-  /* show the button */
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Bg Image");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_2, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Icon Transparent");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_3, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Box Vert");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_4, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Box Horiz");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_5, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Buttons");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_6, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Toggles");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_7, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Table");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_8, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Clock");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_9, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Layout");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_10, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Hover");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_11, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Hover 2");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_12, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Entry");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_13, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Entry Scrolled");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_14, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Notepad");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_15, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Anchorview");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_16, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Anchorblock");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_17, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Toolbar");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_18, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Hoversel");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_19, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "List");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_20, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "List 2");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_21, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "List 3");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_22, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  bt = elm_button_add(win);
-  elm_button_label_set(bt, "Carousel");
-  evas_object_smart_callback_add(bt, "clicked", my_bt_23, NULL);
-  evas_object_size_hint_align_set(bt, -1.0, 0.0);
-  elm_box_pack_end(bx, bt);
-  evas_object_show(bt);
-  
-  /* set an initial window size */
-  evas_object_resize(win, 320, 520);
-  /* show the window */
-  evas_object_show(win);
+   /* 1 create an elm window - it returns an evas object. this is a little
+    * special as the object lives in the canvas that is inside the window
+    * so what is returned is really inside the window, but as you manipulate
+    * the evas object returned - the window will respond. elm_win makes sure
+    * of that so you can blindly treat it like any other evas object
+    * pretty much, just as long as you know it has special significance */
+   /* the first parameter is a "parent" window - eg for a dialog you want to
+    * have a main window it is related to, here it is NULL meaning there
+    * is no parent. "main" is the name of the window - used by the window
+    * manager for identifying the window uniquely amongst all the windows
+    * within this application (and all instances of the application). the
+    * type is a basic window (the final parameter) */
+   win = elm_win_add(NULL, "main", ELM_WIN_BASIC);
+   /* set the title of the window - this is in the titlebar */
+   elm_win_title_set(win, "Elementary Tests");
+   
+   /* set a callback on the window when "delete-request" is emitted as
+    * a callback. when this happens my_win_del() is called and the 
+    * data pointer (first param) is passed the final param here (in this
+    * case it is NULL). This is how you can pass specific things to a
+    * callback like objects or data layered on top */
+   evas_object_smart_callback_add(win, "delete-request", my_win_del, NULL);
+   
+   /* add a background to our window. this just uses the standard theme set
+    * background. without a backgorund, you could make a window seem
+    * transparent with elm_win_alpha_set(win, 1); for example. if you have
+    * a compositor running this will make the window able to be
+    * semi-transparent and any space not filled by object/widget pixels will
+    * be transparent or translucent based on alpha. if you do not have a
+    * comnpositor running this should fall back to using shaped windows
+    * (which have a mask). both these features will be slow and rely on
+    * a lot more resources, so only use it if you need it. */
+   bg = elm_bg_add(win);
+   /* set weight to 1.0 x 1.0 == expand in both x and y direction */
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   /* tell the window that this object is to be resized along with the window.
+    * also as a result this object will be one of several objects that
+    * controls the minimum/maximum size of the window */
+   elm_win_resize_object_add(win, bg);
+   /* and show the background */
+   evas_object_show(bg);
+   
+   /* add a box layout widget to the window */
+   bx0 = elm_box_add(win);
+   /* allow base box (bx0) to expand in x and y */
+   evas_object_size_hint_weight_set(bx0, 1.0, 1.0);
+   /* tell the window that the box affects window size and also will be 
+    * resized when the window is */
+   elm_win_resize_object_add(win, bx0);
+   evas_object_show(bx0);
+   
+   fr = elm_frame_add(win);
+   elm_frame_label_set(fr, "Information");
+   elm_box_pack_end(bx0, fr);
+   evas_object_show(fr);
+   
+   lb = elm_label_add(win);
+   elm_label_label_set(lb, 
+                       "Please slect a test from the list below<br>"
+                       "by clicking the test button to show the<br>"
+                       "test window.");
+   elm_frame_content_set(fr, lb);
+   evas_object_show(lb);
+   
+   li = elm_list_add(win);
+   evas_object_size_hint_weight_set(li, 1.0, 1.0);
+   evas_object_size_hint_align_set(li, -1.0, -1.0);
+   elm_box_pack_end(bx0, li);
+   evas_object_show(li);
+   
+   elm_list_item_append(li, "Bg Plain", NULL, NULL, my_bt_1, NULL);
+   elm_list_item_append(li, "Bg Image", NULL, NULL, my_bt_2, NULL);
+   elm_list_item_append(li, "Icon Transparent", NULL, NULL, my_bt_3, NULL);
+   elm_list_item_append(li, "Box Vert", NULL, NULL, my_bt_4, NULL);
+   elm_list_item_append(li, "Box Horiz", NULL, NULL, my_bt_5, NULL);
+   elm_list_item_append(li, "Buttons", NULL, NULL, my_bt_6, NULL);
+   elm_list_item_append(li, "Toggles", NULL, NULL, my_bt_7, NULL);
+   elm_list_item_append(li, "Table", NULL, NULL, my_bt_8, NULL);
+   elm_list_item_append(li, "Clock", NULL, NULL, my_bt_9, NULL);
+   elm_list_item_append(li, "Layout", NULL, NULL, my_bt_10, NULL);
+   elm_list_item_append(li, "Hover", NULL, NULL, my_bt_11, NULL);
+   elm_list_item_append(li, "Hover 2", NULL, NULL, my_bt_12, NULL);
+   elm_list_item_append(li, "Entry", NULL, NULL, my_bt_13, NULL);
+   elm_list_item_append(li, "Entry Scrolled", NULL, NULL, my_bt_14, NULL);
+   elm_list_item_append(li, "Notepad", NULL, NULL, my_bt_15, NULL);
+   elm_list_item_append(li, "Anchorview", NULL, NULL, my_bt_16, NULL);
+   elm_list_item_append(li, "Anchorblock", NULL, NULL, my_bt_17, NULL);
+   elm_list_item_append(li, "Toolbar", NULL, NULL, my_bt_18, NULL);
+   elm_list_item_append(li, "Hoversel", NULL, NULL, my_bt_19, NULL);
+   elm_list_item_append(li, "List", NULL, NULL, my_bt_20, NULL);
+   elm_list_item_append(li, "List 2", NULL, NULL, my_bt_21, NULL);
+   elm_list_item_append(li, "List 3", NULL, NULL, my_bt_22, NULL);
+   elm_list_item_append(li, "Carousel", NULL, NULL, my_bt_23, NULL);
+   elm_list_item_append(li, "Inwin", NULL, NULL, my_bt_24, NULL);
+   elm_list_item_append(li, "Inwin 2", NULL, NULL, my_bt_25, NULL);
+   elm_list_item_append(li, "Scaling", NULL, NULL, my_bt_26, NULL);
+   elm_list_item_append(li, "Scaling 2", NULL, NULL, my_bt_27, NULL);
+
+   elm_list_go(li);
+   
+   /* set an initial window size */
+   evas_object_resize(win, 320, 520);
+   /* show the window */
+   evas_object_show(win);
 }
 
 /* this is your elementary main function - it MUSt be called IMMEDIATELY

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-03 05:09:03 UTC (rev 38909)
@@ -140,6 +140,10 @@
    EAPI void         elm_run(void);
    EAPI void         elm_exit(void);
    
+   EAPI void         elm_object_scale_set(Evas_Object *obj, double scale);
+   EAPI double       elm_object_scale_get(Evas_Object *obj);
+   EAPI void         elm_object_focus(Evas_Object *obj);
+       
    EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
    EAPI void         elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
    EAPI void         elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);
@@ -494,12 +498,16 @@
 // * when entries are in a scroller and change size, the scroller shows scrollbars. fix. same for selecting. for 1 line entries in a scroller should only have scroll arrow indicators.
 // 
 //// (more widgets/features - medium priority)
+// * selective widget scaling
+// * slider widget
+// * <evas scale cache>
+// * radio + group handling
+// * checkbox (like toggle)
+// * pager (for pushing/popping pages and going back and forward and flipping)
+// * <edje copy & paste fixed>
 // * biglist widget (restricted format label + icon intended for massive lists)
 // * treeview widget (like biglist - but items can expand to sub-items)
-// * radio widget + group handling
-// * checkbox widget (like toggle)
-// * page widget (for pushing/popping pages and going back and forward and flipping)
-// * slider widget
+// * <evas shared cache>
 // 
 // * carousel selector widget
 // * separator widget (h/v)

Modified: trunk/TMP/st/elementary/src/lib/elm_bg.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_bg.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_bg.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -26,6 +26,7 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    _elm_theme_set(wd->img, "bg", "base", "default");
+   _els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * _elm_config->scale);
 }
 
 static void

Modified: trunk/TMP/st/elementary/src/lib/elm_bubble.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_bubble.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_bubble.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -32,6 +32,7 @@
    _elm_theme_set(wd->bbl, "bubble", "base", "default");
    edje_object_part_text_set(wd->bbl, "elm.text", wd->label);
    edje_object_part_text_set(wd->bbl, "elm.info", wd->info);
+   edje_object_scale_set(wd->bbl, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_button.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_button.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_button.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -47,6 +47,7 @@
      edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm");
    edje_object_part_text_set(wd->btn, "elm.text", wd->label);
    edje_object_message_signal_process(wd->btn);
+   edje_object_scale_set(wd->btn, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_carousel.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_carousel.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_carousel.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -85,6 +85,7 @@
         if (it->selected)
           edje_object_signal_emit(it->base, "elm,state,selected", "elm");
         _elm_theme_set(it->base, "carousel", "item", "default");
+        edje_object_scale_set(it->base, elm_widget_scale_get(obj) * _elm_config->scale);
         if (it->icon)
           {
              edje_extern_object_min_size_set(it->icon, 

Modified: trunk/TMP/st/elementary/src/lib/elm_clock.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_clock.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_clock.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -47,6 +47,7 @@
 _theme_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   int i;
    wd->cur.am_pm = !wd->cur.am_pm; /* hack - force update */
    _time_update(obj);
 }
@@ -204,6 +205,7 @@
 	  _elm_theme_set(wd->clk, "clock", "base-am_pm", "default");
 	else
 	  _elm_theme_set(wd->clk, "clock", "base", "default");
+        edje_object_scale_set(wd->clk, elm_widget_scale_get(obj) * _elm_config->scale);
 	
 	for (i = 0; i < 6; i++)
 	  {
@@ -212,6 +214,7 @@
 	     if ((!wd->seconds) && (i >= 4)) break;
 	     wd->digit[i] = edje_object_add(evas_object_evas_get(wd->clk));
 	     _elm_theme_set(wd->digit[i], "clock", "flipdigit", "default");
+             edje_object_scale_set(wd->digit[i], elm_widget_scale_get(obj) * _elm_config->scale);
 	     if (wd->edit)
 	       edje_object_signal_emit(wd->digit[i], "elm,state,edit,on", "elm");
 	     edje_object_signal_callback_add(wd->digit[i], "elm,action,up", "",
@@ -228,6 +231,7 @@
 	  {
 	     wd->ampm = edje_object_add(evas_object_evas_get(wd->clk));
 	     _elm_theme_set(wd->ampm, "clock", "flipampm", "default");
+             edje_object_scale_set(wd->ampm, elm_widget_scale_get(obj) * _elm_config->scale);
 	     if (wd->edit)
 	       edje_object_signal_emit(wd->ampm, "elm,state,edit,on", "elm");
 	     edje_object_signal_callback_add(wd->ampm, "elm,action,up", "",

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -61,6 +61,7 @@
    _elm_theme_set(wd->ent, "entry", _getbase(obj), "default");
    elm_entry_entry_set(obj, t);
    if (t) free(t);
+   edje_object_scale_set(wd->ent, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_frame.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_frame.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_frame.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -32,6 +32,7 @@
    else _elm_theme_set(wd->frm, "frame", "base", "default");
    if (wd->content)
      edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
+   edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_hover.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_hover.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_hover.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -69,6 +69,7 @@
    // FIXME: hover contents doesnt seem to propagate resizes properly
    if (wd->style) _elm_theme_set(wd->cov, "hover", "base", wd->style);
    else _elm_theme_set(wd->cov, "hover", "base", "default");
+   edje_object_scale_set(wd->cov, elm_widget_scale_get(obj) * _elm_config->scale);
    _reval_content(obj);
    _sizing_eval(obj);
    if (evas_object_visible_get(wd->cov)) _hov_show_do(obj);
@@ -99,7 +100,7 @@
    for (l = wd->subs; l; l = l->next)
      {
 	Subinfo *si = l->data;
-        edje_object_part_swallow(wd->hov, si->swallow, si->obj);
+        edje_object_part_swallow(wd->cov, si->swallow, si->obj);
      }
 }
 
@@ -113,7 +114,7 @@
 	Subinfo *si = l->data;
 	if (si->obj == obj)
 	  {
-	     edje_object_part_swallow(wd->hov, si->swallow, si->obj);
+	     edje_object_part_swallow(wd->cov, si->swallow, si->obj);
 	     break;
 	  }
      }

Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_icon.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_icon.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -54,7 +54,7 @@
    if (wd->no_scale) _els_smart_icon_scale_set(wd->img, 1.0);
    else
      {
-	_els_smart_icon_scale_set(wd->img, _elm_config->scale);
+	_els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * _elm_config->scale);
 	_els_smart_icon_size_get(wd->img, &w, &h);
      }
    if (!wd->scale_down)

Modified: trunk/TMP/st/elementary/src/lib/elm_label.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_label.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_label.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -27,6 +27,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    _elm_theme_set(wd->lbl, "label", "base", "default");
    edje_object_part_text_set(wd->lbl, "elm.text", wd->label);
+   edje_object_scale_set(wd->lbl, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_layout.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_layout.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_layout.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -39,6 +39,8 @@
 static void
 _theme_hook(Evas_Object *obj)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   edje_object_scale_set(wd->lay, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -294,3 +294,21 @@
 {
    ecore_main_loop_quit();
 }
+
+EAPI void
+elm_object_scale_set(Evas_Object *obj, double scale)
+{
+   return elm_widget_scale_set(obj, scale);
+}
+
+EAPI double
+elm_object_scale_get(Evas_Object *obj)
+{
+   return elm_widget_scale_get(obj);
+}
+
+EAPI void
+elm_object_focus(Evas_Object *obj)
+{
+   elm_widget_focus_set(obj, 1);
+}

Modified: trunk/TMP/st/elementary/src/lib/elm_photo.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photo.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_photo.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -25,6 +25,8 @@
 static void
 _theme_hook(Evas_Object *obj)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 
@@ -35,8 +37,8 @@
    Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
  
    evas_object_size_hint_min_set(wd->img, 
-                                 wd->size * _elm_config->scale,
-                                 wd->size * _elm_config->scale);
+                                 wd->size * elm_widget_scale_get(obj) * _elm_config->scale,
+                                 wd->size * elm_widget_scale_get(obj) * _elm_config->scale);
    edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->img);
    edje_object_size_min_calc(wd->frm, &minw, &minh);
    maxw = minw;
@@ -75,7 +77,7 @@
    _els_smart_icon_scale_down_set(wd->img, 1);
    _els_smart_icon_smooth_scale_set(wd->img, 1);
    _els_smart_icon_fill_inside_set(wd->img, 0);
-   _els_smart_icon_scale_set(wd->img, _elm_config->scale);
+   _els_smart_icon_scale_set(wd->img, elm_widget_scale_get(obj) * _elm_config->scale);
    evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_UP,
 				  _mouse_up, obj);
    evas_object_repeat_events_set(wd->img, 1);

Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_priv.h	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_priv.h	2009-02-03 05:09:03 UTC (rev 38909)
@@ -92,7 +92,9 @@
 EAPI void         elm_widget_scroll_hold_push(Evas_Object *obj);   
 EAPI void         elm_widget_scroll_hold_pop(Evas_Object *obj);   
 EAPI int          elm_widget_scroll_hold_get(Evas_Object *obj);
-    
+EAPI void         elm_widget_scale_set(Evas_Object *obj, double scale);
+EAPI double       elm_widget_scale_get(Evas_Object *obj);
+
 extern char *_elm_appname;
 extern Elm_Config *_elm_config;
 extern const char *_elm_data_dir;

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -29,6 +29,7 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    elm_smart_scroller_theme_set(wd->scr, "scroller", "base", "default");
+   edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_toggle.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toggle.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_toggle.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -52,6 +52,7 @@
    edje_object_part_text_set(wd->tgl, "elm.ontext", wd->ontext);
    edje_object_part_text_set(wd->tgl, "elm.offtext", wd->offtext);
    edje_object_message_signal_process(wd->tgl);
+   edje_object_scale_set(wd->tgl, elm_widget_scale_get(obj) * _elm_config->scale);
    _sizing_eval(obj);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-02-03 05:07:58 UTC (rev 38908)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-02-03 05:09:03 UTC (rev 38909)
@@ -2,8 +2,15 @@
 #include "elm_priv.h"
 
 #define SMART_NAME "e_widget"
-#define API_ENTRY Smart_Data *sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
-#define INTERNAL_ENTRY Smart_Data *sd = evas_object_smart_data_get(obj); if (!sd) return;
+#define API_ENTRY \
+   Smart_Data *sd = evas_object_smart_data_get(obj); \
+   if ((!obj) || (!sd) || \
+          (evas_object_type_get(obj) && \
+              strcmp(evas_object_type_get(obj), SMART_NAME)))
+#define INTERNAL_ENTRY \
+   Smart_Data *sd = evas_object_smart_data_get(obj); \
+   if (!sd) return;
+
 typedef struct _Smart_Data Smart_Data;
 
 struct _Smart_Data
@@ -29,6 +36,7 @@
    void          *data;
    Evas_Coord     rx, ry, rw, rh;
    int            scroll_hold;
+   double         scale;
    unsigned char  can_focus : 1;
    unsigned char  child_can_focus : 1;
    unsigned char  focused : 1;
@@ -180,6 +188,7 @@
 elm_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   double scale, pscale = elm_widget_scale_get(sobj);
    sd->subobjs = eina_list_append(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -196,6 +205,8 @@
      }
    evas_object_event_callback_add(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
    evas_object_smart_callback_call(obj, "sub-object-add", sobj);
+   scale = elm_widget_scale_get(sobj);
+   if (scale != pscale) elm_widget_theme(sobj);
 }
 
 EAPI void
@@ -694,6 +705,26 @@
    return sd->scroll_hold;
 }
 
+EAPI void
+elm_widget_scale_set(Evas_Object *obj, double scale)
+{
+   API_ENTRY return;
+   if (scale <= 0.0) scale = 0.0;
+   if (sd->scale != scale)
+     {
+        sd->scale = scale;
+        elm_widget_theme(obj);
+     }
+}
+
+EAPI double
+elm_widget_scale_get(Evas_Object *obj)
+{
+   API_ENTRY return 1.0;
+   if (sd->scale == 0.0) return elm_widget_scale_get(sd->parent_obj);
+   return sd->scale;
+}
+
 /* local subsystem functions */
 static void
 _smart_reconfigure(Smart_Data *sd)

Log:
  more genlist testing - deletign items works. not perfect - but working... in
  small tests.
  
  
Author:       raster
Date:         2009-02-16 23:50:35 -0800 (Mon, 16 Feb 2009)
New Revision: 39056

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-17 06:39:56 UTC (rev 39055)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-17 07:50:35 UTC (rev 39056)
@@ -2077,6 +2077,12 @@
 }
 
 static void
+gl_sel(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("sel item data [%p] on genlist obj [%p], item pointer [%p]\n", data, obj, event_info);
+}
+
+static void
 my_bt_29(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *gl;
@@ -2105,15 +2111,110 @@
 
    for (i = 0; i < 10000; i++)
      {
-        gli = elm_genlist_item_append(gl, &itc1, (void *)i/* item data */, 
-                                      NULL/* parent */, ELM_GENLIST_ITEM_NONE, 
-                                      NULL/* func */, NULL/* func data */);
+        gli = elm_genlist_item_append(gl, &itc1, 
+                                      (void *)i/* item data */, 
+                                      NULL/* parent */, 
+                                      ELM_GENLIST_ITEM_NONE, 
+                                      gl_sel/* func */, 
+                                      (void *)(i * 10)/* func data */);
      }
    evas_object_resize(win, 320, 320);
    evas_object_show(win);
 }
 
 static void
+my_gl_add(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   Elm_Genlist_Item *gli;
+   static int i = 0;
+
+   itc1.style          = "default";
+   itc1.func.label_get = gl_label_get;
+   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.state_get = gl_state_get;
+   itc1.func.del       = gl_del;
+
+   gli = elm_genlist_item_append(gl, &itc1, 
+                                 (void *)i/* item data */, 
+                                 NULL/* parent */, 
+                                 ELM_GENLIST_ITEM_NONE, 
+                                 gl_sel/* func */, 
+                                 (void *)(i * 10)/* func data */);
+   i++;
+}
+
+static void
+my_gl_del(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   Elm_Genlist_Item *gli = elm_genlist_selected_item_get(gl);
+   if (!gli)
+     {
+        printf("no item selected\n");
+        return;
+     }
+   elm_genlist_item_del(gli);
+}
+
+static void
+my_bt_30(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
+   int i;
+   
+   win = elm_win_add(NULL, "genlist-2", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Genlist 2");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+   
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
+   gl = elm_genlist_add(win);
+   evas_object_size_hint_align_set(gl, -1.0, -1.0);
+   evas_object_size_hint_weight_set(gl, 1.0, 1.0);
+   evas_object_show(gl);
+   
+   elm_box_pack_end(bx, gl);
+   evas_object_show(bx2);
+   
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   elm_box_homogenous_set(bx2, 1);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[+]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[-]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_del, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
+static void
 my_win_main(void)
 {
    Evas_Object *win, *bg, *bx0, *lb, *li, *fr;
@@ -2217,6 +2318,7 @@
    elm_list_item_append(li, "Scaling 2", NULL, NULL, my_bt_27, NULL);
    elm_list_item_append(li, "Slider", NULL, NULL, my_bt_28, NULL);
    elm_list_item_append(li, "Genlist", NULL, NULL, my_bt_29, NULL);
+   elm_list_item_append(li, "Genlist 2", NULL, NULL, my_bt_30, NULL);
 
    elm_list_go(li);
    

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-17 06:39:56 UTC (rev 39055)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-17 07:50:35 UTC (rev 39056)
@@ -515,13 +515,25 @@
      };
 
    EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
-   EAPI Elm_Genlist_Item *
-     elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc,
-                             const void *data, Elm_Genlist_Item *parent,
-                             Elm_Genlist_Item_Flags flags,
-                             void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI const Elm_Genlist_Item *elm_genlist_selected_item_get(Evas_Object *obj);
+   EAPI const Eina_List *elm_genlist_selected_items_get(Evas_Object *obj);
+   EAPI const Elm_Genlist_Item *elm_genlist_first_item_get(Evas_Object *obj);
+   EAPI const Elm_Genlist_Item *elm_genlist_last_item_get(Evas_Object *obj);
+   EAPI const Elm_Genlist_Item *elm_genlist_item_next_get(Elm_Genlist_Item *item);
+   EAPI const Elm_Genlist_Item *elm_genlist_item_prev_get(Elm_Genlist_Item *item);
+   EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
+   EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
+   EAPI const void *elm_genlist_item_data_get(Elm_Genlist_Item *item);
+       
    /* smart callbacks called:
+    * "clicked" - the user clicked the hoversel button and popped up the sel
+    * "selected" - an item in the hoversel list is selected
+    * "dismissed" - the hover is dismissed
     */
+   
+   /* smart callbacks called:
+    */
         
 #ifdef __cplusplus
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-17 06:39:56 UTC (rev 39055)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-17 07:50:35 UTC (rev 39056)
@@ -18,6 +18,9 @@
    Ecore_Job *calc_job;
    Ecore_Idler *queue_idler;
    Eina_List *queue;
+   Eina_List *selected;
+   Evas_Bool on_hold : 1;
+   Evas_Bool multi : 1;
    Evas_Bool min_w : 1;
    Evas_Bool min_h : 1;
 };
@@ -60,7 +63,6 @@
    Evas_Bool disabled : 1;
    Evas_Bool mincalcd : 1;
    Evas_Bool queued : 1;
-   
 };
 
 struct _Pan {
@@ -92,6 +94,11 @@
         free(itb);
      }
  */
+   // free wd->items
+   // free wd->blocks
+   if (wd->selected) eina_list_free(wd->selected);
+   if (wd->queue) eina_list_free(wd->queue);
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
    free(wd);
@@ -103,6 +110,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    elm_smart_scroller_theme_set(wd->scr, "scroller", "base", "default");
    edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+   // FIXME: redo items
    _sizing_eval(obj);
 }
 
@@ -154,23 +162,8 @@
 {
    _sizing_eval(data);
 }
-/*
+
 static void
-_sub_del(void *data, Evas_Object *obj, void *event_info)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_Object *sub = event_info;
-   if (sub == wd->content)
-     {
-	elm_widget_on_show_region_hook_set(wd->content, NULL, NULL);
-	evas_object_event_callback_del
-	  (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints);
-	wd->content = NULL;
-	_sizing_eval(obj);
-     }
-}
-*/
-static void
 _resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    _sizing_eval(data);
@@ -212,6 +205,80 @@
 }
 
 static void
+_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Item *it = data;
+   Evas_Event_Mouse_Down *ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = 1;
+   else it->wd->on_hold = 0;
+   if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
+     evas_object_smart_callback_call(it->wd->obj, "clicked", it);
+}
+
+static void
+_item_select(Item *it)
+{
+   const char *selectraise;
+   if (it->selected) return;
+   edje_object_signal_emit(it->base, "elm,state,selected", "elm");
+   selectraise = edje_object_data_get(it->base, "selectraise");
+   if ((selectraise) && (!strcmp(selectraise, "on")))
+     evas_object_raise(it->base);
+   it->selected = 1;
+   it->wd->selected = eina_list_append(it->wd->selected, it);
+   if (it->func.func) it->func.func((void *)it->func.data, it->wd->obj, it);
+   evas_object_smart_callback_call(it->wd->obj, "selected", it);
+}
+
+static void
+_item_unselect(Item *it)
+{
+   const char *stacking, *selectraise;
+   if (!it->selected) return;
+   edje_object_signal_emit(it->base, "elm,state,unselected", "elm");
+   stacking = edje_object_data_get(it->base, "stacking");
+   selectraise = edje_object_data_get(it->base, "selectraise");
+   if ((selectraise) && (!strcmp(selectraise, "on")))
+     {
+        if ((stacking) && (!strcmp(stacking, "below")))
+          evas_object_lower(it->base);
+     }
+   it->selected = 0;
+   it->wd->selected = eina_list_remove(it->wd->selected, it);
+   evas_object_smart_callback_call(it->wd->obj, "unselected", it);
+}
+
+static void
+_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Item *it = data;
+   Evas_Event_Mouse_Up *ev = event_info;
+   Eina_List *l;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = 1;
+   else it->wd->on_hold = 0;
+   if (it->wd->on_hold)
+     {
+        it->wd->on_hold = 0;
+        return;
+     }
+   if (it->wd->multi)
+     {
+        if (!it->selected) _item_select(it);
+        else _item_unselect(it);
+     }
+   else
+     {
+        for (l = it->wd->selected; l;)
+          {
+             Item *it2 = l->data;
+             l = l->next;
+             if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+          }
+        if (!it->selected) _item_select(it);
+     }
+}
+
+static void
 _item_realize(Item *it, int in, int calc)
 {
    const char *stacking;
@@ -234,11 +301,12 @@
              if (!strcmp(stacking, "below")) evas_object_lower(it->base);
              else if (!strcmp(stacking, "above")) evas_object_raise(it->base);
           }
-// FIXME: hook callbacks   
-//   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN,
-//                                  _mouse_down, it);
-//   evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP,
-//                                  _mouse_up, it);
+        evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_DOWN,
+                                       _mouse_down, it);
+        evas_object_event_callback_add(it->base, EVAS_CALLBACK_MOUSE_UP,
+                                       _mouse_up, it);
+        if (it->selected)
+          edje_object_signal_emit(it->base, "elm,state,selected", "elm");
      }
    
    if (it->itc->func.label_get)
@@ -606,9 +674,7 @@
    edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &minw, &minh);
    evas_object_size_hint_min_set(obj, minw, minh);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, obj);
-/*
-   evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
- */
+   
    _sizing_eval(obj);
    return obj;
 }
@@ -634,6 +700,44 @@
 }
 
 static void
+_item_block_del(Item *it)
+{
+   Eina_Inlist *il;
+   
+   it->block->items = eina_list_remove(it->block->items, it);
+   it->block->count--;
+   it->block->changed = 1;
+   if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+   it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
+   if (it->block->count < 1)
+     {
+        // FIXME: free block
+     }
+   for (il = (Eina_Inlist *)(it->block); il; il = il->next)
+     {
+        Item_Block *itb = (Item_Block *)il;
+        _item_block_unrealize(itb);
+     }
+}
+
+static void
+_item_del(Item *it)
+{
+   if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
+   if (it->itc->func.del) it->itc->func.del(it->data, it->wd->obj);
+   if (it->realized) _item_unrealize(it);
+   if (it->block) _item_block_del(it);
+   // FIXME: del it->subblocks
+   // FIXME: del it->subitems
+   if (it->queued)
+     {
+        it->wd->queue = eina_list_remove(it->wd->queue, it);
+     }
+   it->wd->items = eina_inlist_remove(it->wd->items, (Eina_Inlist *)it);
+   free(it);
+}
+
+static void
 _item_block_add(Widget_Data *wd, Item *it, Item *itpar, Item *itrel, int before)
 {
    Item_Block *itb;
@@ -780,6 +884,8 @@
 EAPI void
 elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   wd->multi = multi;
 }
 
 EAPI const Eina_List *
@@ -790,21 +896,66 @@
 EAPI const Elm_Genlist_Item *
 elm_genlist_selected_item_get(Evas_Object *obj)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->selected) return wd->selected->data;
+   return NULL;
 }
 
 EAPI const Eina_List *
 elm_genlist_selected_items_get(Evas_Object *obj)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->selected;
 }
 
-EAPI const Eina_List *
-elm_genlist_item_items_get(Elm_Genlist_Item *item)
+EAPI const Elm_Genlist_Item *
+elm_genlist_first_item_get(Evas_Object *obj)
 {
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return (Elm_Genlist_Item *)(wd->items);
 }
 
+EAPI const Elm_Genlist_Item *
+elm_genlist_last_item_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd->items) return NULL;
+   return (Elm_Genlist_Item*)(wd->items->last);
+}
+
+EAPI const Elm_Genlist_Item *
+elm_genlist_item_next_get(Elm_Genlist_Item *item)
+{
+   return ((Eina_Inlist *)item)->next;
+}
+
+EAPI const Elm_Genlist_Item *
+elm_genlist_item_prev_get(Elm_Genlist_Item *item)
+{
+   return ((Eina_Inlist *)item)->prev;
+}
+
 EAPI void
 elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected)
 {
+   Item *it = (Item *)item;
+   Widget_Data *wd = elm_widget_data_get(it->wd->obj);
+   Eina_List *l;
+   if (selected)
+     {
+        if (!wd->multi)
+          {
+             for (l = it->wd->selected; l;)
+               {
+                  Item *it2 = l->data;
+                  l = l->next;
+                  if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+               }
+          }
+        if (!it->selected) _item_select(it);
+     }
+   else if (it->selected)
+     _item_unselect(it);
 }
 
 EAPI void
@@ -814,30 +965,32 @@
 }
 
 EAPI void
-elm_genlist_item_disabld_set(Elm_Genlist_Item *item, Evas_Bool disabld)
+elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled)
 {
+   // call this to set the disabled flag and update
 }
 
 EAPI void
 elm_genlist_item_show(Elm_Genlist_Item *item)
 {
+   // call this to jump to item in scroll
 }
 
 EAPI void
 elm_genlist_item_del(Elm_Genlist_Item *item)
 {
+   Item *it = (Item *)item;
+   if (!it) return;
+   _item_del(it);
 }
 
 EAPI const void *
 elm_genlist_item_data_get(Elm_Genlist_Item *item)
 {
+   Item *it = (Item *)item;
+   return it->data;
 }
 
-EAPI const Evas_Object *
-elm_genlist_item_icon_get(Elm_Genlist_Item *item)
-{
-}
-
 EAPI void
 elm_genlist_item_update(Elm_Genlist_Item *item)
 {

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-02-17 06:39:56 UTC (rev 39055)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-02-17 07:50:35 UTC (rev 39056)
@@ -180,9 +180,10 @@
      }
    else
      {
-        for (l = wd->items; l; l = l->next)
+        for (l = wd->selected; l;)
           {
              Item *it2 = l->data;
+             l = l->next;
              if ((it2 != it) && (it2->selected)) _item_unselect(it2);
           }
         if (!it->selected) _item_select(it);
@@ -468,8 +469,12 @@
      {
         if (!wd->multi)
           {
-             Item *it2 = l->data;
-             if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+             for (l = it->selected; l;)
+               {
+                  Item *it2 = l->data;
+                  l = l->next;
+                  if ((it2 != it) && (it2->selected)) _item_unselect(it2);
+               }
           }
         if (!it->selected) _item_select(it);
      }

Log:
  more genlist work.
  
  
Author:       raster
Date:         2009-02-17 06:39:08 -0800 (Tue, 17 Feb 2009)
New Revision: 39059

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-17 14:18:14 UTC (rev 39058)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-17 14:39:08 UTC (rev 39059)
@@ -2158,6 +2158,26 @@
 }
 
 static void
+my_gl_first(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   Elm_Genlist_Item *gli = elm_genlist_first_item_get(gl);
+   if (!gli) return;
+   elm_genlist_item_show(gli);
+   elm_genlist_item_selected_set(gli, 1);
+}
+
+static void
+my_gl_last(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   Elm_Genlist_Item *gli = elm_genlist_last_item_get(gl);
+   if (!gli) return;
+   elm_genlist_item_show(gli);
+   elm_genlist_item_selected_set(gli, 1);
+}
+
+static void
 my_bt_30(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
@@ -2192,6 +2212,22 @@
    evas_object_size_hint_align_set(bx2, -1.0, -1.0);
    
    bt = elm_button_add(win);
+   elm_button_label_set(bt, "[/\\]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_first, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[\\/]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_last, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
    elm_button_label_set(bt, "[+]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-17 14:18:14 UTC (rev 39058)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-17 14:39:08 UTC (rev 39059)
@@ -523,6 +523,7 @@
    EAPI const Elm_Genlist_Item *elm_genlist_item_next_get(Elm_Genlist_Item *item);
    EAPI const Elm_Genlist_Item *elm_genlist_item_prev_get(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
+   EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
    EAPI const void *elm_genlist_item_data_get(Elm_Genlist_Item *item);
        

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-17 14:18:14 UTC (rev 39058)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-17 14:39:08 UTC (rev 39059)
@@ -19,6 +19,7 @@
    Ecore_Idler *queue_idler;
    Eina_List *queue;
    Eina_List *selected;
+   Item *show_item;
    Evas_Bool on_hold : 1;
    Evas_Bool multi : 1;
    Evas_Bool min_w : 1;
@@ -63,6 +64,7 @@
    Evas_Bool disabled : 1;
    Evas_Bool mincalcd : 1;
    Evas_Bool queued : 1;
+   Evas_Bool showme : 1;
 };
 
 struct _Pan {
@@ -76,26 +78,29 @@
 static void _sizing_eval(Evas_Object *obj);
 static void _sub_del(void *data, Evas_Object *obj, void *event_info);
 
+static void _item_unrealize(Item *it);
+
 static Evas_Smart_Class _pan_sc = {NULL};
 
 static void
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-/*   
+   while (wd->items)
+     {
+        Item *it = (Item *)(wd->items);
+        wd->items = eina_inlist_remove(wd->items, wd->items);
+        if (it->realized) _item_unrealize(it);
+        if (it->itc->func.del) it->itc->func.del(it->data, it->wd->obj);
+        free(it);
+     }
    while (wd->blocks)
      {
-        Item_Block *itb = wd->blocks;
-        while (itb->items)
-          {
-             Item *it = itb->items->data;
-             
-          }
+        Item_Block *itb = (Item_Block *)(wd->blocks);
+        wd->blocks = eina_inlist_remove(wd->blocks, wd->blocks);
+        if (itb->items) eina_list_free(itb->items);
         free(itb);
      }
- */
-   // free wd->items
-   // free wd->blocks
    if (wd->selected) eina_list_free(wd->selected);
    if (wd->queue) eina_list_free(wd->queue);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
@@ -392,15 +397,17 @@
    it->realized = 0;
 }
 
-static void
+static int
 _item_block_recalc(Item_Block *itb, int in)
 {
    Eina_List *l;
    Evas_Coord minw = 0, minh = 0;
-
+   int showme = 0;
+   
    for (l = itb->items; l; l = l->next)
      {
         Item *it = l->data;
+        showme |= it->showme;
         if (!itb->realized)
           {
              _item_realize(it, in, 1);
@@ -417,6 +424,7 @@
    itb->changed = 0;
    /* force an evas norender to garbage collect deleted objects */
    evas_norender(evas_object_evas_get(itb->wd->obj));
+   return showme;
 }
 
 static void
@@ -483,8 +491,8 @@
    for (bn = 0, in = 0, il = wd->blocks; il; il = il->next, bn++)
      {
         Item_Block *itb = (Item_Block *)il;
-        if (itb->changed)
-          _item_block_recalc(itb, in);
+        int showme;
+        if (itb->changed) showme = _item_block_recalc(itb, in);
         itb->y = y;
         itb->x = 0;
         itb->w = itb->minw;
@@ -494,6 +502,12 @@
         itb->h = itb->minh;
         y += itb->minh;
         in += itb->count;
+        if (showme)
+          {
+             wd->show_item->showme = 0;
+             elm_smart_scroller_child_region_show(wd->scr, wd->show_item->x, wd->show_item->y, wd->show_item->w, wd->show_item->h);
+             wd->show_item = NULL;
+          }
      }
    evas_object_geometry_get(wd->pan_smart, NULL, NULL, &ow, &oh);
    if (minw < ow) minw = ow;
@@ -723,6 +737,7 @@
 static void
 _item_del(Item *it)
 {
+   if (it->wd->show_item == it) it->wd->show_item = NULL;
    if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
    if (it->itc->func.del) it->itc->func.del(it->data, it->wd->obj);
    if (it->realized) _item_unrealize(it);
@@ -926,13 +941,13 @@
 EAPI const Elm_Genlist_Item *
 elm_genlist_item_next_get(Elm_Genlist_Item *item)
 {
-   return ((Eina_Inlist *)item)->next;
+   return (Elm_Genlist_Item *)(((Eina_Inlist *)item)->next);
 }
 
 EAPI const Elm_Genlist_Item *
 elm_genlist_item_prev_get(Elm_Genlist_Item *item)
 {
-   return ((Eina_Inlist *)item)->prev;
+   return (Elm_Genlist_Item *)(((Eina_Inlist *)item)->prev);
 }
 
 EAPI void
@@ -973,7 +988,19 @@
 EAPI void
 elm_genlist_item_show(Elm_Genlist_Item *item)
 {
-   // call this to jump to item in scroll
+   Item *it = (Item *)item;
+   if ((it->queued) || (!it->mincalcd))
+     {
+        it->wd->show_item = it;
+        it->showme = 1;
+        return;
+     }
+   if (it->wd->show_item)
+     {
+        it->wd->show_item->showme = 0;
+        it->wd->show_item = NULL;
+     }
+   elm_smart_scroller_child_region_show(it->wd->scr, it->x, it->y, it->w, it->h);
 }
 
 EAPI void

Log:
  fix up some dynamic add/del and showing code.
  
  
Author:       raster
Date:         2009-02-17 20:18:25 -0800 (Tue, 17 Feb 2009)
New Revision: 39072

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 01:07:43 UTC (rev 39071)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 04:18:25 UTC (rev 39072)
@@ -2103,7 +2103,7 @@
    evas_object_size_hint_weight_set(gl, 1.0, 1.0);
    evas_object_show(gl);
    
-   itc1.style          = "default";
+   itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
    itc1.func.icon_get  = gl_icon_get;
    itc1.func.state_get = gl_state_get;
@@ -2129,7 +2129,7 @@
    Elm_Genlist_Item *gli;
    static int i = 0;
 
-   itc1.style          = "default";
+   itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
    itc1.func.icon_get  = gl_icon_get;
    itc1.func.state_get = gl_state_get;

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 01:07:43 UTC (rev 39071)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 04:18:25 UTC (rev 39072)
@@ -505,7 +505,7 @@
    typedef struct _Elm_Genlist_Item       Elm_Genlist_Item;
    struct _Elm_Genlist_Item_Class
      {
-        const char *style;
+        const char *item_style;
         struct {
            char        *(*label_get) (const void *data, Evas_Object *obj, const char *part);
            Evas_Object *(*icon_get)  (const void *data, Evas_Object *obj, const char *part);
@@ -561,7 +561,7 @@
 // 
 //// (more widgets/features - medium priority)
 // * genlist widget (complex list widget - harder to use than normal simple list, but handles huge lists of items etc.)
-// * tree feature fir genlist widget (like biglist - but items can expand to sub-items)
+// * tree feature for genlist widget (like biglist - but items can expand to sub-items)
 // * radio + group handling
 // * checkbox (like toggle)
 // * pager (for pushing/popping pages and going back and forward and flipping)
@@ -602,7 +602,7 @@
 // * prepend or append theme files from code for an app to allow an app to augment the theme eithe rby forcibly overriding things with its own theme file (so it can ship some custom elements that always override user theme) and so it can also provide a final (even after default) fallback for "extended" styles of its own (but thus allowing themes to overried its extensions if they want)
 // * determine prefix of app dynamically and export calls to get prefix info
 // * load config from file
-// * load config from x prpoerty
+// * load config from x property
 // * handle finger size property and on-the-fly changes like scaling does
 // * somehow a pdf(ps) viewer widget that doesnt make it gpl (lgpl)
 // * emotion widget

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 01:07:43 UTC (rev 39071)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 04:18:25 UTC (rev 39072)
@@ -294,9 +294,9 @@
    evas_object_smart_member_add(it->base, it->wd->pan_smart);
    elm_widget_sub_object_add(it->wd->obj, it->base);
    if (in & 0x1)
-     snprintf(buf, sizeof(buf), "%s/%s", "item_odd", it->itc->style);
+     snprintf(buf, sizeof(buf), "%s/%s", "item_odd", it->itc->item_style);
    else
-     snprintf(buf, sizeof(buf), "%s/%s", "item", it->itc->style);
+     snprintf(buf, sizeof(buf), "%s/%s", "item", it->itc->item_style);
    _elm_theme_set(it->base, "genlist", buf, "default");
    if (!calc)
      {
@@ -369,8 +369,8 @@
         elm_coords_finger_size_adjust(1, &mw, 1, &mh);
         edje_object_size_min_restricted_calc(it->base, &mw, &mh, mw, mh);
         elm_coords_finger_size_adjust(1, &mw, 1, &mh);
-        it->minw = mw;
-        it->minh = mh;
+        it->w = it->minw = mw;
+        it->h = it->minh = mh;
         it->mincalcd = 1;
      }
    if (!calc) evas_object_show(it->base);
@@ -403,6 +403,7 @@
    Eina_List *l;
    Evas_Coord minw = 0, minh = 0;
    int showme = 0;
+   Evas_Coord y = 0;
    
    for (l = itb->items; l; l = l->next)
      {
@@ -418,6 +419,9 @@
         minh += it->minh;
         if (minw < it->minw) minw = it->minw;
         in++;
+        it->x = 0;
+        it->y = y;
+        y += it->minw;
      }
    itb->minw = minw;
    itb->minh = minh;
@@ -469,15 +473,16 @@
         it->x = 0;
         it->y = y;
         it->w = itb->w;
-        it->h = it->minh;
-        evas_object_resize(it->base, it->w, it->h);
-        evas_object_move(it->base, 
-                         ox + itb->x + it->x - itb->wd->pan_x,
-                         oy + itb->y + it->y - itb->wd->pan_y);
-        evas_object_show(it->base);
+        if (it->realized)
+          {
+             evas_object_resize(it->base, it->w, it->h);
+             evas_object_move(it->base, 
+                              ox + itb->x + it->x - itb->wd->pan_x,
+                              oy + itb->y + it->y - itb->wd->pan_y);
+             evas_object_show(it->base);
+          }
         y += it->h;
      }
-   itb->realized = 1;
 }
 
 static void
@@ -485,30 +490,68 @@
 {
    Widget_Data *wd = data;
    Eina_Inlist *il;
-   Evas_Coord minw = 0, minh = 0, x = 0, y = 0, ow, oh;
+   Evas_Coord minw = -1, minh = 0, x = 0, y = 0, ow, oh;
+   Item_Block *chb = NULL;
    int bn, in;
+   int minw_change = 0;
    
    for (bn = 0, in = 0, il = wd->blocks; il; il = il->next, bn++)
      {
         Item_Block *itb = (Item_Block *)il;
-        int showme;
-        if (itb->changed) showme = _item_block_recalc(itb, in);
+        int showme = 0;
+        if (chb)
+          {
+             if (itb->realized) _item_block_unrealize(itb);
+          }
+        if (itb->changed)
+          {
+             if (itb->realized) _item_block_unrealize(itb);
+             showme = _item_block_recalc(itb, in);
+             printf("change block %i\n", bn);
+             chb = itb;
+          }
         itb->y = y;
         itb->x = 0;
-        itb->w = itb->minw;
-        itb->h = itb->minh;
         minh += itb->minh;
-        if (minw < itb->minw) minw = itb->minw;
+        if (minw == -1) minw = itb->minw;
+        else if (minw < itb->minw)
+          {
+             minw = itb->minw;
+             minw_change = 1;
+          }
+        itb->w = minw;
         itb->h = itb->minh;
-        y += itb->minh;
+        y += itb->h;
         in += itb->count;
         if (showme)
           {
              wd->show_item->showme = 0;
-             elm_smart_scroller_child_region_show(wd->scr, wd->show_item->x, wd->show_item->y, wd->show_item->w, wd->show_item->h);
+             elm_smart_scroller_child_region_show(wd->scr, 
+                                                  wd->show_item->x + wd->show_item->block->x, 
+                                                  wd->show_item->y + wd->show_item->block->y,
+                                                  wd->show_item->block->w, 
+                                                  wd->show_item->h);
              wd->show_item = NULL;
+             showme = 0;
           }
      }
+   if (minw_change)
+     {
+        for (il = wd->blocks; il; il = il->next)
+          {
+             Item_Block *itb = (Item_Block *)il;
+             itb->minw = minw;
+             itb->w = itb->minw;
+          }
+     }
+   if ((chb) && (((Eina_Inlist *)(chb))->next))
+     {
+        for (il = ((Eina_Inlist *)(chb))->next; il; il = il->next)
+          {
+             Item_Block *itb = (Item_Block *)il;
+             if (itb->realized) _item_block_unrealize(itb);
+          }
+     }
    evas_object_geometry_get(wd->pan_smart, NULL, NULL, &ow, &oh);
    if (minw < ow) minw = ow;
    if ((minw != wd->minw) || (minh != wd->minh))
@@ -717,20 +760,63 @@
 _item_block_del(Item *it)
 {
    Eina_Inlist *il;
+   Item_Block *itb = it->block;
    
-   it->block->items = eina_list_remove(it->block->items, it);
-   it->block->count--;
-   it->block->changed = 1;
+   itb->items = eina_list_remove(itb->items, it);
+   itb->count--;
+   itb->changed = 1;
    if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
    it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
-   if (it->block->count < 1)
+//   for (il = (Eina_Inlist *)(itb); il; il = il->next)
+//     {
+//        Item_Block *itb2 = (Item_Block *)il;
+//        _item_block_unrealize(itb2);
+//     }
+   if (itb->count < 1)
      {
-        // FIXME: free block
+        it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
+        free(itb);
      }
-   for (il = (Eina_Inlist *)(it->block); il; il = il->next)
+   else
      {
-        Item_Block *itb = (Item_Block *)il;
-        _item_block_unrealize(itb);
+        if (itb->count < 16)
+          {
+             Item_Block *itbp = (Item_Block *)(((Eina_Inlist *)(itb))->prev);
+             Item_Block *itbn = (Item_Block *)(((Eina_Inlist *)(itb))->next);
+             if ((itbp) && ((itbp->count + itb->count) < 48))
+               {
+                  printf("merge with prev\n");
+                  // merge prev + itb
+                  while (itb->items)
+                    {
+                       Item *it2 = itb->items->data;
+                       it2->block = itbp;
+                       itbp->items = eina_list_append(itbp->items, it2);
+                       itb->items = eina_list_remove_list(itb->items, itb->items);
+                       itbp->count++;
+                       itbp->changed = 1;
+                    }
+                  it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
+                  free(itb);
+               }
+             else if ((itbn) && ((itbn->count + itb->count) < 48))
+               {
+                  printf("merge with next\n");
+                  // merge next + itb
+                  while (itb->items)
+                    {
+                       Eina_List *last = eina_list_last(itb->items);
+                       Item *it2 = last->data;
+                       it2->block = itbn;
+                       itb->items = eina_list_remove_list(itb->items, last);
+                       itbn->items = eina_list_prepend(itbn->items, it2);
+                       itbn->count++;
+                       itbn->changed = 1;
+                    }
+                  it->wd->blocks = eina_inlist_remove(it->wd->blocks, (Eina_Inlist *)itb);
+                  free(itb);
+               }
+          }
      }
 }
 
@@ -878,6 +964,7 @@
                          Elm_Genlist_Item_Flags flags,
                          void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
+   // fixme
 }
 
 EAPI Elm_Genlist_Item *
@@ -886,6 +973,7 @@
                                Elm_Genlist_Item_Flags flags,
                                void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
+   // fixme
 }
 
 EAPI Elm_Genlist_Item *
@@ -894,6 +982,7 @@
                               Elm_Genlist_Item_Flags flags,
                               void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
+   // fixme
 }
 
 EAPI void
@@ -903,11 +992,6 @@
    wd->multi = multi;
 }
 
-EAPI const Eina_List *
-elm_genlist_items_get(Evas_Object *obj)
-{
-}
-
 EAPI const Elm_Genlist_Item *
 elm_genlist_selected_item_get(Evas_Object *obj)
 {
@@ -1000,7 +1084,14 @@
         it->wd->show_item->showme = 0;
         it->wd->show_item = NULL;
      }
-   elm_smart_scroller_child_region_show(it->wd->scr, it->x, it->y, it->w, it->h);
+   printf("%i %i | %ix%i\n",
+          it->x + it->block->x,
+          it->y + it->block->y,
+          it->block->w, it->h);
+   elm_smart_scroller_child_region_show(it->wd->scr,
+                                        it->x + it->block->x, 
+                                        it->y + it->block->y,
+                                        it->block->w, it->h);
 }
 
 EAPI void

Log:
  add clear call. fix free to have less leaks
  
  
Author:       raster
Date:         2009-02-17 20:27:49 -0800 (Tue, 17 Feb 2009)
New Revision: 39073

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 04:18:25 UTC (rev 39072)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 04:27:49 UTC (rev 39073)
@@ -2123,6 +2123,13 @@
 }
 
 static void
+my_gl_clear(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   elm_genlist_clear(gl);
+}
+
+static void
 my_gl_add(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *gl = data;
@@ -2228,6 +2235,14 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
+   elm_button_label_set(bt, "[X]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_clear, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
    elm_button_label_set(bt, "[+]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 04:18:25 UTC (rev 39072)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 04:27:49 UTC (rev 39073)
@@ -516,6 +516,7 @@
 
    EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
    EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI void elm_genlist_clear(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_selected_item_get(Evas_Object *obj);
    EAPI const Eina_List *elm_genlist_selected_items_get(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_first_item_get(Evas_Object *obj);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 04:18:25 UTC (rev 39072)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 04:27:49 UTC (rev 39073)
@@ -86,24 +86,7 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   while (wd->items)
-     {
-        Item *it = (Item *)(wd->items);
-        wd->items = eina_inlist_remove(wd->items, wd->items);
-        if (it->realized) _item_unrealize(it);
-        if (it->itc->func.del) it->itc->func.del(it->data, it->wd->obj);
-        free(it);
-     }
-   while (wd->blocks)
-     {
-        Item_Block *itb = (Item_Block *)(wd->blocks);
-        wd->blocks = eina_inlist_remove(wd->blocks, wd->blocks);
-        if (itb->items) eina_list_free(itb->items);
-        free(itb);
-     }
-   if (wd->selected) eina_list_free(wd->selected);
-   if (wd->queue) eina_list_free(wd->queue);
-   if (wd->calc_job) ecore_job_del(wd->calc_job);
+   elm_genlist_clear(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
    free(wd);
@@ -986,6 +969,53 @@
 }
 
 EAPI void
+elm_genlist_clear(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   while (wd->items)
+     {
+        Item *it = (Item *)(wd->items);
+        wd->items = eina_inlist_remove(wd->items, wd->items);
+        if (it->realized) _item_unrealize(it);
+        if (it->itc->func.del) it->itc->func.del(it->data, it->wd->obj);
+        free(it);
+     }
+   while (wd->blocks)
+     {
+        Item_Block *itb = (Item_Block *)(wd->blocks);
+        wd->blocks = eina_inlist_remove(wd->blocks, wd->blocks);
+        if (itb->items) eina_list_free(itb->items);
+        free(itb);
+     }
+   if (wd->calc_job)
+     {
+        ecore_job_del(wd->calc_job);
+        wd->calc_job = NULL;
+     }
+   if (wd->queue_idler)
+     {
+        ecore_idler_del(wd->queue_idler);
+        wd->queue_idler = NULL;
+     }
+   if (wd->queue)
+     {
+        eina_list_free(wd->queue);
+        wd->queue = NULL;
+     }
+   if (wd->selected)
+     {
+        eina_list_free(wd->selected);
+        wd->selected = NULL;
+     }
+   wd->show_item = NULL;
+   wd->pan_x = 0;
+   wd->pan_y = 0;
+   wd->minw = 0;
+   wd->minh = 0;
+   evas_object_smart_callback_call(wd->pan_smart, "changed", NULL);
+}
+
+EAPI void
 elm_genlist_multi_select_set(Evas_Object *obj, Evas_Bool multi)
 {
    Widget_Data *wd = elm_widget_data_get(obj);

Log:
  insert and prepend calls work... at least in my tests.
  
  
Author:       raster
Date:         2009-02-18 04:41:45 -0800 (Wed, 18 Feb 2009)
New Revision: 39077

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 07:10:42 UTC (rev 39076)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 12:41:45 UTC (rev 39077)
@@ -2203,6 +2203,7 @@
 my_bt_30(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
+   Elm_Genlist_Item *gli[10];
    int i;
    
    win = elm_win_add(NULL, "genlist-2", ELM_WIN_BASIC);
@@ -2223,6 +2224,34 @@
    evas_object_size_hint_align_set(gl, -1.0, -1.0);
    evas_object_size_hint_weight_set(gl, 1.0, 1.0);
    evas_object_show(gl);
+
+   itc1.item_style     = "default";
+   itc1.func.label_get = gl_label_get;
+   itc1.func.icon_get  = gl_icon_get;
+   itc1.func.state_get = gl_state_get;
+   itc1.func.del       = gl_del;
+
+   gli[0] = elm_genlist_item_append(gl, &itc1, 
+                                    (void *)1001/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, 
+                                    (void *)1001/* func data */);
+   gli[1] = elm_genlist_item_append(gl, &itc1, 
+                                    (void *)1002/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, 
+                                    (void *)1002/* func data */);
+   gli[2] = elm_genlist_item_append(gl, &itc1, 
+                                    (void *)1003/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, 
+                                    (void *)1003/* func data */);
+   gli[3] = elm_genlist_item_prepend(gl, &itc1, 
+                                     (void *)1004/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, 
+                                     (void *)1004/* func data */);
+   gli[4] = elm_genlist_item_prepend(gl, &itc1, 
+                                     (void *)1005/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, 
+                                     (void *)1005/* func data */);
+   gli[5] = elm_genlist_item_insert_before(gl, &itc1, 
+                                           (void *)1006/* item data */, gli[2]/* rel */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                           (void *)1006/* func data */);
+   gli[6] = elm_genlist_item_insert_after(gl, &itc1, 
+                                          (void *)1007/* item data */, gli[2]/* rel */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                          (void *)1007/* func data */);
    
    elm_box_pack_end(bx, gl);
    evas_object_show(bx2);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 07:10:42 UTC (rev 39076)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 12:41:45 UTC (rev 39077)
@@ -516,6 +516,9 @@
 
    EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
    EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
+   EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
    EAPI void elm_genlist_clear(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_selected_item_get(Evas_Object *obj);
    EAPI const Eina_List *elm_genlist_selected_items_get(Evas_Object *obj);
@@ -524,7 +527,9 @@
    EAPI const Elm_Genlist_Item *elm_genlist_item_next_get(Elm_Genlist_Item *item);
    EAPI const Elm_Genlist_Item *elm_genlist_item_prev_get(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
+   EAPI Evas_Bool elm_genlist_item_selected_get(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled);
+   EAPI Evas_Bool elm_genlist_item_disabled_get(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
    EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
    EAPI const void *elm_genlist_item_data_get(Elm_Genlist_Item *item);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 07:10:42 UTC (rev 39076)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 12:41:45 UTC (rev 39077)
@@ -820,8 +820,8 @@
 _item_block_add(Widget_Data *wd, Item *it, Item *itpar, Item *itrel, int before)
 {
    Item_Block *itb;
-   
-   if (!itrel) /* new block */
+
+   if (!itrel)
      {
         newblock:
         itb = calloc(1, sizeof(Item_Block));
@@ -832,17 +832,29 @@
              if (itrel)
                {
                   if (!itrel->block)
-                    printf("EEEK itrel has no block!\n");
+                    {
+                       wd->blocks = eina_inlist_append(wd->blocks, (Eina_Inlist *)itb);
+                       itb->items = eina_list_append(itb->items, it);
+                    }
                   else
                     {
                        if (before)
-                         wd->blocks = eina_inlist_prepend_relative(wd->blocks, (Eina_Inlist *)itb, (Eina_Inlist *)(itrel->block));
+                         {
+                            wd->blocks = eina_inlist_prepend_relative(wd->blocks, (Eina_Inlist *)itb, (Eina_Inlist *)(itrel->block));
+                            itb->items = eina_list_prepend_relative(itb->items, it, itrel);
+                         }
                        else
-                         wd->blocks = eina_inlist_append_relative(wd->blocks, (Eina_Inlist *)itb, (Eina_Inlist *)(itrel->block));
+                         {
+                            wd->blocks = eina_inlist_append_relative(wd->blocks, (Eina_Inlist *)itb, (Eina_Inlist *)(itrel->block));
+                            itb->items = eina_list_append_relative(itb->items, it, itrel);
+                         }
                     }
                }
              else
-               wd->blocks = eina_inlist_append(wd->blocks, (Eina_Inlist *)itb);
+               {
+                  wd->blocks = eina_inlist_append(wd->blocks, (Eina_Inlist *)itb);
+                  itb->items = eina_list_append(itb->items, it);
+               }
           }
         else
           {
@@ -852,9 +864,12 @@
    else
      {
         itb = itrel->block;
-        if (itb->count > 32) goto newblock;
+        if ((!itb) || (itb->count > 32)) goto newblock;
+        if (before)
+          itb->items = eina_list_prepend_relative(itb->items, it, itrel);
+        else
+          itb->items = eina_list_append_relative(itb->items, it, itrel);
      }
-   itb->items = eina_list_append(itb->items, it);
    itb->count++;
    itb->changed = 1;
    it->block = itb;
@@ -922,7 +937,6 @@
                         void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   Item *itpar;
    Item *it = _item_new(wd, itc, data, parent, flags, func, func_data);
    if (!it) return NULL;
    if (!it->parent)
@@ -941,7 +955,17 @@
                          Elm_Genlist_Item_Flags flags,
                          void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
-   // fixme - now
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Item *it = _item_new(wd, itc, data, parent, flags, func, func_data);
+   if (!it) return NULL;
+   if (!it->parent)
+     wd->items = eina_inlist_prepend(wd->items, (Eina_Inlist *)it);
+   else
+     {
+        // FIXME: tree. not done yet
+     }
+   _item_queue(wd, it);
+   return (Elm_Genlist_Item *)it;
 }
 
 EAPI Elm_Genlist_Item *
@@ -950,7 +974,17 @@
                                Elm_Genlist_Item_Flags flags,
                                void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
-   // fixme - now
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Item *it = _item_new(wd, itc, data, NULL, flags, func, func_data);
+   if (!it) return NULL;
+   if (!it->parent)
+     wd->items = eina_inlist_prepend_relative(wd->items, (Eina_Inlist *)it, (Eina_Inlist *)before);
+   else
+     {
+        // FIXME: tree. not done yet
+     }
+   _item_queue(wd, it);
+   return (Elm_Genlist_Item *)it;
 }
 
 EAPI Elm_Genlist_Item *
@@ -959,7 +993,17 @@
                               Elm_Genlist_Item_Flags flags,
                               void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data)
 {
-   // fixme - now
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Item *it = _item_new(wd, itc, data, NULL, flags, func, func_data);
+   if (!it) return NULL;
+   if (!it->parent)
+     wd->items = eina_inlist_append_relative(wd->items, (Eina_Inlist *)it, (Eina_Inlist *)after);
+   else
+     {
+        // FIXME: tree. not done yet
+     }
+   _item_queue(wd, it);
+   return (Elm_Genlist_Item *)it;
 }
 
 EAPI void

Log:
  make scroller stay in the exact pixel pos when resizign - unless at the end.
  
  
Author:       raster
Date:         2009-02-18 05:42:56 -0800 (Wed, 18 Feb 2009)
New Revision: 39080

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 13:13:10 UTC (rev 39079)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-18 13:42:56 UTC (rev 39080)
@@ -2109,7 +2109,7 @@
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
-   for (i = 0; i < 10000; i++)
+   for (i = 0; i < 100000; i++)
      {
         gli = elm_genlist_item_append(gl, &itc1, 
                                       (void *)i/* item data */, 
@@ -2176,6 +2176,7 @@
      }
    elm_genlist_item_disabled_set(gli, 1);
    elm_genlist_item_selected_set(gli, 0);
+   elm_genlist_item_update(gli);
 }
 
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 13:13:10 UTC (rev 39079)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-18 13:42:56 UTC (rev 39080)
@@ -514,25 +514,26 @@
         } func;
      };
 
-   EAPI Evas_Object *elm_genlist_add(Evas_Object *parent);
+   EAPI Evas_Object      *elm_genlist_add(Evas_Object *parent);
    EAPI Elm_Genlist_Item *elm_genlist_item_append(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
    EAPI Elm_Genlist_Item *elm_genlist_item_prepend(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *parent, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
    EAPI Elm_Genlist_Item *elm_genlist_item_insert_before(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *before, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
    EAPI Elm_Genlist_Item *elm_genlist_item_insert_after(Evas_Object *obj, const Elm_Genlist_Item_Class *itc, const void *data, Elm_Genlist_Item *after, Elm_Genlist_Item_Flags flags, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *func_data);
-   EAPI void elm_genlist_clear(Evas_Object *obj);
+   EAPI void              elm_genlist_clear(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_selected_item_get(Evas_Object *obj);
-   EAPI const Eina_List *elm_genlist_selected_items_get(Evas_Object *obj);
+   EAPI const Eina_List  *elm_genlist_selected_items_get(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_first_item_get(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_last_item_get(Evas_Object *obj);
    EAPI const Elm_Genlist_Item *elm_genlist_item_next_get(Elm_Genlist_Item *item);
    EAPI const Elm_Genlist_Item *elm_genlist_item_prev_get(Elm_Genlist_Item *item);
-   EAPI void elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
-   EAPI Evas_Bool elm_genlist_item_selected_get(Elm_Genlist_Item *item);
-   EAPI void elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled);
-   EAPI Evas_Bool elm_genlist_item_disabled_get(Elm_Genlist_Item *item);
-   EAPI void elm_genlist_item_show(Elm_Genlist_Item *item);
-   EAPI void elm_genlist_item_del(Elm_Genlist_Item *item);
-   EAPI const void *elm_genlist_item_data_get(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_selected_set(Elm_Genlist_Item *item, Evas_Bool selected);
+   EAPI Evas_Bool         elm_genlist_item_selected_get(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_disabled_set(Elm_Genlist_Item *item, Evas_Bool disabled);
+   EAPI Evas_Bool         elm_genlist_item_disabled_get(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_show(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_del(Elm_Genlist_Item *item);
+   EAPI const void       *elm_genlist_item_data_get(Elm_Genlist_Item *item);
+   EAPI void              elm_genlist_item_update(Elm_Genlist_Item *item);
        
    /* smart callbacks called:
     * "clicked" - the user clicked the hoversel button and popped up the sel

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 13:13:10 UTC (rev 39079)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-18 13:42:56 UTC (rev 39080)
@@ -1222,5 +1222,10 @@
 EAPI void
 elm_genlist_item_update(Elm_Genlist_Item *item)
 {
-   // fixme - now do call all the class get funcs again - re realize if realized.
+   Item *it = (Item *)item;
+   if (!it->block) return;
+   it->mincalcd = 0;
+   it->block->changed = 1;
+   if (it->wd->calc_job) ecore_job_del(it->wd->calc_job);
+   it->wd->calc_job = ecore_job_add(_calc_job, it->wd);
 }

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-02-18 13:13:10 UTC (rev 39079)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-02-18 13:42:56 UTC (rev 39080)
@@ -915,9 +915,11 @@
 	  edje_object_part_drag_page_set(sd->edje_obj, "elm.dragable.vbar", 0.0, -((double)sd->page.y * ((double)vh / (double)h)) / 100.0);
 	
 	sd->pan_func.get(sd->pan_obj, &px, &py);
+        if (vx != mx) x = px;
+        if (vy != my) y = py;
 	sd->pan_func.set(sd->pan_obj, x, y);
-	if ((px != 0) || (py != 0))
-	  edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm");
+//	if ((px != 0) || (py != 0))
+//	  edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm");
      }
    else
      {

Log:
  and back to 10k test, and only insert 8 items from the queue at a time.
  
  
Author:       raster
Date:         2009-02-18 22:29:07 -0800 (Wed, 18 Feb 2009)
New Revision: 39089

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-19 06:02:56 UTC (rev 39088)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-19 06:29:07 UTC (rev 39089)
@@ -2109,7 +2109,7 @@
    itc1.func.state_get = gl_state_get;
    itc1.func.del       = gl_del;
 
-   for (i = 0; i < 100000; i++)
+   for (i = 0; i < 10000; i++)
      {
         gli = elm_genlist_item_append(gl, &itc1, 
                                       (void *)i/* item data */, 

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-19 06:02:56 UTC (rev 39088)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-19 06:29:07 UTC (rev 39089)
@@ -927,7 +927,7 @@
    Widget_Data *wd = data;
    int n;
 
-   for (n = 0; (wd->queue) && (n < 32); n++)
+   for (n = 0; (wd->queue) && (n < 8); n++)
      {
         Item *it;

Log:
  a specific test for update and multiple/different icons etc.
  
  
Author:       raster
Date:         2009-02-19 17:07:21 -0800 (Thu, 19 Feb 2009)
New Revision: 39108

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-19 22:25:07 UTC (rev 39107)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-20 01:07:21 UTC (rev 39108)
@@ -2055,16 +2055,9 @@
 Evas_Object *gl_icon_get(const void *data, Evas_Object *obj, const char *part)
 {
    char buf[PATH_MAX];
-#if 1
    Evas_Object *ic = elm_icon_add(obj);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
-#else
-   Evas_Object *ic = evas_object_image_filled_add(evas_object_evas_get(obj));
-   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
-   evas_object_image_file_set(ic, buf, NULL);
-#endif
-   
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
 }
@@ -2318,7 +2311,153 @@
    evas_object_show(win);
 }
 
+typedef struct _Testitem
+{
+   Elm_Genlist_Item *item;
+   int mode;
+} Testitem;
+static Elm_Genlist_Item_Class itc2;
+char *gl2_label_get(const void *data, Evas_Object *obj, const char *part)
+{
+   Testitem *tit = data;
+   char buf[256];
+   snprintf(buf, sizeof(buf), "Item mode %i", tit->mode);
+   return strdup(buf);
+}
+Evas_Object *gl2_icon_get(const void *data, Evas_Object *obj, const char *part)
+{
+   Testitem *tit = data;
+   char buf[PATH_MAX];
+   Evas_Object *ic = elm_icon_add(obj);
+   if (!strcmp(part, "elm.swallow.icon"))
+     {
+        if ((tit->mode & 0x3) == 0)
+          snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 1)
+          snprintf(buf, sizeof(buf), "%s/images/logo.png", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 2)
+          snprintf(buf, sizeof(buf), "%s/images/panel_01.jpg", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 3)
+          snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
+        elm_icon_file_set(ic, buf, NULL);
+     }
+   else if (!strcmp(part, "elm.swallow.end"))
+     {
+        if ((tit->mode & 0x3) == 0)
+          snprintf(buf, sizeof(buf), "%s/images/sky_01.jpg", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 1)
+          snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 2)
+          snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR);
+        else if ((tit->mode & 0x3) == 3)
+          snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", PACKAGE_DATA_DIR);
+        elm_icon_file_set(ic, buf, NULL);
+     }
+   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+   return ic;
+}
+Evas_Bool gl2_state_get(const void *data, Evas_Object *obj, const char *part)
+{
+   return 0;
+}
+void gl2_del(const void *data, Evas_Object *obj)
+{
+}
+
 static void
+my_gl_update(void *data, Evas_Object *obj, void *event_info)
+{
+   Testitem *tit = data;
+   tit->mode++;
+   elm_genlist_item_update(tit->item);
+}
+
+static void
+my_bt_31(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
+   static Testitem tit[3];
+   int i;
+   
+   win = elm_win_add(NULL, "genlist-2", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Genlist 2");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+   
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
+   gl = elm_genlist_add(win);
+   evas_object_size_hint_align_set(gl, -1.0, -1.0);
+   evas_object_size_hint_weight_set(gl, 1.0, 1.0);
+   evas_object_show(gl);
+
+   itc2.item_style     = "default";
+   itc2.func.label_get = gl2_label_get;
+   itc2.func.icon_get  = gl2_icon_get;
+   itc2.func.state_get = gl2_state_get;
+   itc2.func.del       = gl2_del;
+
+   tit[0].mode = 0;
+   tit[0].item = elm_genlist_item_append(gl, &itc2, 
+                                         &(tit[0])/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         NULL/* func data */);
+   tit[1].mode = 1;
+   tit[1].item = elm_genlist_item_append(gl, &itc2, 
+                                         &(tit[1])/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         NULL/* func data */);
+   tit[2].mode = 2;
+   tit[2].item = elm_genlist_item_append(gl, &itc2, 
+                                         &(tit[2])/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */,
+                                         NULL/* func data */);
+   
+   elm_box_pack_end(bx, gl);
+   evas_object_show(bx2);
+   
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   elm_box_homogenous_set(bx2, 1);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[1]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0]));
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[2]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1]));
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "[3]");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2]));
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
+   evas_object_resize(win, 320, 320);
+   evas_object_show(win);
+}
+
+static void
 my_win_main(void)
 {
    Evas_Object *win, *bg, *bx0, *lb, *li, *fr;
@@ -2423,6 +2562,7 @@
    elm_list_item_append(li, "Slider", NULL, NULL, my_bt_28, NULL);
    elm_list_item_append(li, "Genlist", NULL, NULL, my_bt_29, NULL);
    elm_list_item_append(li, "Genlist 2", NULL, NULL, my_bt_30, NULL);
+   elm_list_item_append(li, "Genlist 3", NULL, NULL, my_bt_31, NULL);
 
    elm_list_go(li);
    

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-19 22:25:07 UTC (rev 39107)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-20 01:07:21 UTC (rev 39108)
@@ -568,7 +568,6 @@
 // * when entries are in a scroller and change size, the scroller shows scrollbars. fix. same for selecting. for 1 line entries in a scroller should only have scroll arrow indicators.
 // 
 //// (more widgets/features - medium priority)
-// * genlist widget (complex list widget - harder to use than normal simple list, but handles huge lists of items etc.)
 // * tree feature for genlist widget (like biglist - but items can expand to sub-items)
 // * radio + group handling
 // * checkbox (like toggle)

Log:
  fix next/prev bug.
  
  
Author:       raster
Date:         2009-02-24 16:41:57 -0800 (Tue, 24 Feb 2009)
New Revision: 39186

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-24 22:46:45 UTC (rev 39185)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-25 00:41:57 UTC (rev 39186)
@@ -2172,6 +2172,20 @@
    elm_genlist_item_update(gli);
 }
 
+static void
+my_gl_update_all(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   int i = 0;
+   Elm_Genlist_Item *it = elm_genlist_first_item_get(gl);
+   while (it)
+     {
+        elm_genlist_item_update(it);
+        printf("%i\n", i);
+        i++;
+        it = elm_genlist_item_next_get(it);
+     }
+}
 
 static void
 my_gl_first(void *data, Evas_Object *obj, void *event_info)
@@ -2257,7 +2271,7 @@
    evas_object_size_hint_align_set(bx2, -1.0, -1.0);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[/\\]");
+   elm_button_label_set(bt, "/\\");
    evas_object_smart_callback_add(bt, "clicked", my_gl_first, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
@@ -2265,7 +2279,7 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[\\/]");
+   elm_button_label_set(bt, "\\/");
    evas_object_smart_callback_add(bt, "clicked", my_gl_last, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
@@ -2273,7 +2287,7 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[X]");
+   elm_button_label_set(bt, "X");
    evas_object_smart_callback_add(bt, "clicked", my_gl_clear, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
@@ -2281,7 +2295,7 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[.]");
+   elm_button_label_set(bt, "#");
    evas_object_smart_callback_add(bt, "clicked", my_gl_disable, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
@@ -2289,7 +2303,15 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[+]");
+   elm_button_label_set(bt, "U");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_update_all, gl);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "+");
    evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
@@ -2297,7 +2319,7 @@
    evas_object_show(bt);
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[-]");
+   elm_button_label_set(bt, "-");
    evas_object_smart_callback_add(bt, "clicked", my_gl_del, gl);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-24 22:46:45 UTC (rev 39185)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-02-25 00:41:57 UTC (rev 39186)
@@ -1185,7 +1185,7 @@
    while (it)
      {
         it = (Item *)(((Eina_Inlist *)it)->next);
-        if (!it->delete_me) break;
+        if ((it) && (!it->delete_me)) break;
      }
    return (Elm_Genlist_Item *)it;
 }
@@ -1197,7 +1197,7 @@
    while (it)
      {
         it = (Item *)(((Eina_Inlist *)it)->prev);
-        if (!it->delete_me) break;
+        if ((it) && (!it->delete_me)) break;
      }
    return (Elm_Genlist_Item *)it;
 }

Log:
  change argv[0] to match quicklanch process name. much better for debugging!
  
  
Author:       raster
Date:         2009-02-25 22:20:41 -0800 (Wed, 25 Feb 2009)
New Revision: 39235

Modified:
  trunk/TMP/st/elementary/src/bin/quicklaunch.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_main.c 

Modified: trunk/TMP/st/elementary/src/bin/quicklaunch.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/quicklaunch.c	2009-02-26 06:13:31 UTC (rev 39234)
+++ trunk/TMP/st/elementary/src/bin/quicklaunch.c	2009-02-26 06:20:41 UTC (rev 39235)
@@ -10,12 +10,69 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <sys/wait.h>
 
 static double restart_time = 0.0;
 
 #define LENGTH_OF_SOCKADDR_UN(s) (strlen((s)->sun_path) + (size_t)(((struct sockaddr_un *)NULL)->sun_path))
 
+static struct sigaction old_sigint;
+static struct sigaction old_sigterm;
+static struct sigaction old_sigquit;
+static struct sigaction old_sigalrm;
+static struct sigaction old_sigusr1;
+static struct sigaction old_sigusr2;
+static struct sigaction old_sighup;
+static struct sigaction old_sigchld;
+static struct sigaction old_sigsegv;
+static struct sigaction old_sigill;
+static struct sigaction old_sigfpe;
+static struct sigaction old_sigbus;
+static struct sigaction old_sigabrt;
+
 static void
+post_fork(void *data)
+{
+   sigaction(SIGINT, &old_sigint, NULL);
+   sigaction(SIGTERM, &old_sigterm, NULL);
+   sigaction(SIGQUIT, &old_sigquit, NULL);
+   sigaction(SIGALRM, &old_sigalrm, NULL);
+   sigaction(SIGUSR1, &old_sigusr1, NULL);
+   sigaction(SIGUSR2, &old_sigusr2, NULL);
+   sigaction(SIGHUP, &old_sighup, NULL);
+   sigaction(SIGCHLD, &old_sigchld, NULL);
+   sigaction(SIGSEGV, &old_sigsegv, NULL);
+   sigaction(SIGILL, &old_sigill, NULL);
+   sigaction(SIGFPE, &old_sigfpe, NULL);
+   sigaction(SIGBUS, &old_sigbus, NULL);
+   sigaction(SIGABRT, &old_sigabrt, NULL);
+}
+
+static void
+child_handler(int x, siginfo_t *info, void *data)
+{
+   int status;
+   pid_t pid;
+   
+   while ((pid = waitpid(-1, &status, WNOHANG)) > 0);
+}
+
+static void
+crash_handler(int x, siginfo_t *info, void *data)
+{
+   double t;
+   
+   EINA_ERROR_PERR("elementary_quicklaunch: crash detected. restarting.\n");
+   t = ecore_time_get();
+   if ((t - restart_time) <= 2.0)
+     {
+        EINA_ERROR_PERR("elementary_quicklaunch: crash too fast - less than 2 seconds. abort restart\n");
+        exit(-1);
+     }
+   ecore_app_restart();
+}
+
+static void
 handle_run(int fd, unsigned long bytes)
 {
    unsigned char *buf = NULL;
@@ -36,32 +93,10 @@
    for (i = 0; i < argc; i++) argv[i] = buf + (unsigned long)argv[i];
    cwd = argv[argc - 1] + strlen(argv[argc - 1]) + 1;
    elm_quicklaunch_prepare(argc, argv);
-   elm_quicklaunch_fork(argc, argv, cwd);
+   elm_quicklaunch_fork(argc, argv, cwd, post_fork, NULL);
    elm_quicklaunch_cleanup();
 }
 
-static void
-child_handler(int n)
-{
-   int status;
-   wait(&status);
-}
-
-EAPI void
-crash_handler(int x, siginfo_t *info, void *data)
-{
-   double t;
-   
-   EINA_ERROR_PERR("elementary_quicklaunch: crash detected. restarting.\n");
-   t = ecore_time_get();
-   if ((t - restart_time) <= 2.0)
-     {
-        EINA_ERROR_PERR("elementary_quicklaunch: crash too fast - less than 2 seconds. abort restart\n");
-        exit(-1);
-     }
-   ecore_app_restart();
-}
-
 int
 main(int argc, char **argv)
 {
@@ -117,41 +152,98 @@
         exit(-1);
      }
    elm_quicklaunch_init(argc, argv);
-   signal(SIGINT, SIG_DFL);
-   signal(SIGTERM, SIG_DFL);
-   signal(SIGQUIT, SIG_DFL);
-   signal(SIGALRM, SIG_DFL);
-   signal(SIGUSR1, SIG_DFL);
-   signal(SIGUSR2, SIG_DFL);
-   signal(SIGHUP, SIG_DFL);
-   signal(SIGCHLD, child_handler);
+   restart_time = ecore_time_get();
 
-   restart_time = ecore_time_get();
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGINT, &action, &old_sigint);
    
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGTERM, &action, &old_sigterm);
+   
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGQUIT, &action, &old_sigquit);
+   
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGALRM, &action, &old_sigalrm);
+   
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGUSR1, &action, &old_sigusr1);
+   
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGUSR2, &action, &old_sigusr2);
+   
+   action.sa_handler = SIG_DFL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = NULL;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGHUP, &action, &old_sighup);
+   
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
+   action.sa_sigaction = child_handler;
+   action.sa_flags = SA_RESTART | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+   sigaction(SIGCHLD, &action, &old_sigchld);
+
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
    action.sa_sigaction = crash_handler;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
-   sigaction(SIGSEGV, &action, NULL);
+   sigaction(SIGSEGV, &action, &old_sigsegv);
    
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
    action.sa_sigaction = crash_handler;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
-   sigaction(SIGILL, &action, NULL);
+   sigaction(SIGILL, &action, &old_sigill);
    
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
    action.sa_sigaction = crash_handler;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
-   sigaction(SIGFPE, &action, NULL);
+   sigaction(SIGFPE, &action, &old_sigfpe);
    
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
    action.sa_sigaction = crash_handler;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
-   sigaction(SIGBUS, &action, NULL);
+   sigaction(SIGBUS, &action, &old_sigbus);
    
+   action.sa_handler = NULL;
+   action.sa_restorer = NULL;
    action.sa_sigaction = crash_handler;
    action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
    sigemptyset(&action.sa_mask);
-   sigaction(SIGABRT, &action, NULL);
+   sigaction(SIGABRT, &action, &old_sigabrt);
    
    for (;;)
      {
@@ -169,6 +261,7 @@
              char line[4096];
 
              read(fd, &bytes, sizeof(unsigned long));
+             ecore_app_args_set(argc, (const char **)argv);
              handle_run(fd, bytes);
           }
         elm_quicklaunch_sub_shutdown();

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-26 06:13:31 UTC (rev 39234)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-26 06:20:41 UTC (rev 39235)
@@ -155,7 +155,7 @@
    EAPI void         elm_quicklaunch_shutdown(void);
    EAPI void         elm_quicklaunch_seed(void);
    EAPI Evas_Bool    elm_quicklaunch_prepare(int argc, char **argv);
-   EAPI Evas_Bool    elm_quicklaunch_fork(int argc, char **argv, char *cwd);
+   EAPI Evas_Bool    elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);
    EAPI void         elm_quicklaunch_cleanup(void);
    EAPI int          elm_quicklaunch_fallback(int argc, char **argv);
    EAPI char        *elm_quicklaunch_exe_path_get(const char *exe);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2009-02-26 06:13:31 UTC (rev 39234)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2009-02-26 06:20:41 UTC (rev 39235)
@@ -278,28 +278,6 @@
      (double)_elm_config->finger_size * _elm_config->scale;
    if (elm_finger_size)
      _elm_config->finger_size = atoi(elm_finger_size);
-   
-   /* FIXME: implement quickstart below */
-   /* if !quickstart return
-    * else
-    *  set up fast-start-fifo (in $ELM_FAST_START_FIFO)
-    *  sit on blocking read
-    *  read 2 bytes == length of data in bytes including nulls
-    *  read N bytes (must be < (page_size - 2))
-    *  format: exename\0exepath\0[arg1\0][arg2\0][...]
-    *  dlopen exepath
-    *  dlsym elm_main in exe
-    *  if (elm_main ! exists)
-    *   ecore_exe exename
-    *  else
-    *   fork()
-    *   [child]
-    *    call exit(elm_main());
-    *   [parent]
-    *    close x fd the nasty way (with close())
-    *    ecore_x_shutdown()
-    *    ecore_x_init() etc. etc. loop back to blocking on fifo read
-    */
 }
 
 EAPI void
@@ -326,7 +304,6 @@
                                ECORE_X_EVENT_MASK_WINDOW_PROPERTY);
         _elm_event_property_change = ecore_event_handler_add
           (ECORE_X_EVENT_WINDOW_PROPERTY, _elm_window_property_change, NULL);
-        /* FIXME if quickstart this happens in child */
 	if (ecore_x_window_prop_card32_get(ecore_x_window_root_first_get(),
 					   _elm_atom_enlightenment_scale,
 					   &val, 1) > 0)
@@ -465,8 +442,30 @@
    return 1;
 }
 
+static void
+save_env(void)
+{
+   int i, size;
+   extern char **environ;
+   char **oldenv, **p;
+   
+   oldenv = environ;
+   
+   for (i = 0, size = 0; environ[i] != NULL; i++)
+     size += strlen(environ[i]) + 1;
+   
+   p = malloc((i + 1) * sizeof(char *));
+   if (!p) return;
+   
+   environ = p;
+      
+   for (i = 0; oldenv[i] != NULL; i++)
+     environ[i] = strdup(oldenv[i]);
+   environ[i] = NULL;
+}
+
 EAPI Evas_Bool
-elm_quicklaunch_fork(int argc, char **argv, char *cwd)
+elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data)
 {
    pid_t child;
    int ret;
@@ -503,9 +502,25 @@
 	perror("could not fork");
 	return 0;
      }
+   if (postfork_func) postfork_func(postfork_data);
+
    setsid();
    if (chdir(cwd) != 0)
      perror("could not chdir");
+   // FIXME: this is very linux specific. it changes argv[0] of the process
+   // so ps etc. report what you'd expect. for other unixes and os's this
+   // may just not work
+   save_env();
+   if (real_argv)
+     {
+        char *lastarg, *p;
+
+        ecore_app_args_get(&real_argc, &real_argv);
+        lastarg = real_argv[real_argc - 1] + strlen(real_argv[real_argc - 1]);
+        for (p = real_argv[0]; p < lastarg; p++) *p = 0;
+        strcpy(real_argv[0], argv[0]);
+     }
+   ecore_app_args_set(argc, (const char **)argv);
    ret = qr_main(argc, argv);
    exit(ret);
 }

Log:
  demo changed callback of check and using it in genlist item
  
  
Author:       raster
Date:         2009-02-26 00:25:22 -0800 (Thu, 26 Feb 2009)
New Revision: 39242

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-02-26 07:46:57 UTC (rev 39241)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-02-26 08:25:22 UTC (rev 39242)
@@ -2337,6 +2337,7 @@
 {
    Elm_Genlist_Item *item;
    int mode;
+   int onoff;
 } Testitem;
 static Elm_Genlist_Item_Class itc2;
 char *gl2_label_get(const void *data, Evas_Object *obj, const char *part)
@@ -2479,6 +2480,14 @@
    evas_object_show(win);
 }
 
+static void
+my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info)
+{
+   Testitem *tit = data;
+   tit->onoff = elm_check_state_get(obj);
+   printf("item %p onoff = %i\n", tit, tit->onoff);
+}
+
 static Elm_Genlist_Item_Class itc3;
 char *gl3_label_get(const void *data, Evas_Object *obj, const char *part)
 {
@@ -2514,6 +2523,8 @@
      {
         Evas_Object *ck;
         ck = elm_check_add(obj);
+        elm_check_state_set(ck, tit->onoff);
+        evas_object_smart_callback_add(ck, "changed", my_gl_item_check_changed, data);
         evas_object_show(ck);
         return ck;
      }

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-26 07:46:57 UTC (rev 39241)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-02-26 08:25:22 UTC (rev 39242)
@@ -605,6 +605,10 @@
    /* smart callbacks called:
     * "changed" - the user toggled the state
     */
+   
+   EAPI Evas_Object *elm_pager_add(Evas_Object *parent);
+   /* smart callbacks called:
+    */
         
 #ifdef __cplusplus
 }

Log:
  use style generic call in test and fix up freeing of style string.
  
  
Author:       raster
Date:         2009-04-22 21:10:43 -0700 (Wed, 22 Apr 2009)
New Revision: 40320

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-04-23 04:07:59 UTC (rev 40319)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-04-23 04:10:43 UTC (rev 40320)
@@ -569,7 +569,7 @@
    evas_object_show(bx);
 
    hv = elm_hover_add(win);
-   elm_hover_style_set(hv, "popout");
+   elm_object_style_set(hv, "popout");
    
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Button");
@@ -1815,7 +1815,7 @@
    evas_object_show(bg);
    
    inwin = elm_win_inwin_add(win);
-   elm_win_inwin_style_set(inwin, "minimal_vertical");
+   elm_object_style_set(inwin, "minimal_vertical");
    evas_object_show(inwin);
    
    lb = elm_label_add(win);

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-04-23 04:07:59 UTC (rev 40319)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-04-23 04:10:43 UTC (rev 40320)
@@ -74,6 +74,7 @@
      {
         sd->subobjs = eina_list_remove(sd->subobjs, obj);
      }
+   if (sd->style) eina_stringshare_del(sd->style);
    evas_object_smart_callback_call(sd->obj, "sub-object-del", obj);
 }
 
@@ -774,16 +775,15 @@
    const char *old;
    API_ENTRY return;
    old = sd->style;
-   eina_stringshare_del(sd->style);
    sd->style = eina_stringshare_add(style);
-   if (old != sd->style)
-     elm_widget_theme(obj);
+   if (old) eina_stringshare_del(old);
+   if (old != sd->style) elm_widget_theme(obj);
 }
 
 EAPI const char *
 elm_widget_style_get(const Evas_Object *obj)
 {
-   API_ENTRY return "default";
+   API_ENTRY return "";
    if (sd->style) return sd->style;
    return "default";
 }

Log:
  always_select added to normal list too.
  
  
Author:       raster
Date:         2009-04-26 18:29:02 -0700 (Sun, 26 Apr 2009)
New Revision: 40406

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_list.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-04-26 20:58:24 UTC (rev 40405)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-04-27 01:29:02 UTC (rev 40406)
@@ -3300,6 +3300,7 @@
    evas_object_show(lb);
    
    li = elm_list_add(win);
+   elm_list_always_select_mode_set(li, 1);
    evas_object_size_hint_weight_set(li, 1.0, 1.0);
    evas_object_size_hint_align_set(li, -1.0, -1.0);
    elm_box_pack_end(bx0, li);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-04-26 20:58:24 UTC (rev 40405)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-04-27 01:29:02 UTC (rev 40406)
@@ -574,6 +574,7 @@
    EAPI void         elm_list_go(Evas_Object *obj);
    EAPI void         elm_list_multi_select_set(Evas_Object *obj, Evas_Bool multi);
    EAPI void         elm_list_horizontal_mode_set(Evas_Object *obj, Elm_List_Mode mode);
+   EAPI void         elm_list_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select);
    EAPI const Eina_List     *elm_list_items_get(const Evas_Object *obj);
    EAPI Elm_List_Item       *elm_list_selected_item_get(const Evas_Object *obj);
    EAPI const Eina_List     *elm_list_selected_items_get(const Evas_Object *obj);

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-04-26 20:58:24 UTC (rev 40405)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-04-27 01:29:02 UTC (rev 40406)
@@ -12,6 +12,7 @@
    Evas_Coord minw[2], minh[2];
    Evas_Bool on_hold : 1;
    Evas_Bool multi : 1;
+   Evas_Bool always_select : 1;
 };
 
 struct _Elm_List_Item
@@ -129,13 +130,18 @@
 {
    Widget_Data *wd = elm_widget_data_get(it->obj);
    const char *selectraise;
-   if (it->selected) return;
+   if (it->selected)
+     {
+        if (wd->always_select) goto call;
+        return;
+     }
    edje_object_signal_emit(it->base, "elm,state,selected", "elm");
    selectraise = edje_object_data_get(it->base, "selectraise");
    if ((selectraise) && (!strcmp(selectraise, "on")))
      evas_object_raise(it->base);
    it->selected = 1;
    wd->selected = eina_list_append(wd->selected, it);
+   call:
    if (it->func) it->func((void *)it->data, it->obj, it);
    evas_object_smart_callback_call(it->obj, "selected", it);
 }
@@ -191,6 +197,7 @@
 	     Elm_List_Item *it2;
 	     EINA_LIST_FOREACH_SAFE(wd->selected, l, l_next, it2)
 	       if (it2 != it) _item_unselect(it2);
+             _item_select(it);
 	  }
      }
 }
@@ -466,6 +473,13 @@
      elm_scroller_content_min_limit(wd->scroller, 0, 0);
 }
 
+EAPI void      
+elm_list_always_select_mode_set(Evas_Object *obj, Evas_Bool always_select)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   wd->always_select = always_select;
+}
+
 EAPI const Eina_List *
 elm_list_items_get(const Evas_Object *obj)
 {

Log:
  fix horizontal scroll in auto-scroll select mode
  
  
Author:       raster
Date:         2009-05-04 21:58:25 -0700 (Mon, 04 May 2009)
New Revision: 40506

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-05-04 17:36:48 UTC (rev 40505)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-05-05 04:58:25 UTC (rev 40506)
@@ -2095,6 +2095,7 @@
    evas_object_show(bg);
    
    gl = elm_genlist_add(win);
+   elm_genlist_horizontal_mode_set(gl, ELM_LIST_LIMIT);
    elm_win_resize_object_add(win, gl);
    evas_object_size_hint_weight_set(gl, 1.0, 1.0);
    evas_object_show(gl);
@@ -3150,7 +3151,7 @@
    Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
    static Testitem tit[3];
    int i;
-   
+
    win = elm_win_add(NULL, "genlist-5", ELM_WIN_BASIC);
    elm_win_title_set(win, "Genlist 5");
    elm_win_autodel_set(win, 1);
@@ -3170,7 +3171,6 @@
    evas_object_size_hint_align_set(gl, -1.0, -1.0);
    evas_object_size_hint_weight_set(gl, 1.0, 1.0);
    evas_object_show(gl);
-
    itc5.item_style     = "double_label";
    itc5.func.label_get = gl5_label_get;
    itc5.func.icon_get  = gl5_icon_get;

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-05-04 17:36:48 UTC (rev 40505)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-05-05 04:58:25 UTC (rev 40506)
@@ -648,8 +648,8 @@
    if (sd->down.onhold_tlast > 0.0)
      {
         td = t - sd->down.onhold_tlast;
-        vx = sd->down.onhold_vx * td * _elm_config->thumbscroll_threshhold * 2.0;
-        vy = sd->down.onhold_vy * td * _elm_config->thumbscroll_threshhold * 2.0;
+        vx = sd->down.onhold_vx * td * (double)_elm_config->thumbscroll_threshhold * 2.0;
+        vy = sd->down.onhold_vy * td * (double)_elm_config->thumbscroll_threshhold * 2.0;
         elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
         sd->down.onhold_vxe += vx;
         sd->down.onhold_vye += vy;
@@ -744,7 +744,7 @@
                   double vx = 0.0, vy = 0.0;
                   
                   evas_object_geometry_get(sd->event_obj, &ex, &ey, &ew, &eh); 
-                  x = ev->cur.canvas.y - ex;
+                  x = ev->cur.canvas.x - ex;
                   y = ev->cur.canvas.y - ey;
                   if (x < _elm_config->thumbscroll_threshhold)
                     {

Log:
  1. fix box as it didnt hide clipper when it gets empty
  2. add bouncing at ends for scroller and config for it
  3. fix quicklaunch to be cserver-freidnly thanks to its fork tricks
  4. add signals to scroller when scrolling and hitting edges
  5. pants.
  
  
Author:       raster
Date:         2009-05-08 04:27:32 -0700 (Fri, 08 May 2009)
New Revision: 40549

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_main.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_toolbar.c trunk/TMP/st/elementary/src/lib/els_box.c trunk/TMP/st/elementary/src/lib/els_icon.c trunk/TMP/st/elementary/src/lib/els_pan.c trunk/TMP/st/elementary/src/lib/els_scroller.c trunk/TMP/st/elementary/src/lib/els_scroller.h 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -1130,6 +1130,40 @@
 }
 
 static void
+my_anchorblock_edge_left(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("left\n");
+}
+
+static void
+my_anchorblock_edge_right(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("right\n");
+}
+
+static void
+my_anchorblock_edge_top(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("top\n");
+}
+
+static void
+my_anchorblock_edge_bottom(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("bottom\n");
+}
+
+static void
+my_anchorblock_scroll(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Coord x, y, w, h, vw, vh;
+   
+   elm_scroller_region_get(obj, &x, &y, &w, &h);
+   elm_scroller_child_size_get(obj, &vw, &vh);
+   printf("scroll %ix%i +%i+%i in %ix%i\n", w, h, x, y, vw, vh);
+}
+
+static void
 my_bt_17(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *av, *sc, *bx, *bb, *ic;
@@ -1147,6 +1181,12 @@
    sc = elm_scroller_add(win);
    evas_object_size_hint_weight_set(sc, 1.0, 1.0);
    elm_win_resize_object_add(win, sc);
+   
+   evas_object_smart_callback_add(sc, "edge_left", my_anchorblock_edge_left, NULL);
+   evas_object_smart_callback_add(sc, "edge_right", my_anchorblock_edge_right, NULL);
+   evas_object_smart_callback_add(sc, "edge_top", my_anchorblock_edge_top, NULL);
+   evas_object_smart_callback_add(sc, "edge_bottom", my_anchorblock_edge_bottom, NULL);
+   evas_object_smart_callback_add(sc, "scroll", my_anchorblock_scroll, NULL);
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, 1.0, 0.0);
@@ -1576,9 +1616,15 @@
 }
 
 static void
+my_li2_clear(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_list_clear(data);
+}
+
+static void
 my_bt_21(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *li, *ic, *ic2, *bx;
+   Evas_Object *win, *bg, *li, *ic, *ic2, *bx, *bx2, *bt;
    char buf[PATH_MAX];
    
    win = elm_win_add(NULL, "list-2", ELM_WIN_BASIC);
@@ -1586,12 +1632,19 @@
    elm_win_autodel_set(win, 1);
 
    bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
+   elm_bg_file_set(bg, buf, NULL);
    elm_win_resize_object_add(win, bg);
    evas_object_size_hint_weight_set(bg, 1.0, 1.0);
    evas_object_show(bg);
 
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, 1.0, 1.0);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+
    li = elm_list_add(win);
-   elm_win_resize_object_add(win, li);
+   evas_object_size_hint_align_set(li, -1.0, -1.0);
    evas_object_size_hint_weight_set(li, 1.0, 1.0);
    elm_list_horizontal_mode_set(li, ELM_LIST_LIMIT);
    elm_list_multi_select_set(li, 1);
@@ -1618,15 +1671,15 @@
    elm_icon_scale_set(ic2, 0, 0);
    elm_list_item_append(li, "How", ic, ic2,  NULL, NULL);
    
-   bx = elm_box_add(win);
-   elm_box_horizontal_set(bx, 1);
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    elm_icon_file_set(ic, buf, NULL);
    elm_icon_scale_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
-   elm_box_pack_end(bx, ic);
+   elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
    
    ic = elm_icon_add(win);
@@ -1634,9 +1687,9 @@
    elm_icon_file_set(ic, buf, NULL);
    elm_icon_scale_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
-   elm_box_pack_end(bx, ic);
+   elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
-   elm_list_item_append(li, "are", bx, NULL,  NULL, NULL);
+   elm_list_item_append(li, "are", bx2, NULL,  NULL, NULL);
    
    elm_list_item_append(li, "you", NULL, NULL,  NULL, NULL);
    elm_list_item_append(li, "doing", NULL, NULL,  NULL, NULL);
@@ -1653,8 +1706,26 @@
 
    elm_list_go(li);
    
+   elm_box_pack_end(bx, li);
    evas_object_show(li);
    
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   elm_box_homogenous_set(bx2, 1);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, -1.0, -1.0);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Clear");
+   evas_object_smart_callback_add(bt, "clicked", my_li2_clear, li);
+   evas_object_size_hint_align_set(bt, -1.0, -1.0);
+   evas_object_size_hint_weight_set(bt, 1.0, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
    evas_object_resize(win, 320, 300);
    evas_object_show(win);
 }
@@ -2216,6 +2287,7 @@
 {
    Evas_Object *win, *bg, *gl, *bx, *bx2, *bt;
    Elm_Genlist_Item *gli[10];
+   char buf[PATH_MAX];
    int i;
    
    win = elm_win_add(NULL, "genlist-2", ELM_WIN_BASIC);
@@ -2223,6 +2295,8 @@
    elm_win_autodel_set(win, 1);
 
    bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/plant_01.jpg", PACKAGE_DATA_DIR);
+   elm_bg_file_set(bg, buf, NULL);
    elm_win_resize_object_add(win, bg);
    evas_object_size_hint_weight_set(bg, 1.0, 1.0);
    evas_object_show(bg);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-05-08 11:27:32 UTC (rev 40549)
@@ -337,7 +337,14 @@
    EAPI void         elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
    EAPI void         elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
    EAPI void         elm_scroller_region_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+   EAPI void         elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+   EAPI void         elm_scroller_bounce_set(Evas_Object *obj, Evas_Bool h_bounce, Evas_Bool v_bounce);
    /* smart callbacks called:
+    * "edge_left"
+    * "edge_right"
+    * "edge_top"
+    * "edge_bottom"
+    * "scroll"
     */
 
    EAPI Evas_Object *elm_label_add(Evas_Object *parent);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -623,10 +623,10 @@
    if (ow < 0) ow = 0;
    oh = sd->wd->minh - oh;
    if (oh < 0) oh = 0;
-   if (x < 0) x = 0;
-   if (y < 0) y = 0;
-   if (x > ow) x = ow;
-   if (y > oh) y = oh;
+//   if (x < 0) x = 0;
+//   if (y < 0) y = 0;
+//   if (x > ow) x = ow;
+//   if (y > oh) y = oh;
    if ((x == sd->wd->pan_x) && (y == sd->wd->pan_y)) return;
    sd->wd->pan_x = x;
    sd->wd->pan_y = y;
@@ -751,6 +751,8 @@
    wd->scr = elm_smart_scroller_add(e);
    elm_widget_resize_object_set(obj, wd->scr);
    
+   elm_smart_scroller_bounce_allow_set(wd->scr, 0, 1);
+   
    wd->obj = obj;
    wd->mode = ELM_LIST_SCROLL;
    

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -370,6 +370,8 @@
    wd->scroller = elm_scroller_add(parent);
    elm_widget_resize_object_set(obj, wd->scroller);
    
+   elm_scroller_bounce_set(wd->scroller, 0, 1);
+   
    wd->box = elm_box_add(parent);
    elm_box_homogenous_set(wd->box, 1);
    evas_object_size_hint_weight_set(wd->box, 1.0, 0.0);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -91,6 +91,8 @@
 static const char *elm_engine, *elm_scale, *elm_theme, *elm_prefix, *elm_data_dir;
 static const char *elm_font_hinting, *elm_font_path, *elm_image_cache;
 static const char *elm_font_cache, *elm_finger_size, *elm_fps;
+static const char *elm_thumbscroll_enabled, *elm_thumbscroll_threshhold;
+static const char *elm_thumbscroll_momentum_threshhold, *elm_thumbscroll_friction;
 
 EAPI void
 elm_quicklaunch_init(int argc, char **argv)
@@ -121,6 +123,10 @@
    elm_font_cache = getenv("ELM_FONT_CACHE");
    elm_finger_size = getenv("ELM_FINGER_SIZE");
    elm_fps = getenv("ELM_FPS");
+   elm_thumbscroll_enabled = getenv("ELM_THUMBSCROLL_ENABLE");
+   elm_thumbscroll_threshhold = getenv("ELM_THUMBSCROLL_THRESHOLD");
+   elm_thumbscroll_momentum_threshhold = getenv("ELM_THUMBSCROLL_MOMENTUM_THRESHOLD");
+   elm_thumbscroll_friction = getenv("ELM_THUMBSCROLL_FRICTION");
    
    if (!_elm_data_dir)
      {
@@ -174,7 +180,9 @@
    _elm_config->thumbscroll_enable = 1;
    _elm_config->thumbscroll_threshhold = 24;
    _elm_config->thumbscroll_momentum_threshhold = 100.0;
-   _elm_config->thumbscroll_friction = 20.0;
+   _elm_config->thumbscroll_friction = 1.0;
+   _elm_config->thumbscroll_bounce_friction = 0.5;
+   _elm_config->thumbscroll_bounce_enable = 1;
    _elm_config->scale = 1.0;
    _elm_config->font_hinting = 2;
    _elm_config->font_dirs = NULL;
@@ -221,6 +229,16 @@
           _elm_config->engine = ELM_SOFTWARE_16_WINCE;
      }
    
+   if (elm_thumbscroll_enabled)
+     _elm_config->thumbscroll_enable = atoi(elm_thumbscroll_enabled);
+   if (elm_thumbscroll_threshhold)
+     _elm_config->thumbscroll_threshhold = atoi(elm_thumbscroll_threshhold);
+   // FIXME: floatformat locale issues here 1.0 vs 1,0 - should just be 1.0
+   if (elm_thumbscroll_momentum_threshhold)
+     _elm_config->thumbscroll_momentum_threshhold = atof(elm_thumbscroll_momentum_threshhold);
+   if (elm_thumbscroll_friction)
+     _elm_config->thumbscroll_friction = atof(elm_thumbscroll_friction);
+   
    if (elm_theme)
      _elm_theme_parse(elm_theme);
    else
@@ -349,7 +367,8 @@
         ecore_event_handler_del(_elm_event_property_change);
         _elm_event_property_change = NULL;
         ecore_x_disconnect();
-#endif        
+#endif
+        evas_cserve_disconnect();
      }
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_priv.h	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_priv.h	2009-05-08 11:27:32 UTC (rev 40549)
@@ -41,6 +41,8 @@
    int thumbscroll_threshhold;
    double thumbscroll_momentum_threshhold;
    double thumbscroll_friction;
+   double thumbscroll_bounce_friction;
+   int thumbscroll_bounce_enable;
    double scale;
    int bgpixmap;
    int compositing;

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -137,6 +137,36 @@
    _sizing_eval(data);
 }
 
+static void
+_edge_left(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "edge_left", NULL);
+}
+
+static void
+_edge_right(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "edge_right", NULL);
+}
+
+static void
+_edge_top(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "edge_top", NULL);
+}
+
+static void
+_edge_bottom(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "edge_bottom", NULL);
+}
+
+static void
+_scroll(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll", NULL);
+}
+
 EAPI Evas_Object *
 elm_scroller_add(Evas_Object *parent)
 {
@@ -167,6 +197,12 @@
    evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj);
    evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj);
    
+   evas_object_smart_callback_add(wd->scr, "edge,left", _edge_left, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,right", _edge_right, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj);
+   evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom, obj);
+   evas_object_smart_callback_add(wd->scr, "scroll", _scroll, obj);
+   
    _sizing_eval(obj);
    return obj;
 }
@@ -232,3 +268,19 @@
    if ((x) && (y)) elm_smart_scroller_child_pos_get(wd->scr, x, y);
    if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
 }
+
+EAPI void
+elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   evas_object_geometry_get(wd->content, NULL, NULL, w, h);
+}
+
+EAPI void
+elm_scroller_bounce_set(Evas_Object *obj, Evas_Bool h_bounce, Evas_Bool v_bounce)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
+}

Modified: trunk/TMP/st/elementary/src/lib/elm_toolbar.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/elm_toolbar.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -185,6 +185,7 @@
    elm_widget_can_focus_set(obj, 0);
    
    wd->scr = elm_smart_scroller_add(e);
+   elm_scroller_bounce_set(wd->scr, 1, 0);
    elm_smart_scroller_theme_set(wd->scr, "toolbar", "base", "default");
    elm_widget_resize_object_set(obj, wd->scr);
    elm_smart_scroller_policy_set(wd->scr, 

Modified: trunk/TMP/st/elementary/src/lib/els_box.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_box.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/els_box.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -162,7 +162,12 @@
    if (!sd) return;
    sd->items = eina_list_remove(sd->items, obj);
    _smart_disown(obj);
-   if (!sd->deleting) _smart_reconfigure(sd);
+   if (!sd->deleting)
+     {
+        if (!evas_object_clipees_get(sd->clip))
+          evas_object_hide(sd->clip);
+        _smart_reconfigure(sd);
+     }
 }
 
 /* local subsystem functions */

Modified: trunk/TMP/st/elementary/src/lib/els_icon.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_icon.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/els_icon.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -356,6 +356,7 @@
    sd = calloc(1, sizeof(Smart_Data));
    if (!sd) return;
    sd->obj = evas_object_image_add(evas_object_evas_get(obj));
+   evas_object_image_scale_hint_set(sd->obj, EVAS_IMAGE_SCALE_HINT_STATIC);
    sd->x = 0;
    sd->y = 0;
    sd->w = 0;

Modified: trunk/TMP/st/elementary/src/lib/els_pan.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_pan.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/els_pan.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -87,10 +87,10 @@
 _elm_smart_pan_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
    API_ENTRY return;
-   if (x > (sd->child_w - sd->w)) x = sd->child_w - sd->w;
-   if (y > (sd->child_h - sd->h)) y = sd->child_h - sd->h;
-   if (x < 0) x = 0;
-   if (y < 0) y = 0;
+//   if (x > (sd->child_w - sd->w)) x = sd->child_w - sd->w;
+//   if (y > (sd->child_h - sd->h)) y = sd->child_h - sd->h;
+//   if (x < 0) x = 0;
+//   if (y < 0) y = 0;
    if ((x == sd->px) && (y == sd->py)) return;
    sd->px = x;
    sd->py = y;

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-05-08 11:27:32 UTC (rev 40549)
@@ -22,22 +22,34 @@
       Evas_Coord x, y;
       Evas_Coord sx, sy;
       Evas_Coord dx, dy;
+      Evas_Coord bx, by;
+      Evas_Coord ax, ay;
+      Evas_Coord bx0, by0;
+      Evas_Coord b0x, b0y;
+      Evas_Coord b2x, b2y;
       struct {
 	 Evas_Coord    x, y;
 	 double        timestamp;
       } history[20];
       double anim_start;
+      double anim_start2;
+      double anim_start3;
       double onhold_vx, onhold_vy, onhold_tlast, onhold_vxe, onhold_vye;
       Evas_Coord hold_x, hold_y;
       Ecore_Animator *hold_animator;
+      Ecore_Animator *onhold_animator;
       Ecore_Animator *momentum_animator;
-      Ecore_Animator *onhold_animator;
+      Ecore_Animator *bounce_x_animator;
+      Ecore_Animator *bounce_y_animator;
       Evas_Coord locked_x, locked_y;
       unsigned char now : 1;
       unsigned char dragged : 1;
       unsigned char dir_x : 1;
       unsigned char dir_y : 1;
+      unsigned char dir_none : 1;
       unsigned char locked : 1;
+      unsigned char bounce_x_hold : 1;
+      unsigned char bounce_y_hold : 1;
    } down;
    
    struct {
@@ -61,6 +73,10 @@
    unsigned char one_dir_at_a_time : 1;
    unsigned char hold : 1;
    unsigned char freeze : 1;
+   unsigned char bouncemex : 1;
+   unsigned char bouncemey : 1;
+   unsigned char bounce_horiz : 1;
+   unsigned char bounce_vert : 1;
 }; 
 
 /* local subsystem functions */
@@ -215,6 +231,173 @@
      edje_object_signal_emit(sd->edje_obj, "elm,action,show_notalways,vbar", "elm");
 }
 
+static int
+_smart_bounce_x_animator(void *data)
+{
+   Smart_Data *sd;
+   Evas_Coord x, y, dx, dy/*, ox, oy*/;
+   double t, p, dt;
+   
+   sd = data;
+   t = ecore_loop_time_get();
+   dt = t - sd->down.anim_start2;
+   if (dt >= 0.0)
+     {
+	dt = dt / _elm_config->thumbscroll_bounce_friction;
+	if (dt > 1.0) dt = 1.0;
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+        dx = sd->down.b2x - sd->down.bx;
+	dx = (dx * p);
+	x = sd->down.bx + dx;
+        elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
+        if (dt >= 1.0)
+          {
+             if (sd->down.momentum_animator)
+               sd->down.bounce_x_hold = 1;
+             sd->down.bounce_x_animator = NULL;
+             sd->bouncemex = 0;
+             return 0;
+          }
+     }
+   return 1;
+}
+
+static int
+_smart_bounce_y_animator(void *data)
+{
+   Smart_Data *sd;
+   Evas_Coord x, y, dx, dy;
+   double t, p, dt;
+   
+   sd = data;
+   t = ecore_loop_time_get();
+   dt = t - sd->down.anim_start3;
+   if (dt >= 0.0)
+     {
+	dt = dt / _elm_config->thumbscroll_bounce_friction;
+	if (dt > 1.0) dt = 1.0;
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+        dy = sd->down.b2y - sd->down.by;
+	dy = (dy * p);
+	y = sd->down.by + dy;
+        elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
+        if (dt >= 1.0)
+          {
+             if (sd->down.momentum_animator)
+               sd->down.bounce_y_hold = 1;
+             sd->down.bounce_y_animator = NULL;
+             sd->bouncemey = 0;
+             return 0;
+          }
+     }
+   return 1;
+}
+
+static int
+_smart_momentum_animator(void *data)
+{
+   Smart_Data *sd;
+   double t, dt, p;
+   Evas_Coord x, y, dx, dy, px, py;
+   
+   sd = data;
+   t = ecore_loop_time_get();
+   dt = t - sd->down.anim_start;
+   if (dt >= 0.0)
+     {
+	dt = dt / _elm_config->thumbscroll_friction;
+	if (dt > 1.0) dt = 1.0;
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+	dx = (sd->down.dx * _elm_config->thumbscroll_friction * p);
+	dy = (sd->down.dy * _elm_config->thumbscroll_friction * p);
+        sd->down.ax = dx;
+        sd->down.ay = dy;
+	x = sd->down.sx - dx;
+	y = sd->down.sy - dy;
+        elm_smart_scroller_child_pos_get(sd->smart_obj, &px, &py);
+        if ((sd->down.bounce_x_animator) ||
+            (sd->down.bounce_x_hold))
+          {
+             sd->down.bx = sd->down.bx0 - dx + sd->down.b0x;
+             x = px;
+          }
+        if ((sd->down.bounce_y_animator) ||
+            (sd->down.bounce_y_hold))
+          {
+             sd->down.by = sd->down.by0 - dy + sd->down.b0y;
+             y = py;
+          }
+	elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
+	if (dt >= 1.0)
+	  {
+	     sd->down.momentum_animator = NULL;
+             sd->down.bounce_x_hold = 0;
+             sd->down.bounce_y_hold = 0;
+             sd->down.ax = 0;
+             sd->down.ay = 0;
+	     return 0;
+	  }
+     }
+   return 1;
+}
+
+static void
+bounce_eval(Smart_Data *sd)
+{
+   Evas_Coord mx, my, px, py, bx, by, b2x, b2y;
+   
+   if ((!sd->bouncemex) && (!sd->bouncemey)) return;
+   if (sd->down.now) return; // down bounce while still held down
+   if (sd->down.onhold_animator)
+     {
+        ecore_animator_del(sd->down.onhold_animator);
+        sd->down.onhold_animator = NULL;
+     }
+   if (sd->down.hold_animator)
+     {
+        ecore_animator_del(sd->down.hold_animator);
+        sd->down.hold_animator = NULL;
+     }
+   sd->pan_func.max_get(sd->pan_obj, &mx, &my);
+   sd->pan_func.get(sd->pan_obj, &px, &py);
+   bx = px;
+   by = py;
+   if (px < 0) px = 0;
+   if (px > mx) px = mx;
+   if (py < 0) py = 0;
+   if (py > my) py = my;
+   b2x = px;
+   b2y = py;
+   if (!sd->down.bounce_x_animator)
+     {
+        if (sd->bouncemex)
+          {
+             sd->down.bounce_x_animator = ecore_animator_add(_smart_bounce_x_animator, sd);
+             sd->down.anim_start2 = ecore_loop_time_get();
+             sd->down.bx = bx;
+             sd->down.bx0 = bx;
+             sd->down.b2x = b2x;
+             if (sd->down.momentum_animator) sd->down.b0x = sd->down.ax;
+             else sd->down.b0x = 0;
+          }
+     }
+   if (!sd->down.bounce_y_animator)
+     {
+        if (sd->bouncemey)
+          {
+             sd->down.bounce_y_animator = ecore_animator_add(_smart_bounce_y_animator, sd);
+             sd->down.anim_start3 = ecore_loop_time_get();
+             sd->down.by = by;
+             sd->down.by0 = by;
+             sd->down.b2y = b2y;
+             if (sd->down.momentum_animator) sd->down.b0y = sd->down.ay;
+             else sd->down.b0y = 0;
+          }
+     }
+}
+
 void
 elm_smart_scroller_child_pos_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
 {
@@ -235,9 +418,62 @@
    edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.vbar", 0.0, vy);
    edje_object_part_drag_value_set(sd->edje_obj, "elm.dragable.hbar", vx, 0.0);
    sd->pan_func.get(sd->pan_obj, &px, &py);
+   if (!_elm_config->thumbscroll_bounce_enable)
+     {
+        if (x < 0) x = 0;
+        if (x > mx) x = mx;
+        if (y < 0) y = 0;
+        if (y > my) y = my;
+     }
+
+   if (!sd->bounce_horiz)
+     {
+        if (x < 0) x = 0;
+        if (x > mx) x = mx;
+     }
+   if (!sd->bounce_vert)
+     {
+        if (y < 0) y = 0;
+        if (y > my) y = my;
+     }
+   
    sd->pan_func.set(sd->pan_obj, x, y);
    if ((px != x) || (py != y))
      edje_object_signal_emit(sd->edje_obj, "elm,action,scroll", "elm");
+   if (!sd->down.bounce_x_animator)
+     {
+        if ((x < 0) || (x > mx))
+          {
+             sd->bouncemex = 1;
+             bounce_eval(sd);
+          }
+     }
+   if (!sd->down.bounce_y_animator)
+     {
+        if ((y < 0) || (y > my))
+          {
+             sd->bouncemey = 1;
+             bounce_eval(sd);
+          }
+     }
+   if ((x != px) || (y != py))
+     {
+        evas_object_smart_callback_call(obj, "scroll", NULL);
+     }
+   if ((x != px)/* && (!sd->bouncemex)*/)
+     {
+        if (x == 0)
+          evas_object_smart_callback_call(obj, "edge,left", NULL);
+        if (x == mx)
+          evas_object_smart_callback_call(obj, "edge,right", NULL);
+     }
+   if ((y != py)/* && (!sd->bouncemey)*/)
+     {
+        if (y == 0)
+          evas_object_smart_callback_call(obj, "edge,top", NULL);
+        if (y == my)
+          evas_object_smart_callback_call(obj, "edge,bottom", NULL);
+     }
 }
 
 void
@@ -272,6 +508,18 @@
 	if (ny > y) ny = y;
      }
    if ((nx == px) && (ny == py)) return;
+   if (sd->down.bounce_x_animator)
+     {
+        ecore_animator_del(sd->down.bounce_x_animator);
+        sd->down.bounce_x_animator = NULL;
+        sd->bouncemex = 0;
+     }
+   if (sd->down.bounce_y_animator)
+     {
+        ecore_animator_del(sd->down.bounce_y_animator);
+        sd->down.bounce_y_animator = NULL;
+        sd->bouncemey = 0;
+     }
    elm_smart_scroller_child_pos_set(obj, nx, ny);
 }
 
@@ -404,6 +652,14 @@
      }
 }
 
+void
+elm_smart_scroller_bounce_allow_set(Evas_Object *obj, Evas_Bool horiz, Evas_Bool vert)
+{
+   API_ENTRY return;
+   sd->bounce_horiz = horiz;
+   sd->bounce_vert = vert;
+}
+
 /* local subsystem functions */
 static void
 _smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source)
@@ -437,10 +693,24 @@
 static void
 _smart_pan_changed_hook(void *data, Evas_Object *obj, void *event_info)
 {
+   Evas_Coord x, y;
    Evas_Coord w, h;
    Smart_Data *sd;
    
    sd = data;
+   if (sd->down.bounce_x_animator)
+     {
+        ecore_animator_del(sd->down.bounce_x_animator);
+        sd->down.bounce_x_animator = NULL;
+        sd->bouncemex = 0;
+     }
+   if (sd->down.bounce_y_animator)
+     {
+        ecore_animator_del(sd->down.bounce_y_animator);
+        sd->down.bounce_y_animator = NULL;
+        sd->bouncemey = 0;
+     }
+   sd->pan_func.get(sd->pan_obj, &x, &y);
    sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
    if ((w != sd->child.w) || (h != sd->child.h))
      {
@@ -448,6 +718,7 @@
 	sd->child.h = h;
 	_smart_scrollbar_size_adjust(sd);
         evas_object_size_hint_min_set(sd->smart_obj, sd->child.w, sd->child.h);
+        elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
      }
 }
 
@@ -459,6 +730,18 @@
    
    sd = data;
    sd->pan_func.get(sd->pan_obj, &x, &y);
+   if (sd->down.bounce_x_animator)
+     {
+        ecore_animator_del(sd->down.bounce_x_animator);
+        sd->down.bounce_x_animator = NULL;
+        sd->bouncemex = 0;
+     }
+   if (sd->down.bounce_y_animator)
+     {
+        ecore_animator_del(sd->down.bounce_y_animator);
+        sd->down.bounce_y_animator = NULL;
+        sd->bouncemey = 0;
+     }
    elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
 }
 
@@ -473,6 +756,12 @@
    ev = event_info;
    elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
    y += ev->z * sd->step.y;
+   if (sd->down.bounce_y_animator)
+     {
+        ecore_animator_del(sd->down.bounce_y_animator);
+        sd->down.bounce_y_animator = NULL;
+        sd->bouncemey = 0;
+     }
    elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
 }
 
@@ -487,6 +776,18 @@
    ev = event_info;
    if (_elm_config->thumbscroll_enable)
      {
+        if (sd->down.bounce_x_animator)
+          {
+             ecore_animator_del(sd->down.bounce_x_animator);
+             sd->down.bounce_x_animator = NULL;
+             sd->bouncemex = 0;
+          }
+        if (sd->down.bounce_y_animator)
+          {
+             ecore_animator_del(sd->down.bounce_y_animator);
+             sd->down.bounce_y_animator = NULL;
+             sd->bouncemey = 0;
+          }
 	if (sd->down.hold_animator)
 	  {
 	     ecore_animator_del(sd->down.hold_animator);
@@ -496,6 +797,10 @@
 	  {
 	     ecore_animator_del(sd->down.momentum_animator);
 	     sd->down.momentum_animator = NULL;
+             sd->down.bounce_x_hold = 0;
+             sd->down.bounce_y_hold = 0;
+             sd->down.ax = 0;
+             sd->down.ay = 0;
 	  }
 	if (ev->button == 1)
 	  {
@@ -503,6 +808,7 @@
 	     sd->down.dragged = 0;
 	     sd->down.dir_x = 0;
 	     sd->down.dir_y = 0;
+	     sd->down.dir_none = 0;
 	     sd->down.x = ev->canvas.x;
 	     sd->down.y = ev->canvas.y;
 	     elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
@@ -510,7 +816,7 @@
 	     sd->down.sy = y;
 	     sd->down.locked = 0;
 	     memset(&(sd->down.history[0]), 0, sizeof(sd->down.history[0]) * 20);
-	     sd->down.history[0].timestamp = ecore_time_get();
+	     sd->down.history[0].timestamp = ecore_loop_time_get();
 	     sd->down.history[0].x = ev->canvas.x;
 	     sd->down.history[0].y = ev->canvas.y;
 	  }
@@ -528,35 +834,6 @@
    return 0;
 }
 
-static int
-_smart_momentum_animator(void *data)
-{
-   Smart_Data *sd;
-   double t, dt, p;
-   Evas_Coord x, y, dx, dy;
-   
-   sd = data;
-   t = ecore_time_get();
-   dt = t - sd->down.anim_start;
-   if (dt >= 0.0)
-     {
-	dt = dt / _elm_config->thumbscroll_friction;
-	if (dt > 1.0) dt = 1.0;
-	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
-	dx = (sd->down.dx * _elm_config->thumbscroll_friction * p);
-	dy = (sd->down.dy * _elm_config->thumbscroll_friction * p);
-	x = sd->down.sx - dx;
-	y = sd->down.sy - dy;
-	elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
-	if (dt >= 1.0)
-	  {
-	     sd->down.momentum_animator = NULL;
-	     return 0;
-	  }
-     }
-   return 1;
-}
-
 static void
 _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
@@ -586,7 +863,7 @@
                        int i;
                        Evas_Coord ax, ay, dx, dy, vel;
                        
-                       t = ecore_time_get();
+                       t = ecore_loop_time_get();
                        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
                        ax = ev->canvas.x;
                        ay = ev->canvas.y;
@@ -624,6 +901,8 @@
                                  elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
                                  sd->down.sx = x;
                                  sd->down.sy = y;
+                                 sd->down.b0x = 0;
+                                 sd->down.b0y = 0;
                               }
                          }
                     }
@@ -631,6 +910,9 @@
 	       }
 	     sd->down.dragged = 0;
 	     sd->down.now = 0;
+             elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+             elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
+             bounce_eval(sd);
 	  }
      }
 }
@@ -677,9 +959,11 @@
      {
 	if (sd->down.now)
 	  {
+             int faildir = 0;
+             
 	     memmove(&(sd->down.history[1]), &(sd->down.history[0]),
 		     sizeof(sd->down.history[0]) * 19);
-	     sd->down.history[0].timestamp = ecore_time_get();
+	     sd->down.history[0].timestamp = ecore_loop_time_get();
 	     sd->down.history[0].x = ev->cur.canvas.x;
 	     sd->down.history[0].y = ev->cur.canvas.y;
 	     
@@ -688,24 +972,27 @@
 	     y = ev->cur.canvas.y - sd->down.y;
 	     if (y < 0) y = -y;
 	     if ((sd->one_dir_at_a_time) && 
-		 (!sd->down.dir_x) && (!sd->down.dir_y))
+		 (!sd->down.dir_x) && (!sd->down.dir_y) && (!sd->down.dir_none))
 	       {
-		  if (x > y)
-		    {
-		       if (x > _elm_config->thumbscroll_threshhold)
-			 {
+                  if (x > _elm_config->thumbscroll_threshhold)
+                    {
+                       if (x > (y * 2))
+                         {
 			    sd->down.dir_x = 1;
 			    sd->down.dir_y = 0;
 			 }
+                       else faildir++;
 		    }
-		  else
+                  if (y > _elm_config->thumbscroll_threshhold)
 		    {
-		       if (y > _elm_config->thumbscroll_threshhold)
+                       if (y > (x * 2))
 			 {
 			    sd->down.dir_x = 0;
 			    sd->down.dir_y = 1;
-			 }
+                         }
+                       else faildir++;
 		    }
+                  if (faildir) sd->down.dir_none = 1;
 	       }
              if (!sd->hold)
                {
@@ -809,6 +1096,7 @@
    Evas_Event_Key_Down *ev;
    Smart_Data *sd;
    Evas_Coord x = 0, y = 0, vw = 0, vh = 0, mx = 0, my = 0;
+   int xch = 0, ych = 0;
    
    sd = data;
    ev = event_info;
@@ -817,23 +1105,42 @@
    sd->pan_func.max_get(sd->pan_obj, &mx, &my);
    evas_object_geometry_get(sd->pan_obj, NULL, NULL, &vw, &vh);
    if (!strcmp(ev->keyname, "Left"))
-     x -= sd->step.x;
+     {
+        x -= sd->step.x;
+        xch = 1;
+     }
    else if (!strcmp(ev->keyname, "Right"))
-     x += sd->step.x;
+     {
+        x += sd->step.x;
+        xch = 1;
+     }
    else if (!strcmp(ev->keyname, "Up"))
-     y -= sd->step.y;
+     {
+        y -= sd->step.y;
+        ych = 1;
+     }
    else if (!strcmp(ev->keyname, "Home"))
-     y = 0;
+     {
+        y = 0;
+        ych = 1;
+     }
    else if (!strcmp(ev->keyname, "End"))
-     y = my;
+     {
+        y = my;
+        ych = 1;
+     }
    else if (!strcmp(ev->keyname, "Down"))
-     y += sd->step.y;
+     {
+        y += sd->step.y;
+        ych = 1;
+     }
    else if (!strcmp(ev->keyname, "Prior"))
      {
 	if (sd->page.y < 0)
 	  y -= -(sd->page.y * vh) / 100;
 	else
 	  y -= sd->page.y;
+        ych = 1;
      }
    else if (!strcmp(ev->keyname, "Next"))
      {
@@ -841,7 +1148,27 @@
 	  y += -(sd->page.y * vh) / 100;
 	else
 	  y += sd->page.y;
+        ych = 1;
      }
+   if (xch)
+     {
+        if (sd->down.bounce_x_animator)
+          {
+             ecore_animator_del(sd->down.bounce_x_animator);
+             sd->down.bounce_x_animator = NULL;
+             sd->bouncemex = 0;
+          }
+     }
+   if (ych)
+     {
+        if (sd->down.bounce_y_animator)
+          {
+             ecore_animator_del(sd->down.bounce_y_animator);
+             sd->down.bounce_y_animator = NULL;
+             sd->bouncemey = 0;
+          }
+     }
+
    elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
 }
 
@@ -1135,6 +1462,11 @@
    sd->hbar_visible = 1;
    sd->vbar_visible = 1;
    
+   sd->bounce_horiz = 1;
+   sd->bounce_vert = 1;
+   
+   sd->one_dir_at_a_time = 1;
+   
    evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _smart_event_key_down, sd);
    evas_object_propagate_events_set(obj, 0);
    
@@ -1180,7 +1512,10 @@
    evas_object_del(sd->edje_obj);
    evas_object_del(sd->event_obj);
    if (sd->down.hold_animator) ecore_animator_del(sd->down.hold_animator);
+   if (sd->down.onhold_animator) ecore_animator_del(sd->down.onhold_animator);
    if (sd->down.momentum_animator) ecore_animator_del(sd->down.momentum_animator);
+   if (sd->down.bounce_x_animator) ecore_animator_del(sd->down.bounce_x_animator);
+   if (sd->down.bounce_y_animator) ecore_animator_del(sd->down.bounce_y_animator);
    free(sd);
    evas_object_smart_data_set(obj, NULL);
 }

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.h	2009-05-08 11:26:25 UTC (rev 40548)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.h	2009-05-08 11:27:32 UTC (rev 40549)
@@ -26,3 +26,4 @@
 void elm_smart_scroller_theme_set               (Evas_Object *obj, const char *clas, const char *group, const char *style);
 void elm_smart_scroller_hold_set                (Evas_Object *obj, Evas_Bool hold);
 void elm_smart_scroller_freeze_set              (Evas_Object *obj, Evas_Bool freeze);
+void elm_smart_scroller_bounce_allow_set        (Evas_Object *obj, Evas_Bool horiz, Evas_Bool vert);

Log:
  From: Dave Andreoli <dave@...>
  
  file selector patch - awesome! in early. work needed.
  
  
Author:       raster
Date:         2009-08-12 09:08:53 -0700 (Wed, 12 Aug 2009)
New Revision: 41709

Added:
  trunk/TMP/st/elementary/src/lib/elm_fileselector.c 
Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/Makefile.am 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-08-12 16:02:32 UTC (rev 41708)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-08-12 16:08:53 UTC (rev 41709)
@@ -3478,6 +3478,61 @@
 }
 
 static void
+my_bt_39_done(void *data, Evas_Object *obj, void *event_info)
+{
+   /* event_info conatin the full path of the selected file
+    * or NULL if none is selected or cancel is pressed */
+   const char *selected = event_info;
+   
+   if (selected)
+      printf("Selected file: %s\n", selected);
+   else
+      evas_object_del(data); /* delete the test window */
+}
+
+static void
+my_bt_39_selected(void *data, Evas_Object *obj, void *event_info)
+{
+   /* event_info conatin the full path of the selected file */
+   const char *selected = event_info;
+   printf("Selected file: %s\n", selected);
+   
+   /* or you can query the selection */
+   printf("or: %s\n", elm_fileselector_selected_get(obj));
+}
+
+static void
+my_bt_39(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *fs, *bg;
+   char buf[PATH_MAX];
+
+   win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
+   elm_win_title_set(win, "File Selector");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_show(bg);
+
+   fs = elm_fileselector_add(win);
+   elm_fileselector_expandable_set(fs, EINA_FALSE);
+   /* start the fileselector in the home dir */
+   elm_fileselector_path_set(fs, getenv("HOME"));
+   /* allow fs to expand in x & y */
+   evas_object_size_hint_weight_set(fs, 1.0, 1.0);
+   elm_win_resize_object_add(win, fs);
+   evas_object_show(fs);
+   /* the 'done' cb is called when the user press ok/cancel */
+   evas_object_smart_callback_add(fs, "done", my_bt_39_done, win);
+   evas_object_smart_callback_add(fs, "selected", my_bt_39_selected, win);
+
+   evas_object_resize(win, 240, 350);
+   evas_object_show(win);
+}
+
+static void
 my_win_main(void)
 {
    Evas_Object *win, *bg, *bx0, *lb, *li, *fr;
@@ -3553,6 +3608,7 @@
    elm_box_pack_end(bx0, li);
    evas_object_show(li);
 
+   elm_list_item_append(li, "File Selector", NULL, NULL, my_bt_39, NULL);
    elm_list_item_append(li, "Bg Plain", NULL, NULL, my_bt_1, NULL);
    elm_list_item_append(li, "Bg Image", NULL, NULL, my_bt_2, NULL);
    elm_list_item_append(li, "Icon Transparent", NULL, NULL, my_bt_3, NULL);
@@ -3591,6 +3647,7 @@
    elm_list_item_append(li, "Genlist Tree", NULL, NULL, my_bt_36, NULL);
    elm_list_item_append(li, "Genlist 5", NULL, NULL, my_bt_37, NULL);
    elm_list_item_append(li, "Window States", NULL, NULL, my_bt_38, NULL);
+   
 
    elm_list_go(li);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-08-12 16:02:32 UTC (rev 41708)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-08-12 16:08:53 UTC (rev 41709)
@@ -709,6 +709,15 @@
    EAPI Evas_Object *elm_pager_content_top_get(Evas_Object *obj);
    /* smart callbacks called:
     */
+    
+   EAPI Evas_Object *elm_fileselector_add(Evas_Object *parent);
+   EAPI const char*  elm_fileselector_selected_get(Evas_Object *obj);
+   EAPI void         elm_fileselector_path_set(Evas_Object *obj, const char *path);
+   EAPI void         elm_fileselector_expandable_set(Evas_Object *obj, Eina_Bool expand);
+   /* smart callbacks called:
+    * "selected" - the user click on a file
+    * "done" - the user click on the ok or cancel buttons
+    */
 
 #ifdef __cplusplus
 }

Modified: trunk/TMP/st/elementary/src/lib/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/lib/Makefile.am	2009-08-12 16:02:32 UTC (rev 41708)
+++ trunk/TMP/st/elementary/src/lib/Makefile.am	2009-08-12 16:08:53 UTC (rev 41709)
@@ -54,6 +54,7 @@
 elm_check.c \
 elm_radio.c \
 elm_pager.c \
+elm_fileselector.c \
 \
 elc_notepad.c \
 elc_anchorview.c \

Added: trunk/TMP/st/elementary/src/lib/elm_fileselector.c

Log:
  1. add scroller test
  2. add pagination concept to scroller (only scroll by pages)
  3. add longpress callback for list + genlist
  4. scroller docs and some empty api calls. 
  
  
Author:       raster
Date:         2009-09-01 03:42:52 -0700 (Tue, 01 Sep 2009)
New Revision: 42147

Added:
  trunk/TMP/st/elementary/src/bin/test_scroller.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/els_scroller.c trunk/TMP/st/elementary/src/lib/els_scroller.h 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-01 10:42:52 UTC (rev 42147)
@@ -30,7 +30,7 @@
 test_toolbar.c test_hoversel.c test_list.c test_carousel.c test_inwin.c \
 test_scaling.c test_slider.c test_genlist.c test_check.c test_pager.c \
 test_radio.c test_win_state.c test_progressbar.c test_fileselector.c \
-test_separator.c
+test_separator.c test_scroller.c
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la
 elementary_test_LDFLAGS =
 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-09-01 10:42:52 UTC (rev 42147)
@@ -44,6 +44,7 @@
 void test_progressbar(void *data, Evas_Object *obj, void *event_info);
 void test_fileselector(void *data, Evas_Object *obj, void *event_info);
 void test_separator(void *data, Evas_Object *obj, void *event_info);
+void test_scroller(void *data, Evas_Object *obj, void *event_info);
 
 
 
@@ -170,7 +171,8 @@
    elm_list_item_append(li, "Window States", NULL, NULL, test_win_state, NULL);
    elm_list_item_append(li, "Progressbar", NULL, NULL, test_progressbar, NULL);
    elm_list_item_append(li, "File Selector", NULL, NULL, test_fileselector, NULL);
-   elm_list_item_append(li, "Separators", NULL, NULL, test_separator, NULL);
+   elm_list_item_append(li, "Separator", NULL, NULL, test_separator, NULL);
+   elm_list_item_append(li, "Scroller", NULL, NULL, test_scroller, NULL);
 
    elm_list_go(li);
 

Added: trunk/TMP/st/elementary/src/bin/test_scroller.c

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-01 10:42:52 UTC (rev 42147)
@@ -307,6 +307,12 @@
 	  ELM_SCROLLER_POLICY_OFF
      }
    Elm_Scroller_Policy;
+   typedef enum _Elm_Scroller_Axis
+     {
+	ELM_SCROLLER_AXIS_HORIZONTAL,
+	  ELM_SCROLLER_AXIS_VERTICAL
+     }
+   Elm_Scroller_Axis;
 
    EAPI Evas_Object *elm_scroller_add(Evas_Object *parent);
    EAPI void         elm_scroller_content_set(Evas_Object *obj, Evas_Object *child);
@@ -316,12 +322,19 @@
    EAPI void         elm_scroller_region_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
    EAPI void         elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
    EAPI void         elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
+   EAPI void         elm_scroller_index_set(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index);
+   EAPI void         elm_scroller_index_clear(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index);
+   EAPI void         elm_scroller_index_add(Evas_Object *obj, Elm_Scroller_Axis axis, const char *label, Evas_Object *icon, Evas_Coord position, Evas_Coord size);
    /* smart callbacks called:
     * "edge_left"
     * "edge_right"
     * "edge_top"
     * "edge_bottom"
     * "scroll"
+    * "scroll_anim_start"
+    * "scroll_anim_stop"
+    * "scroll_drag_start"
+    * "scroll_drag_stop"
     */
 
    EAPI Evas_Object *elm_label_add(Evas_Object *parent);
@@ -601,6 +614,7 @@
     * "clicked" - when the user double-clicked an item
     * "selected" - when the user selected an item
     * "unselected" - when the user selected an item
+    * "longpressed" - an item in the hoversel list is long-pressed
     */
 
    // FIXME: incomplete - carousel
@@ -694,6 +708,7 @@
     * "clicked" - when the user double-clicked an item
     * "selected" - when the user selected an item
     * "unselected" - when the user selected an item
+    * "longpressed" - an item in the hoversel list is long-pressed
     * "expanded" - when the user expanded an item
     * "contracted" - when the user contracted an item
     * "expand,request" - when the user requested to expand an item

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-01 10:42:52 UTC (rev 42147)
@@ -238,6 +238,8 @@
    Eina_Bool min_w : 1;
    Eina_Bool min_h : 1;
    Eina_Bool always_select : 1;
+   Eina_Bool longpressed : 1;
+   Eina_Bool wasselected : 1;
    Eina_Bool no_select : 1;
 };
 
@@ -257,11 +259,11 @@
    EINA_INLIST;
    Widget_Data *wd;
    Item_Block *block;
-   Eina_List *items; // FIXME: not done yet
+   Eina_List *items;
    Evas_Coord x, y, w, h, minw, minh;
    const Elm_Genlist_Item_Class *itc;
    const void *data;
-   Elm_Genlist_Item *parent; // not done yet
+   Elm_Genlist_Item *parent;
    Elm_Genlist_Item_Flags flags;
    struct {
       void (*func) (void *data, Evas_Object *obj, void *event_info);
@@ -272,7 +274,8 @@
    Evas_Object *spacer;
    Eina_List *labels, *icons, *states;
    Eina_List *icon_objs;
-
+   Ecore_Timer *long_timer;
+   
    Elm_Genlist_Item *rel;
    int relcount;
    Eina_Bool before : 1;
@@ -280,7 +283,7 @@
    Eina_Bool realized : 1;
    Eina_Bool selected : 1;
    Eina_Bool hilighted : 1;
-   Eina_Bool expanded : 1; // FIXME: not done yet
+   Eina_Bool expanded : 1;
    Eina_Bool disabled : 1;
    Eina_Bool mincalcd : 1;
    Eina_Bool queued : 1;
@@ -467,16 +470,31 @@
      }
 }
 
+static int
+_long_press(void *data)
+{
+   Elm_Genlist_Item *it = data;
+   it->long_timer = NULL;
+   if (it->disabled) return 0;
+   it->wd->longpressed = EINA_TRUE;
+   evas_object_smart_callback_call(it->wd->obj, "longpressed", it);
+   return 0;
+}            
+
 static void
 _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Down *ev = event_info;
+   if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
+   it->wd->wasselected = it->selected;
    _item_hilight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      evas_object_smart_callback_call(it->wd->obj, "clicked", it);
+   if (it->long_timer) ecore_timer_del(it->long_timer);
+   it->long_timer = ecore_timer_add(1.0, _long_press, it);
 }
 
 static void
@@ -485,13 +503,27 @@
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_List *l;
+   if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
+   if (it->long_timer)
+     {
+        ecore_timer_del(it->long_timer);
+        it->long_timer = NULL;
+     }
    if (it->wd->on_hold)
      {
 	it->wd->on_hold = EINA_FALSE;
 	return;
      }
+   if (it->wd->longpressed)
+     {
+        it->wd->longpressed = EINA_FALSE;
+        if (!it->wd->wasselected)
+          _item_unselect(it);
+        it->wd->wasselected = 0;
+        return;
+     }
    if (it->disabled) return;
    if (it->wd->multi)
      {
@@ -1149,6 +1181,7 @@
 _item_del(Elm_Genlist_Item *it)
 {
    elm_genlist_item_subitems_clear(it);
+   if (it->long_timer) ecore_timer_del(it->long_timer);
    if (it->wd->show_item == it) it->wd->show_item = NULL;
    if (it->selected) it->wd->selected = eina_list_remove(it->wd->selected, it);
    if (it->realized) _item_unrealize(it);

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-09-01 10:42:52 UTC (rev 42147)
@@ -13,6 +13,8 @@
    Eina_Bool on_hold : 1;
    Eina_Bool multi : 1;
    Eina_Bool always_select : 1;
+   Eina_Bool longpressed : 1;
+   Eina_Bool wasselected : 1;
 };
 
 struct _Elm_List_Item
@@ -25,6 +27,7 @@
    void (*func) (void *data, Evas_Object *obj, void *event_info);
    void (*del_cb) (void *data, Evas_Object *obj, void *event_info);
    const void *data;
+   Ecore_Timer *long_timer;
    Eina_Bool even : 1;
    Eina_Bool is_even : 1;
    Eina_Bool fixed : 1;
@@ -50,6 +53,7 @@
    EINA_LIST_FREE(wd->items, it)
      {
 	if (it->del_cb) it->del_cb((void *)it->data, it->obj, it);
+        if (it->long_timer) ecore_timer_del(it->long_timer);
 	eina_stringshare_del(it->label);
 	if (!it->fixed)
 	  {
@@ -183,17 +187,33 @@
      }
 }
 
+static int
+_long_press(void *data)
+{
+   Elm_List_Item *it = data;
+   Widget_Data *wd = elm_widget_data_get(it->obj);
+   it->long_timer = NULL;
+   wd->longpressed = EINA_TRUE;
+   evas_object_smart_callback_call(it->obj, "longpressed", it);
+   return 0;
+}
+
 static void
 _mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
 {
    Elm_List_Item *it = data;
    Widget_Data *wd = elm_widget_data_get(it->obj);
    Evas_Event_Mouse_Down *ev = event_info;
+   if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
    else wd->on_hold = EINA_FALSE;
+   wd->wasselected = it->selected;
    _item_hilight(it);
    if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
      evas_object_smart_callback_call(it->obj, "clicked", it);
+   wd->longpressed = EINA_FALSE;
+   if (it->long_timer) ecore_timer_del(it->long_timer);
+   it->long_timer = ecore_timer_add(1.0, _long_press, it);
 }
 
 static void
@@ -202,13 +222,27 @@
    Elm_List_Item *it = data;
    Widget_Data *wd = elm_widget_data_get(it->obj);
    Evas_Event_Mouse_Up *ev = event_info;
+   if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
    else wd->on_hold = EINA_FALSE;
+   if (it->long_timer)
+     {
+        ecore_timer_del(it->long_timer);
+        it->long_timer = NULL;
+     }
    if (wd->on_hold)
      {
 	wd->on_hold = EINA_FALSE;
 	return;
      }
+   if (wd->longpressed)
+     {
+        wd->longpressed = EINA_FALSE;
+        if (!wd->wasselected)
+          _item_unselect(it);
+        wd->wasselected = 0;
+        return;
+     }
    if (wd->multi)
      {
 	if (!it->selected)

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-09-01 10:42:52 UTC (rev 42147)
@@ -1,6 +1,35 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
+/**
+ * @defgroup Scroller Scroller
+ *
+ * A scroller holds a single object and "scrolls it around". This means that
+ * it allows the user to use a scrollbar (or a finger) to drag the viewable
+ * region around, allowing to move through a much larger object that is
+ * contained in the scroller. The scroiller will always have a small minimum
+ * size by default as it won't be limited by the contents of the scroller.
+ * 
+ * Signals that you can add callbacks for are:
+ * 
+ * edge_left - the left edge of the content has been reached
+ * 
+ * edge_right - the right edge of the content has been reached
+ * 
+ * edge_top - the top edge of the content has been reached
+ * 
+ * edge_bottom - the bottom edge of the content has been reached
+ * 
+ * scroll - the content has been scrolled (moved)
+ * 
+ * scroll_anim_start - scrolling animation has started
+ * 
+ * scroll_anim_stop - scrolling animation has stopped
+ * 
+ * scroll_drag_start - dragging the contents around has started
+ * 
+ * scroll_drag_stop - dragging the contents around has stopped
+ */
 typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
@@ -9,6 +38,8 @@
    Evas_Object *content;
    Eina_Bool min_w : 1;
    Eina_Bool min_h : 1;
+   double pagerel_h, pagerel_v;
+   Evas_Coord pagesize_h, pagesize_v;
 };
 
 static void _del_hook(Evas_Object *obj);
@@ -167,6 +198,38 @@
    evas_object_smart_callback_call(data, "scroll", NULL);
 }
 
+static void
+_scroll_anim_start(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll_anim_start", NULL);
+}
+
+static void
+_scroll_anim_stop(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll_anim_stop", NULL);
+}
+
+static void
+_scroll_drag_start(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll_drag_start", NULL);
+}
+
+static void
+_scroll_drag_stop(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll_drag_stop", NULL);
+}
+
+/**
+ * Add a new scroller to the parent
+ *
+ * @param parent The parent object
+ * @return The new object or NULL if it cannot be created
+ *
+ * @ingroup Scroller
+ */
 EAPI Evas_Object *
 elm_scroller_add(Evas_Object *parent)
 {
@@ -204,11 +267,26 @@
    evas_object_smart_callback_add(wd->scr, "edge,top", _edge_top, obj);
    evas_object_smart_callback_add(wd->scr, "edge,bottom", _edge_bottom, obj);
    evas_object_smart_callback_add(wd->scr, "scroll", _scroll, obj);
+   evas_object_smart_callback_add(wd->scr, "animate,start", _scroll_anim_start, obj);
+   evas_object_smart_callback_add(wd->scr, "animate,start", _scroll_anim_stop, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,start", _scroll_drag_start, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,start", _scroll_drag_stop, obj);
 
    _sizing_eval(obj);
    return obj;
 }
 
+
+/**
+ * Set the content object
+ *
+ * XXX
+ *
+ * @param obj The scroller object
+ * @param content The new content object
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_content_set(Evas_Object *obj, Evas_Object *content)
 {
@@ -228,6 +306,19 @@
      }
 }
 
+/**
+ * Make the scroller minimum size limited to the minimum size of the content
+ *
+ * By default the scroller will be as small as its design allows, irrespective
+ * of its content. This will make the scroller minimum size the right size
+ * horizontally and/or vertically to perfectly fit its content.
+ *
+ * @param obj The scroller object
+ * @param w Enable limiting minimum size horizontally
+ * @param h Enable limiting minimum size vertically
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_content_min_limit(Evas_Object *obj, Eina_Bool w, Eina_Bool h)
 {
@@ -238,6 +329,21 @@
    _sizing_eval(obj);
 }
 
+/**
+ * Show a specific virtual region within the scroller content object
+ *
+ * This will ensure all (or part if it does not fit) of the designated
+ * region in the virtual content object (0, 0 starting at the top-left of the
+ * virtual content object) is shown within the scroller.
+ *
+ * @param obj The scroller object
+ * @param x X coordinate of the region
+ * @param y Y coordinate of the region
+ * @param w Width of the region
+ * @param h Height of the region
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_region_show(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
 {
@@ -246,6 +352,21 @@
    elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
 }
 
+/**
+ * Set the scroller scrollbar policy
+ *
+ * This sets the scrollbar visibility policy for the given scroller. 
+ * ELM_SMART_SCROLLER_POLICY_AUTO means the scrollber is made visible if it
+ * is needed, and otherwise kept hidden. ELM_SMART_SCROLLER_POLICY_ON turns
+ * it on all the time, and ELM_SMART_SCROLLER_POLICY_OFF always keeps it off.
+ * This applies respectively for the horizontal and vertical scrollbars.
+ *
+ * @param obj The scroller object
+ * @param policy_h Horizontal scrollbar policy
+ * @param policy_v Vertical scrollbar policy
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v)
 {
@@ -262,6 +383,21 @@
    elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]);
 }
 
+/**
+ * Get the currently visible content region
+ *
+ * This gets the current region in the content object that is visible through
+ * the scroller. Also see elm_scroller_region_show(). The region co-ordinates
+ * are returned in the @p x, @p y, @p w, @p h values pointed to.
+ *
+ * @param obj The scroller object
+ * @param x X coordinate of the region
+ * @param y Y coordinate of the region
+ * @param w Width of the region
+ * @param h Height of the region
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_region_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
 {
@@ -271,6 +407,19 @@
    if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
 }
 
+/**
+ * Get the size of the content child object
+ *
+ * This gets the size of the child object of the scroller. Actually the
+ * content of a scroller doesn't specifically need to be an actual object
+ * as it can be virtual and defined purely by callbacks.
+ *
+ * @param obj The scroller object
+ * @param w Width return
+ * @param h Height return
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_child_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
 {
@@ -279,6 +428,20 @@
    evas_object_geometry_get(wd->content, NULL, NULL, w, h);
 }
 
+/**
+ * Set bouncing behavior
+ *
+ * When scrolling, the scroller may "bounce" when reaching an edge of the child
+ * object. This is a visual way to indicate the end has been reached. This is
+ * enabled by default for both axes. This will set if it is enabled for that
+ * axis with the boolean parameers for each axis.
+ *
+ * @param obj The scroller object
+ * @param h_bounce Will the scroller bounce horizontally or not
+ * @param v_bounce Will the scroller bounce vertically or not
+ *
+ * @ingroup Scroller
+ */
 EAPI void
 elm_scroller_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce)
 {
@@ -286,3 +449,98 @@
    if (!wd) return;
    elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
 }
+
+/**
+ * Enable quick-index jump on each axis
+ *
+ * This enabled a quick jump list along a specific axis. This is, for example
+ * "A, B, C, D ... X, Y, Z" along an axis that will jump to the item beginning
+ * with that letter as a quick way to jump to the position desired.
+ *
+ * @param obj The scroller object
+ * @param h_index Will the index be available horizontally
+ * @param v_index Will the index be available vertically
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_index_set(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   // XXX
+}
+
+/**
+ * XXX
+ *
+ * xx
+ * 
+ * @param obj The scroller object
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_index_clear(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   // XXX
+}
+
+/**
+ * XXX
+ *
+ * xx
+ * 
+ * @param obj The scroller object
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_index_add(Evas_Object *obj, Elm_Scroller_Axis axis, const char *label, Evas_Object *icon, Evas_Coord position, Evas_Coord size)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   // XXX
+}
+
+/**
+ * XXX
+ *
+ * xx
+ * 
+ * @param obj The scroller object
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_page_relative_set(Evas_Object *obj, double h_pagerel, double v_pagerel)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->pagerel_h = h_pagerel;
+   wd->pagerel_v = v_pagerel;
+   elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
+                                 wd->pagesize_h, wd->pagesize_v);
+}
+
+/**
+ * XXX
+ *
+ * xx
+ * 
+ * @param obj The scroller object
+ *
+ * @ingroup Scroller
+ */
+EAPI void
+elm_scroller_page_size_set(Evas_Object *obj, Evas_Coord h_pagesize, Evas_Coord v_pagesize)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   wd->pagesize_h = h_pagesize;
+   wd->pagesize_v = v_pagesize;
+   elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
+                                 wd->pagesize_h, wd->pagesize_v);
+}

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-01 10:42:52 UTC (rev 42147)
@@ -66,7 +66,17 @@
       void (*child_size_get) (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y);
    } pan_func;
 
-
+   struct {
+      struct {
+         Evas_Coord start, end;
+         double t_start, t_end;
+         Ecore_Animator *animator;
+      } x, y;
+   } scrollto;
+   
+   double pagerel_h, pagerel_v;
+   Evas_Coord pagesize_h, pagesize_v;
+   
    unsigned char hbar_visible : 1;
    unsigned char vbar_visible : 1;
    unsigned char extern_pan : 1;
@@ -91,7 +101,11 @@
 static int  _smart_onhold_animator(void *data);
 static void _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _smart_edje_drag_v_start(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _smart_edje_drag_v_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _smart_edje_drag_h_start(void *data, Evas_Object *obj, const char *emission, const char *source);
+static void _smart_edje_drag_h_stop(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _smart_edje_drag_h(void *data, Evas_Object *obj, const char *emission, const char *source);
 static void _smart_scrollbar_read(Smart_Data *sd);
 static void _smart_scrollbar_reset(Smart_Data *sd);
@@ -232,6 +246,226 @@
 }
 
 static int
+_smart_scrollto_x_animator(void *data)
+{
+   Smart_Data *sd = data;
+   Evas_Coord px, py;
+   double t, tt;
+   
+   t = ecore_loop_time_get();
+   tt = (t - sd->scrollto.x.t_start) / (sd->scrollto.x.t_end - sd->scrollto.x.t_start);
+   tt = 1.0 - tt;
+   tt = 1.0 - (tt * tt * tt);
+   sd->pan_func.get(sd->pan_obj, &px, &py);
+   px = (sd->scrollto.x.start * (1.0 - tt)) +
+     (sd->scrollto.x.end * tt);
+   elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+   if (t >= sd->scrollto.x.t_end)
+     {
+        px = sd->scrollto.x.end;
+        sd->pan_func.set(sd->pan_obj, px, py);
+        sd->scrollto.x.animator = NULL;
+        return 0;
+     }
+   return 1;
+}
+
+static void
+_smart_scrollto_x(Smart_Data *sd, double t_in, Evas_Coord pos_x)
+{
+   Evas_Coord px, py, x, y, w, h;
+   double t;
+
+   if (t_in <= 0.0)
+     {
+        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+        elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+        x = pos_x;
+        elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
+        return;
+     }
+   t = ecore_loop_time_get();
+   sd->pan_func.get(sd->pan_obj, &px, &py);
+   sd->scrollto.x.start = px;
+   sd->scrollto.x.end = pos_x;
+   sd->scrollto.x.t_start = t;
+   sd->scrollto.x.t_end = t + t_in;
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+   elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
+   if (!sd->scrollto.x.animator)
+     sd->scrollto.x.animator = ecore_animator_add(_smart_scrollto_x_animator, sd);
+}
+
+static int
+_smart_scrollto_y_animator(void *data)
+{
+   Smart_Data *sd = data;
+   Evas_Coord px, py;
+   double t, tt;
+   
+   t = ecore_loop_time_get();
+   tt = (t - sd->scrollto.y.t_start) / (sd->scrollto.y.t_end - sd->scrollto.y.t_start);
+   tt = 1.0 - tt;
+   tt = 1.0 - (tt * tt * tt);
+   sd->pan_func.get(sd->pan_obj, &px, &py);
+   py = (sd->scrollto.y.start * (1.0 - tt)) +
+     (sd->scrollto.y.end * tt);
+   elm_smart_scroller_child_pos_set(sd->smart_obj, px, py);
+   if (t >= sd->scrollto.y.t_end)
+     {
+        py = sd->scrollto.y.end;
+        sd->pan_func.set(sd->pan_obj, px, py);
+        sd->scrollto.y.animator = NULL;
+        return 0;
+     }
+   return 1;
+}
+
+static void
+_smart_scrollto_y(Smart_Data *sd, double t_in, Evas_Coord pos_y)
+{
+   Evas_Coord px, py, x, y, w, h;
+   double t;
+
+   if (t_in <= 0.0)
+     {
+        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+        elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+        y = pos_y;
+        elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
+        return;
+     }
+   t = ecore_loop_time_get();
+   sd->pan_func.get(sd->pan_obj, &px, &py);
+   sd->scrollto.y.start = py;
+   sd->scrollto.y.end = pos_y;
+   sd->scrollto.y.t_start = t;
+   sd->scrollto.y.t_end = t + t_in;
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+   elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
+   if (!sd->scrollto.y.animator)
+     sd->scrollto.y.animator = ecore_animator_add(_smart_scrollto_y_animator, sd);
+}
+
+static Eina_Bool
+_smart_do_page(Smart_Data *sd)
+{
+   if ((sd->pagerel_h == 0.0) && (sd->pagesize_h == 0) &&
+       (sd->pagerel_v == 0.0) && (sd->pagesize_v == 0))
+     return 0;
+   return 1;
+}
+
+static Evas_Coord
+_smart_page_x_get(Smart_Data *sd)
+{
+   Evas_Coord x, y, w, h;
+   
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+   
+   if (sd->pagerel_h > 0.0)
+     {
+        x = x + (w * sd->pagerel_h * 0.5);
+        x = x / (w * sd->pagerel_h);
+        x = x * (w * sd->pagerel_h);
+     }
+   else if (sd->pagesize_h > 0)
+     {
+        x = x + (sd->pagesize_h * 0.5);
+        x = x / (sd->pagesize_h);
+        x = x * (sd->pagesize_h);
+     }
+   return x;
+}
+
+static Evas_Coord
+_smart_page_y_get(Smart_Data *sd)
+{
+   Evas_Coord x, y, w, h;
+   
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+   
+   if (sd->pagerel_v > 0.0)
+     {
+        y = y + (h * sd->pagerel_v * 0.5);
+        y = y / (h * sd->pagerel_v);
+        y = y * (h * sd->pagerel_v);
+     }
+   else if (sd->pagesize_v > 0)
+     {
+        y = y + (sd->pagesize_v * 0.5);
+        y = y / (sd->pagesize_v);
+        y = y * (sd->pagesize_v);
+     }
+   return y;
+}
+
+static void
+_smart_page_adjust(Smart_Data *sd)
+{
+   Evas_Coord x, y, w, h;
+   
+   if (!_smart_do_page(sd)) return;
+   
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   elm_smart_scroller_child_viewport_size_get(sd->smart_obj, &w, &h);
+   
+   if (sd->pagerel_h > 0.0)
+     {
+        x = x + (w * sd->pagerel_h * 0.5);
+        x = x / (w * sd->pagerel_h);
+        x = x * (w * sd->pagerel_h);
+     }
+   else if (sd->pagesize_h > 0)
+     {
+        x = x + (sd->pagesize_h * 0.5);
+        x = x / (sd->pagesize_h);
+        x = x * (sd->pagesize_h);
+     }
+   if (sd->pagerel_v > 0.0)
+     {
+        y = y + (w * sd->pagerel_v * 0.5);
+        y = y / (w * sd->pagerel_v);
+        y = y * (w * sd->pagerel_v);
+     }
+   else if (sd->pagesize_v > 0)
+     {
+        y = y + (sd->pagesize_v * 0.5);
+        y = y / (sd->pagesize_v);
+        y = y * (sd->pagesize_v);
+     }
+   elm_smart_scroller_child_region_show(sd->smart_obj, x, y, w, h);
+}
+
+static void
+_smart_anim_start(Evas_Object *obj)
+{
+   evas_object_smart_callback_call(obj, "animate,start", NULL);
+}
+
+static void
+_smart_anim_stop(Evas_Object *obj)
+{
+   evas_object_smart_callback_call(obj, "animate,stop", NULL);
+}
+
+static void
+_smart_drag_start(Evas_Object *obj)
+{
+   evas_object_smart_callback_call(obj, "drag,start", NULL);
+}
+
+static void
+_smart_drag_stop(Evas_Object *obj)
+{
+   evas_object_smart_callback_call(obj, "drag,stop", NULL);
+}
+
+static int
 _smart_bounce_x_animator(void *data)
 {
    Smart_Data *sd;
@@ -332,6 +566,7 @@
 	elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
 	if (dt >= 1.0)
 	  {
+             _smart_anim_stop(sd->smart_obj);
 	     sd->down.momentum_animator = NULL;
              sd->down.bounce_x_hold = 0;
              sd->down.bounce_y_hold = 0;
@@ -508,6 +743,20 @@
 	if (ny > y) ny = y;
      }
    if ((nx == px) && (ny == py)) return;
+   if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator))
+     {
+        _smart_anim_stop(sd->smart_obj);
+     }
+   if (sd->scrollto.x.animator)
+     {
+        ecore_animator_del(sd->scrollto.x.animator);
+        sd->scrollto.x.animator = NULL;
+     }
+   if (sd->scrollto.y.animator)
+     {
+        ecore_animator_del(sd->scrollto.y.animator);
+        sd->scrollto.y.animator = NULL;
+     }
    if (sd->down.bounce_x_animator)
      {
         ecore_animator_del(sd->down.bounce_x_animator);
@@ -520,6 +769,21 @@
         sd->down.bounce_y_animator = NULL;
         sd->bouncemey = 0;
      }
+   if (sd->down.hold_animator)
+     {
+        ecore_animator_del(sd->down.hold_animator);
+        sd->down.hold_animator = NULL;
+        _smart_drag_stop(sd->smart_obj);
+     }
+   if (sd->down.momentum_animator)
+     {
+        ecore_animator_del(sd->down.momentum_animator);
+        sd->down.momentum_animator = NULL;
+        sd->down.bounce_x_hold = 0;
+        sd->down.bounce_y_hold = 0;
+        sd->down.ax = 0;
+        sd->down.ay = 0;
+     }
    elm_smart_scroller_child_pos_set(obj, nx, ny);
 }
 
@@ -660,8 +924,40 @@
    sd->bounce_vert = vert;
 }
 
+void
+elm_smart_scroller_paging_set(Evas_Object *obj, double pagerel_h, double pagerel_v, Evas_Coord pagesize_h, Evas_Coord pagesize_v)
+{
+   API_ENTRY return;
+   sd->pagerel_h = pagerel_h;
+   sd->pagerel_v = pagerel_v;
+   sd->pagesize_h = pagesize_h;
+   sd->pagesize_v = pagesize_v;
+   _smart_page_adjust(sd);
+}
+
+
 /* local subsystem functions */
 static void
+_smart_edje_drag_v_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Smart_Data *sd;
+
+   sd = data;
+   _smart_scrollbar_read(sd);
+   _smart_drag_start(sd->smart_obj);
+}
+
+static void
+_smart_edje_drag_v_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Smart_Data *sd;
+
+   sd = data;
+   _smart_scrollbar_read(sd);
+   _smart_drag_stop(sd->smart_obj);
+}
+
+static void
 _smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Smart_Data *sd;
@@ -671,6 +967,26 @@
 }
 
 static void
+_smart_edje_drag_h_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Smart_Data *sd;
+
+   sd = data;
+   _smart_scrollbar_read(sd);
+   _smart_drag_start(sd->smart_obj);
+}
+
+static void
+_smart_edje_drag_h_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+{
+   Smart_Data *sd;
+
+   sd = data;
+   _smart_scrollbar_read(sd);
+   _smart_drag_stop(sd->smart_obj);
+}
+
+static void
 _smart_edje_drag_h(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
    Smart_Data *sd;
@@ -698,18 +1014,6 @@
    Smart_Data *sd;
 
    sd = data;
-   if (sd->down.bounce_x_animator)
-     {
-        ecore_animator_del(sd->down.bounce_x_animator);
-        sd->down.bounce_x_animator = NULL;
-        sd->bouncemex = 0;
-     }
-   if (sd->down.bounce_y_animator)
-     {
-        ecore_animator_del(sd->down.bounce_y_animator);
-        sd->down.bounce_y_animator = NULL;
-        sd->bouncemey = 0;
-     }
    sd->pan_func.get(sd->pan_obj, &x, &y);
    sd->pan_func.child_size_get(sd->pan_obj, &w, &h);
    if ((w != sd->child.w) || (h != sd->child.h))
@@ -730,6 +1034,20 @@
 
    sd = data;
    sd->pan_func.get(sd->pan_obj, &x, &y);
+   if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator))
+     {
+        _smart_anim_stop(sd->smart_obj);
+     }
+   if (sd->scrollto.x.animator)
+     {
+        ecore_animator_del(sd->scrollto.x.animator);
+        sd->scrollto.x.animator = NULL;
+     }
+   if (sd->scrollto.y.animator)
+     {
+        ecore_animator_del(sd->scrollto.y.animator);
+        sd->scrollto.y.animator = NULL;
+     }
    if (sd->down.bounce_x_animator)
      {
         ecore_animator_del(sd->down.bounce_x_animator);
@@ -763,6 +1081,26 @@
        evas_key_modifier_is_set(ev->modifiers, "Super"))
      return;
    elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+   if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator))
+     {
+        _smart_anim_stop(sd->smart_obj);
+     }
+   if (sd->scrollto.x.animator)
+     {
+        ecore_animator_del(sd->scrollto.x.animator);
+        sd->scrollto.x.animator = NULL;
+     }
+   if (sd->scrollto.y.animator)
+     {
+        ecore_animator_del(sd->scrollto.y.animator);
+        sd->scrollto.y.animator = NULL;
+     }
+   if (sd->down.bounce_x_animator)
+     {
+        ecore_animator_del(sd->down.bounce_x_animator);
+        sd->down.bounce_x_animator = NULL;
+        sd->bouncemex = 0;
+     }
    if (sd->down.bounce_y_animator)
      {
         ecore_animator_del(sd->down.bounce_y_animator);
@@ -788,6 +1126,21 @@
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
    if (_elm_config->thumbscroll_enable)
      {
+        if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) ||
+            (sd->down.momentum_animator))
+          {
+             _smart_anim_stop(sd->smart_obj);
+          }
+        if (sd->scrollto.x.animator)
+          {
+             ecore_animator_del(sd->scrollto.x.animator);
+             sd->scrollto.x.animator = NULL;
+          }
+        if (sd->scrollto.y.animator)
+          {
+             ecore_animator_del(sd->scrollto.y.animator);
+             sd->scrollto.y.animator = NULL;
+          }
         if (sd->down.bounce_x_animator)
           {
              ecore_animator_del(sd->down.bounce_x_animator);
@@ -804,6 +1157,7 @@
 	  {
 	     ecore_animator_del(sd->down.hold_animator);
 	     sd->down.hold_animator = NULL;
+             _smart_drag_stop(sd->smart_obj);
 	  }
 	if (sd->down.momentum_animator)
 	  {
@@ -870,6 +1224,7 @@
 	     y = ev->canvas.y - sd->down.y;
              if (sd->down.dragged)
                {
+                  _smart_drag_stop(sd->smart_obj);
                   if ((!sd->hold) && (!sd->freeze))
                     {
                        double t, at, dt;
@@ -902,11 +1257,9 @@
                                 (vel > _elm_config->thumbscroll_momentum_threshhold))
                               {
                                  if (!sd->down.momentum_animator)
-                                   sd->down.momentum_animator = ecore_animator_add(_smart_momentum_animator, sd);
-                                 if (sd->down.hold_animator)
                                    {
-                                      ecore_animator_del(sd->down.hold_animator);
-                                      sd->down.hold_animator = NULL;
+                                      sd->down.momentum_animator = ecore_animator_add(_smart_momentum_animator, sd);
+                                      _smart_anim_start(sd->smart_obj);
                                    }
                                  sd->down.dx = ((double)dx / at);
                                  sd->down.dy = ((double)dy / at);
@@ -918,14 +1271,30 @@
                                  sd->down.b0y = 0;
                               }
                          }
+                       if (sd->down.hold_animator)
+                         {
+                            ecore_animator_del(sd->down.hold_animator);
+                            sd->down.hold_animator = NULL;
+                         }
                     }
                   evas_event_feed_hold(e, 0, ev->timestamp, ev->data);
+                  if (_smart_do_page(sd))
+                    {
+                       Evas_Coord pgx, pgy;
+                       
+                       elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
+                       pgx = _smart_page_x_get(sd);
+                       if (pgx != x) _smart_scrollto_x(sd, 0.5, pgx);
+                       pgy = _smart_page_y_get(sd);
+                       if (pgy != y) _smart_scrollto_y(sd, 0.5, pgy);
+                    }
 	       }
 	     sd->down.dragged = 0;
 	     sd->down.now = 0;
              elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
              elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
-             bounce_eval(sd);
+             if (!_smart_do_page(sd))
+               bounce_eval(sd);
 	  }
      }
 }
@@ -1016,7 +1385,10 @@
                         _elm_config->thumbscroll_threshhold)))
                     {
                        if (!sd->down.dragged)
-                         evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
+                         {
+                            evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
+                            _smart_drag_start(sd->smart_obj);
+                         }
                        ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
                        sd->down.dragged = 1;
                        x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
@@ -1166,6 +1538,11 @@
      }
    if (xch)
      {
+        if (sd->scrollto.x.animator)
+          {
+             ecore_animator_del(sd->scrollto.x.animator);
+             sd->scrollto.x.animator = NULL;
+          }
         if (sd->down.bounce_x_animator)
           {
              ecore_animator_del(sd->down.bounce_x_animator);
@@ -1175,6 +1552,11 @@
      }
    if (ych)
      {
+        if (sd->scrollto.y.animator)
+          {
+             ecore_animator_del(sd->scrollto.y.animator);
+             sd->scrollto.y.animator = NULL;
+          }
         if (sd->down.bounce_y_animator)
           {
              ecore_animator_del(sd->down.bounce_y_animator);
@@ -1488,13 +1870,13 @@
    sd->edje_obj = o;
    _elm_theme_set(o, "scroller", "base", "default");
    edje_object_signal_callback_add(o, "drag", "elm.dragable.vbar", _smart_edje_drag_v, sd);
-   edje_object_signal_callback_add(o, "drag,start", "elm.dragable.vbar", _smart_edje_drag_v, sd);
-   edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.vbar", _smart_edje_drag_v, sd);
+   edje_object_signal_callback_add(o, "drag,start", "elm.dragable.vbar", _smart_edje_drag_v_start, sd);
+   edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.vbar", _smart_edje_drag_v_stop, sd);
    edje_object_signal_callback_add(o, "drag,step", "elm.dragable.vbar", _smart_edje_drag_v, sd);
    edje_object_signal_callback_add(o, "drag,page", "elm.dragable.vbar", _smart_edje_drag_v, sd);
    edje_object_signal_callback_add(o, "drag", "elm.dragable.hbar", _smart_edje_drag_h, sd);
-   edje_object_signal_callback_add(o, "drag,start", "elm.dragable.hbar", _smart_edje_drag_h, sd);
-   edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.hbar", _smart_edje_drag_h, sd);
+   edje_object_signal_callback_add(o, "drag,start", "elm.dragable.hbar", _smart_edje_drag_h_start, sd);
+   edje_object_signal_callback_add(o, "drag,stop", "elm.dragable.hbar", _smart_edje_drag_h_stop, sd);
    edje_object_signal_callback_add(o, "drag,step", "elm.dragable.hbar", _smart_edje_drag_h, sd);
    edje_object_signal_callback_add(o, "drag,page", "elm.dragable.hbar", _smart_edje_drag_h, sd);
    evas_object_smart_member_add(o, obj);
@@ -1530,6 +1912,8 @@
    if (sd->down.momentum_animator) ecore_animator_del(sd->down.momentum_animator);
    if (sd->down.bounce_x_animator) ecore_animator_del(sd->down.bounce_x_animator);
    if (sd->down.bounce_y_animator) ecore_animator_del(sd->down.bounce_y_animator);
+   if (sd->scrollto.x.animator) ecore_animator_del(sd->scrollto.x.animator);
+   if (sd->scrollto.y.animator) ecore_animator_del(sd->scrollto.y.animator);
    free(sd);
    evas_object_smart_data_set(obj, NULL);
 }

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.h	2009-09-01 10:02:40 UTC (rev 42146)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.h	2009-09-01 10:42:52 UTC (rev 42147)
@@ -27,3 +27,4 @@
 void elm_smart_scroller_hold_set                (Evas_Object *obj, Eina_Bool hold);
 void elm_smart_scroller_freeze_set              (Evas_Object *obj, Eina_Bool freeze);
 void elm_smart_scroller_bounce_allow_set        (Evas_Object *obj, Eina_Bool horiz, Eina_Bool vert);
+void elm_smart_scroller_paging_set              (Evas_Object *obj, double pagerel_h, double pagerel_v, Evas_Coord pagesize_h, Evas_Coord pagesize_v);

Log:
  index not in scroller. better. a start.
  
  
Author:       raster
Date:         2009-09-04 02:50:25 -0700 (Fri, 04 Sep 2009)
New Revision: 42241

Added:
  trunk/TMP/st/elementary/src/bin/test_index.c trunk/TMP/st/elementary/src/lib/elm_index.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Makefile.am trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/els_box.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-04 09:50:25 UTC (rev 42241)
@@ -24,13 +24,39 @@
 bin_PROGRAMS += elementary_quicklaunch elementary_run elementary_testql
 endif
 
-elementary_test_SOURCES = test.c test_bg.c test_icon.c test_box.c \
-test_button.c test_toggle.c test_table.c test_clock.c test_layout.c \
-test_hover.c test_entry.c test_notepad.c test_anchorview.c test_anchorblock.c \
-test_toolbar.c test_hoversel.c test_list.c test_carousel.c test_inwin.c \
-test_scaling.c test_slider.c test_genlist.c test_check.c test_pager.c \
-test_radio.c test_win_state.c test_progressbar.c test_fileselector.c \
-test_separator.c test_scroller.c test_spinner.c
+elementary_test_SOURCES = \
+test.c \
+test_bg.c \
+test_icon.c \
+test_box.c \
+test_button.c \
+test_toggle.c \
+test_table.c \
+test_clock.c \
+test_layout.c \
+test_hover.c \
+test_entry.c \
+test_notepad.c \
+test_anchorview.c \
+test_anchorblock.c \
+test_toolbar.c \
+test_hoversel.c \
+test_list.c \
+test_carousel.c \
+test_inwin.c \
+test_scaling.c \
+test_slider.c \
+test_genlist.c \
+test_check.c \
+test_pager.c \
+test_radio.c \
+test_win_state.c \
+test_progressbar.c \
+test_fileselector.c \
+test_separator.c \
+test_scroller.c \
+test_spinner.c \
+test_index.c
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la
 elementary_test_LDFLAGS =
 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-09-04 09:50:25 UTC (rev 42241)
@@ -44,8 +44,9 @@
 void test_progressbar(void *data, Evas_Object *obj, void *event_info);
 void test_fileselector(void *data, Evas_Object *obj, void *event_info);
 void test_separator(void *data, Evas_Object *obj, void *event_info);
+void test_scroller(void *data, Evas_Object *obj, void *event_info);
 void test_spinner(void *data, Evas_Object *obj, void *event_info);
-void test_scroller(void *data, Evas_Object *obj, void *event_info);
+void test_index(void *data, Evas_Object *obj, void *event_info);
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
@@ -173,6 +174,7 @@
    elm_list_item_append(li, "Separator", NULL, NULL, test_separator, NULL);
    elm_list_item_append(li, "Scroller", NULL, NULL, test_scroller, NULL);
    elm_list_item_append(li, "Spinner", NULL, NULL, test_spinner, NULL);
+   elm_list_item_append(li, "Index", NULL, NULL, test_index, NULL);
 
    elm_list_go(li);
 

Added: trunk/TMP/st/elementary/src/bin/test_index.c

Modified: trunk/TMP/st/elementary/src/lib/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/lib/Makefile.am	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/lib/Makefile.am	2009-09-04 09:50:25 UTC (rev 42241)
@@ -57,6 +57,7 @@
 elm_progressbar.c \
 elm_separator.c \
 elm_spinner.c \
+elm_index.c \
 \
 elc_notepad.c \
 elc_anchorview.c \

Added: trunk/TMP/st/elementary/src/lib/elm_index.c

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-09-04 09:50:25 UTC (rev 42241)
@@ -38,8 +38,6 @@
    Evas_Object *content;
    Eina_Bool min_w : 1;
    Eina_Bool min_h : 1;
-   Eina_Bool index_h : 1;
-   Eina_Bool index_v : 1;
    double pagerel_h, pagerel_v;
    Evas_Coord pagesize_h, pagesize_v;
 };
@@ -457,80 +455,6 @@
 }
 
 /**
- * Enable quick-index jump on each axis
- *
- * This enabled a quick jump list along a specific axis. This is, for example
- * "A, B, C, D ... X, Y, Z" along an axis that will jump to the item beginning
- * with that letter as a quick way to jump to the position desired.
- *
- * @param obj The scroller object
- * @param h_index Will the index be available horizontally
- * @param v_index Will the index be available vertically
- *
- * @ingroup Scroller
- */
-EAPI void
-elm_scroller_index_set(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   wd->index_h = h_index;
-   wd->index_v = v_index;
-   // XXX eval index and show/hide
-}
-
-/**
- * Clear specific indexes for the scroller
- *
- * This clears the horizontal and/or vertical indexes for the scroller. After
- * this the indicated index(es) will be empty.
- * 
- * @param obj The scroller object
- * @param h_index Clear the horizontal index (or not)
- * @param v_index Clear the vertical index (or not)
- *
- * @ingroup Scroller
- */
-EAPI void
-elm_scroller_index_clear(Evas_Object *obj, Eina_Bool h_index, Eina_Bool v_index)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   // XXX eval index and show/hide
-}
-
-/**
- * Add a scroller index member
- *
- * This adds an item in the scroller index, giving it a position in the
- * virtual content region along a specific axis and a size (the area that
- * index item consumes). This is used to determine how to display the
- * index item, if at all, and where it will "jump to". If an icon is used,
- * the icon object becomes owned by the scroller and will be deleted if the
- * scroller is deleted or the index cleared. The index level can indicate
- * to use the main index (0) or sub-indexes for more accurate positioning.
- * These are optional and may not function if not supported. Icons used for
- * non-functioning index levels will be deleted.
- * 
- * @param obj The scroller object
- * @param axis The axis this item is to be asigned to
- * @param label A string label for this index item
- * @param icon An icon to display on the index item
- * @param position The virtual position of the item
- * @param size The virtual size of the item
- * @param level Index level. 0 is the main. Others (1, 2, etc.) are optional.
- *
- * @ingroup Scroller
- */
-EAPI void
-elm_scroller_index_add(Evas_Object *obj, Elm_Scroller_Axis axis, const char *label, Evas_Object *icon, Evas_Coord position, Evas_Coord size, int level)
-{
-   Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return;
-   // XXX eval index and show/hide
-}
-
-/**
  * Set scroll page size relative to viewport size
  *
  * The scroller is sapale of limiting scrolling by the user to "pages". That

Modified: trunk/TMP/st/elementary/src/lib/els_box.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_box.c	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/lib/els_box.c	2009-09-04 09:50:25 UTC (rev 42241)
@@ -444,7 +444,7 @@
      {
 	static const Evas_Smart_Class sc =
 	  {
-	     "e_box",
+	     "els_box",
 	       EVAS_SMART_CLASS_VERSION,
 	       _smart_add,
 	       _smart_del,

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-04 05:49:54 UTC (rev 42240)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-04 09:50:25 UTC (rev 42241)
@@ -1,7 +1,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-#define SMART_NAME "elm_scroller"
+#define SMART_NAME "els_scroller"
 #define API_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if ((!obj) || (!sd) || (evas_object_type_get(obj) && strcmp(evas_object_type_get(obj), SMART_NAME)))
 #define INTERNAL_ENTRY Smart_Data *sd; sd = evas_object_smart_data_get(obj); if (!sd) return;
 typedef struct _Smart_Data Smart_Data;

Log:
  fix scroll freeze and propagate to built-in scrollers. also genlist now knows
  about dragging items. callbacks for that.
  
  
Author:       raster
Date:         2009-09-07 23:20:32 -0700 (Mon, 07 Sep 2009)
New Revision: 42342

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elc_notepad.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-08 05:39:09 UTC (rev 42341)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-08 06:20:32 UTC (rev 42342)
@@ -802,6 +802,7 @@
 					 NULL/* func data */);
 
    elm_box_pack_end(bx, gl);
+   elm_object_scroll_freeze_push(gl);
    evas_object_show(bx2);
 
    bx2 = elm_box_add(win);

Modified: trunk/TMP/st/elementary/src/lib/elc_notepad.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_notepad.c	2009-09-08 05:39:09 UTC (rev 42341)
+++ trunk/TMP/st/elementary/src/lib/elc_notepad.c	2009-09-08 06:20:32 UTC (rev 42342)
@@ -20,7 +20,7 @@
 
 struct _Widget_Data
 {
-   Evas_Object *scroller, *entry;
+   Evas_Object *scr, *entry;
    const char *file;
    Elm_Text_Format format;
    Ecore_Timer *delay_write;
@@ -220,6 +220,38 @@
    wd->delay_write = ecore_timer_add(2.0, _delay_write, data);
 }
 
+static void
+_hold_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_push(wd->scr);
+}
+
+static void
+_hold_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_pop(wd->scr);
+}
+
+static void
+_freeze_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_push(wd->scr);
+}
+
+static void
+_freeze_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_pop(wd->scr);
+}
+
 /**
  * Add a new notepad to the parent
  *
@@ -245,17 +277,22 @@
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_can_focus_set(obj, 1);
 
-   wd->scroller = elm_scroller_add(parent);
-   elm_widget_resize_object_set(obj, wd->scroller);
+   wd->scr = elm_scroller_add(parent);
+   elm_widget_resize_object_set(obj, wd->scr);
    wd->entry = elm_entry_add(parent);
    evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0);
    evas_object_size_hint_align_set(wd->entry, -1.0, -1.0);
-   elm_scroller_content_set(wd->scroller, wd->entry);
+   elm_scroller_content_set(wd->scr, wd->entry);
    evas_object_show(wd->entry);
 
    elm_entry_entry_set(wd->entry, "");
    evas_object_smart_callback_add(wd->entry, "changed", _entry_changed, obj);
-
+   
+   evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj);
+   
    wd->auto_write = EINA_TRUE;
 
    _sizing_eval(obj);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-08 05:39:09 UTC (rev 42341)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-08 06:20:32 UTC (rev 42342)
@@ -50,6 +50,21 @@
  * not use the object pointer from elm_genlist_item_object_get() in a way
  * where it may point to freed objects.
  *
+ * drag,start,up - This is called when the item in the list has been dragged
+ * (not scrolled) up.
+ *
+ * drag,start,down - This is called when the item in the list has been dragged
+ * (not scrolled) down.
+ *
+ * drag,start,left - This is called when the item in the list has been dragged
+ * (not scrolled) left.
+ *
+ * drag,start,right - This is called when the item in the list has been dragged
+ * (not scrolled) right.
+ *
+ * drag,stop - This is called when the item in the list has stopped being
+ * dragged.
+ *
  * Genlist has a fairly large API, mostly because it's relatively complex,
  * trying to be both expansive, powerful and efficient. First we will begin
  * an overview o the theory behind genlist.
@@ -281,6 +296,7 @@
    Eina_List *labels, *icons, *states;
    Eina_List *icon_objs;
    Ecore_Timer *long_timer;
+   Evas_Coord dx, dy;
    
    Elm_Genlist_Item *rel;
    int relcount;
@@ -295,6 +311,8 @@
    Eina_Bool queued : 1;
    Eina_Bool showme : 1;
    Eina_Bool delete_me : 1;
+   Eina_Bool down : 1;
+   Eina_Bool dragging : 1;
 };
 
 struct _Pan
@@ -466,6 +484,7 @@
 {
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Move *ev = event_info;
+   Evas_Coord minw = 0, minh = 0, x, y, dx, dy, adx, ady;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
      {
 	if (!it->wd->on_hold)
@@ -474,6 +493,57 @@
 	     _item_unselect(it);
 	  }
      }
+   if (!it->down) return;
+   if (it->wd->on_hold) return;
+   if (it->wd->longpressed) return;
+   elm_coords_finger_size_adjust(1, &minw, 1, &minh);
+   evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+   x = ev->cur.canvas.x - x;
+   y = ev->cur.canvas.y - y;
+   dx = x - it->dx;
+   adx = dx;
+   if (adx < 0) adx = -dx;
+   dy = y - it->dy;
+   ady = dy;
+   if (ady < 0) ady = -dy;
+   minw /= 2;
+   minh /= 2;
+   if ((adx > minw) || (ady > minh))
+     {
+        it->dragging = 1;
+        if (it->long_timer)
+          {
+             ecore_timer_del(it->long_timer);
+             it->long_timer = NULL;
+          }
+        if (!it->wd->wasselected)
+          _item_unselect(it);
+        it->wd->wasselected = 0;
+        if (dy < 0)
+          {
+             if (ady > adx)
+               evas_object_smart_callback_call(it->wd->obj, "drag,start,up", it);
+             else
+               {
+                  if (dx < 0)
+                    evas_object_smart_callback_call(it->wd->obj, "drag,start,left", it);
+                  else
+                    evas_object_smart_callback_call(it->wd->obj, "drag,start,right", it);
+               }
+          }
+        else
+          {
+             if (ady > adx)
+               evas_object_smart_callback_call(it->wd->obj, "drag,start,down", it);
+             else
+               {
+                  if (dx < 0)
+                    evas_object_smart_callback_call(it->wd->obj, "drag,start,left", it);
+                  else
+                    evas_object_smart_callback_call(it->wd->obj, "drag,start,right", it);
+               }
+          }
+     }
 }
 
 static int
@@ -482,6 +552,7 @@
    Elm_Genlist_Item *it = data;
    it->long_timer = NULL;
    if (it->disabled) return 0;
+   if (it->dragging) return 0;
    it->wd->longpressed = EINA_TRUE;
    evas_object_smart_callback_call(it->wd->obj, "longpressed", it);
    return 0;
@@ -492,7 +563,13 @@
 {
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Down *ev = event_info;
+   Evas_Coord x, y;
    if (ev->button != 1) return;
+   it->down = 1;
+   it->dragging  = 0;
+   evas_object_geometry_get(obj, &x, &y, NULL, NULL);
+   it->dx = ev->canvas.x - x;
+   it->dy = ev->canvas.y - y;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
    it->wd->wasselected = it->selected;
@@ -510,6 +587,7 @@
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_List *l;
    if (ev->button != 1) return;
+   it->down = 0;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
    if (it->long_timer)
@@ -517,8 +595,14 @@
         ecore_timer_del(it->long_timer);
         it->long_timer = NULL;
      }
+   if (it->dragging)
+     {
+        it->dragging = 0;
+        evas_object_smart_callback_call(it->wd->obj, "drag,stop", it);
+     }
    if (it->wd->on_hold)
      {
+        it->wd->longpressed = EINA_FALSE;
 	it->wd->on_hold = EINA_FALSE;
 	return;
      }
@@ -1050,6 +1134,38 @@
      }
 }
 
+static void
+_hold_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_hold_set(wd->scr, 1);
+}
+
+static void
+_hold_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_hold_set(wd->scr, 0);
+}
+
+static void
+_freeze_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_freeze_set(wd->scr, 1);
+}
+
+static void
+_freeze_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_smart_scroller_freeze_set(wd->scr, 0);
+}
+
 /**
  * Add a new Genlist object
  *
@@ -1084,6 +1200,11 @@
    wd->obj = obj;
    wd->mode = ELM_LIST_SCROLL;
 
+   evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj);
+   
    if (!smart)
      {
 	static Evas_Smart_Class sc;

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2009-09-08 05:39:09 UTC (rev 42341)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2009-09-08 06:20:32 UTC (rev 42342)
@@ -5,7 +5,7 @@
 
 struct _Widget_Data
 {
-   Evas_Object *scroller, *box;
+   Evas_Object *scr, *box;
    Eina_List *items;
    Eina_List *selected;
    Elm_List_Mode mode;
@@ -73,8 +73,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
 
-   evas_object_size_hint_min_get(wd->scroller, &minw, &minh);
-   evas_object_size_hint_max_get(wd->scroller, &maxw, &maxh);
+   evas_object_size_hint_min_get(wd->scr, &minw, &minh);
+   evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
    evas_object_size_hint_min_set(obj, minw, minh);
    evas_object_size_hint_max_set(obj, maxw, maxh);
 }
@@ -429,12 +429,44 @@
    mw = 0; mh = 0;
    evas_object_size_hint_min_get(wd->box, &mw, &mh);
    if (wd->mode == ELM_LIST_LIMIT)
-     elm_scroller_content_min_limit(wd->scroller, 1, 0);
+     elm_scroller_content_min_limit(wd->scr, 1, 0);
    else
-     elm_scroller_content_min_limit(wd->scroller, 0, 0);
+     elm_scroller_content_min_limit(wd->scr, 0, 0);
    _sizing_eval(obj);
 }
 
+static void
+_hold_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_push(wd->scr);
+}
+
+static void
+_hold_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_pop(wd->scr);
+}
+
+static void
+_freeze_on(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_push(wd->scr);
+}
+
+static void
+_freeze_off(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   elm_widget_scroll_hold_pop(wd->scr);
+}
+
 EAPI Evas_Object *
 elm_list_add(Evas_Object *parent)
 {
@@ -452,22 +484,26 @@
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_can_focus_set(obj, 1);
 
-   wd->scroller = elm_scroller_add(parent);
-   elm_widget_resize_object_set(obj, wd->scroller);
+   wd->scr = elm_scroller_add(parent);
+   elm_widget_resize_object_set(obj, wd->scr);
 
-   elm_scroller_bounce_set(wd->scroller, 0, 1);
+   elm_scroller_bounce_set(wd->scr, 0, 1);
 
    wd->box = elm_box_add(parent);
    elm_box_homogenous_set(wd->box, 1);
    evas_object_size_hint_weight_set(wd->box, 1.0, 0.0);
    evas_object_size_hint_align_set(wd->box, -1.0, 0.0);
-   elm_scroller_content_set(wd->scroller, wd->box);
+   elm_scroller_content_set(wd->scr, wd->box);
    evas_object_show(wd->box);
 
    wd->mode = ELM_LIST_SCROLL;
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
-
+   evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-hold-off", _hold_off, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-on", _freeze_on, obj);
+   evas_object_smart_callback_add(obj, "scroll-freeze-off", _freeze_off, obj);
+   
    _sizing_eval(obj);
    return obj;
 }
@@ -555,9 +591,9 @@
    if (wd->mode == mode) return;
    wd->mode = mode;
    if (wd->mode == ELM_LIST_LIMIT)
-     elm_scroller_content_min_limit(wd->scroller, 1, 0);
+     elm_scroller_content_min_limit(wd->scr, 1, 0);
    else
-     elm_scroller_content_min_limit(wd->scroller, 0, 0);
+     elm_scroller_content_min_limit(wd->scr, 0, 0);
 }
 
 EAPI void
@@ -621,7 +657,7 @@
    evas_object_geometry_get(it->base, &x, &y, &w, &h);
    x -= bx;
    y -= by;
-   elm_scroller_region_show(wd->scroller, x, y, w, h);
+   elm_scroller_region_show(wd->scr, x, y, w, h);
 }
 
 EAPI void

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-08 05:39:09 UTC (rev 42341)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-08 06:20:32 UTC (rev 42342)
@@ -305,6 +305,7 @@
    Evas_Coord px, py, x, y, w, h;
    double t;
 
+   if (sd->freeze) return;
    if (t_in <= 0.0)
      {
         elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
@@ -369,6 +370,7 @@
    Evas_Coord px, py, x, y, w, h;
    double t;
 
+   if (sd->freeze) return;
    if (t_in <= 0.0)
      {
         elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
@@ -598,6 +600,7 @@
 {
    Evas_Coord mx, my, px, py, bx, by, b2x, b2y;
 
+   if (sd->freeze) return;
    if ((!sd->bouncemex) && (!sd->bouncemey)) return;
    if (sd->down.now) return; // down bounce while still held down
    if (sd->down.onhold_animator)
@@ -1359,7 +1362,8 @@
                          {
                             vel = sqrt((dx * dx) + (dy * dy)) / at;
                             if ((_elm_config->thumbscroll_friction > 0.0) &&
-                                (vel > _elm_config->thumbscroll_momentum_threshhold))
+                                (vel > _elm_config->thumbscroll_momentum_threshhold) &&
+                                (!sd->freeze))
                               {
                                  sd->down.dx = ((double)dx / at);
                                  sd->down.dy = ((double)dy / at);
@@ -1504,7 +1508,7 @@
 		    }
                   if (faildir) sd->down.dir_none = 1;
 	       }
-             if (!sd->hold)
+             if ((!sd->hold) && (!sd->freeze))
                {
                   if ((sd->down.dragged) ||
                       (((x * x) + (y * y)) >

Log:
  test callbacks and fix select on drag
  
  
Author:       raster
Date:         2009-09-07 23:35:14 -0700 (Mon, 07 Sep 2009)
New Revision: 42344

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-08 06:22:11 UTC (rev 42343)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-08 06:35:14 UTC (rev 42344)
@@ -756,6 +756,42 @@
 {
 }
 
+static void
+item_drag_up(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag up\n");
+}
+
+static void
+item_drag_down(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag down\n");
+}
+
+static void
+item_drag_left(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag left\n");
+}
+
+static void
+item_drag_right(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag right\n");
+}
+
+static void
+item_drag(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag\n");
+}
+
+static void
+item_drag_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("drag stop\n");
+}
+
 void
 test_genlist5(void *data, Evas_Object *obj, void *event_info)
 {
@@ -804,6 +840,13 @@
    elm_box_pack_end(bx, gl);
    elm_object_scroll_freeze_push(gl);
    evas_object_show(bx2);
+   
+   evas_object_smart_callback_add(gl, "drag,start,up", item_drag_up, NULL);
+   evas_object_smart_callback_add(gl, "drag,start,down", item_drag_down, NULL);
+   evas_object_smart_callback_add(gl, "drag,start,left", item_drag_left, NULL);
+   evas_object_smart_callback_add(gl, "drag,start,right", item_drag_right, NULL);
+   evas_object_smart_callback_add(gl, "drag", item_drag, NULL);
+   evas_object_smart_callback_add(gl, "drag,stop", item_drag_stop, NULL);
 
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-08 06:22:11 UTC (rev 42343)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-08 06:35:14 UTC (rev 42344)
@@ -593,6 +593,7 @@
    Elm_Genlist_Item *it = data;
    Evas_Event_Mouse_Up *ev = event_info;
    Eina_List *l;
+   Eina_Bool dragged = 0;
    if (ev->button != 1) return;
    it->down = 0;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
@@ -606,6 +607,7 @@
      {
         it->dragging = 0;
         evas_object_smart_callback_call(it->wd->obj, "drag,stop", it);
+        dragged = 1;
      }
    if (it->wd->on_hold)
      {
@@ -622,6 +624,7 @@
         return;
      }
    if (it->disabled) return;
+   if (dragged) return;
    if (it->wd->multi)
      {
 	if (!it->selected)

Log:
  1. box has clear.
  2. photocam widget++
  
  
Author:       raster
Date:         2009-09-11 06:43:02 -0700 (Fri, 11 Sep 2009)
New Revision: 42405

Added:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/Makefile.am trunk/TMP/st/elementary/src/lib/elm_box.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/els_box.c trunk/TMP/st/elementary/src/lib/els_box.h 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2009-09-11 13:43:02 UTC (rev 42405)
@@ -56,7 +56,8 @@
 test_separator.c \
 test_scroller.c \
 test_spinner.c \
-test_index.c
+test_index.c \
+test_photocam.c
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la
 elementary_test_LDFLAGS =
 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/bin/test.c	2009-09-11 13:43:02 UTC (rev 42405)
@@ -47,6 +47,7 @@
 void test_scroller(void *data, Evas_Object *obj, void *event_info);
 void test_spinner(void *data, Evas_Object *obj, void *event_info);
 void test_index(void *data, Evas_Object *obj, void *event_info);
+void test_photocam(void *data, Evas_Object *obj, void *event_info);
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
@@ -175,6 +176,7 @@
    elm_list_item_append(li, "Scroller", NULL, NULL, test_scroller, NULL);
    elm_list_item_append(li, "Spinner", NULL, NULL, test_spinner, NULL);
    elm_list_item_append(li, "Index", NULL, NULL, test_index, NULL);
+   elm_list_item_append(li, "Photocam", NULL, NULL, test_photocam, NULL);
 
    elm_list_go(li);
 

Added: trunk/TMP/st/elementary/src/bin/test_photocam.c

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-11 13:43:02 UTC (rev 42405)
@@ -288,6 +288,7 @@
    EAPI void         elm_box_pack_end(Evas_Object *obj, Evas_Object *subobj);
    EAPI void         elm_box_pack_before(Evas_Object *obj, Evas_Object *subobj, Evas_Object *before);
    EAPI void         elm_box_pack_after(Evas_Object *obj, Evas_Object *subobj, Evas_Object *after);
+   EAPI void         elm_box_clear(Evas_Object *obj);
    /* smart callbacks called:
     */
 
@@ -823,6 +824,9 @@
    EAPI void         elm_index_item_clear(Evas_Object *obj);
    EAPI void         elm_index_item_go(Evas_Object *obj, int level);
    /* smart callbacks called:
+    * "changed" - when the selected index item changes
+    * "delay,changed" - when the selected index item changes, but after some small idle period
+    * "selected" - when the user releases heir finger and selects an item
     */
    
 #ifdef __cplusplus

Modified: trunk/TMP/st/elementary/src/lib/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/lib/Makefile.am	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/Makefile.am	2009-09-11 13:43:02 UTC (rev 42405)
@@ -58,6 +58,7 @@
 elm_separator.c \
 elm_spinner.c \
 elm_index.c \
+elm_photocam.c \
 \
 elc_notepad.c \
 elc_anchorview.c \

Modified: trunk/TMP/st/elementary/src/lib/elm_box.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_box.c	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/elm_box.c	2009-09-11 13:43:02 UTC (rev 42405)
@@ -222,3 +222,19 @@
    elm_widget_sub_object_add(obj, subobj);
    _els_smart_box_pack_after(wd->box, subobj, after);
 }
+
+/**
+ * This clears the box items
+ *
+ * This delete all members of the box object, but not the box itself.
+ *
+ * @param obj The box object
+ *
+ * @ingroup Box
+ */
+EAPI void
+elm_box_clear(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   _els_smart_box_clear(wd->box);
+}

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-11 13:43:02 UTC (rev 42405)
@@ -258,8 +258,6 @@
    Elm_List_Mode mode;
    Eina_Bool on_hold : 1;
    Eina_Bool multi : 1;
-   Eina_Bool min_w : 1;
-   Eina_Bool min_h : 1;
    Eina_Bool always_select : 1;
    Eina_Bool longpressed : 1;
    Eina_Bool wasselected : 1;
@@ -343,6 +341,7 @@
    elm_genlist_clear(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
    free(wd);
 }
 

Added: trunk/TMP/st/elementary/src/lib/elm_photocam.c

Modified: trunk/TMP/st/elementary/src/lib/els_box.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_box.c	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/els_box.c	2009-09-11 13:43:02 UTC (rev 42405)
@@ -170,6 +170,20 @@
      }
 }
 
+void
+_els_smart_box_clear(Evas_Object *obj)
+{
+   Smart_Data *sd;
+
+   sd = evas_object_smart_data_get(obj);
+   if (!sd) return;
+   while (sd->items)
+     {
+	Evas_Object *child = sd->items->data;
+        evas_object_del(child);
+     }
+}
+
 /* local subsystem functions */
 static void
 _smart_adopt(Smart_Data *sd, Evas_Object *obj)

Modified: trunk/TMP/st/elementary/src/lib/els_box.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_box.h	2009-09-11 06:09:02 UTC (rev 42404)
+++ trunk/TMP/st/elementary/src/lib/els_box.h	2009-09-11 13:43:02 UTC (rev 42405)
@@ -7,3 +7,4 @@
 int          _els_smart_box_pack_before       (Evas_Object *obj, Evas_Object *child, Evas_Object *before);
 int          _els_smart_box_pack_after        (Evas_Object *obj, Evas_Object *child, Evas_Object *after);
 void         _els_smart_box_unpack            (Evas_Object *obj);
+void         _els_smart_box_clear             (Evas_Object *obj);

Log:
  more work on photocam.
  
  
Author:       raster
Date:         2009-09-15 03:58:35 -0700 (Tue, 15 Sep 2009)
New Revision: 42491

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-14 20:18:25 UTC (rev 42490)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-15 10:58:35 UTC (rev 42491)
@@ -25,7 +25,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[2]);
+   elm_photocam_file_set(ph, img[0]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-14 20:18:25 UTC (rev 42490)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-15 10:58:35 UTC (rev 42491)
@@ -15,19 +15,55 @@
 typedef struct _Widget_Data Widget_Data;
 typedef struct _Pan Pan;
 
+typedef struct _Grid Grid;
+typedef struct _Grid_Item Grid_Item;
+
+struct _Grid_Item
+{
+   Evas_Object *img[2];
+   struct {
+      int x, y, w, h;
+   } src, out;
+   int loadnum;
+   Eina_Bool want : 1;
+   Eina_Bool have : 1;
+   Eina_Bool want_new : 1;
+   Eina_Bool have_new : 1;
+};
+
+struct _Grid
+{
+   int tsize; // size of tile (tsize x tsize pixels)
+   int zoom; // zoom level tiles want for optimal display (1, 2, 4, 8)
+   int w, h; // size of image in pixels (represented by grid)
+   int gw, gh; // size of grid in tiles
+   Grid_Item *grid; // the grid (gw * gh items)
+   Evas_Object *img; // low res version of image (scale down == 8)
+};
+
 struct _Widget_Data
 {
    Evas_Object *obj;
    Evas_Object *scr;
-   Evas_Object *img[2];
    Evas_Object *pan_smart;
    Pan *pan;
+   Evas_Coord pan_x, pan_y, minw, minh;
+
+   int zoom;
+   const char *file;
    Ecore_Job *calc_job;
+   
+   Grid grid;
+
+/*   
+   Evas_Object *img[3];
    int ph_w, ph_h;
-   Evas_Coord pan_x, pan_y, minw, minh;
+   double preload_time, fade_time;
+   Ecore_Animator *fade_animator;
    int scale;
-   int imuse;
-   const char *file;
+   int imuse, imfade;
+   Eina_Bool do_fade : 1;
+ */
 };
 
 struct _Pan
@@ -43,6 +79,237 @@
 
 static void _calc_job(void *data);
 
+static void grid_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy);
+static void grid_clear(Evas_Object *obj);
+static void grid_create(Evas_Object *obj);
+static void grid_load(Evas_Object *obj);
+
+static void
+grid_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int x, y;
+    
+   evas_object_move(wd->grid.img, 
+                    ox + 0 - px,
+                    oy + 0 - py);
+   evas_object_resize(wd->grid.img, 
+                      wd->grid.w / wd->zoom, 
+                      wd->grid.h / wd->zoom);
+   for (y = 0; y < wd->grid.gh; y++)
+     {
+        for (x = 0; x < wd->grid.gw; x++)
+          {
+             int tn, xx, yy, ww, hh;
+             
+             tn = (y * wd->grid.gw) + x;
+             xx = wd->grid.grid[tn].out.x;
+             yy = wd->grid.grid[tn].out.y;
+             ww = wd->grid.grid[tn].out.w;
+             hh = wd->grid.grid[tn].out.h;
+             evas_object_move(wd->grid.grid[tn].img[0],
+                              ox + xx - px,
+                              oy + yy - py);
+             evas_object_resize(wd->grid.grid[tn].img[0],
+                                ww, hh);
+             evas_object_move(wd->grid.grid[tn].img[1],
+                              ox + xx - px,
+                              oy + yy - py);
+             evas_object_resize(wd->grid.grid[tn].img[1],
+                                ww, hh);
+          }
+     }
+}
+
+static void
+grid_clear(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int x, y;
+}
+
+static void
+_tile_preloaded(void *data, Evas *e, Evas_Object *o, void *event_info)
+{
+   Grid_Item *git = data;
+
+   evas_object_show(git->img[git->loadnum]);
+   git->have = 1;
+}
+
+static void
+grid_create(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int x, y;
+   
+   grid_clear(obj);
+   wd->grid.zoom = wd->zoom;
+   wd->grid.gw = (wd->grid.w + wd->grid.tsize - 1) / wd->grid.tsize;
+   wd->grid.gh = (wd->grid.h + wd->grid.tsize - 1) / wd->grid.tsize;
+   wd->grid.grid = calloc(1, sizeof(Grid_Item) * wd->grid.gw * wd->grid.gh);
+   if (!wd->grid.grid)
+     {
+        wd->grid.gw = 0;
+        wd->grid.gh = 0;
+        return;
+     }
+   for (y = 0; y < wd->grid.gh; y++)
+     {
+        for (x = 0; x < wd->grid.gw; x++)
+          {
+             int tn, i, xx, yy, ww, hh;
+             
+             tn = (y * wd->grid.gw) + x;
+             wd->grid.grid[tn].src.x = x * wd->grid.tsize;
+             if (x == (wd->grid.gw - 1))
+               wd->grid.grid[tn].src.w = wd->grid.w - ((wd->grid.gw - 1) * wd->grid.tsize);
+             else
+               wd->grid.grid[tn].src.w = wd->grid.tsize;
+             wd->grid.grid[tn].src.y = y * wd->grid.tsize;
+             if (y == (wd->grid.gh - 1))
+               wd->grid.grid[tn].src.h = wd->grid.h - ((wd->grid.gh - 1) * wd->grid.tsize);
+             else
+               wd->grid.grid[tn].src.h = wd->grid.tsize;
+             
+             wd->grid.grid[tn].out.x = wd->grid.grid[tn].src.x / wd->zoom;
+             wd->grid.grid[tn].out.y = wd->grid.grid[tn].src.y / wd->zoom;
+             wd->grid.grid[tn].out.w = wd->grid.grid[tn].src.w / wd->zoom;
+             wd->grid.grid[tn].out.h = wd->grid.grid[tn].src.h / wd->zoom;
+             
+             for (i = 0; i < 2; i++)
+               {
+                  wd->grid.grid[tn].img[i] = 
+                    evas_object_image_add(evas_object_evas_get(obj));
+                  evas_object_image_scale_hint_set(wd->grid.grid[tn].img[i], EVAS_IMAGE_SCALE_HINT_STATIC);
+                  evas_object_smart_member_add(wd->grid.grid[tn].img[i], 
+                                               wd->pan_smart);
+                  elm_widget_sub_object_add(obj, wd->grid.grid[tn].img[i]);
+                  evas_object_image_filled_set(wd->grid.grid[tn].img[i], 1);
+                  evas_object_event_callback_add(wd->grid.grid[tn].img[i], 
+                                                 EVAS_CALLBACK_IMAGE_PRELOADED,
+                                                 _tile_preloaded, 
+                                                 &(wd->grid.grid[tn]));
+               }
+          }
+     }
+}
+
+static void
+grid_load(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int x, y;
+   Evas_Coord ow, oh;
+
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
+   for (y = 0; y < wd->grid.gh; y++)
+     {
+        for (x = 0; x < wd->grid.gw; x++)
+          {
+             int tn, loadnum;
+             Eina_Bool visible = 0;
+             
+             tn = (y * wd->grid.gw) + x;
+             loadnum = wd->grid.grid[tn].loadnum;
+             if (ELM_RECTS_INTERSECT(wd->pan_x, wd->pan_y, 
+                                     ow, oh,
+                                     wd->grid.grid[tn].out.x,
+                                     wd->grid.grid[tn].out.y,
+                                     wd->grid.grid[tn].out.w,
+                                     wd->grid.grid[tn].out.h))
+               visible = 1;
+             if ((visible) && (!wd->grid.grid[tn].want))
+               {
+                  wd->grid.grid[tn].want = 1;
+                  evas_object_hide(wd->grid.grid[tn].img[loadnum]);
+                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL);
+                  evas_object_image_load_scale_down_set(wd->grid.grid[tn].img[loadnum], wd->grid.zoom);
+/*                  evas_object_image_load_region_set(wd->grid.grid[tn].img[loadnum],
+                                                    wd->grid.grid[tn].src.x,
+                                                    wd->grid.grid[tn].src.y,
+                                                    wd->grid.grid[tn].src.w,
+                                                    wd->grid.grid[tn].src.h);
+ */
+//                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img[loadnum], 1);
+                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], wd->file, NULL); 
+                  evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 0);
+               }
+             else if ((wd->grid.grid[tn].want) && (!visible))
+               {
+                  wd->grid.grid[tn].want = 0;
+                  wd->grid.grid[tn].have = 0;
+                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL);
+                  evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 1);
+               }
+          }
+     }
+}
+
+/*
+static void _next_stage(Evas_Object *obj);
+
+static int
+_fade_animator(void *data)
+{
+   Evas_Object *obj = data;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   double t;
+   int v;
+   
+   t = ecore_loop_time_get() - wd->preload_time;
+   v = (255.0 * t) / wd->fade_time;
+   if (v > 255) v = 255;
+   evas_object_color_set(wd->img[wd->imfade], v, v, v, v);
+   if (v < 255) return 1;
+   
+   wd->fade_animator = NULL;
+   if (wd->do_fade)
+     {
+        wd->do_fade = 0;
+        _next_stage(obj);
+     }
+   return 0;
+}
+
+static void
+_next_stage(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int w, h;
+   double t, td;
+   
+   wd->imfade = wd->imuse;
+   evas_object_raise(wd->img[wd->imfade]);
+   evas_object_color_set(wd->img[wd->imfade], 0, 0, 0, 0);
+   evas_object_show(wd->img[wd->imfade]);
+   
+   t = ecore_loop_time_get();
+   td = t - wd->preload_time;
+   printf("scale: %i use %i. done in %3.3f\n", wd->scale, wd->imuse, td);
+   if (td > 1.0) td = 1.0;
+   wd->fade_time = td;
+   wd->preload_time = t;
+   wd->fade_animator = ecore_animator_add(_fade_animator, obj);
+   
+   if (wd->scale == 1) return;
+   
+   wd->imuse++;
+   if (wd->imuse >= 3) wd->imuse = 0;
+   wd->scale /= 2;
+   evas_object_hide(wd->img[wd->imuse]);
+   evas_object_image_load_scale_down_set(wd->img[wd->imuse], wd->scale);
+   evas_object_image_pixels_dirty_set(wd->img[wd->imuse], 1);
+   evas_object_image_file_set(wd->img[wd->imuse], wd->file, NULL);
+   evas_object_image_preload(wd->img[wd->imuse], 0);
+   evas_object_image_size_get(wd->img[wd->imuse], &w, &h);
+   wd->ph_w = w * wd->scale;
+   wd->ph_h = h * wd->scale;
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
+   wd->calc_job = ecore_job_add(_calc_job, wd);
+}
+*/
+
 static Evas_Smart_Class _pan_sc = {NULL};
 
 static void
@@ -95,8 +362,8 @@
    Widget_Data *wd = data;
    Evas_Coord minw, minh;
 
-   minw = wd->ph_w;
-   minh = wd->ph_h;
+   minw = wd->grid.w;
+   minh = wd->grid.h;
    
    if ((minw != wd->minw) || (minh != wd->minh))
      {
@@ -191,14 +458,8 @@
    Evas_Coord ox, oy, ow, oh;
 
    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-   evas_object_move(sd->wd->img[0], 
-                    ox + 0 - sd->wd->pan_x,
-                    oy + 0 - sd->wd->pan_y);
-   evas_object_resize(sd->wd->img[0], sd->wd->minw, sd->wd->minh);
-   evas_object_move(sd->wd->img[1], 
-                    ox + 0 - sd->wd->pan_x,
-                    oy + 0 - sd->wd->pan_y);
-   evas_object_resize(sd->wd->img[1], sd->wd->minw, sd->wd->minh);
+   grid_load(sd->wd->obj);
+   grid_place(sd->wd->obj, sd->wd->pan_x, sd->wd->pan_y, ox, oy);
 }
 
 static void
@@ -234,28 +495,13 @@
 }
 
 static void
-_preloaded(void *data, Evas *e, Evas_Object *o, void *event_info)
+_main_preloaded(void *data, Evas *e, Evas_Object *o, void *event_info)
 {
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   int w, h;
-   
-   printf("scale: %i use %i\n", wd->scale, wd->imuse);
-   evas_object_show(wd->img[wd->imuse]);
-   if (wd->scale == 1) return;
-   
-   wd->imuse = 1 - wd->imuse;
-   wd->scale /= 2;
-   evas_object_hide(wd->img[wd->imuse]);
-   evas_object_image_load_scale_down_set(wd->img[wd->imuse], wd->scale);
-   evas_object_image_pixels_dirty_set(wd->img[wd->imuse], 1);
-   evas_object_image_file_set(wd->img[wd->imuse], wd->file, NULL);
-   evas_object_image_preload(wd->img[wd->imuse], 0);
-   evas_object_image_size_get(wd->img[wd->imuse], &w, &h);
-   wd->ph_w = w * wd->scale;
-   wd->ph_h = h * wd->scale;
-   if (wd->calc_job) ecore_job_del(wd->calc_job);
-   wd->calc_job = ecore_job_add(_calc_job, wd);
+
+   evas_object_show(wd->grid.img);
+   grid_load(obj);
 }
    
 /**
@@ -321,17 +567,19 @@
    elm_smart_scroller_extern_pan_set(wd->scr, wd->pan_smart,
 				     _pan_set, _pan_get,
 				     _pan_max_get, _pan_child_size_get);
-   for (i = 0; i < 2; i++)
-     {
-        wd->img[i] = evas_object_image_add(e);
-        evas_object_smart_member_add(wd->img[i], wd->pan_smart);
-        elm_widget_sub_object_add(obj, wd->img[i]);
-        evas_object_image_filled_set(wd->img[i], 1);
-        evas_object_event_callback_add(wd->img[i], EVAS_CALLBACK_IMAGE_PRELOADED,
-                                       _preloaded, obj);
-        evas_object_show(wd->img[i]);
-     }
+
+   wd->zoom = 1;
    
+   wd->grid.tsize = 256;
+   
+   wd->grid.img = evas_object_image_add(e);
+   evas_object_image_scale_hint_set(wd->grid.img, EVAS_IMAGE_SCALE_HINT_STATIC);
+   evas_object_smart_member_add(wd->grid.img, wd->pan_smart);
+   elm_widget_sub_object_add(obj, wd->grid.img);
+   evas_object_image_filled_set(wd->grid.img, 1);
+   evas_object_event_callback_add(wd->grid.img, EVAS_CALLBACK_IMAGE_PRELOADED,
+                                  _main_preloaded, obj);
+   
    edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), 
                              &minw, &minh);
    evas_object_size_hint_min_set(obj, minw, minh);
@@ -357,20 +605,20 @@
    int w, h;
 
    if (wd->file) eina_stringshare_del(wd->file);
-//   evas_object_image_preload(wd->img[0], 1);
-//   evas_object_image_preload(wd->img[1], 1);
-   evas_object_hide(wd->img[0]);
-   evas_object_hide(wd->img[1]);
    
    wd->file = eina_stringshare_add(file);
-   wd->scale = 8;
-   wd->imuse = 0;
-   evas_object_image_load_scale_down_set(wd->img[wd->imuse], wd->scale);
-   evas_object_image_file_set(wd->img[wd->imuse], wd->file, NULL);
-   evas_object_image_preload(wd->img[wd->imuse], 0);
-   evas_object_image_size_get(wd->img[wd->imuse], &w, &h);
-   wd->ph_w = w * wd->scale;
-   wd->ph_h = h * wd->scale;
+   evas_object_hide(wd->grid.img);
+   evas_object_image_file_set(wd->grid.img, NULL, NULL);
+   evas_object_image_load_scale_down_set(wd->grid.img, 0);
+   evas_object_image_file_set(wd->grid.img, wd->file, NULL);
+   evas_object_image_size_get(wd->grid.img, &w, &h);
+   wd->grid.w = w;
+   wd->grid.h = h;
+   evas_object_image_file_set(wd->grid.img, NULL, NULL);
+   evas_object_image_load_scale_down_set(wd->grid.img, 8);
+   evas_object_image_file_set(wd->grid.img, wd->file, NULL);
+   evas_object_image_preload(wd->grid.img, 0);
+   grid_create(obj);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
 }

Log:
  can use specific zoom level now just fine... need to make it dynamic next
  
  
Author:       raster
Date:         2009-09-22 04:06:26 -0700 (Tue, 22 Sep 2009)
New Revision: 42618

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-22 08:04:57 UTC (rev 42617)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-22 11:06:26 UTC (rev 42618)
@@ -26,7 +26,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[3]);
+   elm_photocam_file_set(ph, img[1]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-22 08:04:57 UTC (rev 42617)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-22 11:06:26 UTC (rev 42618)
@@ -226,10 +226,10 @@
                   evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL);
                   evas_object_image_load_scale_down_set(wd->grid.grid[tn].img[loadnum], wd->grid.zoom);
                   evas_object_image_load_region_set(wd->grid.grid[tn].img[loadnum],
-                                                    wd->grid.grid[tn].src.x,
-                                                    wd->grid.grid[tn].src.y,
-                                                    wd->grid.grid[tn].src.w,
-                                                    wd->grid.grid[tn].src.h);
+                                                    wd->grid.grid[tn].src.x / wd->grid.zoom,
+                                                    wd->grid.grid[tn].src.y / wd->grid.zoom,
+                                                    wd->grid.grid[tn].src.w / wd->grid.zoom,
+                                                    wd->grid.grid[tn].src.h / wd->grid.zoom);
 //                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img[loadnum], 1);
                   evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], wd->file, NULL); 
                   evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 0);
@@ -362,8 +362,8 @@
    Widget_Data *wd = data;
    Evas_Coord minw, minh;
 
-   minw = wd->grid.w;
-   minh = wd->grid.h;
+   minw = wd->grid.w / wd->grid.zoom;
+   minh = wd->grid.h / wd->grid.zoom;
    
    if ((minw != wd->minw) || (minh != wd->minh))
      {

Log:
  add api calls (non-functioning), remove unneeded objects, turn off smooth
  scaling while scrolling around
  
  
Author:       raster
Date:         2009-09-22 07:04:09 -0700 (Tue, 22 Sep 2009)
New Revision: 42619

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_photocam.c trunk/TMP/st/elementary/src/lib/els_scroller.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-22 11:06:26 UTC (rev 42618)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-22 14:04:09 UTC (rev 42619)
@@ -26,7 +26,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[1]);
+   elm_photocam_file_set(ph, img[3]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-22 11:06:26 UTC (rev 42618)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-22 14:04:09 UTC (rev 42619)
@@ -833,8 +833,18 @@
     * "selected" - when the user releases heir finger and selects an item
     */
 
+   typedef enum _Elm_Photocam_Zoom_Mode
+     {
+	ELM_PHOTOCAM_ZOOM_MODE_MANUAL,
+	ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT,
+	ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL
+     } Elm_Photocam_Zoom_Mode;
    EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
    EAPI void         elm_photocam_file_set(Evas_Object *obj, const char *file);
+   EAPI void         elm_photocam_zoom_set(Evas_Object *obj, int zoom);
+   EAPI int          elm_photocam_zoom_get(Evas_Object *obj);
+   EAPI void         elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
+   EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(Evas_Object *obj);
        
 #ifdef __cplusplus
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-22 11:06:26 UTC (rev 42618)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-22 14:04:09 UTC (rev 42619)
@@ -20,11 +20,10 @@
 
 struct _Grid_Item
 {
-   Evas_Object *img[2];
+   Evas_Object *img;
    struct {
       int x, y, w, h;
    } src, out;
-   int loadnum;
    Eina_Bool want : 1;
    Eina_Bool have : 1;
    Eina_Bool want_new : 1;
@@ -50,10 +49,13 @@
    Evas_Coord pan_x, pan_y, minw, minh;
 
    int zoom;
+   Elm_Photocam_Zoom_Mode mode;
    const char *file;
+   
    Ecore_Job *calc_job;
-   
+   Ecore_Timer *scr_timer;
    Grid grid;
+   Eina_Bool smooth : 1;
 
 /*   
    Evas_Object *img[3];
@@ -107,16 +109,11 @@
              yy = wd->grid.grid[tn].out.y;
              ww = wd->grid.grid[tn].out.w;
              hh = wd->grid.grid[tn].out.h;
-             evas_object_move(wd->grid.grid[tn].img[0],
+             evas_object_move(wd->grid.grid[tn].img,
                               ox + xx - px,
                               oy + yy - py);
-             evas_object_resize(wd->grid.grid[tn].img[0],
+             evas_object_resize(wd->grid.grid[tn].img,
                                 ww, hh);
-             evas_object_move(wd->grid.grid[tn].img[1],
-                              ox + xx - px,
-                              oy + yy - py);
-             evas_object_resize(wd->grid.grid[tn].img[1],
-                                ww, hh);
           }
      }
 }
@@ -133,7 +130,7 @@
 {
    Grid_Item *git = data;
 
-   evas_object_show(git->img[git->loadnum]);
+   evas_object_show(git->img);
    git->have = 1;
 }
 
@@ -158,7 +155,7 @@
      {
         for (x = 0; x < wd->grid.gw; x++)
           {
-             int tn, i, xx, yy, ww, hh;
+             int tn, xx, yy, ww, hh;
              
              tn = (y * wd->grid.gw) + x;
              wd->grid.grid[tn].src.x = x * wd->grid.tsize;
@@ -177,20 +174,17 @@
              wd->grid.grid[tn].out.w = wd->grid.grid[tn].src.w / wd->zoom;
              wd->grid.grid[tn].out.h = wd->grid.grid[tn].src.h / wd->zoom;
              
-             for (i = 0; i < 2; i++)
-               {
-                  wd->grid.grid[tn].img[i] = 
-                    evas_object_image_add(evas_object_evas_get(obj));
-                  evas_object_image_scale_hint_set(wd->grid.grid[tn].img[i], EVAS_IMAGE_SCALE_HINT_STATIC);
-                  evas_object_smart_member_add(wd->grid.grid[tn].img[i], 
-                                               wd->pan_smart);
-                  elm_widget_sub_object_add(obj, wd->grid.grid[tn].img[i]);
-                  evas_object_image_filled_set(wd->grid.grid[tn].img[i], 1);
-                  evas_object_event_callback_add(wd->grid.grid[tn].img[i], 
-                                                 EVAS_CALLBACK_IMAGE_PRELOADED,
-                                                 _tile_preloaded, 
-                                                 &(wd->grid.grid[tn]));
-               }
+             wd->grid.grid[tn].img = 
+               evas_object_image_add(evas_object_evas_get(obj));
+             evas_object_image_scale_hint_set(wd->grid.grid[tn].img, EVAS_IMAGE_SCALE_HINT_STATIC);
+             evas_object_smart_member_add(wd->grid.grid[tn].img, 
+                                          wd->pan_smart);
+             elm_widget_sub_object_add(obj, wd->grid.grid[tn].img);
+             evas_object_image_filled_set(wd->grid.grid[tn].img, 1);
+             evas_object_event_callback_add(wd->grid.grid[tn].img, 
+                                            EVAS_CALLBACK_IMAGE_PRELOADED,
+                                            _tile_preloaded, 
+                                            &(wd->grid.grid[tn]));
           }
      }
 }
@@ -207,11 +201,10 @@
      {
         for (x = 0; x < wd->grid.gw; x++)
           {
-             int tn, loadnum;
+             int tn;
              Eina_Bool visible = 0;
              
              tn = (y * wd->grid.gw) + x;
-             loadnum = wd->grid.grid[tn].loadnum;
              if (ELM_RECTS_INTERSECT(wd->pan_x, wd->pan_y, 
                                      ow, oh,
                                      wd->grid.grid[tn].out.x,
@@ -222,30 +215,75 @@
              if ((visible) && (!wd->grid.grid[tn].want))
                {
                   wd->grid.grid[tn].want = 1;
-                  evas_object_hide(wd->grid.grid[tn].img[loadnum]);
-                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL);
-                  evas_object_image_load_scale_down_set(wd->grid.grid[tn].img[loadnum], wd->grid.zoom);
-                  evas_object_image_load_region_set(wd->grid.grid[tn].img[loadnum],
+                  evas_object_hide(wd->grid.grid[tn].img);
+                  evas_object_image_file_set(wd->grid.grid[tn].img, NULL, NULL);
+                  evas_object_image_load_scale_down_set(wd->grid.grid[tn].img, wd->grid.zoom);
+                  evas_object_image_load_region_set(wd->grid.grid[tn].img,
                                                     wd->grid.grid[tn].src.x / wd->grid.zoom,
                                                     wd->grid.grid[tn].src.y / wd->grid.zoom,
                                                     wd->grid.grid[tn].src.w / wd->grid.zoom,
                                                     wd->grid.grid[tn].src.h / wd->grid.zoom);
-//                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img[loadnum], 1);
-                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], wd->file, NULL); 
-                  evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 0);
+//                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img, 1);
+                  evas_object_image_file_set(wd->grid.grid[tn].img, wd->file, NULL); 
+                  evas_object_image_preload(wd->grid.grid[tn].img, 0);
                }
              else if ((wd->grid.grid[tn].want) && (!visible))
                {
                   wd->grid.grid[tn].want = 0;
                   wd->grid.grid[tn].have = 0;
-                  evas_object_hide(wd->grid.grid[tn].img[loadnum]);
-                  evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 1);
-                  evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL);
+                  evas_object_hide(wd->grid.grid[tn].img);
+                  evas_object_image_preload(wd->grid.grid[tn].img, 1);
+                  evas_object_image_file_set(wd->grid.grid[tn].img, NULL, NULL);
                }
           }
      }
 }
 
+static void
+_smooth_update(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   int x, y;
+
+   for (y = 0; y < wd->grid.gh; y++)
+     {
+        for (x = 0; x < wd->grid.gw; x++)
+          {
+             int tn;
+             
+             tn = (y * wd->grid.gw) + x;
+             evas_object_image_smooth_scale_set(wd->grid.grid[tn].img, wd->smooth);
+          }
+     }
+   evas_object_image_smooth_scale_set(wd->grid.img, wd->smooth);
+}
+
+static int
+_scr_timeout(void *data)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd->smooth)
+     {
+        wd->smooth = 1;
+        _smooth_update(data);
+     }
+   wd->scr_timer = NULL;
+   return 0;
+}
+
+static void
+_scr(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
+   wd->scr_timer = ecore_timer_add(0.25, _scr_timeout, data);
+   if (wd->smooth)
+     {
+        wd->smooth = 0;
+        _smooth_update(data);
+     }
+}
+
 /*
 static void _next_stage(Evas_Object *obj);
 
@@ -320,6 +358,7 @@
    wd->pan_smart = NULL;
    if (wd->file) eina_stringshare_del(wd->file);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
+   if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
    free(wd);
 }
 
@@ -532,6 +571,8 @@
    elm_widget_theme_hook_set(obj, _theme_hook);
 
    wd->scr = elm_smart_scroller_add(e);
+   evas_object_smart_callback_add(wd->scr, "scroll", _scr, obj);
+   evas_object_smart_callback_add(wd->scr, "drag", _scr, obj);
    elm_widget_resize_object_set(obj, wd->scr);
 
    elm_smart_scroller_bounce_allow_set(wd->scr, 1, 1);
@@ -569,6 +610,8 @@
 				     _pan_max_get, _pan_child_size_get);
 
    wd->zoom = 1;
+   wd->mode = ELM_PHOTOCAM_ZOOM_MODE_MANUAL;
+   wd->smooth = 1;
    
    wd->grid.tsize = 512;
    
@@ -608,6 +651,7 @@
    
    wd->file = eina_stringshare_add(file);
    evas_object_hide(wd->grid.img);
+   evas_object_image_smooth_scale_set(wd->grid.img, wd->smooth);
    evas_object_image_file_set(wd->grid.img, NULL, NULL);
    evas_object_image_load_scale_down_set(wd->grid.img, 0);
    evas_object_image_file_set(wd->grid.img, wd->file, NULL);
@@ -622,3 +666,67 @@
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
 }
+
+/**
+ * XXX
+ *
+ * xxx
+ *
+ * @param obj The photocam object
+ *
+ * @ingroup Photocam
+ */
+EAPI void
+elm_photocam_zoom_set(Evas_Object *obj, int zoom)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (zoom == wd->zoom) return;
+}
+
+/**
+ * XXX
+ *
+ * xxx
+ *
+ * @param obj The photocam object
+ *
+ * @ingroup Photocam
+ */
+EAPI int
+elm_photocam_zoom_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->zoom;
+}
+
+/**
+ * XXX
+ *
+ * xxx
+ *
+ * @param obj The photocam object
+ *
+ * @ingroup Photocam
+ */
+EAPI void
+elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->mode == mode) return;
+}
+
+/**
+ * XXX
+ *
+ * xxx
+ *
+ * @param obj The photocam object
+ *
+ * @ingroup Photocam
+ */
+EAPI Elm_Photocam_Zoom_Mode
+elm_photocam_zoom_mode_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->mode;
+}

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-22 11:06:26 UTC (rev 42618)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2009-09-22 14:04:09 UTC (rev 42619)
@@ -124,7 +124,7 @@
 static void _smart_show(Evas_Object *obj);
 static void _smart_hide(Evas_Object *obj);
 static void _smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
-static void _smart_clip_set(Evas_Object *obj, Evas_Object * clip);
+static void _smart_clip_set(Evas_Object *obj, Evas_Object *clip);
 static void _smart_clip_unset(Evas_Object *obj);
 static void _smart_init(void);
 
@@ -282,7 +282,7 @@
    t = ecore_loop_time_get();
    tt = (t - sd->scrollto.x.t_start) / (sd->scrollto.x.t_end - sd->scrollto.x.t_start);
    tt = 1.0 - tt;
-   tt = 1.0 - (tt * tt * tt);
+   tt = 1.0 - (tt * tt);
    sd->pan_func.get(sd->pan_obj, &px, &py);
    px = (sd->scrollto.x.start * (1.0 - tt)) +
      (sd->scrollto.x.end * tt);
@@ -347,7 +347,7 @@
    t = ecore_loop_time_get();
    tt = (t - sd->scrollto.y.t_start) / (sd->scrollto.y.t_end - sd->scrollto.y.t_start);
    tt = 1.0 - tt;
-   tt = 1.0 - (tt * tt * tt);
+   tt = 1.0 - (tt * tt);
    sd->pan_func.get(sd->pan_obj, &px, &py);
    py = (sd->scrollto.y.start * (1.0 - tt)) +
      (sd->scrollto.y.end * tt);
@@ -496,7 +496,7 @@
      {
 	dt = dt / _elm_config->thumbscroll_bounce_friction;
 	if (dt > 1.0) dt = 1.0;
-	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt));
         elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
         dx = sd->down.b2x - sd->down.bx;
 	dx = (dx * p);
@@ -528,7 +528,7 @@
      {
 	dt = dt / _elm_config->thumbscroll_bounce_friction;
 	if (dt > 1.0) dt = 1.0;
-	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt));
         elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
         dy = sd->down.b2y - sd->down.by;
 	dy = (dy * p);
@@ -560,7 +560,7 @@
      {
 	dt = dt / _elm_config->thumbscroll_friction;
 	if (dt > 1.0) dt = 1.0;
-	p = 1.0 - ((1.0 - dt) * (1.0 - dt) * (1.0 - dt));
+	p = 1.0 - ((1.0 - dt) * (1.0 - dt));
 	dx = (sd->down.dx * _elm_config->thumbscroll_friction * p);
 	dy = (sd->down.dy * _elm_config->thumbscroll_friction * p);
         sd->down.ax = dx;
@@ -2107,7 +2107,7 @@
 }
 
 static void
-_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
+_smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
    INTERNAL_ENTRY;
    evas_object_clip_set(sd->edje_obj, clip);

Log:
  genlist - get item at xy. handy for dnd. skips blocks that dont intersect
  
  
Author:       raster
Date:         2009-09-22 20:22:07 -0700 (Tue, 22 Sep 2009)
New Revision: 42635

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-23 00:16:52 UTC (rev 42634)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-09-23 03:22:07 UTC (rev 42635)
@@ -39,10 +39,25 @@
    printf("sel item data [%p] on genlist obj [%p], item pointer [%p]\n", data, obj, event_info);
 }
 
+static void
+_move(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   Evas_Event_Mouse_Move *ev = event_info;
+   int where = 0;
+   Elm_Genlist_Item *gli;
+   gli = elm_genlist_at_xy_item_get(gl, ev->cur.canvas.x, ev->cur.canvas.y, &where);
+   if (gli)
+     printf("over %p, where %i\n", elm_genlist_item_data_get(gli), where);
+   else
+     printf("over none, where %i\n", where);
+}
+
 void
 test_genlist(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *gl;
+   Evas_Object *over;
    Elm_Genlist_Item *gli;
    int i;
 
@@ -60,7 +75,15 @@
    elm_win_resize_object_add(win, gl);
    evas_object_size_hint_weight_set(gl, 1.0, 1.0);
    evas_object_show(gl);
-
+   
+   over = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_color_set(over, 0, 0, 0, 0);
+   evas_object_event_callback_add(over, EVAS_CALLBACK_MOUSE_MOVE, _move, gl);
+   evas_object_repeat_events_set(over, 1);
+   evas_object_show(over);
+   evas_object_size_hint_weight_set(over, 1.0, 1.0);
+   elm_win_resize_object_add(win, over);
+   
    itc1.item_style     = "default";
    itc1.func.label_get = gl_label_get;
    itc1.func.icon_get  = gl_icon_get;

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-23 00:16:52 UTC (rev 42634)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-23 03:22:07 UTC (rev 42635)
@@ -26,7 +26,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[3]);
+   elm_photocam_file_set(ph, img[1]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-23 00:16:52 UTC (rev 42634)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-23 03:22:07 UTC (rev 42635)
@@ -694,6 +694,7 @@
    EAPI void              elm_genlist_multi_select_set(Evas_Object *obj, Eina_Bool multi);
    EAPI Elm_Genlist_Item *elm_genlist_selected_item_get(const Evas_Object *obj);
    EAPI const Eina_List  *elm_genlist_selected_items_get(const Evas_Object *obj);
+   EAPI Elm_Genlist_Item *elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret);
    EAPI Elm_Genlist_Item *elm_genlist_first_item_get(const Evas_Object *obj);
    EAPI Elm_Genlist_Item *elm_genlist_last_item_get(const Evas_Object *obj);
    EAPI Elm_Genlist_Item *elm_genlist_item_next_get(const Elm_Genlist_Item *item);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-23 00:16:52 UTC (rev 42634)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-09-23 03:22:07 UTC (rev 42635)
@@ -1853,6 +1853,72 @@
 }
 
 /**
+ * Get the item that is at the x, y canvas coords
+ *
+ * This returns the item at the given coordinates (which are canvas relative
+ * not object-relative). If an item is at that coordinate, that item handle
+ * is returned, and if @p posret is not NULL, the integer pointed to is set
+ * to a value of -1, 0 or 1, depending if the coordinate is on the upper
+ * portion of that item (-1), on the middle section (0) or on the lower part
+ * (1). If NULL is returned as an item (no item found there), then posret
+ * may indicate -1 or 1 based if the coordinate is above or below all items
+ * respectively in the genlist.
+ *
+ * @param it The item
+ * @param x The input x coordinate
+ * @param y The input y coordinate
+ * @param posret The position relative to the item returned here
+ * @return The item at the coordinates or NULL if none
+ *
+ * @ingroup Genlist
+ */
+EAPI Elm_Genlist_Item *
+elm_genlist_at_xy_item_get(const Evas_Object *obj, Evas_Coord x, Evas_Coord y, int *posret)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord ox, oy, ow, oh;
+   Item_Block *itb;
+   Evas_Coord lasty;
+   
+   evas_object_geometry_get(wd->pan_smart, &ox, &oy, &ow, &oh);
+   lasty = oy;
+   EINA_INLIST_FOREACH(wd->blocks, itb)
+     {
+	Eina_List *l;
+	Elm_Genlist_Item *it;
+
+        if (!ELM_RECTS_INTERSECT(ox + itb->x - itb->wd->pan_x, 
+                                 oy + itb->y - itb->wd->pan_y,
+                                 itb->w, itb->h, x, y, 1, 1))
+          continue;
+	EINA_LIST_FOREACH(itb->items, l, it)
+	  {
+             Evas_Coord itx, ity;
+             
+             itx = ox + itb->x + it->x - itb->wd->pan_x;
+             ity = oy + itb->y + it->y - itb->wd->pan_y;
+             if (ELM_RECTS_INTERSECT(itx, ity, it->w, it->h, x, y, 1, 1))
+               {
+                  if (posret)
+                    {
+                       if (y <= (ity + (it->h / 4))) *posret = -1;
+                       else if (y >= (ity + it->h - (it->h / 4))) *posret = 1;
+                       else *posret = 0;
+                    }
+                  return it;
+               }
+             lasty = ity + it->h;
+	  }
+     }
+   if (posret)
+     {
+        if (y > lasty) *posret = 1;
+        else *posret = -1;
+     }
+   return NULL;
+}
+
+/**
  * Get the first item in the genlist
  *
  * This returns the first item in the list.

Log:
  some zooming working dynamically
  
  
Author:       raster
Date:         2009-09-23 01:19:03 -0700 (Wed, 23 Sep 2009)
New Revision: 42642

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-23 07:12:11 UTC (rev 42641)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-23 08:19:03 UTC (rev 42642)
@@ -1,9 +1,31 @@
 #include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 void
+my_bt_zoom_in(void *data, Evas_Object *obj, void *event_info)
+{
+   int zoom;
+   
+   zoom = elm_photocam_zoom_get(data);
+   zoom /= 2;
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
+   if (zoom >= 1) elm_photocam_zoom_set(data, zoom);
+}
+
+void
+my_bt_zoom_out(void *data, Evas_Object *obj, void *event_info)
+{
+   int zoom;
+   
+   zoom = elm_photocam_zoom_get(data);
+   zoom *= 2;
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
+   if (zoom <= 32) elm_photocam_zoom_set(data, zoom);
+}
+
+void
 test_photocam(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *ph;
+   Evas_Object *win, *bg, *ph, *tb2, *bt;
    char buf[PATH_MAX];
    const char *img[4] =
      {
@@ -26,10 +48,32 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[1]);
+   elm_photocam_file_set(ph, img[2]);
    
    evas_object_show(ph);
    
+   tb2 = elm_table_add(win);
+   evas_object_size_hint_weight_set(tb2, 1.0, 1.0);
+   elm_win_resize_object_add(win, tb2);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Z -");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_out, ph);
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.1, 0.1);
+   elm_table_pack(tb2, bt, 0, 0, 1, 1);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Z +");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_in, ph);
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.9, 0.1);
+   elm_table_pack(tb2, bt, 0, 0, 1, 1);
+   evas_object_show(bt);
+   
+   evas_object_show(tb2);
+   
    evas_object_resize(win, 800, 800);
    evas_object_show(win);
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-23 07:12:11 UTC (rev 42641)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-23 08:19:03 UTC (rev 42642)
@@ -34,10 +34,10 @@
 {
    int tsize; // size of tile (tsize x tsize pixels)
    int zoom; // zoom level tiles want for optimal display (1, 2, 4, 8)
-   int w, h; // size of image in pixels (represented by grid)
+   int iw, ih; // size of image in pixels
+   int w, h; // size of grid image in pixels (represented by grid)
    int gw, gh; // size of grid in tiles
    Grid_Item *grid; // the grid (gw * gh items)
-   Evas_Object *img; // low res version of image (scale down == 8)
 };
 
 struct _Widget_Data
@@ -54,6 +54,7 @@
    
    Ecore_Job *calc_job;
    Ecore_Timer *scr_timer;
+   Evas_Object *img; // low res version of image (scale down == 8)
    Grid grid;
    Eina_Bool smooth : 1;
 
@@ -92,12 +93,12 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
     
-   evas_object_move(wd->grid.img, 
+   evas_object_move(wd->img, 
                     ox + 0 - px,
                     oy + 0 - py);
-   evas_object_resize(wd->grid.img, 
-                      wd->grid.w / wd->zoom, 
-                      wd->grid.h / wd->zoom);
+   evas_object_resize(wd->img, 
+                      wd->grid.w,
+                      wd->grid.h);
    for (y = 0; y < wd->grid.gh; y++)
      {
         for (x = 0; x < wd->grid.gw; x++)
@@ -123,6 +124,22 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
+   
+   if (!wd->grid.grid) return;
+   for (y = 0; y < wd->grid.gh; y++)
+     {
+        for (x = 0; x < wd->grid.gw; x++)
+          {
+             int tn;
+             
+             tn = (y * wd->grid.gw) + x;
+             evas_object_del(wd->grid.grid[tn].img);
+          }
+     }
+   free(wd->grid.grid);
+   wd->grid.grid = NULL;
+   wd->grid.gw = 0;
+   wd->grid.gh = 0;
 }
 
 static void
@@ -142,6 +159,9 @@
    
    grid_clear(obj);
    wd->grid.zoom = wd->zoom;
+   wd->grid.w = wd->grid.iw / wd->grid.zoom;
+   wd->grid.h = wd->grid.ih / wd->grid.zoom;
+   if (wd->grid.zoom >= 8) return;
    wd->grid.gw = (wd->grid.w + wd->grid.tsize - 1) / wd->grid.tsize;
    wd->grid.gh = (wd->grid.h + wd->grid.tsize - 1) / wd->grid.tsize;
    wd->grid.grid = calloc(1, sizeof(Grid_Item) * wd->grid.gw * wd->grid.gh);
@@ -169,10 +189,10 @@
              else
                wd->grid.grid[tn].src.h = wd->grid.tsize;
              
-             wd->grid.grid[tn].out.x = wd->grid.grid[tn].src.x / wd->zoom;
-             wd->grid.grid[tn].out.y = wd->grid.grid[tn].src.y / wd->zoom;
-             wd->grid.grid[tn].out.w = wd->grid.grid[tn].src.w / wd->zoom;
-             wd->grid.grid[tn].out.h = wd->grid.grid[tn].src.h / wd->zoom;
+             wd->grid.grid[tn].out.x = wd->grid.grid[tn].src.x;
+             wd->grid.grid[tn].out.y = wd->grid.grid[tn].src.y;
+             wd->grid.grid[tn].out.w = wd->grid.grid[tn].src.w;
+             wd->grid.grid[tn].out.h = wd->grid.grid[tn].src.h;
              
              wd->grid.grid[tn].img = 
                evas_object_image_add(evas_object_evas_get(obj));
@@ -219,10 +239,10 @@
                   evas_object_image_file_set(wd->grid.grid[tn].img, NULL, NULL);
                   evas_object_image_load_scale_down_set(wd->grid.grid[tn].img, wd->grid.zoom);
                   evas_object_image_load_region_set(wd->grid.grid[tn].img,
-                                                    wd->grid.grid[tn].src.x / wd->grid.zoom,
-                                                    wd->grid.grid[tn].src.y / wd->grid.zoom,
-                                                    wd->grid.grid[tn].src.w / wd->grid.zoom,
-                                                    wd->grid.grid[tn].src.h / wd->grid.zoom);
+                                                    wd->grid.grid[tn].src.x,
+                                                    wd->grid.grid[tn].src.y,
+                                                    wd->grid.grid[tn].src.w,
+                                                    wd->grid.grid[tn].src.h);
 //                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img, 1);
                   evas_object_image_file_set(wd->grid.grid[tn].img, wd->file, NULL); 
                   evas_object_image_preload(wd->grid.grid[tn].img, 0);
@@ -255,7 +275,7 @@
              evas_object_image_smooth_scale_set(wd->grid.grid[tn].img, wd->smooth);
           }
      }
-   evas_object_image_smooth_scale_set(wd->grid.img, wd->smooth);
+   evas_object_image_smooth_scale_set(wd->img, wd->smooth);
 }
 
 static int
@@ -401,8 +421,8 @@
    Widget_Data *wd = data;
    Evas_Coord minw, minh;
 
-   minw = wd->grid.w / wd->grid.zoom;
-   minh = wd->grid.h / wd->grid.zoom;
+   minw = wd->grid.w;
+   minh = wd->grid.h;
    
    if ((minw != wd->minw) || (minh != wd->minh))
      {
@@ -539,7 +559,7 @@
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
 
-   evas_object_show(wd->grid.img);
+   evas_object_show(wd->img);
    grid_load(obj);
 }
    
@@ -615,12 +635,12 @@
    
    wd->grid.tsize = 512;
    
-   wd->grid.img = evas_object_image_add(e);
-   evas_object_image_scale_hint_set(wd->grid.img, EVAS_IMAGE_SCALE_HINT_STATIC);
-   evas_object_smart_member_add(wd->grid.img, wd->pan_smart);
-   elm_widget_sub_object_add(obj, wd->grid.img);
-   evas_object_image_filled_set(wd->grid.img, 1);
-   evas_object_event_callback_add(wd->grid.img, EVAS_CALLBACK_IMAGE_PRELOADED,
+   wd->img = evas_object_image_add(e);
+   evas_object_image_scale_hint_set(wd->img, EVAS_IMAGE_SCALE_HINT_STATIC);
+   evas_object_smart_member_add(wd->img, wd->pan_smart);
+   elm_widget_sub_object_add(obj, wd->img);
+   evas_object_image_filled_set(wd->img, 1);
+   evas_object_event_callback_add(wd->img, EVAS_CALLBACK_IMAGE_PRELOADED,
                                   _main_preloaded, obj);
    
    edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), 
@@ -650,18 +670,18 @@
    if (wd->file) eina_stringshare_del(wd->file);
    
    wd->file = eina_stringshare_add(file);
-   evas_object_hide(wd->grid.img);
-   evas_object_image_smooth_scale_set(wd->grid.img, wd->smooth);
-   evas_object_image_file_set(wd->grid.img, NULL, NULL);
-   evas_object_image_load_scale_down_set(wd->grid.img, 0);
-   evas_object_image_file_set(wd->grid.img, wd->file, NULL);
-   evas_object_image_size_get(wd->grid.img, &w, &h);
-   wd->grid.w = w;
-   wd->grid.h = h;
-   evas_object_image_file_set(wd->grid.img, NULL, NULL);
-   evas_object_image_load_scale_down_set(wd->grid.img, 8);
-   evas_object_image_file_set(wd->grid.img, wd->file, NULL);
-   evas_object_image_preload(wd->grid.img, 0);
+   evas_object_hide(wd->img);
+   evas_object_image_smooth_scale_set(wd->img, wd->smooth);
+   evas_object_image_file_set(wd->img, NULL, NULL);
+   evas_object_image_load_scale_down_set(wd->img, 0);
+   evas_object_image_file_set(wd->img, wd->file, NULL);
+   evas_object_image_size_get(wd->img, &w, &h);
+   wd->grid.iw = w;
+   wd->grid.ih = h;
+   evas_object_image_file_set(wd->img, NULL, NULL);
+   evas_object_image_load_scale_down_set(wd->img, 8);
+   evas_object_image_file_set(wd->img, wd->file, NULL);
+   evas_object_image_preload(wd->img, 0);
    grid_create(obj);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
@@ -680,7 +700,12 @@
 elm_photocam_zoom_set(Evas_Object *obj, int zoom)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (zoom < 1) zoom = 1;
    if (zoom == wd->zoom) return;
+   wd->zoom = zoom;
+   grid_create(obj);
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
+   wd->calc_job = ecore_job_add(_calc_job, wd);
 }
 
 /**

Log:
  and zoom actually works dynamically
  
  
Author:       raster
Date:         2009-09-24 00:17:52 -0700 (Thu, 24 Sep 2009)
New Revision: 42665

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 06:01:59 UTC (rev 42664)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 07:17:52 UTC (rev 42665)
@@ -48,7 +48,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[2]);
+   elm_photocam_file_set(ph, img[1]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 06:01:59 UTC (rev 42664)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 07:17:52 UTC (rev 42665)
@@ -38,6 +38,7 @@
    int w, h; // size of grid image in pixels (represented by grid)
    int gw, gh; // size of grid in tiles
    Grid_Item *grid; // the grid (gw * gh items)
+   Eina_Bool dead : 1; // old grid. will die as soon as anim is over
 };
 
 struct _Widget_Data
@@ -54,19 +55,21 @@
    
    Ecore_Job *calc_job;
    Ecore_Timer *scr_timer;
+   Ecore_Animator *zoom_animator;
+   double t_start, t_end;
+   struct {
+      int imw, imh;
+      int w, h;
+      int ow, oh, nw, nh;
+      struct {
+         double x, y;
+      } spos;
+   } size;
+   int tsize;
    Evas_Object *img; // low res version of image (scale down == 8)
-   Grid grid;
-   Eina_Bool smooth : 1;
-
-/*   
-   Evas_Object *img[3];
-   int ph_w, ph_h;
-   double preload_time, fade_time;
-   Ecore_Animator *fade_animator;
-   int scale;
-   int imuse, imfade;
-   Eina_Bool do_fade : 1;
- */
+   int nosmooth;
+   Eina_List *grids;
+   Eina_Bool main_load_pending : 1;
 };
 
 struct _Pan
@@ -82,64 +85,95 @@
 
 static void _calc_job(void *data);
 
-static void grid_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy);
-static void grid_clear(Evas_Object *obj);
-static void grid_create(Evas_Object *obj);
-static void grid_load(Evas_Object *obj);
+static void grid_place(Evas_Object *obj, Grid *g, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh);
+static void grid_clear(Grid *g);
+static Grid *grid_create(Evas_Object *obj);
+static void grid_load(Evas_Object *obj, Grid *g);
 
 static void
-grid_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy)
+img_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord ax, ay, gw, gh;
    int x, y;
-    
+
+   ax = 0;
+   ay = 0;
+   gw = wd->size.w;
+   gh = wd->size.h;
+   if (ow > gw) ax = (ow - gw) / 2;
+   if (oh > gh) ay = (oh - gh) / 2;
    evas_object_move(wd->img, 
-                    ox + 0 - px,
-                    oy + 0 - py);
-   evas_object_resize(wd->img, 
-                      wd->grid.w,
-                      wd->grid.h);
-   for (y = 0; y < wd->grid.gh; y++)
+                    ox + 0 - px + ax,
+                    oy + 0 - py + ay);
+   evas_object_resize(wd->img, gw, gh);
+}
+
+static void
+grid_place(Evas_Object *obj, Grid *g, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord ax, ay, gw, gh, tx, ty;
+   int x, y;
+
+   ax = 0;
+   ay = 0;
+   gw = wd->size.w;
+   gh = wd->size.h;
+   if (ow > gw) ax = (ow - gw) / 2;
+   if (oh > gh) ay = (oh - gh) / 2;
+   for (y = 0; y < g->gh; y++)
      {
-        for (x = 0; x < wd->grid.gw; x++)
+        for (x = 0; x < g->gw; x++)
           {
              int tn, xx, yy, ww, hh;
              
-             tn = (y * wd->grid.gw) + x;
-             xx = wd->grid.grid[tn].out.x;
-             yy = wd->grid.grid[tn].out.y;
-             ww = wd->grid.grid[tn].out.w;
-             hh = wd->grid.grid[tn].out.h;
-             evas_object_move(wd->grid.grid[tn].img,
-                              ox + xx - px,
-                              oy + yy - py);
-             evas_object_resize(wd->grid.grid[tn].img,
+             tn = (y * g->gw) + x;
+             xx = g->grid[tn].out.x;
+             yy = g->grid[tn].out.y;
+             ww = g->grid[tn].out.w;
+             hh = g->grid[tn].out.h;
+             if (gw != g->w)
+               {
+                  tx = xx;
+                  xx = (gw * xx) / g->w;
+                  ww = ((gw * (tx + ww)) / g->w) - xx;
+               }
+             if (gh != g->h)
+               {
+                  ty = yy;
+                  yy = (gh * yy) / g->h;
+                  hh = ((gh * (ty + hh)) / g->h) - yy;
+               }
+             evas_object_move(g->grid[tn].img,
+                              ox + xx - px + ax,
+                              oy + yy - py + ay);
+             evas_object_resize(g->grid[tn].img,
                                 ww, hh);
           }
      }
 }
 
 static void
-grid_clear(Evas_Object *obj)
+grid_clear(Grid *g)
 {
-   Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
    
-   if (!wd->grid.grid) return;
-   for (y = 0; y < wd->grid.gh; y++)
+   if (!g->grid) return;
+   for (y = 0; y < g->gh; y++)
      {
-        for (x = 0; x < wd->grid.gw; x++)
+        for (x = 0; x < g->gw; x++)
           {
              int tn;
              
-             tn = (y * wd->grid.gw) + x;
-             evas_object_del(wd->grid.grid[tn].img);
+             tn = (y * g->gw) + x;
+             evas_object_del(g->grid[tn].img);
           }
      }
-   free(wd->grid.grid);
-   wd->grid.grid = NULL;
-   wd->grid.gw = 0;
-   wd->grid.gh = 0;
+   free(g->grid);
+   g->grid = NULL;
+   g->gw = 0;
+   g->gh = 0;
 }
 
 static void
@@ -151,142 +185,180 @@
    git->have = 1;
 }
 
-static void
+static Grid *
 grid_create(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
+   Grid *g;
    
-   grid_clear(obj);
-   wd->grid.zoom = wd->zoom;
-   wd->grid.w = wd->grid.iw / wd->grid.zoom;
-   wd->grid.h = wd->grid.ih / wd->grid.zoom;
-   if (wd->grid.zoom >= 8) return;
-   wd->grid.gw = (wd->grid.w + wd->grid.tsize - 1) / wd->grid.tsize;
-   wd->grid.gh = (wd->grid.h + wd->grid.tsize - 1) / wd->grid.tsize;
-   wd->grid.grid = calloc(1, sizeof(Grid_Item) * wd->grid.gw * wd->grid.gh);
-   if (!wd->grid.grid)
+   g = calloc(1, sizeof(Grid));
+   
+   g->zoom = wd->zoom;
+   g->tsize = wd->tsize;
+   g->iw = wd->size.imw;
+   g->ih = wd->size.imh;
+   
+   g->w = g->iw / g->zoom;
+   g->h = g->ih / g->zoom;
+   if (g->zoom >= 8) return NULL;
+   g->gw = (g->w + g->tsize - 1) / g->tsize;
+   g->gh = (g->h + g->tsize - 1) / g->tsize;
+   g->grid = calloc(1, sizeof(Grid_Item) * g->gw * g->gh);
+   if (!g->grid)
      {
-        wd->grid.gw = 0;
-        wd->grid.gh = 0;
-        return;
+        g->gw = 0;
+        g->gh = 0;
+        return g;
      }
-   for (y = 0; y < wd->grid.gh; y++)
+   for (y = 0; y < g->gh; y++)
      {
-        for (x = 0; x < wd->grid.gw; x++)
+        for (x = 0; x < g->gw; x++)
           {
              int tn, xx, yy, ww, hh;
              
-             tn = (y * wd->grid.gw) + x;
-             wd->grid.grid[tn].src.x = x * wd->grid.tsize;
-             if (x == (wd->grid.gw - 1))
-               wd->grid.grid[tn].src.w = wd->grid.w - ((wd->grid.gw - 1) * wd->grid.tsize);
+             tn = (y * g->gw) + x;
+             g->grid[tn].src.x = x * g->tsize;
+             if (x == (g->gw - 1))
+               g->grid[tn].src.w = g->w - ((g->gw - 1) * g->tsize);
              else
-               wd->grid.grid[tn].src.w = wd->grid.tsize;
-             wd->grid.grid[tn].src.y = y * wd->grid.tsize;
-             if (y == (wd->grid.gh - 1))
-               wd->grid.grid[tn].src.h = wd->grid.h - ((wd->grid.gh - 1) * wd->grid.tsize);
+               g->grid[tn].src.w = g->tsize;
+             g->grid[tn].src.y = y * g->tsize;
+             if (y == (g->gh - 1))
+               g->grid[tn].src.h = g->h - ((g->gh - 1) * g->tsize);
              else
-               wd->grid.grid[tn].src.h = wd->grid.tsize;
+               g->grid[tn].src.h = g->tsize;
              
-             wd->grid.grid[tn].out.x = wd->grid.grid[tn].src.x;
-             wd->grid.grid[tn].out.y = wd->grid.grid[tn].src.y;
-             wd->grid.grid[tn].out.w = wd->grid.grid[tn].src.w;
-             wd->grid.grid[tn].out.h = wd->grid.grid[tn].src.h;
+             g->grid[tn].out.x = g->grid[tn].src.x;
+             g->grid[tn].out.y = g->grid[tn].src.y;
+             g->grid[tn].out.w = g->grid[tn].src.w;
+             g->grid[tn].out.h = g->grid[tn].src.h;
              
-             wd->grid.grid[tn].img = 
+             g->grid[tn].img = 
                evas_object_image_add(evas_object_evas_get(obj));
-             evas_object_image_scale_hint_set(wd->grid.grid[tn].img, EVAS_IMAGE_SCALE_HINT_STATIC);
-             evas_object_smart_member_add(wd->grid.grid[tn].img, 
+             evas_object_image_scale_hint_set(g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_STATIC);
+             evas_object_smart_member_add(g->grid[tn].img, 
                                           wd->pan_smart);
-             elm_widget_sub_object_add(obj, wd->grid.grid[tn].img);
-             evas_object_image_filled_set(wd->grid.grid[tn].img, 1);
-             evas_object_event_callback_add(wd->grid.grid[tn].img, 
+             elm_widget_sub_object_add(obj, g->grid[tn].img);
+             evas_object_image_filled_set(g->grid[tn].img, 1);
+             evas_object_event_callback_add(g->grid[tn].img, 
                                             EVAS_CALLBACK_IMAGE_PRELOADED,
                                             _tile_preloaded, 
-                                            &(wd->grid.grid[tn]));
+                                            &(g->grid[tn]));
           }
      }
+   return g;
 }
 
 static void
-grid_load(Evas_Object *obj)
+grid_load(Evas_Object *obj, Grid *g)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
    Evas_Coord ow, oh;
 
    elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
-   for (y = 0; y < wd->grid.gh; y++)
+   for (y = 0; y < g->gh; y++)
      {
-        for (x = 0; x < wd->grid.gw; x++)
+        for (x = 0; x < g->gw; x++)
           {
              int tn;
              Eina_Bool visible = 0;
              
-             tn = (y * wd->grid.gw) + x;
+             tn = (y * g->gw) + x;
              if (ELM_RECTS_INTERSECT(wd->pan_x, wd->pan_y, 
                                      ow, oh,
-                                     wd->grid.grid[tn].out.x,
-                                     wd->grid.grid[tn].out.y,
-                                     wd->grid.grid[tn].out.w,
-                                     wd->grid.grid[tn].out.h))
+                                     g->grid[tn].out.x,
+                                     g->grid[tn].out.y,
+                                     g->grid[tn].out.w,
+                                     g->grid[tn].out.h))
                visible = 1;
-             if ((visible) && (!wd->grid.grid[tn].want))
+             if ((visible) && (!g->grid[tn].want))
                {
-                  wd->grid.grid[tn].want = 1;
-                  evas_object_hide(wd->grid.grid[tn].img);
-                  evas_object_image_file_set(wd->grid.grid[tn].img, NULL, NULL);
-                  evas_object_image_load_scale_down_set(wd->grid.grid[tn].img, wd->grid.zoom);
-                  evas_object_image_load_region_set(wd->grid.grid[tn].img,
-                                                    wd->grid.grid[tn].src.x,
-                                                    wd->grid.grid[tn].src.y,
-                                                    wd->grid.grid[tn].src.w,
-                                                    wd->grid.grid[tn].src.h);
-//                  evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img, 1);
-                  evas_object_image_file_set(wd->grid.grid[tn].img, wd->file, NULL); 
-                  evas_object_image_preload(wd->grid.grid[tn].img, 0);
+                  g->grid[tn].want = 1;
+                  evas_object_hide(g->grid[tn].img);
+                  evas_object_image_file_set(g->grid[tn].img, NULL, NULL);
+                  evas_object_image_load_scale_down_set(g->grid[tn].img, g->zoom);
+                  evas_object_image_load_region_set(g->grid[tn].img,
+                                                    g->grid[tn].src.x,
+                                                    g->grid[tn].src.y,
+                                                    g->grid[tn].src.w,
+                                                    g->grid[tn].src.h);
+                  evas_object_image_file_set(g->grid[tn].img, wd->file, NULL); 
+                  evas_object_image_preload(g->grid[tn].img, 0);
                }
-             else if ((wd->grid.grid[tn].want) && (!visible))
+             else if ((g->grid[tn].want) && (!visible))
                {
-                  wd->grid.grid[tn].want = 0;
-                  wd->grid.grid[tn].have = 0;
-                  evas_object_hide(wd->grid.grid[tn].img);
-                  evas_object_image_preload(wd->grid.grid[tn].img, 1);
-                  evas_object_image_file_set(wd->grid.grid[tn].img, NULL, NULL);
+                  g->grid[tn].want = 0;
+                  g->grid[tn].have = 0;
+                  evas_object_hide(g->grid[tn].img);
+                  evas_object_image_preload(g->grid[tn].img, 1);
+                  evas_object_image_file_set(g->grid[tn].img, NULL, NULL);
                }
           }
      }
 }
 
 static void
+grid_clearall(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Grid *g;
+   
+   EINA_LIST_FREE(wd->grids, g)
+     {
+        grid_clear(g);
+        free(g);
+     }
+}
+
+static void
 _smooth_update(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    int x, y;
+   Eina_List *l;
+   Grid *g;
 
-   for (y = 0; y < wd->grid.gh; y++)
+   EINA_LIST_FOREACH(wd->grids, l, g)
      {
-        for (x = 0; x < wd->grid.gw; x++)
+        for (y = 0; y < g->gh; y++)
           {
+             for (x = 0; x < g->gw; x++)
+               {
+                  int tn;
+                  
+                  tn = (y * g->gw) + x;
+                  evas_object_image_smooth_scale_set(g->grid[tn].img, (wd->nosmooth == 0));
+               }
+          }
+     }
+   evas_object_image_smooth_scale_set(wd->img, (wd->nosmooth == 0));
+}
+
+static void
+_grid_raise(Grid *g)
+{
+   int x, y;
+   
+   for (y = 0; y < g->gh; y++)
+     {
+        for (x = 0; x < g->gw; x++)
+          {
              int tn;
              
-             tn = (y * wd->grid.gw) + x;
-             evas_object_image_smooth_scale_set(wd->grid.grid[tn].img, wd->smooth);
+             tn = (y * g->gw) + x;
+             evas_object_raise(g->grid[tn].img);
           }
      }
-   evas_object_image_smooth_scale_set(wd->img, wd->smooth);
 }
 
 static int
 _scr_timeout(void *data)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-   if (!wd->smooth)
-     {
-        wd->smooth = 1;
-        _smooth_update(data);
-     }
+   wd->nosmooth--;
+   if (wd->nosmooth == 0) _smooth_update(data);
    wd->scr_timer = NULL;
    return 0;
 }
@@ -295,78 +367,81 @@
 _scr(void *data, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(data);
+   if (!wd->scr_timer)
+     {
+        wd->nosmooth++;
+        if (wd->nosmooth == 1) _smooth_update(data);
+     }
    if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
    wd->scr_timer = ecore_timer_add(0.25, _scr_timeout, data);
-   if (wd->smooth)
-     {
-        wd->smooth = 0;
-        _smooth_update(data);
-     }
 }
 
-/*
-static void _next_stage(Evas_Object *obj);
-
-static int
-_fade_animator(void *data)
+static void
+_main_preloaded(void *data, Evas *e, Evas_Object *o, void *event_info)
 {
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   double t;
-   int v;
+   Grid *g;
    
-   t = ecore_loop_time_get() - wd->preload_time;
-   v = (255.0 * t) / wd->fade_time;
-   if (v > 255) v = 255;
-   evas_object_color_set(wd->img[wd->imfade], v, v, v, v);
-   if (v < 255) return 1;
-   
-   wd->fade_animator = NULL;
-   if (wd->do_fade)
+   evas_object_show(wd->img);
+   wd->main_load_pending = 0;
+   g = grid_create(obj);
+   if (g)
      {
-        wd->do_fade = 0;
-        _next_stage(obj);
+        wd->grids = eina_list_prepend(wd->grids, g);
      }
-   return 0;
+   if (wd->calc_job) ecore_job_del(wd->calc_job);
+   wd->calc_job = ecore_job_add(_calc_job, wd);
 }
 
-static void
-_next_stage(Evas_Object *obj)
+static int
+_zoom_anim(void *data)
 {
+   Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   int w, h;
-   double t, td;
+   double t;
+   Evas_Coord ow, oh;
    
-   wd->imfade = wd->imuse;
-   evas_object_raise(wd->img[wd->imfade]);
-   evas_object_color_set(wd->img[wd->imfade], 0, 0, 0, 0);
-   evas_object_show(wd->img[wd->imfade]);
-   
    t = ecore_loop_time_get();
-   td = t - wd->preload_time;
-   printf("scale: %i use %i. done in %3.3f\n", wd->scale, wd->imuse, td);
-   if (td > 1.0) td = 1.0;
-   wd->fade_time = td;
-   wd->preload_time = t;
-   wd->fade_animator = ecore_animator_add(_fade_animator, obj);
-   
-   if (wd->scale == 1) return;
-   
-   wd->imuse++;
-   if (wd->imuse >= 3) wd->imuse = 0;
-   wd->scale /= 2;
-   evas_object_hide(wd->img[wd->imuse]);
-   evas_object_image_load_scale_down_set(wd->img[wd->imuse], wd->scale);
-   evas_object_image_pixels_dirty_set(wd->img[wd->imuse], 1);
-   evas_object_image_file_set(wd->img[wd->imuse], wd->file, NULL);
-   evas_object_image_preload(wd->img[wd->imuse], 0);
-   evas_object_image_size_get(wd->img[wd->imuse], &w, &h);
-   wd->ph_w = w * wd->scale;
-   wd->ph_h = h * wd->scale;
+   if (t >= wd->t_end)
+     {
+        t = 1.0;
+     }
+   else t = (t - wd->t_start) / (wd->t_end - wd->t_start);
+   t = 1.0 - t;
+   t = 1.0 - (t * t);
+   wd->size.w = (wd->size.ow * (1.0 - t)) + (wd->size.nw * t);
+   wd->size.h = (wd->size.oh * (1.0 - t)) + (wd->size.nh * t);
+   printf("%3.3f %3.3f\n", wd->size.spos.x, wd->size.spos.y);
+//   elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
+//   elm_smart_scroller_child_region_show
+//     (wd->scr, 
+//      (wd->size.spos.x * wd->size.w) - (ow / 2),
+//      (wd->size.spos.y * wd->size.h) - (oh / 2),
+//      ow, oh);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
+   if (t >= 1.0)
+     {
+        Eina_List *l, *l_next;
+        Grid *g;
+        
+        EINA_LIST_FOREACH_SAFE(wd->grids, l, l_next, g)
+          {
+             if (g->dead)
+               {
+                  wd->grids = eina_list_remove_list(wd->grids, l);
+                  grid_clear(g);
+                  free(g);
+               }
+          }
+        wd->nosmooth--;
+        if (wd->nosmooth == 0) _smooth_update(data);
+        wd->zoom_animator = NULL;
+        return 0;
+     }
+   return 1;
 }
-*/
 
 static Evas_Smart_Class _pan_sc = {NULL};
 
@@ -374,11 +449,13 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   grid_clearall(obj);
    evas_object_del(wd->pan_smart);
    wd->pan_smart = NULL;
    if (wd->file) eina_stringshare_del(wd->file);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
+   if (wd->zoom_animator) ecore_animator_del(wd->zoom_animator);
    free(wd);
 }
 
@@ -421,8 +498,8 @@
    Widget_Data *wd = data;
    Evas_Coord minw, minh;
 
-   minw = wd->grid.w;
-   minh = wd->grid.h;
+   minw = wd->size.w;
+   minh = wd->size.h;
    
    if ((minw != wd->minw) || (minh != wd->minh))
      {
@@ -515,10 +592,16 @@
 {
    Pan *sd = evas_object_smart_data_get(obj);
    Evas_Coord ox, oy, ow, oh;
-
+   Eina_List *l;
+   Grid *g;
+   
    evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
-   grid_load(sd->wd->obj);
-   grid_place(sd->wd->obj, sd->wd->pan_x, sd->wd->pan_y, ox, oy);
+   img_place(sd->wd->obj, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh);
+   EINA_LIST_FOREACH(sd->wd->grids, l, g)
+     {
+        grid_load(sd->wd->obj, g);
+        grid_place(sd->wd->obj, g, sd->wd->pan_x, sd->wd->pan_y, ox, oy, ow, oh);
+     }
 }
 
 static void
@@ -553,16 +636,6 @@
    elm_smart_scroller_freeze_set(wd->scr, 0);
 }
 
-static void
-_main_preloaded(void *data, Evas *e, Evas_Object *o, void *event_info)
-{
-   Evas_Object *obj = data;
-   Widget_Data *wd = elm_widget_data_get(obj);
-
-   evas_object_show(wd->img);
-   grid_load(obj);
-}
-   
 /**
  * Add a new Photocam object
  *
@@ -631,9 +704,8 @@
 
    wd->zoom = 1;
    wd->mode = ELM_PHOTOCAM_ZOOM_MODE_MANUAL;
-   wd->smooth = 1;
    
-   wd->grid.tsize = 512;
+   wd->tsize = 512;
    
    wd->img = evas_object_image_add(e);
    evas_object_image_scale_hint_set(wd->img, EVAS_IMAGE_SCALE_HINT_STATIC);
@@ -671,18 +743,28 @@
    
    wd->file = eina_stringshare_add(file);
    evas_object_hide(wd->img);
-   evas_object_image_smooth_scale_set(wd->img, wd->smooth);
+   evas_object_image_smooth_scale_set(wd->img, (wd->nosmooth == 0));
    evas_object_image_file_set(wd->img, NULL, NULL);
    evas_object_image_load_scale_down_set(wd->img, 0);
    evas_object_image_file_set(wd->img, wd->file, NULL);
    evas_object_image_size_get(wd->img, &w, &h);
-   wd->grid.iw = w;
-   wd->grid.ih = h;
+   wd->size.imw = w;
+   wd->size.imh = h;
+   wd->size.w = wd->size.imw / wd->zoom;
+   wd->size.h = wd->size.imh / wd->zoom;
+   if (wd->zoom_animator)
+     {
+        wd->nosmooth--;
+        if (wd->nosmooth == 0) _smooth_update(obj);
+        ecore_animator_del(wd->zoom_animator);
+        wd->zoom_animator = NULL;
+     }
    evas_object_image_file_set(wd->img, NULL, NULL);
    evas_object_image_load_scale_down_set(wd->img, 8);
    evas_object_image_file_set(wd->img, wd->file, NULL);
    evas_object_image_preload(wd->img, 0);
-   grid_create(obj);
+   wd->main_load_pending = 1;
+   grid_clearall(obj);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
 }
@@ -700,10 +782,59 @@
 elm_photocam_zoom_set(Evas_Object *obj, int zoom)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   Eina_List *l;
+   Grid *g, *g_zoom = NULL;
+   Evas_Coord pw, ph, rx, ry, rw, rh;
+   Ecore_Animator *an;
+   
    if (zoom < 1) zoom = 1;
    if (zoom == wd->zoom) return;
    wd->zoom = zoom;
-   grid_create(obj);
+   wd->size.ow = wd->size.w;
+   wd->size.oh = wd->size.h;
+   wd->size.nw = wd->size.imw / wd->zoom;
+   wd->size.nh = wd->size.imh / wd->zoom;
+   wd->size.w = wd->size.nw;
+   wd->size.h = wd->size.nh;
+   if (wd->main_load_pending) goto done;
+   EINA_LIST_FOREACH(wd->grids, l, g)
+     {
+        if (g->zoom == wd->zoom)
+          {
+             g_zoom = g;
+             g->dead = 0;
+          }
+        else
+          g->dead = 1;
+     }
+   if (g_zoom)
+     {
+        g = g_zoom;
+        wd->grids = eina_list_remove(wd->grids, g);
+        wd->grids = eina_list_prepend(wd->grids, g);
+        _grid_raise(g);
+        goto done;
+     }
+   g = grid_create(obj);
+   if (g)
+     {
+        wd->grids = eina_list_prepend(wd->grids, g);
+     }
+   done:
+   if (!wd->zoom_animator)
+     {
+        wd->zoom_animator = ecore_animator_add(_zoom_anim, obj);
+        wd->nosmooth++;
+        if (wd->nosmooth == 1) _smooth_update(obj);
+     }
+   wd->t_start = ecore_loop_time_get();
+   elm_smart_scroller_child_pos_get(wd->scr, &rx, &ry);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &rw, &rh);
+   wd->size.spos.x = (double)(rx + (rw / 2)) / (double)wd->size.w;
+   wd->size.spos.y = (double)(ry + (rh / 2)) / (double)wd->size.h;
+   wd->t_end = wd->t_start + 0.5;
+   an = wd->zoom_animator;
+   if (!_zoom_anim(obj)) ecore_animator_del(an);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
 }

Log:
  other zoom modes work now.
  
  
Author:       raster
Date:         2009-09-24 01:55:12 -0700 (Thu, 24 Sep 2009)
New Revision: 42669

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 07:40:14 UTC (rev 42668)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 08:55:12 UTC (rev 42669)
@@ -19,10 +19,28 @@
    zoom = elm_photocam_zoom_get(data);
    zoom *= 2;
    elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
-   if (zoom <= 32) elm_photocam_zoom_set(data, zoom);
+   if (zoom <= 256) elm_photocam_zoom_set(data, zoom);
 }
 
 void
+my_bt_zoom_man(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
+}
+
+void
+my_bt_zoom_fit(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT);
+}
+
+void
+my_bt_zoom_fill(void *data, Evas_Object *obj, void *event_info)
+{
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL);
+}
+
+void
 test_photocam(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *ph, *tb2, *bt;
@@ -69,9 +87,33 @@
    evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_in, ph);
    evas_object_size_hint_weight_set(bt, 1.0, 1.0);
    evas_object_size_hint_align_set(bt, 0.9, 0.1);
-   elm_table_pack(tb2, bt, 0, 0, 1, 1);
+   elm_table_pack(tb2, bt, 2, 0, 1, 1);
    evas_object_show(bt);
    
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Manual");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_man, ph);
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.1, 0.9);
+   elm_table_pack(tb2, bt, 0, 1, 1, 1);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Fit");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fit, ph);
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.9);
+   elm_table_pack(tb2, bt, 1, 1, 1, 1);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Fill");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fill, ph);
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.9, 0.9);
+   elm_table_pack(tb2, bt, 2, 1, 1, 1);
+   evas_object_show(bt);
+   
    evas_object_show(tb2);
    
    evas_object_resize(win, 800, 800);

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 07:40:14 UTC (rev 42668)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 08:55:12 UTC (rev 42669)
@@ -400,7 +400,7 @@
    Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
    double t;
-   Evas_Coord ow, oh;
+   Evas_Coord xx, yy, ow, oh;
    
    t = ecore_loop_time_get();
    if (t >= wd->t_end)
@@ -412,13 +412,14 @@
    t = 1.0 - (t * t);
    wd->size.w = (wd->size.ow * (1.0 - t)) + (wd->size.nw * t);
    wd->size.h = (wd->size.oh * (1.0 - t)) + (wd->size.nh * t);
-   printf("%3.3f %3.3f\n", wd->size.spos.x, wd->size.spos.y);
-//   elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
-//   elm_smart_scroller_child_region_show
-//     (wd->scr, 
-//      (wd->size.spos.x * wd->size.w) - (ow / 2),
-//      (wd->size.spos.y * wd->size.h) - (oh / 2),
-//      ow, oh);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
+   xx = (wd->size.spos.x * wd->size.w) - (ow / 2);
+   yy = (wd->size.spos.y * wd->size.h) - (oh / 2);
+   if (xx < 0) xx = 0;
+   else if (xx > (wd->size.w - ow)) xx = wd->size.w - ow;
+   if (yy < 0) yy = 0;
+   else if (yy > (wd->size.h - oh)) yy = wd->size.h - oh;
+   elm_smart_scroller_child_region_show(wd->scr, xx, yy, ow, oh);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
    if (t >= 1.0)
@@ -785,6 +786,7 @@
    Eina_List *l;
    Grid *g, *g_zoom = NULL;
    Evas_Coord pw, ph, rx, ry, rw, rh;
+   int z;
    Ecore_Animator *an;
    
    if (zoom < 1) zoom = 1;
@@ -792,11 +794,76 @@
    wd->zoom = zoom;
    wd->size.ow = wd->size.w;
    wd->size.oh = wd->size.h;
-   wd->size.nw = wd->size.imw / wd->zoom;
-   wd->size.nh = wd->size.imh / wd->zoom;
-   wd->size.w = wd->size.nw;
-   wd->size.h = wd->size.nh;
-   if (wd->main_load_pending) goto done;
+   elm_smart_scroller_child_pos_get(wd->scr, &rx, &ry);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &rw, &rh);
+   if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_MANUAL)
+     {
+        wd->size.nw = wd->size.imw / wd->zoom;
+        wd->size.nh = wd->size.imh / wd->zoom;
+     }
+   else if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT)
+     {
+        ph = (wd->size.imh * rw) / wd->size.imw;
+        if (ph > rh)
+          {
+             pw = (wd->size.imw * rh) / wd->size.imh;
+             ph = rh;
+          }
+        else
+          {
+             pw = rw;
+          }
+        if ((pw > wd->size.imw) || (ph > wd->size.imh))
+          {
+             pw = wd->size.imw;
+             ph = wd->size.imh;
+          }
+        if (wd->size.imw > wd->size.imh)
+          z = wd->size.imw / pw;
+        else
+          z = wd->size.imh / ph;
+        z++;
+        if (z <= 1) z == 1;
+        else if (z <= 2) z = 2;
+        else if (z <= 4) z = 4;
+        else if (z <= 8) z = 8;
+        else z = 8;
+        wd->zoom = z;
+        wd->size.nw = pw;
+        wd->size.nh = ph;
+     }
+   else if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL)
+     {
+        ph = (wd->size.imh * rw) / wd->size.imw;
+        if (ph < rh)
+          {
+             pw = (wd->size.imw * rh) / wd->size.imh;
+             ph = rh;
+          }
+        else
+          {
+             pw = rw;
+          }
+        if (wd->size.imw > wd->size.imh)
+          z = wd->size.imw / pw;
+        else
+          z = wd->size.imh / ph;
+        z++;
+        if (z <= 1) z == 1;
+        else if (z <= 2) z = 2;
+        else if (z <= 4) z = 4;
+        else if (z <= 8) z = 8;
+        else z = 8;
+        wd->zoom = z;
+        wd->size.nw = pw;
+        wd->size.nh = ph;
+     }
+   if (wd->main_load_pending)
+     {
+        wd->size.w = wd->size.nw;
+        wd->size.h = wd->size.nh;
+        goto done;
+     }
    EINA_LIST_FOREACH(wd->grids, l, g)
      {
         if (g->zoom == wd->zoom)
@@ -828,11 +895,13 @@
         if (wd->nosmooth == 1) _smooth_update(obj);
      }
    wd->t_start = ecore_loop_time_get();
-   elm_smart_scroller_child_pos_get(wd->scr, &rx, &ry);
-   elm_smart_scroller_child_viewport_size_get(wd->scr, &rw, &rh);
+   wd->t_end = wd->t_start + _elm_config->zoom_friction;
    wd->size.spos.x = (double)(rx + (rw / 2)) / (double)wd->size.w;
    wd->size.spos.y = (double)(ry + (rh / 2)) / (double)wd->size.h;
-   wd->t_end = wd->t_start + _elm_config->zoom_friction;
+   if (rw > wd->size.w) wd->size.spos.x = 0.5;
+   if (rh > wd->size.h) wd->size.spos.y = 0.5;
+   if (wd->size.spos.x > 1.0) wd->size.spos.x = 1.0;
+   if (wd->size.spos.y > 1.0) wd->size.spos.y = 1.0;
    an = wd->zoom_animator;
    if (!_zoom_anim(obj)) ecore_animator_del(an);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
@@ -869,6 +938,9 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (wd->mode == mode) return;
+   wd->mode = mode;
+   wd->zoom++;
+   elm_photocam_zoom_set(obj, wd->zoom - 1);
 }
 
 /**

Log:
  and add doce for photocam. and a todo of less essential features
  
  
Author:       raster
Date:         2009-09-24 06:57:04 -0700 (Thu, 24 Sep 2009)
New Revision: 42677

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 13:20:46 UTC (rev 42676)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-09-24 13:57:04 UTC (rev 42677)
@@ -45,6 +45,7 @@
 {
    Evas_Object *win, *bg, *ph, *tb2, *bt;
    char buf[PATH_MAX];
+   // FIXME: add a file selector and a "select a file" button.
    const char *img[4] =
      {
         "/home/raster/t1.jpg",  //   5 mpixel
@@ -66,7 +67,7 @@
    evas_object_size_hint_weight_set(ph, 1.0, 1.0);
    elm_win_resize_object_add(win, ph);
    
-   elm_photocam_file_set(ph, img[1]);
+   elm_photocam_file_set(ph, img[3]);
    
    evas_object_show(ph);
    

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-24 13:20:46 UTC (rev 42676)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-09-24 13:57:04 UTC (rev 42677)
@@ -878,11 +878,12 @@
 	ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL
      } Elm_Photocam_Zoom_Mode;
    EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
-   EAPI void         elm_photocam_file_set(Evas_Object *obj, const char *file);
+   EAPI int          elm_photocam_file_set(Evas_Object *obj, const char *file);
    EAPI void         elm_photocam_zoom_set(Evas_Object *obj, int zoom);
    EAPI int          elm_photocam_zoom_get(Evas_Object *obj);
    EAPI void         elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
    EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(Evas_Object *obj);
+   EAPI void         elm_photocam_image_size_get(Evas_Object *obj, int *w, int *h);
 
 #ifdef __cplusplus
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 13:20:46 UTC (rev 42676)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-09-24 13:57:04 UTC (rev 42677)
@@ -4,7 +4,25 @@
 /**
  * @defgroup Photocam Photocam
  *
- * XXX
+ * This is a widget specifically for displaying high-resolution digital
+ * camera photos giving speedy feedback (fast load), low memory footprint
+ * and zooming and panning as well as fitting logic.
+ * 
+ * TODO:
+ * 
+ * 1. clicked signal - get mouse down/up etc. on photo
+ * 2. longpress signal "
+ * 3. wrap photo in theme edje so u can have styling around photo
+ * 4. handle styles properly
+ * 5. signals for stages of load (main preload, each tile, all done)
+ * 6. signals for change in zoom level
+ * 7. signals for change in pan
+ * 8. controls for setting panning
+ * 
+ * optional?
+ * 
+ * 9.  exif handling
+ * 10. rotation flags in exif handling (nasty! should have rot in evas)
  *
  * Signals that you can add callbacks for are:
  *
@@ -742,16 +760,22 @@
 }
 
 /**
- * XXX
+ * Set the photo file to be shown
  *
- * xxx
+ * This sets (and shows) the specified file (with a relative or absolute path)
+ * and will return a load error (same error that
+ * evas_object_image_load_error_get() will return). The image will change and
+ * adjust its size at this point and begin a background load process for this
+ * photo that at some time in the future will be displayed at the full quality
+ * needed.
  *
  * @param obj The photocam object
  * @param file The photo file
+ * @return The return error (see EVAS_LOAD_ERROR_NONE, EVAS_LOAD_ERROR_GENERIC etc.)
  *
  * @ingroup Photocam
  */
-EAPI void
+EAPI int
 elm_photocam_file_set(Evas_Object *obj, const char *file)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -785,12 +809,17 @@
    grid_clearall(obj);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
+   return evas_object_image_load_error_get(wd->img);
 }
 
 /**
- * XXX
+ * Set the zoom level of the photo
  *
- * xxx
+ * This sets the zoom level. 1 will be 1:1 pixel for pixel. 2 will be 2:1
+ * (that is 2x2 photo pixels will display as 1 on-screen pixel). 4:1 will be
+ * 4x4 photo pixels as 1 screen pixel, and so on. The @p zoom parameter must
+ * be a power of 2 (1, 2, 4, 8, 16, 32, 64 etc.) to work correctly, and be
+ * greater than 0. Other values will have undefined behavior.
  *
  * @param obj The photocam object
  *
@@ -839,7 +868,6 @@
           z = wd->size.imw / pw;
         else
           z = wd->size.imh / ph;
-//        z++;
         if      (z >= 8) z = 8;
         else if (z >= 4) z = 4;
         else if (z >= 2) z = 2;
@@ -864,7 +892,6 @@
           z = wd->size.imw / pw;
         else
           z = wd->size.imh / ph;
-//        z++;
         if      (z >= 8) z = 8;
         else if (z >= 4) z = 4;
         else if (z >= 2) z = 2;
@@ -924,11 +951,15 @@
 }
 
 /**
- * XXX
+ * Get the zoom level of the photo
  *
- * xxx
+ * This returns the current zoom level of the photocam object. Note that if
+ * you set the fill mode to other than ELM_PHOTOCAM_ZOOM_MODE_MANUAL
+ * (which is the default), the zoom level may be changed at any time by the
+ * photocam object itself to account for photo size and photocam viewpoer size
  *
  * @param obj The photocam object
+ * @return The current zoom level
  *
  * @ingroup Photocam
  */
@@ -940,11 +971,20 @@
 }
 
 /**
- * XXX
+ * Set the zoom mode
  *
- * xxx
+ * This sets the zoom mode to manual or one of several automatic levels.
+ * Manual (ELM_PHOTOCAM_ZOOM_MODE_MANUAL) means that zoom is set manually by
+ * elm_photocam_zoom_set() and will stay at that level until changed by code
+ * or until zoom mode is changed. This is the default mode.
+ * The Automatic modes will allow the photocam object to automatically
+ * adjust zoom mode based on properties. ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT) will
+ * adjust zoom so the photo fits EXACTLY inside the scroll frame with no pixels
+ * outside this area. ELM_PHOTOCAM_ZOOM_MODE_AUTO_FILL will be similar but
+ * ensure no pixels within the frame are left unfilled.
  *
  * @param obj The photocam object
+ * @param mode The desired mode
  *
  * @ingroup Photocam
  */
@@ -959,11 +999,12 @@
 }
 
 /**
- * XXX
+ * Get the zoom mode
  *
- * xxx
+ * This gets the current zoom mode of the photocam object
  *
  * @param obj The photocam object
+ * @return The current zoom mode
  *
  * @ingroup Photocam
  */
@@ -973,3 +1014,24 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    return wd->mode;
 }
+
+/**
+ * Get the current image pixel width and height
+ *
+ * This gets the current photo pixel width and height (for the original).
+ * The size will be returned in the integers @p w and @p h that are pointed
+ * to.
+ *
+ * @param obj The photocam object
+ * @param w A pointer to the width return
+ * @param h A pointer to the height return
+ *
+ * @ingroup Photocam
+ */
+EAPI void
+elm_photocam_image_size_get(Evas_Object *obj, int *w, int *h)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (w) *w = wd->size.imw;
+   if (h) *h = wd->size.imh;
+}

Log:
  1. move orientation box call to after back- this makes the box do a calc
  2. too keen on removing swallows. add back.
  
  
Author:       raster
Date:         2009-10-07 23:18:51 -0700 (Wed, 07 Oct 2009)
New Revision: 42955

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_hover.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-10-08 06:04:03 UTC (rev 42954)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-10-08 06:18:51 UTC (rev 42955)
@@ -589,7 +589,6 @@
      {
 	Evas_Object *bx = elm_box_add(obj);
 	Evas_Object *ic;
-	elm_box_horizontal_set(bx, 1);
 	ic = elm_icon_add(obj);
 	snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
 	elm_icon_file_set(ic, buf, NULL);
@@ -601,6 +600,7 @@
 	elm_icon_scale_set(ic, 0, 0);
 	evas_object_show(ic);
 	elm_box_pack_end(bx, ic);
+        elm_box_horizontal_set(bx, 1);
 	evas_object_show(bx);
 	return bx;
      }
@@ -755,6 +755,7 @@
 	elm_icon_scale_set(ic, 0, 0);
 	evas_object_show(ic);
 	elm_box_pack_end(bx, ic);
+        elm_box_horizontal_set(bx, 1);
 	evas_object_show(bx);
 	return bx;
      }

Modified: trunk/TMP/st/elementary/src/lib/elm_hover.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_hover.c	2009-10-08 06:04:03 UTC (rev 42954)
+++ trunk/TMP/st/elementary/src/lib/elm_hover.c	2009-10-08 06:18:51 UTC (rev 42955)
@@ -87,6 +87,8 @@
    evas_object_resize(wd->cov, w, h);
    evas_object_size_hint_min_set(wd->offset, x2 - x, y2 - y);
    evas_object_size_hint_min_set(wd->size, w2, h2);
+   edje_object_part_swallow(wd->cov, "elm.swallow.offset", wd->offset);
+   edje_object_part_swallow(wd->cov, "elm.swallow.size", wd->size);
 }
 
 static void

Log:
  photocam -> allow zoom as a double and allow all values > 0.0 for zoom for
  variable zoom levels.
  
  
Author:       raster
Date:         2009-10-13 20:23:03 -0700 (Tue, 13 Oct 2009)
New Revision: 43066

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 03:03:07 UTC (rev 43065)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 03:23:03 UTC (rev 43066)
@@ -1,17 +1,6 @@
 #include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 static void
-my_bt_zoom_in(void *data, Evas_Object *obj, void *event_info)
-{
-   int zoom;
-   
-   zoom = elm_photocam_zoom_get(data);
-   zoom /= 2;
-   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
-   if (zoom >= 1) elm_photocam_zoom_set(data, zoom);
-}
-
-static void
 sel_done(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *ph, *iw;
@@ -58,14 +47,25 @@
 }
 
 static void
+my_bt_zoom_in(void *data, Evas_Object *obj, void *event_info)
+{
+   double zoom;
+   
+   zoom = elm_photocam_zoom_get(data);
+   zoom -= 0.5;
+   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
+   if (zoom >= (1.0 / 32.0)) elm_photocam_zoom_set(data, zoom);
+}
+
+static void
 my_bt_zoom_out(void *data, Evas_Object *obj, void *event_info)
 {
-   int zoom;
+   double zoom;
    
    zoom = elm_photocam_zoom_get(data);
-   zoom *= 2;
+   zoom += 0.5;
    elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
-   if (zoom <= 256) elm_photocam_zoom_set(data, zoom);
+   if (zoom <= 256.0) elm_photocam_zoom_set(data, zoom);
 }
 
 static void

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 03:03:07 UTC (rev 43065)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 03:23:03 UTC (rev 43066)
@@ -938,8 +938,8 @@
    EAPI Evas_Object *elm_photocam_add(Evas_Object *parent);
    EAPI int          elm_photocam_file_set(Evas_Object *obj, const char *file);
    EAPI const char * elm_photocam_file_get(Evas_Object *obj);
-   EAPI void         elm_photocam_zoom_set(Evas_Object *obj, int zoom);
-   EAPI int          elm_photocam_zoom_get(Evas_Object *obj);
+   EAPI void         elm_photocam_zoom_set(Evas_Object *obj, double zoom);
+   EAPI double       elm_photocam_zoom_get(Evas_Object *obj);
    EAPI void         elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
    EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(Evas_Object *obj);
    EAPI void         elm_photocam_image_size_get(Evas_Object *obj, int *w, int *h);

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 03:03:07 UTC (rev 43065)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 03:23:03 UTC (rev 43066)
@@ -84,7 +84,7 @@
    Pan *pan;
    Evas_Coord pan_x, pan_y, minw, minh;
 
-   int zoom;
+   double zoom;
    Elm_Photocam_Zoom_Mode mode;
    const char *file;
    
@@ -130,6 +130,18 @@
 static Grid *grid_create(Evas_Object *obj);
 static void grid_load(Evas_Object *obj, Grid *g);
 
+static int
+nearest_pow2(int num)
+{
+   unsigned int n = num - 1;
+   n |= n >> 1;
+   n |= n >> 2;
+   n |= n >> 4;
+   n |= n >> 8;
+   n |= n >> 16;
+   return n + 1;
+}
+
 static void
 img_place(Evas_Object *obj, Evas_Coord px, Evas_Coord py, Evas_Coord ox, Evas_Coord oy, Evas_Coord ow, Evas_Coord oh)
 {
@@ -246,6 +258,14 @@
      }
 }
 
+static int
+grid_zoom_calc(double zoom)
+{
+   int z = zoom;
+   if (z < 1) z = 1;
+   return nearest_pow2(z);
+}
+
 static Grid *
 grid_create(Evas_Object *obj)
 {
@@ -255,7 +275,7 @@
    
    g = calloc(1, sizeof(Grid));
    
-   g->zoom = wd->zoom;
+   g->zoom = grid_zoom_calc(wd->zoom);
    g->tsize = wd->tsize;
    g->iw = wd->size.imw;
    g->ih = wd->size.imh;
@@ -298,8 +318,9 @@
              g->grid[tn].wd = wd;
              g->grid[tn].img = 
                evas_object_image_add(evas_object_evas_get(obj));
+             evas_object_image_scale_hint_set
+               (g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
              evas_object_pass_events_set(g->grid[tn].img, 1);
-             evas_object_image_scale_hint_set(g->grid[tn].img, EVAS_IMAGE_SCALE_HINT_STATIC);
              evas_object_smart_member_add(g->grid[tn].img, 
                                           wd->pan_smart);
              elm_widget_sub_object_add(obj, g->grid[tn].img);
@@ -476,7 +497,7 @@
         if (wd->nosmooth == 1) _smooth_update(data);
      }
    if (wd->scr_timer) ecore_timer_del(wd->scr_timer);
-   wd->scr_timer = ecore_timer_add(0.25, _scr_timeout, data);
+   wd->scr_timer = ecore_timer_add(0.5, _scr_timeout, data);
 }
 
 static void
@@ -682,8 +703,9 @@
         wd->resized = 0;
         if (wd->mode != ELM_PHOTOCAM_ZOOM_MODE_MANUAL)
           {
-             wd->zoom++;
-             elm_photocam_zoom_set(wd->obj, wd->zoom - 1);
+             double tz = wd->zoom;
+             wd->zoom = 0.0;
+             elm_photocam_zoom_set(wd->obj, tz);
           }
      }
    if ((minw != wd->minw) || (minh != wd->minh))
@@ -894,6 +916,7 @@
    wd->tsize = 512;
    
    wd->img = evas_object_image_add(e);
+   evas_object_image_scale_hint_set(wd->img, EVAS_IMAGE_SCALE_HINT_DYNAMIC);
    evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_DOWN,
                                   _mouse_down, obj);
    evas_object_event_callback_add(wd->img, EVAS_CALLBACK_MOUSE_UP,
@@ -973,8 +996,11 @@
                                 "elm,state,busy,start", "elm");
         evas_object_smart_callback_call(obj, "load,detail", NULL);
      }
-   wd->zoom++;
-   elm_photocam_zoom_set(obj, wd->zoom - 1);
+     {
+        double tz = wd->zoom;
+        wd->zoom = 0.0;
+        elm_photocam_zoom_set(wd->obj, tz);
+     }
    return evas_object_image_load_error_get(wd->img);
 }
 
@@ -998,8 +1024,8 @@
  * This sets the zoom level. 1 will be 1:1 pixel for pixel. 2 will be 2:1
  * (that is 2x2 photo pixels will display as 1 on-screen pixel). 4:1 will be
  * 4x4 photo pixels as 1 screen pixel, and so on. The @p zoom parameter must
- * be a power of 2 (1, 2, 4, 8, 16, 32, 64 etc.) to work correctly, and be
- * greater than 0. Other values will have undefined behavior.
+ * be greater than 0. It is usggested to stick to powers of 2. (1, 2, 4, 8,
+ * 16, 32, etc.). 
  *
  * @param obj The photocam object
  * @param zoom The zoom level to set
@@ -1007,7 +1033,7 @@
  * @ingroup Photocam
  */
 EAPI void
-elm_photocam_zoom_set(Evas_Object *obj, int zoom)
+elm_photocam_zoom_set(Evas_Object *obj, double zoom)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    Eina_List *l;
@@ -1017,7 +1043,7 @@
    int zoom_changed = 0, started = 0;
    Ecore_Animator *an;
    
-   if (zoom < 1) zoom = 1;
+   if (zoom <= (1.0 / 256.0)) zoom = (1.0 / 256.0);
    if (zoom == wd->zoom) return;
    wd->zoom = zoom;
    wd->size.ow = wd->size.w;
@@ -1028,8 +1054,8 @@
 
    if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_MANUAL)
      {
-        wd->size.nw = wd->size.imw / wd->zoom;
-        wd->size.nh = wd->size.imh / wd->zoom;
+        wd->size.nw = (double)wd->size.imw / wd->zoom;
+        wd->size.nh = (double)wd->size.imh / wd->zoom;
      }
    else if (wd->mode == ELM_PHOTOCAM_ZOOM_MODE_AUTO_FIT)
      {
@@ -1110,27 +1136,38 @@
      }
    EINA_LIST_FOREACH(wd->grids, l, g)
      {
-        if (g->zoom == wd->zoom)
+        if (g->zoom == grid_zoom_calc(wd->zoom))
           {
-             g_zoom = g;
-             g->dead = 0;
+             wd->grids = eina_list_remove(wd->grids, g);
+             wd->grids = eina_list_prepend(wd->grids, g);
+             _grid_raise(g);
+             goto done;
           }
-        else
-          g->dead = 1;
      }
-   if (g_zoom)
-     {
-        g = g_zoom;
-        wd->grids = eina_list_remove(wd->grids, g);
-        wd->grids = eina_list_prepend(wd->grids, g);
-        _grid_raise(g);
-        goto done;
-     }
    g = grid_create(obj);
    if (g)
      {
+        if (eina_list_count(wd->grids) > 1)
+          {
+             g_zoom = eina_list_last(wd->grids)->data;
+             wd->grids = eina_list_remove(wd->grids, g_zoom);
+             grid_clear(obj, g_zoom);
+             free(g_zoom);
+             EINA_LIST_FOREACH(wd->grids, l, g_zoom)
+               {
+                  g_zoom->dead = 1;
+               }
+          }
         wd->grids = eina_list_prepend(wd->grids, g);
      }
+   else
+     {
+        EINA_LIST_FREE(wd->grids, g)
+          {
+             grid_clear(obj, g);
+             free(g);
+          }
+     }
    done:
    if (!wd->zoom_animator)
      {
@@ -1184,7 +1221,7 @@
  *
  * @ingroup Photocam
  */
-EAPI int
+EAPI double
 elm_photocam_zoom_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1215,8 +1252,11 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (wd->mode == mode) return;
    wd->mode = mode;
-   wd->zoom++;
-   elm_photocam_zoom_set(obj, wd->zoom - 1);
+     {
+        double tz = wd->zoom;
+        wd->zoom = 0.0;
+        elm_photocam_zoom_set(wd->obj, tz);
+     }
 }
 
 /**

Log:
  1. add signal emits for scrolling in photocam
  2. standardise all callback names to be x,y,z etc. if they have multiple words.
  3. add cal to get the region viewed
  4. test photocams signals and new call
  
  
Author:       raster
Date:         2009-10-14 01:41:36 -0700 (Wed, 14 Oct 2009)
New Revision: 43069

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_bubble.c trunk/TMP/st/elementary/src/lib/elm_icon.c trunk/TMP/st/elementary/src/lib/elm_image.c trunk/TMP/st/elementary/src/lib/elm_photo.c trunk/TMP/st/elementary/src/lib/elm_photocam.c trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_win.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -1,6 +1,121 @@
 #include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
+
 static void
+my_ph_clicked(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("clicked\n");
+}
+
+static void
+my_ph_press(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("press\n");
+}
+
+static void
+my_ph_longpressed(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("longpressed\n");
+}
+
+static void
+my_ph_clicked_double(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("clicked,double\n");
+}
+
+static void
+my_ph_load(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("load\n");
+}
+
+static void
+my_ph_loaded(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("loaded\n");
+}
+
+static void
+my_ph_load_details(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("load,details\n");
+}
+
+static void
+my_ph_loaded_details(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("loaded,details\n");
+}
+
+static void
+my_ph_zoom_start(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("zoom,start\n");
+}
+
+static void
+my_ph_zoom_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("zoom,stop\n");
+}
+
+static void
+my_ph_zoom_change(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("zoom,change\n");
+}
+
+static void
+my_ph_anim_start(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("anim,start\n");
+}
+
+static void
+my_ph_anim_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("anim,stop\n");
+}
+
+static void
+my_ph_drag_start(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("drag,start\n");
+}
+
+static void
+my_ph_drag_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   printf("drag_stop\n");
+}
+
+static void
+my_ph_scroll(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   int x, y, w, h;
+   elm_photocam_region_get(obj, &x, &y, &w, &h);
+   printf("scroll %i %i %ix%i\n", x, y, w, h);
+}
+
+static void
 sel_done(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *ph, *iw;
@@ -115,6 +230,23 @@
    elm_win_resize_object_add(win, ph);
    evas_object_data_set(ph, "window", win);
    
+   evas_object_smart_callback_add(ph, "clicked", my_ph_clicked, win);
+   evas_object_smart_callback_add(ph, "press", my_ph_press, win);
+   evas_object_smart_callback_add(ph, "longpressed", my_ph_longpressed, win);
+   evas_object_smart_callback_add(ph, "clicked,double", my_ph_clicked_double, win);
+   evas_object_smart_callback_add(ph, "load", my_ph_load, win);
+   evas_object_smart_callback_add(ph, "loaded", my_ph_loaded, win);
+   evas_object_smart_callback_add(ph, "load,details", my_ph_load_details, win);
+   evas_object_smart_callback_add(ph, "loaded,details", my_ph_loaded_details, win);
+   evas_object_smart_callback_add(ph, "zoom,start", my_ph_zoom_start, win);
+   evas_object_smart_callback_add(ph, "zoom,stop", my_ph_zoom_stop, win);
+   evas_object_smart_callback_add(ph, "zoom,change", my_ph_zoom_change, win);
+   evas_object_smart_callback_add(ph, "scroll,anim,start", my_ph_anim_start, win);
+   evas_object_smart_callback_add(ph, "scroll,anim,stop", my_ph_anim_stop, win);
+   evas_object_smart_callback_add(ph, "scroll,drag,start", my_ph_drag_start, win);
+   evas_object_smart_callback_add(ph, "scroll,drag,stop", my_ph_drag_stop, win);
+   evas_object_smart_callback_add(ph, "scroll", my_ph_scroll, win);
+   
    elm_photocam_file_set(ph, img[1]);
    
    evas_object_show(ph);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 08:41:36 UTC (rev 43069)
@@ -943,6 +943,7 @@
    EAPI void         elm_photocam_zoom_mode_set(Evas_Object *obj, Elm_Photocam_Zoom_Mode mode);
    EAPI Elm_Photocam_Zoom_Mode elm_photocam_zoom_mode_get(Evas_Object *obj);
    EAPI void         elm_photocam_image_size_get(Evas_Object *obj, int *w, int *h);
+   EAPI void         elm_photocam_region_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
    EAPI void         elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h);
    EAPI void         elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
    /* smart callbacks called:

Modified: trunk/TMP/st/elementary/src/lib/elm_bubble.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_bubble.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_bubble.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -6,7 +6,6 @@
  *
  * The Bubble is an widget used to show a text in a frame as speach is
  * represented in comics.
- *
  */
 
 typedef struct _Widget_Data Widget_Data;

Modified: trunk/TMP/st/elementary/src/lib/elm_icon.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_icon.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_icon.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -8,6 +8,10 @@
  * arrows etc.) or a custom file (PNG, JPG, EDJE etc.) used for an
  * icon. The Icon may scale or not and of course... support alpha
  * channels.
+ * 
+ * Signals that you can add callbacks for are:
+ * 
+ * clicked - This is called when a user has clicked the icon
  */
 
 typedef struct _Widget_Data Widget_Data;

Modified: trunk/TMP/st/elementary/src/lib/elm_image.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_image.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_image.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -11,6 +11,11 @@
  * arrows etc.) or a custom file (PNG, JPG, EDJE etc.) used for an
  * icon. The Icon may scale or not and of course... support alpha
  * channels.
+ * 
+ * Signals that you can add callbacks for are:
+ *
+ * clicked - This is called when a user has clicked the image
+ * 
  */
 
 typedef struct _Widget_Data Widget_Data;

Modified: trunk/TMP/st/elementary/src/lib/elm_photo.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photo.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_photo.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -6,6 +6,11 @@
  *
  * For displaying the photo of a person (contact). Simple yet
  * with a very specific purpose. 
+ * 
+ * Signals that you can add callbacks for are:
+ *
+ * clicked - This is called when a user has clicked the photo
+ *
  */
 
 typedef struct _Widget_Data Widget_Data;

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -38,6 +38,16 @@
  * 
  * zoom,change - Zoom changed when using an auto zoom mode.
  * 
+ * scroll - the content has been scrolled (moved)
+ *
+ * scroll,anim,start - scrolling animation has started
+ *
+ * scroll,anim,stop - scrolling animation has stopped
+ *
+ * scroll,drag,start - dragging the contents around has started
+ *
+ * scroll,drag,stop - dragging the contents around has stopped
+ * 
  * ---
  * 
  * TODO (maybe - optional future stuff):
@@ -843,6 +853,36 @@
    elm_smart_scroller_freeze_set(wd->scr, 0);
 }
 
+static void
+_scr_anim_start(void *data, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll,anim,start", NULL);
+}
+
+static void
+_scr_anim_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll,anim,stop", NULL);
+}
+
+static void
+_scr_drag_start(void *data, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll,drag,start", NULL);
+}
+
+static void
+_scr_drag_stop(void *data, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll,drag,stop", NULL);
+}
+
+static void
+_scr_scroll(void *data, Evas_Object *obj, void *event_info)
+{
+   evas_object_smart_callback_call(data, "scroll", NULL);
+}
+
 /**
  * Add a new Photocam object
  *
@@ -876,6 +916,12 @@
    evas_object_smart_callback_add(wd->scr, "drag", _scr, obj);
    elm_widget_resize_object_set(obj, wd->scr);
 
+   evas_object_smart_callback_add(wd->scr, "animate,start", _scr_anim_start, obj);
+   evas_object_smart_callback_add(wd->scr, "animate,stop", _scr_anim_stop, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,start", _scr_drag_start, obj);
+   evas_object_smart_callback_add(wd->scr, "drag,stop", _scr_drag_stop, obj);
+   evas_object_smart_callback_add(wd->scr, "scroll", _scr_scroll, obj);
+   
    elm_smart_scroller_bounce_allow_set(wd->scr, 1, 1);
 
    wd->obj = obj;
@@ -1298,6 +1344,54 @@
 }
 
 /**
+ * Get the current area of the image that is currently shown
+ * 
+ * This gets the region 
+ * 
+ */
+EAPI void
+elm_photocam_region_get(Evas_Object *obj, int *x, int *y, int *w, int *h)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord sx, sy, sw, sh;
+   int iw, ih;
+
+   elm_smart_scroller_child_pos_get(wd->scr, &sx, &sy);
+   elm_smart_scroller_child_viewport_size_get(wd->scr, &sw, &sh);
+   if (wd->size.w > 0)
+     {
+        if (x)
+          {
+             *x = (wd->size.imw * sx) / wd->size.w;
+             if (*x > wd->size.imw) *x = wd->size.imw;
+             else if (*x < 0) *x = 0;
+          }
+        if (w)
+          {
+             *w = (wd->size.imw * sw) / wd->size.w;
+             if (*w > wd->size.imw) *w = wd->size.imw;
+             else if (*w < 0) *w = 0;
+          }
+     }
+   if (wd->size.h > 0)
+     {
+        if (y)
+          {
+             *y = (wd->size.imh * sy) / wd->size.h;
+             if (*y > wd->size.imh) *y = wd->size.imh;
+             else if (*y < 0) *y = 0;
+          }
+        if (h)
+          {
+             *h = (wd->size.imh * sh) / wd->size.h;
+             if (*h > wd->size.imh) *h = wd->size.imh;
+             else if (*h < 0) *h = 0;
+          }
+     }
+   wd->size.w;
+}
+
+/**
  * Set the viewed portion of the image
  *
  * This sets the region of the image to be viewed

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -12,23 +12,23 @@
  * 
  * Signals that you can add callbacks for are:
  * 
- * edge_left - the left edge of the content has been reached
+ * edge,left - the left edge of the content has been reached
  * 
- * edge_right - the right edge of the content has been reached
+ * edge,right - the right edge of the content has been reached
  * 
- * edge_top - the top edge of the content has been reached
+ * edge,top - the top edge of the content has been reached
  * 
- * edge_bottom - the bottom edge of the content has been reached
+ * edge,bottom - the bottom edge of the content has been reached
  * 
  * scroll - the content has been scrolled (moved)
  * 
- * scroll_anim_start - scrolling animation has started
+ * scroll,anim,start - scrolling animation has started
  * 
- * scroll_anim_stop - scrolling animation has stopped
+ * scroll,anim,stop - scrolling animation has stopped
  * 
- * scroll_drag_start - dragging the contents around has started
+ * scroll,drag,start - dragging the contents around has started
  * 
- * scroll_drag_stop - dragging the contents around has stopped
+ * scroll,drag,stop - dragging the contents around has stopped
  */
 typedef struct _Widget_Data Widget_Data;
 
@@ -171,25 +171,25 @@
 static void
 _edge_left(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "edge_left", NULL);
+   evas_object_smart_callback_call(data, "edge,left", NULL);
 }
 
 static void
 _edge_right(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "edge_right", NULL);
+   evas_object_smart_callback_call(data, "edge,right", NULL);
 }
 
 static void
 _edge_top(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "edge_top", NULL);
+   evas_object_smart_callback_call(data, "edge,top", NULL);
 }
 
 static void
 _edge_bottom(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "edge_bottom", NULL);
+   evas_object_smart_callback_call(data, "edge,bottom", NULL);
 }
 
 static void
@@ -201,25 +201,25 @@
 static void
 _scroll_anim_start(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "scroll_anim_start", NULL);
+   evas_object_smart_callback_call(data, "scroll,anim,start", NULL);
 }
 
 static void
 _scroll_anim_stop(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "scroll_anim_stop", NULL);
+   evas_object_smart_callback_call(data, "scroll,anim,stop", NULL);
 }
 
 static void
 _scroll_drag_start(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "scroll_drag_start", NULL);
+   evas_object_smart_callback_call(data, "scroll,drag,start", NULL);
 }
 
 static void
 _scroll_drag_stop(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
-   evas_object_smart_callback_call(data, "scroll_drag_stop", NULL);
+   evas_object_smart_callback_call(data, "scroll,drag,stop", NULL);
 }
 
 /**

Modified: trunk/TMP/st/elementary/src/lib/elm_win.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_win.c	2009-10-14 04:03:22 UTC (rev 43068)
+++ trunk/TMP/st/elementary/src/lib/elm_win.c	2009-10-14 08:41:36 UTC (rev 43069)
@@ -55,7 +55,8 @@
    if(strcmp(elm_widget_type_get(obj), "win")) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
-   evas_object_smart_callback_call(win->win_obj, "focus-in", NULL);
+   evas_object_smart_callback_call(win->win_obj, "focus-in", NULL); // FIXME: remove me
+   evas_object_smart_callback_call(win->win_obj, "focus,in", NULL);
 }
 
 static void
@@ -66,7 +67,8 @@
    if(strcmp(elm_widget_type_get(obj), "win")) return;
    win = elm_widget_data_get(obj);
    if (!win) return;
-   evas_object_smart_callback_call(win->win_obj, "focus-out", NULL);
+   evas_object_smart_callback_call(win->win_obj, "focus-out", NULL); // FIXME: remove me
+   evas_object_smart_callback_call(win->win_obj, "focus,out", NULL);
 }
 
 static void
@@ -127,7 +129,8 @@
    if (!win) return;
    int autodel = win->autodel;
    win->autodel_clear = &autodel;
-   evas_object_smart_callback_call(win->win_obj, "delete-request", NULL);
+   evas_object_smart_callback_call(win->win_obj, "delete-request", NULL); // FIXME: remove me
+   evas_object_smart_callback_call(win->win_obj, "delete,request", NULL);
    // FIXME: if above callback deletes - then the below will be invalid
    if (autodel) evas_object_del(win->win_obj);
    else win->autodel_clear = NULL;

Log:
  add paused state to photocam to allow for instance changes of zoom level when
  desired.
  
  
Author:       raster
Date:         2009-10-14 07:03:42 -0700 (Wed, 14 Oct 2009)
New Revision: 43072

Modified:
  trunk/TMP/st/elementary/src/bin/test_photocam.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/test_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 09:22:20 UTC (rev 43071)
+++ trunk/TMP/st/elementary/src/bin/test_photocam.c	2009-10-14 14:03:42 UTC (rev 43072)
@@ -184,9 +184,9 @@
 }
 
 static void
-my_bt_zoom_man(void *data, Evas_Object *obj, void *event_info)
+my_bt_pause(void *data, Evas_Object *obj, void *event_info)
 {
-   elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
+   elm_photocam_paused_set(data, !elm_photocam_paused_get(data));
 }
 
 static void
@@ -298,8 +298,8 @@
    
    
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Manual");
-   evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_man, ph);
+   elm_button_label_set(bt, "Pause On/Off");
+   evas_object_smart_callback_add(bt, "clicked", my_bt_pause, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.9);
    elm_table_pack(tb2, bt, 0, 2, 1, 1);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 09:22:20 UTC (rev 43071)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-10-14 14:03:42 UTC (rev 43072)
@@ -946,6 +946,8 @@
    EAPI void         elm_photocam_region_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
    EAPI void         elm_photocam_image_region_show(Evas_Object *obj, int x, int y, int w, int h);
    EAPI void         elm_photocam_image_region_bring_in(Evas_Object *obj, int x, int y, int w, int h);
+   EAPI void         elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused);
+   EAPI Eina_Bool    elm_photocam_paused_get(Evas_Object *obj);
    /* smart callbacks called:
     * "clicked" - when image clicked
     * "press" - when mouse/finger held down initially on image
@@ -969,78 +971,4 @@
 }
 #endif
 
-  ////////////////////////////////////////////////////////////////////////////
- /// FIXME: TODO LIST ///////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-//
-//// (bugs - high priority)
-// * left/right arrow broken with password mode for entry + utf8 chars...
-// * bubble doesnt handle child size changes right
-// * table doesnt do homogenous properly
-//
-//// (incomplete - medium priority)
-// * need to add support for disabled in all widgets. Button, toolbar, hoversel, radio, check, toggle, spinner and entry are currently done.
-// * on the fly theme changes - test (should work)
-// * hoversel only vertical right now - make horizontal
-// * when entries are in a scroller and change size, the scroller shows scrollbars. fix. same for selecting. for 1 line entries in a scroller should only have scroll arrow indicators.
-//
-//// (more widgets/features - medium priority)
-// * carousel selector widget
-// * auto-size label/text that adapts text size to its allocated region
-// * [ scrollable dropdown combo box ]
-// * [ toggle with 2x labelled button for 2 states ]
-// * [ poker spinner with numbers + labels ]
-// * [ wrapping text button bar ]
-// * slide-open "panel" that can hold stuff and optionally scroll
-// * calendar widget (select date)
-// * range selector (select range of values from X to Y over an interval)
-// * "dialogbutton" widget (bigger button for bottom of wins)
-// * dialog window widget
-// * phone-number widget (hilight country dial prefixes, add flags, photos of contacts that match etc.)
-// * dialpad widget - need one with a phone dialpad
-// * file selector widget - needs look and functionality improvement :)
-// * generic "tacho" widget (set min/max labels - and up to 3 intermediate labels etc.)
-// * status widget (busy, stalled, running, etc.)
-// * full window in window widget (so move/resize of window object does as you'd expect a child window to do within the canvas)
-// * window frame widget for borderless windows that want the app to do its own frame (move, resize as well etc.)
-//
-//// (improvements - low priority)
-// * test for all bubble styles
-// * test for all frame styles
-// * test for all genlist item styles
-// * test for all button styles
-// * test for all hoversel styles
-// * test for all inwin styles
-// * test for all anchorblock styles
-// * test for all anchorview styles
-// * test more layout in layout
-// * test normal evas (and edje) objects used as children in elm widgets
-// * need a way to attach a "dnd detector" to any object
-// * need a dnd handler (able to hook to dnd detector)
-// * need another sample theme
-// * need a way to set a preferred size of a widget (but not min or max).
-// * merge with gurana
-// * use evas's new box instead of a box smart
-// * use evas's table instead of a table smart
-// * use stack for win widget
-// * determine prefix of app dynamically and export calls to get prefix info
-// * load config from file - currently being done
-// * load config from x property
-// * handle finger size property and on-the-fly changes like scaling does
-// * somehow a pdf(ps) viewer widget that doesnt make it gpl (lgpl)
-// * emotion widget
-// * ewebkit widget
-// * flash (gnash) widget
-// * menu bar + menu widget
-// * need url and path entry modes for vkbd
-// * return list of toplevel window objects
-// * focus should have an object that is layered above all others (definable layer) that moves + resizes (slides about - animated) from one focused widget to the next for focus. also emit focus/unfocus signals too
-// * scroller could do with page up/down/left/right buttons and and idea of a page size
-// * current sizing tree inefficient
-// * need a way to filter entry data for entry (eg for phone numbers)
-// * win should emit signals based on vkbd type - if it gets a message and is a vkbd win
-// * win needs a way of setting aspect too
-// * use the wrong call on the wrong widget and *BOOM* ... crashland
-//
-//////////////////////////////////////////////////////////////////////////////
 #endif

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 09:22:20 UTC (rev 43071)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2009-10-14 14:03:42 UTC (rev 43072)
@@ -122,6 +122,7 @@
    Eina_Bool resized : 1;
    Eina_Bool longpressed : 1;
    Eina_Bool on_hold : 1;
+   Eina_Bool paused : 1;
 };
 
 struct _Pan
@@ -538,24 +539,11 @@
 }
 
 static int
-_zoom_anim(void *data)
+zoom_do(Evas_Object *obj, double t)
 {
-   Evas_Object *obj = data;
    Widget_Data *wd = elm_widget_data_get(obj);
-   double t;
    Evas_Coord xx, yy, ow, oh;
    
-   t = ecore_loop_time_get();
-   if (t >= wd->t_end)
-     {
-        t = 1.0;
-     }
-   else if (wd->t_end > wd->t_start)
-     t = (t - wd->t_start) / (wd->t_end - wd->t_start);
-   else
-     t = 1.0;
-   t = 1.0 - t;
-   t = 1.0 - (t * t);
    wd->size.w = (wd->size.ow * (1.0 - t)) + (wd->size.nw * t);
    wd->size.h = (wd->size.oh * (1.0 - t)) + (wd->size.nh * t);
    elm_smart_scroller_child_viewport_size_get(wd->scr, &ow, &oh);
@@ -578,17 +566,42 @@
              if (g->dead)
                {
                   wd->grids = eina_list_remove_list(wd->grids, l);
-                  grid_clear(data, g);
+                  grid_clear(obj, g);
                   free(g);
                }
           }
+        return 0;
+     }
+   return 1;
+}
+
+
+static int
+_zoom_anim(void *data)
+{
+   Evas_Object *obj = data;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   double t;
+   int go;
+   
+   t = ecore_loop_time_get();
+   if (t >= wd->t_end)
+     t = 1.0;
+   else if (wd->t_end > wd->t_start)
+     t = (t - wd->t_start) / (wd->t_end - wd->t_start);
+   else
+     t = 1.0;
+   t = 1.0 - t;
+   t = 1.0 - (t * t);
+   go = zoom_do(obj, t);
+   if (!go)
+     {
         wd->nosmooth--;
         if (wd->nosmooth == 0) _smooth_update(data);
         wd->zoom_animator = NULL;
-        evas_object_smart_callback_call(data, "zoom,stop", NULL);
-        return 0;
+        evas_object_smart_callback_call(obj, "zoom,stop", NULL);
      }
-   return 1;
+   return go;
 }
 
 static void
@@ -1210,13 +1223,6 @@
           }
      }
    done:
-   if (!wd->zoom_animator)
-     {
-        wd->zoom_animator = ecore_animator_add(_zoom_anim, obj);
-        wd->nosmooth++;
-        if (wd->nosmooth == 1) _smooth_update(obj);
-        started = 1;
-     }
    wd->t_start = ecore_loop_time_get();
    wd->t_end = wd->t_start + _elm_config->zoom_friction;
    if ((wd->size.w > 0) && (wd->size.h > 0))
@@ -1233,18 +1239,38 @@
    if (rh > wd->size.h) wd->size.spos.y = 0.5;
    if (wd->size.spos.x > 1.0) wd->size.spos.x = 1.0;
    if (wd->size.spos.y > 1.0) wd->size.spos.y = 1.0;
+   if (wd->paused)
+     {
+        zoom_do(obj, 1.0);
+     }
+   else
+     {
+        if (!wd->zoom_animator)
+          {
+             wd->zoom_animator = ecore_animator_add(_zoom_anim, obj);
+             wd->nosmooth++;
+             if (wd->nosmooth == 1) _smooth_update(obj);
+             started = 1;
+          }
+     }
    an = wd->zoom_animator;
-   if (!_zoom_anim(obj))
+   if (an)
      {
-        ecore_animator_del(an);
-        an = NULL;
+        if (!_zoom_anim(obj))
+          {
+             ecore_animator_del(an);
+             an = NULL;
+          }
      }
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    wd->calc_job = ecore_job_add(_calc_job, wd);
-   if (started)
-     evas_object_smart_callback_call(obj, "zoom,start", NULL);
-   if (!an)
-     evas_object_smart_callback_call(obj, "zoom,stop", NULL);
+   if (!wd->paused)
+     {
+        if (started)
+          evas_object_smart_callback_call(obj, "zoom,start", NULL);
+        if (!an)
+          evas_object_smart_callback_call(obj, "zoom,stop", NULL);
+     }
    if (zoom_changed)
      evas_object_smart_callback_call(obj, "zoom,change", NULL);
 }
@@ -1417,9 +1443,10 @@
    if (wd->zoom_animator)
      {
         wd->nosmooth--;
-        if (wd->nosmooth == 0) _smooth_update(obj);
         ecore_animator_del(wd->zoom_animator);
         wd->zoom_animator = NULL;
+        zoom_do(obj, 1.0);
+        evas_object_smart_callback_call(obj, "zoom,stop", NULL);
      }
    elm_smart_scroller_child_region_show(wd->scr, rx, ry, rw, rh);
 }
@@ -1458,6 +1485,51 @@
         if (wd->nosmooth == 0) _smooth_update(obj);
         ecore_animator_del(wd->zoom_animator);
         wd->zoom_animator = NULL;
-     }
+        zoom_do(obj, 1.0);
+        evas_object_smart_callback_call(obj, "zoom,stop", NULL);
+    }
    elm_smart_scroller_region_bring_in(wd->scr, rx, ry, rw, rh);
 }
+
+/**
+ * Set the paused state for photocam
+ * 
+ * This sets the paused state to on (1) or off (0) for photocam. The default
+ * is on. This will stop zooming using animation ch change zoom levels and
+ * change instantly. This will stop any existing animations that are running.
+ * 
+ * @param obj The photocam object
+ * @param paused The pause state to set
+ */
+EAPI void
+elm_photocam_paused_set(Evas_Object *obj, Eina_Bool paused)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->paused == !!paused) return;
+   wd->paused = paused;
+   if (wd->paused)
+     {
+        if (wd->zoom_animator)
+          {
+             ecore_animator_del(wd->zoom_animator);
+             wd->zoom_animator = NULL;
+             zoom_do(obj, 1.0);
+             evas_object_smart_callback_call(obj, "zoom,stop", NULL);
+          }
+     }
+}
+
+/**
+ * Get the paused state for photocam
+ * 
+ * This gets the current paused state for the photocam object.
+ * 
+ * @param obj The photocam object
+ * @return The current paused state
+ */
+EAPI Eina_Bool
+elm_photocam_paused_get(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->paused;
+}

Log:
  dont grab focus if widget cant focus.
  
  
Author:       raster
Date:         2009-10-22 05:04:55 -0700 (Thu, 22 Oct 2009)
New Revision: 43197

Modified:
  trunk/TMP/st/elementary/src/bin/test_entry.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_entry.c	2009-10-22 11:08:01 UTC (rev 43196)
+++ trunk/TMP/st/elementary/src/bin/test_entry.c	2009-10-22 12:04:55 UTC (rev 43197)
@@ -93,6 +93,7 @@
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
+   elm_object_focus_allow_set(bt, 0);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
@@ -101,6 +102,7 @@
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
+   elm_object_focus_allow_set(bt, 0);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
@@ -109,6 +111,8 @@
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
+   elm_object_focus_allow_set(bt, 0);
+   printf("selection: %p\n", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
@@ -117,6 +121,7 @@
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
+   elm_object_focus_allow_set(bt, 0);
    evas_object_show(bt);
 
    elm_box_pack_end(bx, bx2);

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-10-22 11:08:01 UTC (rev 43196)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2009-10-22 12:04:55 UTC (rev 43197)
@@ -80,8 +80,19 @@
 _sub_obj_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
    Smart_Data *sd = data;
-
-   elm_widget_focus_steal(sd->obj);
+   Evas_Object *o;
+   const char *s;
+   
+   o = obj;
+   do {
+      s = evas_object_type_get(o);
+      if (!s) return;
+      if (!strcmp(s, "elm_widget")) break;
+      o = evas_object_smart_parent_get(o);
+   } while (o);
+   if (!o) return;
+   if (!elm_widget_can_focus_get(o)) return;
+   elm_widget_focus_steal(o);
 }
 
 /* externally accessible functions */
@@ -616,7 +627,9 @@
 	parent = elm_widget_parent_get(parent);
 	sd = evas_object_smart_data_get(parent);
 	if (elm_widget_focus_get(sd->resize_obj))
-	  elm_widget_focused_object_clear(sd->resize_obj);
+          {
+             elm_widget_focused_object_clear(sd->resize_obj);
+          }
 	else
 	  {
 	     const Eina_List *l;

Log:
  fix some freeze issues with scroller.
  
  
Author:       raster
Date:         2009-11-21 22:25:10 -0800 (Sat, 21 Nov 2009)
New Revision: 43887

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-11-22 01:49:44 UTC (rev 43886)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2009-11-22 06:25:10 UTC (rev 43887)
@@ -894,7 +894,6 @@
 					 NULL/* func data */);
 
    elm_box_pack_end(bx, gl);
-   elm_object_scroll_freeze_push(gl);
    evas_object_show(bx2);
 
    evas_object_smart_callback_add(gl, "drag,start,up", item_drag_up, NULL);

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-11-22 01:49:44 UTC (rev 43886)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2009-11-22 06:25:10 UTC (rev 43887)
@@ -345,6 +345,7 @@
    const Elm_Entry_Context_Menu_Item *it;
 
    if (wd->hoversel) evas_object_del(wd->hoversel);
+   else elm_widget_scroll_freeze_push(data);
    wd->hoversel = elm_hoversel_add(data);
    elm_object_style_set(wd->hoversel, "entry");
    elm_widget_sub_object_add(data, wd->hoversel);
@@ -397,7 +398,6 @@
    if (ev->button != 1) return;
    //   if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
    if (wd->longpress_timer) ecore_timer_del(wd->longpress_timer);
-   elm_widget_scroll_freeze_push(data);
    wd->longpress_timer = ecore_timer_add(1.0, _long_press, data);
    wd->downx = ev->canvas.x;
    wd->downy = ev->canvas.y;
@@ -412,7 +412,6 @@
    if (ev->button != 1) return;
    if (wd->longpress_timer)
      {
-	elm_widget_scroll_freeze_pop(data);
 	ecore_timer_del(wd->longpress_timer);
 	wd->longpress_timer = NULL;
      }
@@ -430,7 +429,6 @@
 	  {
 	     if (wd->longpress_timer)
 	       {
-		  elm_widget_scroll_freeze_pop(data);
 		  ecore_timer_del(wd->longpress_timer);
 		  wd->longpress_timer = NULL;
 	       }
@@ -447,7 +445,6 @@
 		 ((_elm_config->finger_size / 2) *
 		  (_elm_config->finger_size / 2)))
 	       {
-		  elm_widget_scroll_freeze_pop(data);
 		  ecore_timer_del(wd->longpress_timer);
 		  wd->longpress_timer = NULL;
 	       }
@@ -465,7 +462,6 @@
 	    ((_elm_config->finger_size / 2) *
 	     (_elm_config->finger_size / 2)))
 	  {
-	     elm_widget_scroll_freeze_pop(data);
 	     ecore_timer_del(wd->longpress_timer);
 	     wd->longpress_timer = NULL;
 	  }

Log:
  flip widget! first go at it and still primitive. will expand! for flipping
  between 2 bits of content (front and back).
  
  
Author:       raster
Date:         2009-12-11 00:12:58 -0800 (Fri, 11 Dec 2009)
New Revision: 44352

Modified:
  trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_flip.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_layout.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2009-12-11 08:07:55 UTC (rev 44351)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2009-12-11 08:12:58 UTC (rev 44352)
@@ -5,13 +5,36 @@
 my_fl_1(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_ROTATE_Y_CENTER_AXIS);
 }
 
 void
+my_fl_2(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_ROTATE_X_CENTER_AXIS);
+}
+
+void
+my_fl_3(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_ROTATE_XZ_CENTER_AXIS);
+}
+
+void
+my_fl_4(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_ROTATE_YZ_CENTER_AXIS);
+}
+
+void
 test_flip(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt;
-
+   char buf[PATH_MAX];
+   
    win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
    elm_win_title_set(win, "Flip");
    elm_win_autodel_set(win, 1);
@@ -26,28 +49,31 @@
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
    
-#if 0 // working on it
+#if 1 // working on it
    
    fl = elm_flip_add(win);
    evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, fl);
 
-   o = elm_button_add(win);
-   elm_button_label_set(o, "Front");
+   o = elm_bg_add(win);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, "sky_01.jpg");
+   elm_bg_file_set(o, buf, NULL);
    elm_flip_content_front_set(fl, o);
    evas_object_show(o);
    
-   o = elm_button_add(win);
-   elm_button_label_set(o, "Back");
+   o = elm_bg_add(win);
    evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_flip_content_front_set(fl, o);
+   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, "rock_01.jpg");
+   elm_bg_file_set(o, buf, NULL);
+   elm_flip_content_back_set(fl, o);
    evas_object_show(o);
 
    evas_object_show(fl);
 
    bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
    
@@ -61,7 +87,7 @@
    
    bt = elm_button_add(win);
    elm_button_label_set(bt, "2");
-   evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
+   evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
@@ -69,7 +95,7 @@
    
    bt = elm_button_add(win);
    elm_button_label_set(bt, "3");
-   evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
+   evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
@@ -77,7 +103,7 @@
    
    bt = elm_button_add(win);
    elm_button_label_set(bt, "4");
-   evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
+   evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx2, bt);
@@ -87,7 +113,7 @@
    evas_object_show(bx2);
 #endif
 
-   evas_object_resize(win, 300, 300);
+   evas_object_resize(win, 320, 480);
    evas_object_show(win);
 }
 #endif

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-12-11 08:07:55 UTC (rev 44351)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2009-12-11 08:12:58 UTC (rev 44352)
@@ -462,7 +462,7 @@
    EAPI Eina_Bool    elm_layout_file_set(Evas_Object *obj, const char *file, const char *group);
    EAPI void         elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
    EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
-   EAPI void          elm_layout_sizing_eval(const Evas_Object *obj);
+   EAPI void          elm_layout_sizing_eval(Evas_Object *obj);
        /* smart callbacks called:
     */
 
@@ -851,6 +851,7 @@
    EAPI void              elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
    EAPI void              elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
    EAPI void              elm_genlist_compress_mode_set(Evas_Object *obj, Eina_Bool compress);
+   EAPI void              elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
    /* available item styles:
     * default
     * default_style - The text part is a textblock
@@ -1122,7 +1123,7 @@
    EAPI void         elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
    EAPI void         elm_panel_content_set(Evas_Object *obj, Evas_Object *content);
 
-#if 0 // working on it
+#if 1 // working on it
    // flip types:
    //  rotate around y axis 180 degrees
    //  rotate around x axis 180 degrees
@@ -1143,8 +1144,10 @@
    //  light x, y, z
    typedef enum _Elm_Flip_Mode
      {
-        ELM_FLIP_ROTATE_Y CENTER_AXIS,
-          ELM_FLIP_ROTATE_X_CENTER_AXIS
+        ELM_FLIP_ROTATE_Y_CENTER_AXIS,
+          ELM_FLIP_ROTATE_X_CENTER_AXIS,
+          ELM_FLIP_ROTATE_XZ_CENTER_AXIS,
+          ELM_FLIP_ROTATE_YZ_CENTER_AXIS
      } Elm_Flip_Mode;
    
    EAPI Evas_Object *elm_flip_add(Evas_Object *parent);

Modified: trunk/TMP/st/elementary/src/lib/elm_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flip.c	2009-12-11 08:07:55 UTC (rev 44351)
+++ trunk/TMP/st/elementary/src/lib/elm_flip.c	2009-12-11 08:12:58 UTC (rev 44352)
@@ -1,9 +1,8 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-#if 0 // working on it
+#if 1 // working on it
 
-// fixme: on configure of widget smart obj - reconfigure front + back and maps
 /**
  * @defgroup Flip Flip
  *
@@ -15,9 +14,13 @@
 
 struct _Widget_Data
 {
+   Ecore_Animator *animator;
+   double start, len;
+   Elm_Flip_Mode mode;
    struct {
       Evas_Object *content;
    } front, back;
+   Eina_Bool state : 1;
 };
 
 static void _del_hook(Evas_Object *obj);
@@ -30,6 +33,7 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->animator) ecore_animator_del(wd->animator);
    free(wd);
 }
 
@@ -94,6 +98,161 @@
      }
 }
 
+static int
+_flip(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   double t = ecore_loop_time_get() - wd->start;
+   Evas_Coord x, y, w, h;
+   double p, deg;
+   Evas_Map *mf, *mb;
+   Evas_Coord cx, cy, cz, px, py, foc;
+   int lx, ly, lz, lr, lg, lb, lar, lag, lab;
+   if (!wd->animator) return 0;
+   t = t / wd->len;
+   if (t > 1.0) t = 1.0;
+
+   evas_object_geometry_get(obj, &x, &y, &w, &h);
+   
+
+   mf = evas_map_new(4);
+   evas_map_smooth_set(mf, 0);
+   mb = evas_map_new(4);
+   evas_map_smooth_set(mb, 0);
+
+   if (wd->front.content)
+     evas_map_util_points_populate_from_object_full(mf, wd->front.content, 0);
+   if (wd->back.content)
+     evas_map_util_points_populate_from_object_full(mb, wd->back.content, 0);
+   
+   cx = x + (w / 2);
+   cy = y + (h / 2);
+
+   px = x + (w / 2);
+   py = y + (h / 2);
+   foc = 2048;
+   
+   lx = cx;
+   ly = cy;
+   lz = -10000;
+   lr = 255;
+   lg = 255;
+   lb = 255;
+   lar = 0;
+   lag = 0;
+   lab = 0;
+   
+   switch (wd->mode)
+     {
+     case ELM_FLIP_ROTATE_Y_CENTER_AXIS:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        if (wd->state) deg = 180.0 * p;
+        else deg = 180 + (180.0 * p);
+        evas_map_util_3d_rotate(mf, 0.0, deg, 0.0, cx, cy, 0);
+        evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, 0.0, cx, cy, 0);
+        break;
+     case ELM_FLIP_ROTATE_X_CENTER_AXIS:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        if (wd->state) deg = 180.0 * p;
+        else deg = 180 + (180.0 * p);
+        evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, 0);
+        evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, 0.0, cx, cy, 0);
+        break;
+     case ELM_FLIP_ROTATE_XZ_CENTER_AXIS:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        if (wd->state) deg = 180.0 * p;
+        else deg = 180 + (180.0 * p);
+        evas_map_util_3d_rotate(mf, deg, 0.0, deg, cx, cy, 0);
+        evas_map_util_3d_rotate(mb, deg + 180.0, 0.0, deg + 180.0, cx, cy, 0);
+        break;
+     case ELM_FLIP_ROTATE_YZ_CENTER_AXIS:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        if (wd->state) deg = 180.0 * p;
+        else deg = 180 + (180.0 * p);
+        evas_map_util_3d_rotate(mf, 0.0, deg, deg, cx, cy, 0);
+        evas_map_util_3d_rotate(mb, 0.0, deg + 180.0, deg + 180.0, cx, cy, 0);
+        break;
+     default:
+        break;
+     }
+
+   
+   if (wd->front.content)
+     {
+        evas_map_util_3d_lighting(mf, lx, ly, lz, lr, lg, lb, lar, lag, lab);
+        evas_map_util_3d_perspective(mf, px, py, 0, foc);
+        evas_object_map_set(wd->front.content, mf);
+        evas_object_map_enable_set(wd->front.content, 1);
+        if (evas_map_util_clockwise_get(mf)) evas_object_show(wd->front.content);
+        else evas_object_hide(wd->front.content);
+     }
+      
+   if (wd->back.content)
+     {
+        evas_map_util_3d_lighting(mb, lx, ly, lz, lr, lg, lb, lar, lag, lab);
+        evas_map_util_3d_perspective(mb, px, py, 0, foc);
+        evas_object_map_set(wd->back.content, mb);
+        evas_object_map_enable_set(wd->back.content, 1);
+        if (evas_map_util_clockwise_get(mb)) evas_object_show(wd->back.content);
+        else evas_object_hide(wd->back.content);
+     }
+   
+   evas_map_free(mf);
+   evas_map_free(mb);
+   
+   if (t >= 1.0)
+     {
+        evas_object_map_enable_set(wd->front.content, 0);
+        evas_object_map_enable_set(wd->back.content, 0);
+        wd->animator = NULL;
+        wd->state = !wd->state;
+        evas_object_smart_callback_call(obj, "animate,done", NULL);
+        return 0;
+     }
+   return 1;
+}
+
+static void
+_configure(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Coord x, y, w, h;
+   evas_object_geometry_get(obj, &x, &y, &w, &h);
+   if (wd->front.content)
+     {
+        evas_object_move(wd->front.content, x, y);
+        evas_object_resize(wd->front.content, w, h);
+     }
+   if (wd->back.content)
+     {
+        evas_object_move(wd->back.content, x, y);
+        evas_object_resize(wd->back.content, w, h);
+     }
+   _flip(obj);
+}
+
+static void
+_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   _configure(obj);
+}
+
+static void
+_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{    
+   _configure(obj);
+}
+
+static int
+_animate(void *data)
+{
+   return _flip(data);
+}
+
 /**
  * Add a new flip to the parent
  *
@@ -119,7 +278,11 @@
    elm_widget_theme_hook_set(obj, _theme_hook);
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
-
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
+   
+   wd->state = 1;
+     
    _sizing_eval(obj);
    return obj;
 }
@@ -154,6 +317,7 @@
      }
    //XXX use clips
    if (!elm_flip_front_get(obj)) evas_object_hide(wd->front.content);
+   _configure(obj);
 }
 
 /**
@@ -186,6 +350,7 @@
      }
    //XXX use clips
    if (elm_flip_front_get(obj)) evas_object_hide(wd->back.content);
+   _configure(obj);
 }
 
 /**
@@ -200,8 +365,7 @@
 elm_flip_front_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-   //XXX retunr if front is showing or not
-   return 1;
+   return wd->state;
 }
 
 EAPI void
@@ -214,5 +378,9 @@
 elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd->animator) wd->animator = ecore_animator_add(_animate, obj);
+   wd->mode = mode;
+   wd->start = ecore_loop_time_get();
+   wd->len = 0.5;
 }
 #endif

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-12-11 08:07:55 UTC (rev 44351)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2009-12-11 08:12:58 UTC (rev 44352)
@@ -2637,7 +2637,6 @@
 elm_genlist_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-
    wd->always_select = always_select;
 }
 
@@ -2656,12 +2655,11 @@
 elm_genlist_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
-
    wd->no_select = no_select;
 }
 
 /**
- * Set compress mode mode
+ * Set compress mode
  *
  * This will enable the compress mode where items are "compressed" horizontally
  * to fit the genlist scrollable viewport width.
@@ -2677,3 +2675,22 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    wd->compress = compress;
 }
+
+/**
+ * Set bounce mode
+ *
+ * This will enable or disable the scroller bounce mode for the gnelist. See 
+ * elm_scroller_bounce_set() for details
+ *
+ * @param obj The genlist object
+ * @param h_bounce Allow bounce horizontally
+ * @param v_bounce Allow bounce vertically
+ *
+ * @ingroup Genlist
+ */
+EAPI void
+elm_genlist_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
+}

Modified: trunk/TMP/st/elementary/src/lib/elm_layout.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_layout.c	2009-12-11 08:07:55 UTC (rev 44351)
+++ trunk/TMP/st/elementary/src/lib/elm_layout.c	2009-12-11 08:12:58 UTC (rev 44352)
@@ -257,7 +257,7 @@
  * @ingroup Layout
  */
 EAPI void
-elm_layout_sizing_eval(const Evas_Object *obj)
+elm_layout_sizing_eval(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    _request_sizing_eval(obj);

Log:
  patch from <jihoon48.kim@...> - horizontal context menu option.
  
  
Author:       raster
Date:         2010-01-13 19:47:28 -0800 (Wed, 13 Jan 2010)
New Revision: 45105

Modified:
  trunk/TMP/st/elementary/src/bin/test_entry.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elc_hoversel.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_entry.c	2010-01-14 02:45:15 UTC (rev 45104)
+++ trunk/TMP/st/elementary/src/bin/test_entry.c	2010-01-14 03:47:28 UTC (rev 45105)
@@ -196,6 +196,7 @@
    elm_box_pack_end(bx, sc);
 
    en = elm_entry_add(win);
+   elm_entry_context_menu_horizontal_set(en, 1);
    elm_entry_context_menu_item_add(en, "Hello", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_entry_context_menu_item_add(en, "World", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_entry_entry_set(en,

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-14 02:45:15 UTC (rev 45104)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-14 03:47:28 UTC (rev 45105)
@@ -560,6 +560,7 @@
    EAPI void         elm_entry_selection_copy(Evas_Object *obj);
    EAPI void         elm_entry_selection_paste(Evas_Object *obj);
    EAPI void         elm_entry_context_menu_clear(Evas_Object *obj);
+   EAPI void         elm_entry_context_menu_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
    EAPI void         elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data);
    EAPI void         elm_entry_context_menu_disabled_set(Evas_Object *obj, Eina_Bool disabled);
    EAPI Eina_Bool    elm_entry_context_menu_disabled_get(Evas_Object *obj);
@@ -665,6 +666,7 @@
     */
 
    EAPI Evas_Object *elm_hoversel_add(Evas_Object *parent);
+   EAPI void         elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal);
    EAPI void         elm_hoversel_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
    EAPI void         elm_hoversel_label_set(Evas_Object *obj, const char *label);
    EAPI const char  *elm_hoversel_label_get(Evas_Object *obj);

Modified: trunk/TMP/st/elementary/src/lib/elc_hoversel.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_hoversel.c	2010-01-14 02:45:15 UTC (rev 45104)
+++ trunk/TMP/st/elementary/src/lib/elc_hoversel.c	2010-01-14 03:47:28 UTC (rev 45105)
@@ -26,6 +26,7 @@
    Evas_Object *btn, *hover;
    Evas_Object *hover_parent;
    Eina_List *items;
+   Eina_Bool horizontal:1;
 };
 
 struct _Elm_Hoversel_Item
@@ -151,6 +152,7 @@
 
    bx = elm_box_add(wd->hover);
    elm_box_homogenous_set(bx, 1);
+   elm_box_horizontal_set(bx, wd->horizontal);
 
    snprintf(buf, sizeof(buf), "hoversel_vertical_entry/%s",
             elm_widget_style_get(obj));
@@ -185,6 +187,8 @@
 
    evas_object_show(wd->hover);
    evas_object_smart_callback_call(obj, "clicked", NULL);
+
+   if(wd->horizontal)evas_object_hide(wd->btn);
 }
 
 static void
@@ -282,6 +286,13 @@
    elm_button_label_set(wd->btn, label);
 }
 
+EAPI void
+elm_hoversel_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   wd->horizontal = !!horizontal;
+}
+
 /**
  * Get the hoversel button label
  *

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-01-14 02:45:15 UTC (rev 45104)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-01-14 03:47:28 UTC (rev 45105)
@@ -33,6 +33,7 @@
    Eina_Bool deferred_cur : 1;
    Eina_Bool disabled : 1;
    Eina_Bool context_menu : 1;
+   Eina_Bool horizontal : 1;   
 };
 
 struct _Elm_Entry_Context_Menu_Item
@@ -387,6 +388,7 @@
         if (wd->hoversel) evas_object_del(wd->hoversel);
         else elm_widget_scroll_freeze_push(data);
         wd->hoversel = elm_hoversel_add(data);
+        elm_hoversel_horizontal_set(wd->hoversel, wd->horizontal);	
         elm_object_style_set(wd->hoversel, "entry");
         elm_widget_sub_object_add(data, wd->hoversel);
         elm_hoversel_label_set(wd->hoversel, "Text");
@@ -1458,6 +1460,13 @@
 }
 
 EAPI void
+elm_entry_context_menu_horizontal_set(Evas_Object *obj, Eina_Bool horizontal)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   wd->horizontal = !!horizontal;
+}
+
+EAPI void
 elm_entry_context_menu_item_add(Evas_Object *obj, const char *label, const char *icon_file, Elm_Icon_Type icon_type, void (*func) (void *data, Evas_Object *obj, void *event_info), const void *data)
 {
    Widget_Data *wd = elm_widget_data_get(obj);

Log:
  1. fix list theme adapting - simply never got callbac ks to handle iot,
  that's why!
  2. make cmd-line tool to set scale, theme, finger size (more later) - used
  this to test this and fix it.
  3. cmd-line tool... also uses elm - and... as a result... also has a dialog
  sayint its doing something - and... it can get a gui config later too!
  
  
Author:       raster
Date:         2010-01-15 01:32:43 -0800 (Fri, 15 Jan 2010)
New Revision: 45175

Added:
  trunk/TMP/st/elementary/src/bin/config.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_button.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_main.c trunk/TMP/st/elementary/src/lib/elm_theme.c 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2010-01-15 09:32:43 UTC (rev 45175)
@@ -21,7 +21,7 @@
 AM_CPPFLAGS += -DELEMENTARY_BUILD
 endif
 
-bin_PROGRAMS = elementary_test
+bin_PROGRAMS = elementary_test elementary_config
 if BUILD_QUICKLAUNCH
 bin_PROGRAMS += elementary_quicklaunch elementary_run elementary_testql
 endif
@@ -75,6 +75,12 @@
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
 elementary_test_LDFLAGS =
 
+elementary_config_SOURCES = \
+config.c
+
+elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
+elementary_config_LDFLAGS =
+
 if BUILD_QUICKLAUNCH
 elementary_quicklaunch_SOURCES = quicklaunch.c
 elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-15 09:32:43 UTC (rev 45175)
@@ -222,9 +222,11 @@
 
    EAPI double       elm_scale_get(void);
    EAPI void         elm_scale_set(double scale);
+   EAPI void         elm_scale_all_set(double scale);
    EAPI Evas_Coord   elm_finger_size_get(void);
    EAPI void         elm_finger_size_set(Evas_Coord size);
-
+   EAPI void         elm_finger_size_all_set(Evas_Coord size);
+       
    EAPI void         elm_object_focus(Evas_Object *obj);
    EAPI void         elm_object_unfocus(Evas_Object *obj);
    EAPI void         elm_object_focus_allow_set(Evas_Object *obj, Eina_Bool enable);
@@ -242,7 +244,8 @@
    EAPI void         elm_theme_extension_add(const char *item);
    EAPI void         elm_theme_extension_del(const char *item);
    EAPI void         elm_theme_flush(void);
-
+   EAPI void         elm_theme_all_set(const char *theme);
+       
    EAPI Evas_Object *elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type);
    EAPI void         elm_win_resize_object_add(Evas_Object *obj, Evas_Object *subobj);
    EAPI void         elm_win_resize_object_del(Evas_Object *obj, Evas_Object *subobj);

Modified: trunk/TMP/st/elementary/src/lib/elm_button.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_button.c	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/lib/elm_button.c	2010-01-15 09:32:43 UTC (rev 45175)
@@ -163,7 +163,7 @@
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_disable_hook_set(obj, _disable_hook);
-   elm_widget_can_focus_set( obj, 1 );                 
+   elm_widget_can_focus_set(obj, 1 );                 
 
    wd->btn = edje_object_add(e);
    _elm_theme_set(wd->btn, "button", "base", "default");

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-01-15 09:32:43 UTC (rev 45175)
@@ -39,6 +39,7 @@
 };
 
 static void _del_hook(Evas_Object *obj);
+static void _theme_hook(Evas_Object *obj);
 static void _sizing_eval(Evas_Object *obj);
 static void _on_focus_hook(void *data, Evas_Object *obj);
 static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
@@ -192,6 +193,23 @@
 }
 
 static void
+_theme_hook(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_List_Item *it;
+   Eina_List *n;
+   
+   elm_smart_scroller_theme_set(wd->scr, "scroller", "base", elm_widget_style_get(obj));
+   edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+   EINA_LIST_FOREACH(wd->items, n, it)
+     {
+        it->fixed = 0;
+     }
+   _fix_items(obj);
+   _sizing_eval(obj);
+}
+
+static void
 _on_focus_hook(void *data, Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -670,6 +688,7 @@
    elm_widget_on_focus_hook_set(obj, _on_focus_hook, NULL);
    elm_widget_data_set(obj, wd);
    elm_widget_del_hook_set(obj, _del_hook);
+   elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_can_focus_set(obj, 1);
 
    wd->scr = elm_scroller_add(parent);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2010-01-15 09:32:43 UTC (rev 45175)
@@ -1320,6 +1320,27 @@
 }
 
 /**
+ * Set the global scaling factor for all applications on the display
+ * 
+ * This sets the globally configured scaling factor that is applied to all
+ * objects for all applications.
+ * @param scale The scaling factor to set
+ * @ingroup Scaling
+ */
+EAPI void
+elm_scale_all_set(double scale)
+{
+#ifdef HAVE_ELEMENTARY_X
+   static Ecore_X_Atom atom = 0;
+   int scale_i = (int)(scale * 1000.0);
+
+   if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_SCALE");
+   ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
+                                  atom, &scale_i, 1);
+#endif   
+}
+
+/**
  * @defgroup Fingers Fingers
  *
  * Elementary is designed to be finger-friendly for touchscreens, and so in
@@ -1358,6 +1379,28 @@
 }
 
 /**
+ * Set the configured finger size for all applications on the display
+ *
+ * This sets the globally configured finger size in pixels for all applications
+ * on the display
+ *
+ * @param size The finger size
+ * @ingroup Fingers
+ */
+EAPI void
+elm_finger_size_all_set(Evas_Coord size)
+{
+#ifdef HAVE_ELEMENTARY_X
+   static Ecore_X_Atom atom = 0;
+   int size_i = (int)size;
+
+   if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_FINGER_SIZE");
+   ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
+                                  atom, &size_i, 1);
+#endif   
+}
+
+/**
  * Adjust size of an element for finger usage
  *
  * This takes width and height sizes (in pixels) as input and a size multiple

Modified: trunk/TMP/st/elementary/src/lib/elm_theme.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_theme.c	2010-01-15 08:20:30 UTC (rev 45174)
+++ trunk/TMP/st/elementary/src/lib/elm_theme.c	2010-01-15 09:32:43 UTC (rev 45175)
@@ -140,6 +140,18 @@
    _elm_win_rescale();
 }
 
+EAPI void
+elm_theme_all_set(const char *theme)
+{
+#ifdef HAVE_ELEMENTARY_X
+   static Ecore_X_Atom atom = 0;
+   
+   if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_THEME");
+   ecore_x_window_prop_string_set(ecore_x_window_root_first_get(),
+                                  atom, theme);
+#endif
+}
+
 int
 _elm_theme_set(Evas_Object *o, const char *clas, const char *group, const char *style)
 {

Log:
  fix build break!
  
  
Author:       raster
Date:         2010-01-16 04:35:31 -0800 (Sat, 16 Jan 2010)
New Revision: 45214

Modified:
  trunk/TMP/st/elementary/src/bin/test_panel.c trunk/TMP/st/elementary/src/lib/elc_fileselector.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_panel.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_panel.c	2010-01-16 12:20:56 UTC (rev 45213)
+++ trunk/TMP/st/elementary/src/bin/test_panel.c	2010-01-16 12:35:31 UTC (rev 45214)
@@ -117,7 +117,7 @@
      }
    closedir(d);
 
-   dirs = eina_list_sort(dirs, ECORE_SORT_MIN, ECORE_COMPARE_CB(strcoll));
+   dirs = eina_list_sort(dirs, EINA_SORT_MIN, EINA_COMPARE_CB(strcoll));
 
    EINA_LIST_FOREACH(dirs, l, real) 
      {

Modified: trunk/TMP/st/elementary/src/lib/elc_fileselector.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_fileselector.c	2010-01-16 12:20:56 UTC (rev 45213)
+++ trunk/TMP/st/elementary/src/lib/elc_fileselector.c	2010-01-16 12:35:31 UTC (rev 45214)
@@ -298,8 +298,8 @@
      }
    closedir(dir);
 
-   files = eina_list_sort(files, ECORE_SORT_MIN, ECORE_COMPARE_CB(strcoll));
-   dirs = eina_list_sort(dirs, ECORE_SORT_MIN, ECORE_COMPARE_CB(strcoll));
+   files = eina_list_sort(files, EINA_SORT_MIN, EINA_COMPARE_CB(strcoll));
+   dirs = eina_list_sort(dirs, EINA_SORT_MIN, EINA_COMPARE_CB(strcoll));
 
    EINA_LIST_FOREACH(dirs, l, real)
      {

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-01-16 12:20:56 UTC (rev 45213)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-01-16 12:35:31 UTC (rev 45214)
@@ -905,19 +905,21 @@
 {
    const Eina_List *l;
    Elm_Genlist_Item *it;
-   Evas_Coord y = 0, ox, oy, ow, oh;
+   Evas_Coord y = 0, ox, oy, ow, oh, cvx, cvy, cvw, cvh;
    int vis;
 
    evas_object_geometry_get(itb->wd->pan_smart, &ox, &oy, &ow, &oh);
+   evas_output_viewport_get(evas_object_evas_get(itb->wd->obj), &cvx, &cvy, &cvw, &cvh);
    EINA_LIST_FOREACH(itb->items, l, it)
      {
 	if (it->delete_me) continue;
 	it->x = 0;
 	it->y = y;
 	it->w = itb->w;
-	vis = (ELM_RECTS_INTERSECT(itb->x + it->x - itb->wd->pan_x,
-				   itb->y + it->y - itb->wd->pan_y,
-				   it->w, it->h, 0, 0, ow, oh));
+	vis = (ELM_RECTS_INTERSECT(itb->x - it->wd->pan_x + ox,
+                                   itb->y - it->wd->pan_y + oy,
+                                   itb->w, itb->h,
+                                   cvx, cvy, cvw, cvh));
 	if ((itb->realized) && (!it->realized))
 	  {
 	     if (vis)
@@ -1192,17 +1194,18 @@
 {
    Pan *sd = evas_object_smart_data_get(obj);
    Item_Block *itb;
-   Evas_Coord ow, oh;
+   Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
    int in = 0;
 
-   evas_object_geometry_get(obj, NULL, NULL, &ow, &oh);
+   evas_object_geometry_get(obj, &ox, &oy, &ow, &oh);
+   evas_output_viewport_get(evas_object_evas_get(obj), &cvx, &cvy, &cvw, &cvh);
    EINA_INLIST_FOREACH(sd->wd->blocks, itb)
      {
 	itb->w = sd->wd->minw;
-	if (ELM_RECTS_INTERSECT(itb->x - sd->wd->pan_x,
-				itb->y - sd->wd->pan_y,
+	if (ELM_RECTS_INTERSECT(itb->x - sd->wd->pan_x + ox,
+				itb->y - sd->wd->pan_y + oy,
 				itb->w, itb->h,
-				0, 0, ow, oh))
+				cvx, cvy, cvw, cvh))
 	  {
 	     if ((!itb->realized) || (itb->changed))
                _item_block_realize(itb, in, 0);

Log:
  add test for floating objects (they can slide in etc. andnot be already
  packed inside the view) and... fix issues with pan based objects clipping to
  vieport etc. etc.
  
  
Author:       raster
Date:         2010-01-24 19:53:36 -0800 (Sun, 24 Jan 2010)
New Revision: 45542

Added:
  trunk/TMP/st/elementary/src/bin/test_floating.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_map.c trunk/TMP/st/elementary/src/lib/elm_photocam.c 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2010-01-25 02:51:57 UTC (rev 45541)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2010-01-25 03:53:36 UTC (rev 45542)
@@ -71,7 +71,8 @@
 test_flip.c \
 test_label.c \
 test_conform.c \
-test_multi.c
+test_multi.c \
+test_floating.c
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
 elementary_test_LDFLAGS =

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-01-25 02:51:57 UTC (rev 45541)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-01-25 03:53:36 UTC (rev 45542)
@@ -60,6 +60,7 @@
 void test_label(void *data, Evas_Object *obj, void *event_info);
 void test_conformant(void *data, Evas_Object *obj, void *event_info);
 void test_multi(void *data, Evas_Object *obj, void *event_info);
+void test_floating(void *data, Evas_Object *obj, void *event_info);
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
@@ -202,6 +203,7 @@
    elm_list_item_append(li, "Label", NULL, NULL, test_label, NULL);
    elm_list_item_append(li, "Conformant", NULL, NULL, test_conformant, NULL);
    elm_list_item_append(li, "Multi Touch", NULL, NULL, test_multi, NULL);
+   elm_list_item_append(li, "Floating Objects", NULL, NULL, test_floating, NULL);
 
    elm_list_go(li);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-01-25 02:51:57 UTC (rev 45541)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-01-25 03:53:36 UTC (rev 45542)
@@ -1279,6 +1279,15 @@
 }
 
 static void
+_pan_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Pan *sd = evas_object_smart_data_get(obj);
+
+   if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
+   sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
+}
+
+static void
 _hold_on(void *data, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1366,6 +1375,7 @@
 	sc.add = _pan_add;
 	sc.del = _pan_del;
 	sc.resize = _pan_resize;
+	sc.move = _pan_move;
 	sc.calculate = _pan_calculate;
 	smart = evas_smart_class_new(&sc);
      }

Modified: trunk/TMP/st/elementary/src/lib/elm_map.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_map.c	2010-01-25 02:51:57 UTC (rev 45541)
+++ trunk/TMP/st/elementary/src/lib/elm_map.c	2010-01-25 03:53:36 UTC (rev 45542)
@@ -1271,6 +1271,15 @@
 }
 
 static void
+_pan_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Pan *sd = evas_object_smart_data_get(obj);
+   
+   if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
+   sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
+}
+
+static void
 _hold_on(void *data, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1689,6 +1698,7 @@
 	sc.add = _pan_add;
 	sc.del = _pan_del;
 	sc.resize = _pan_resize;
+	sc.move = _pan_move;
 	sc.calculate = _pan_calculate;
 	smart = evas_smart_class_new(&sc);
      }

Modified: trunk/TMP/st/elementary/src/lib/elm_photocam.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_photocam.c	2010-01-25 02:51:57 UTC (rev 45541)
+++ trunk/TMP/st/elementary/src/lib/elm_photocam.c	2010-01-25 03:53:36 UTC (rev 45542)
@@ -855,6 +855,15 @@
 }
 
 static void
+_pan_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+{
+   Pan *sd = evas_object_smart_data_get(obj);
+   
+   if (sd->wd->calc_job) ecore_job_del(sd->wd->calc_job);
+   sd->wd->calc_job = ecore_job_add(_calc_job, sd->wd);
+}
+
+static void
 _hold_on(void *data, Evas_Object *obj, void *event_info)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -975,6 +984,7 @@
 	sc.add = _pan_add;
 	sc.del = _pan_del;
 	sc.resize = _pan_resize;
+	sc.move = _pan_move;
 	sc.calculate = _pan_calculate;
 	smart = evas_smart_class_new(&sc);
      }

Log:
  label preferred line wrap width set thing.
  
  
Author:       raster
Date:         2010-01-26 00:42:37 -0800 (Tue, 26 Jan 2010)
New Revision: 45576

Modified:
  trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_label.c 

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-01-26 08:17:26 UTC (rev 45575)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-01-26 08:42:37 UTC (rev 45576)
@@ -135,7 +135,6 @@
    evas_object_show(mb);
    
    elm_scroller_page_relative_set(sc, 1.0, 1.0);
-   // elm_scroller_page_size_set(sc, 200, 200);
    evas_object_show(sc);
    
    tb2 = elm_table_add(win);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-26 08:17:26 UTC (rev 45575)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-01-26 08:42:37 UTC (rev 45576)
@@ -430,7 +430,10 @@
    EAPI void         elm_label_label_set(Evas_Object *obj, const char *label);
    EAPI const char  *elm_label_label_get(Evas_Object *obj);
    EAPI void         elm_label_line_wrap_set(Evas_Object *obj, Eina_Bool wrap);
-   /* available styles:
+   EAPI Eina_Bool    elm_label_line_wrap_get(const Evas_Object *obj);
+   EAPI void         elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w);
+   EAPI Evas_Coord   elm_label_wrap_width_get(const Evas_Object *obj);
+/* available styles:
     * default
     * marker
     */

Modified: trunk/TMP/st/elementary/src/lib/elm_label.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_label.c	2010-01-26 08:17:26 UTC (rev 45575)
+++ trunk/TMP/st/elementary/src/lib/elm_label.c	2010-01-26 08:42:37 UTC (rev 45576)
@@ -16,6 +16,7 @@
    const char *label;
    Evas_Coord lastw;
    Ecore_Job *deferred_recalc_job;
+   Evas_Coord wrap_w;
    Eina_Bool linewrap : 1;
    Eina_Bool changed : 1;
 };
@@ -37,6 +38,8 @@
    minminw = 0;
    edje_object_size_min_restricted_calc(wd->lbl, &minw, &minh, 0, 0);
    minminw = minw;
+   if (wd->wrap_w > minminw) minminw = wd->wrap_w;
+   if (wd->wrap_w > resw) resw = wd->wrap_w;
    edje_object_size_min_restricted_calc(wd->lbl, &minw, &minh, resw, 0);
    evas_object_size_hint_min_set(data, minminw, minh);
    maxh = minh;
@@ -169,10 +172,10 @@
  * Get the label used on the label object
  *
  * @param obj The label object
- *
+ * @return The string inside the label
  * @ingroup Label
  */
-EAPI const char*
+EAPI const char *
 elm_label_label_get(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -181,6 +184,13 @@
    return wd->label;
 }
 
+/**
+ * Set the wrapping behavior of the label
+ *
+ * @param obj The label object
+ * @param wrap To wrap text or not
+ * @ingroup Label
+ */
 EAPI void
 elm_label_line_wrap_set(Evas_Object *obj, Eina_Bool wrap)
 {
@@ -198,3 +208,47 @@
    wd->changed = 1;
    _sizing_eval(obj);
 }
+
+/**
+ * Get the wrapping behavior of the label
+ *
+ * @param obj The label object
+ * @return To wrap text or not
+ * @ingroup Label
+ */
+EAPI Eina_Bool
+elm_label_line_wrap_get(const Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->linewrap;
+}
+
+/**
+ * Set wrap width of the label
+ *
+ * @param obj The label object
+ * @param w The wrap width in pixels at a minimum where words need to wrap
+ * @ingroup Label
+ */
+EAPI void
+elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (wd->wrap_w == w) return;
+   wd->wrap_w = w;
+   _sizing_eval(obj);
+}
+
+/**
+ * get wrap width of the label
+ *
+ * @param obj The label object
+ * @return The wrap width in pixels at a minimum where words need to wrap
+ * @ingroup Label
+ */
+EAPI Evas_Coord
+elm_label_wrap_width_get(const Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->wrap_w;
+}

Log:
  4 not 4 screens for launcher test
  
  
Author:       raster
Date:         2010-01-26 02:59:26 -0800 (Tue, 26 Jan 2010)
New Revision: 45581

Modified:
  trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/elm_conform.c 

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-01-26 10:50:51 UTC (rev 45580)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-01-26 10:59:26 UTC (rev 45581)
@@ -70,7 +70,7 @@
    evas_object_size_hint_weight_set(tb, 0.0, 0.0);
    evas_object_size_hint_align_set(tb, 0.5, 0.5);
    n = 0; m = 0;
-   for (k = 0 ; k < 5; k++)
+   for (k = 0 ; k < 4; k++)
      {
         pad = evas_object_rectangle_add(evas_object_evas_get(win));
         evas_object_size_hint_min_set(pad, 470, 4);

Modified: trunk/TMP/st/elementary/src/lib/elm_conform.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-01-26 10:50:51 UTC (rev 45580)
+++ trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-01-26 10:59:26 UTC (rev 45581)
@@ -65,32 +65,28 @@
    _elm_theme_set(wd->base, "conformant", "base", "default");
    elm_widget_resize_object_set(obj, wd->base);
 
-   // FIXME: broken. doesnt handle property changes, keyboard popup or not
-   // etc. doesnt gettop helf geometry either.
 #ifdef HAVE_ELEMENTARY_X
    int sh = -1;
 
    ecore_x_e_illume_top_shelf_geometry_get(ecore_x_window_root_first_get(), 
                                            NULL, NULL, NULL, &sh);
-   printf("sh0: %i\n", sh);
-   if (sh < 1) sh = 1;
+   if (sh < 0) sh = 32;
 
    wd->shelf = evas_object_rectangle_add(evas);
    evas_object_color_set(wd->shelf, 0, 0, 0, 0);
-   evas_object_size_hint_min_set(wd->shelf, 0, sh);
-   evas_object_size_hint_max_set(wd->shelf, -1, -1);
+   evas_object_size_hint_min_set(wd->shelf, -1, sh);
+   evas_object_size_hint_max_set(wd->shelf, -1, sh);
    edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf);
 
    sh = -1;
    ecore_x_e_illume_bottom_panel_geometry_get(ecore_x_window_root_first_get(), 
                                               NULL, NULL, NULL, &sh);
-   printf("sh1: %i\n", sh);
-   if (sh < 1) sh = 1;
+   if (sh < 0) sh = 32;
 
    wd->panel = evas_object_rectangle_add(evas);
    evas_object_color_set(wd->panel, 0, 0, 0, 0);
-   evas_object_size_hint_min_set(wd->panel, 0, sh);
-   evas_object_size_hint_max_set(wd->panel, -1, -1);
+   evas_object_size_hint_min_set(wd->panel, -1, sh);
+   evas_object_size_hint_max_set(wd->panel, -1, sh);
    edje_object_part_swallow(wd->base, "elm.swallow.panel", wd->panel);
 #endif

Log:
  1. fix conforman stuff to actually respect min size of content. it never did.
  2. more comprehensive test.
  
  
Author:       raster
Date:         2010-02-04 01:08:02 -0800 (Thu, 04 Feb 2010)
New Revision: 45863

Modified:
  trunk/TMP/st/elementary/src/bin/test_conform.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_conform.c 

Modified: trunk/TMP/st/elementary/src/bin/test_conform.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_conform.c	2010-02-04 08:06:41 UTC (rev 45862)
+++ trunk/TMP/st/elementary/src/bin/test_conform.c	2010-02-04 09:08:02 UTC (rev 45863)
@@ -4,7 +4,7 @@
 void 
 test_conformant(void *data, Evas_Object *obj, void *event) 
 {
-   Evas_Object *win, *bg, *conform, *btn;
+   Evas_Object *win, *bg, *conform, *btn, *bx, *sc, *en;
 
    win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
    elm_win_title_set(win, "Conformant");
@@ -21,13 +21,90 @@
    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(conform);
 
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   
+   sc = elm_scroller_add(win);
+   elm_scroller_content_min_limit(sc, 0, 1);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_bounce_set(sc, 1, 0);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5);
+   elm_box_pack_end(bx, sc);
+
+   en = elm_entry_add(win);
+   elm_entry_single_line_set(en, 1);
+   elm_entry_entry_set(en, "This is the top entry here");
+   evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
+   elm_scroller_content_set(sc, en);
+   evas_object_show(en);
+  
+   evas_object_show(sc);
+   
    btn = elm_button_add(win);
    elm_button_label_set(btn, "Test Conformant");
+   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, btn);
    evas_object_show(btn);
 
-   elm_conformant_content_set(conform, btn);
+   sc = elm_scroller_add(win);
+   elm_scroller_content_min_limit(sc, 0, 1);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   elm_scroller_bounce_set(sc, 1, 0);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5);
+   elm_box_pack_end(bx, sc);
 
-   evas_object_resize(win, 200, 200);
+   en = elm_entry_add(win);
+   elm_entry_single_line_set(en, 1);
+   elm_entry_entry_set(en, "This is the middle entry here");
+   evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
+   elm_scroller_content_set(sc, en);
+   evas_object_show(en);
+  
+   evas_object_show(sc);
+   
+   btn = elm_button_add(win);
+   elm_button_label_set(btn, "Test Conformant");
+   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, btn);
+   evas_object_show(btn);
+
+   sc = elm_scroller_add(win);
+   elm_scroller_content_min_limit(sc, 0, 0);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
+   elm_scroller_bounce_set(sc, 0, 1);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, sc);
+
+   en = elm_entry_add(win);
+   elm_entry_entry_set(en, 
+                       "This is a multi-line entry at the bottom<br>"
+                       "This can contain more than 1 line of text and be "
+                       "scrolled around to allow for entering of lots of "
+                       "content. It is also to test to see that autoscroll "
+                       "moves to the right part of a larger multi-line "
+                       "text entry that is inside of a scroller than can be "
+                       "scrolled around, thus changing the expected position "
+                       "as well as cursor changes updating auto-scroll when "
+                       "it is enabled.");
+   evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_scroller_content_set(sc, en);
+   evas_object_show(en);
+  
+   evas_object_show(sc);
+   
+   elm_conformant_content_set(conform, bx);
+   evas_object_show(bx);
+   
+   evas_object_resize(win, 240, 240);
    evas_object_show(win);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-02-04 08:06:41 UTC (rev 45862)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-02-04 09:08:02 UTC (rev 45863)
@@ -473,8 +473,6 @@
    EAPI void         elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous);
    EAPI void         elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
    EAPI void	     elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-   /* smart callbacks called:
-    */
 
    EAPI Evas_Object *elm_clock_add(Evas_Object *parent);
    EAPI void         elm_clock_time_set(Evas_Object *obj, int hrs, int min, int sec);
@@ -491,8 +489,8 @@
    EAPI Eina_Bool    elm_layout_theme_set(Evas_Object *obj, const char *clas, const char *group, const char *style);
    EAPI void         elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content);
    EAPI Evas_Object *elm_layout_edje_get(const Evas_Object *obj);
-   EAPI void          elm_layout_sizing_eval(Evas_Object *obj);
-       /* smart callbacks called:
+   EAPI void         elm_layout_sizing_eval(Evas_Object *obj);
+   /* smart callbacks called:
     */
 
    typedef enum _Elm_Notify_Orient
@@ -516,6 +514,7 @@
    EAPI void	     elm_notify_repeat_events_set(Evas_Object *obj, Eina_Bool repeat);
    /* smart callbacks called:
     */
+   
    typedef enum _Elm_Hover_Axis
      {
 	ELM_HOVER_AXIS_NONE,
@@ -587,7 +586,6 @@
    EAPI Eina_Bool    elm_entry_context_menu_disabled_get(Evas_Object *obj);
    EAPI char        *elm_entry_markup_to_utf8(const char *s);
    EAPI char        *elm_entry_utf8_to_markup(const char *s);
-
    /* smart callbacks called:
     * "changed" - the text content changed
     * "selection,start" - the user started selecting text
@@ -607,7 +605,6 @@
 
    /* composite widgets - these basically put together basic widgets above
     * in convenient packages that do more than basic stuff */
-
    typedef enum _Elm_Text_Format
      {
 	ELM_TEXT_FORMAT_PLAIN_UTF8,
@@ -795,7 +792,6 @@
    EAPI Elm_List_Item   *elm_list_item_next(const Elm_List_Item *it);
    EAPI void             elm_list_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
    EAPI void             elm_list_scroller_policy_set(Evas_Object *obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
-
    /* smart callbacks called:
     * "clicked" - when the user double-clicked an item
     * "selected" - when the user selected an item
@@ -827,12 +823,6 @@
    EAPI void         elm_slider_value_set(Evas_Object *obj, double val);
    EAPI double       elm_slider_value_get(const Evas_Object *obj);
    EAPI void         elm_slider_inverted_set(Evas_Object *obj, Eina_Bool inverted);
-   /* smart callbacks called:
-    * "changed" - when the slider value changes
-    * "delay,changed" - when the slider value changed, but a small time after a change (use this if you only want to respond to a change once the slider is held still for a short while).
-    * "slider,drag,start" - dragging the slider indicator around has started
-    * "slider,drag,stop" - dragging the slider indicator around has stopped
-    */
 
    typedef enum _Elm_Genlist_Item_Flags
      {

Modified: trunk/TMP/st/elementary/src/lib/elm_conform.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-02-04 08:06:41 UTC (rev 45862)
+++ trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-02-04 09:08:02 UTC (rev 45863)
@@ -48,6 +48,28 @@
    evas_object_size_hint_max_set(obj, -1, -1);
 }
 
+static void
+_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   _sizing_eval(data);
+}
+
+static void
+_sub_del(void *data, Evas_Object *obj, void *event_info)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Evas_Object *sub = event_info;
+   
+   if (sub == wd->content)
+     {
+        evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                            _changed_size_hints, obj);
+        wd->content = NULL;
+        _sizing_eval(obj);
+     }
+}
+
 static int 
 _prop_change(void *data, int type, void *event) 
 {
@@ -131,7 +153,9 @@
    wd->prop_hdl = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_PROPERTY, 
                                           _prop_change, obj);
 #endif
-
+   
+   evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
+   
    _sizing_eval(obj);
    return obj;
 }
@@ -147,6 +171,9 @@
    if (content) 
      {
         elm_widget_sub_object_add(obj, content);
+        evas_object_event_callback_add(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _changed_size_hints, obj);
         edje_object_part_swallow(wd->base, "elm.swallow.content", content);
         _sizing_eval(obj);
      }

Log:
  From: ?\236?\157?\180?\236?\131?\129?\236?\167?\132 <lsj119@...>
  
  Patch for rotate with resize
  
  (some formatting fixed too like ecore patch)
  
  
Author:       raster
Date:         2010-02-10 06:38:08 -0800 (Wed, 10 Feb 2010)
New Revision: 46047

Modified:
  trunk/TMP/st/elementary/src/bin/test_win_state.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_win.c 

Modified: trunk/TMP/st/elementary/src/bin/test_win_state.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_win_state.c	2010-02-10 14:35:07 UTC (rev 46046)
+++ trunk/TMP/st/elementary/src/bin/test_win_state.c	2010-02-10 14:38:08 UTC (rev 46047)
@@ -6,6 +6,8 @@
    int mode, onoff;
 } Testitem;
 
+static int rotate_with_resize = 0;
+
 static void
 my_bt_38_alpha_on(void *data, Evas_Object *obj, void *event_info)
 {
@@ -25,11 +27,21 @@
 }
 
 static void
+my_ck_38_resize(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win = data;
+   rotate_with_resize = elm_check_state_get(obj);
+}
+
+static void
 my_bt_38_rot_0(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win = data;
    Evas_Object *bg = evas_object_data_get(win, "bg");
-   elm_win_rotation_set(win, 0);
+   if (rotate_with_resize)
+     elm_win_rotation_with_resize_set(win, 0);
+   else   	
+     elm_win_rotation_set(win, 0);
 }
 
 static void
@@ -37,7 +49,10 @@
 {
    Evas_Object *win = data;
    Evas_Object *bg = evas_object_data_get(win, "bg");
-   elm_win_rotation_set(win, 90);
+   if (rotate_with_resize)
+     elm_win_rotation_with_resize_set(win, 90);
+   else   	
+     elm_win_rotation_set(win, 90);
 }
 
 static void
@@ -45,7 +60,10 @@
 {
    Evas_Object *win = data;
    Evas_Object *bg = evas_object_data_get(win, "bg");
-   elm_win_rotation_set(win, 180);
+   if (rotate_with_resize)
+     elm_win_rotation_with_resize_set(win, 180);
+   else   	
+     elm_win_rotation_set(win, 180);
 }
 
 static void
@@ -53,7 +71,10 @@
 {
    Evas_Object *win = data;
    Evas_Object *bg = evas_object_data_get(win, "bg");
-   elm_win_rotation_set(win, 270);
+   if (rotate_with_resize)
+     elm_win_rotation_with_resize_set(win, 270);
+   else   	
+     elm_win_rotation_set(win, 270);
 }
 
 static void
@@ -87,7 +108,7 @@
 void
 test_win_state(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *sl, *bx, *bx2, *bt;
+   Evas_Object *win, *bg, *sl, *bx, *bx2, *bt, *ck;
    static Testitem tit[3];
    int i;
 
@@ -156,6 +177,15 @@
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "resize");
+   elm_check_state_set(ck, rotate_with_resize);
+   evas_object_smart_callback_add(ck, "changed", my_ck_38_resize, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.02, 0.99);
+   evas_object_show(ck); 
+   elm_box_pack_end(bx, ck);
+
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);
    elm_box_homogenous_set(bx2, 1);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-02-10 14:35:07 UTC (rev 46046)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-02-10 14:38:08 UTC (rev 46047)
@@ -269,6 +269,7 @@
    EAPI void         elm_win_layer_set(Evas_Object *obj, int layer);
    EAPI int          elm_win_layer_get(Evas_Object *obj);
    EAPI void         elm_win_rotation_set(Evas_Object *obj, int rotation);
+   EAPI void         elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation);
    EAPI int          elm_win_rotation_get(Evas_Object *obj);
    EAPI void         elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky);
    EAPI Eina_Bool    elm_win_sticky_get(Evas_Object *obj);

Modified: trunk/TMP/st/elementary/src/lib/elm_win.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_win.c	2010-02-10 14:35:07 UTC (rev 46046)
+++ trunk/TMP/st/elementary/src/lib/elm_win.c	2010-02-10 14:38:08 UTC (rev 46047)
@@ -775,6 +775,22 @@
    _elm_win_xwin_update(win);
 }
 
+EAPI void
+elm_win_rotation_with_resize_set(Evas_Object *obj, int rotation)
+{
+   Elm_Win *win;
+   if (strcmp(elm_widget_type_get(obj), "win")) return;
+   win = elm_widget_data_get(obj);
+   if (!win) return;
+   if (win->rot == rotation) return;
+   win->rot = rotation;
+   ecore_evas_rotation_with_resize_set(win->ee, rotation);
+   evas_object_size_hint_min_set(obj, -1, -1);
+   evas_object_size_hint_max_set(obj, -1, -1);
+   _elm_win_eval_subobjs(obj);
+   _elm_win_xwin_update(win);
+}
+
 EAPI int
 elm_win_rotation_get(Evas_Object *obj)
 {

Log:
  slight change in drag events vs scrolling on_hold to fix small "distance
  race" issue.
  
  
Author:       raster
Date:         2010-02-25 22:30:17 -0800 (Thu, 25 Feb 2010)
New Revision: 46505

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-02-26 06:01:09 UTC (rev 46504)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-02-26 06:30:17 UTC (rev 46505)
@@ -872,6 +872,12 @@
    printf("drag stop\n");
 }
 
+static void
+item_longpress(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("longpress\n");
+}
+
 void
 test_genlist5(void *data, Evas_Object *obj, void *event_info)
 {
@@ -926,6 +932,7 @@
    evas_object_smart_callback_add(gl, "drag,start,right", item_drag_right, NULL);
    evas_object_smart_callback_add(gl, "drag", item_drag, NULL);
    evas_object_smart_callback_add(gl, "drag,stop", item_drag_stop, NULL);
+   evas_object_smart_callback_add(gl, "longpressed", item_longpress, NULL);
 
    bx2 = elm_box_add(win);
    elm_box_horizontal_set(bx2, 1);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-02-26 06:01:09 UTC (rev 46504)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-02-26 06:30:17 UTC (rev 46505)
@@ -477,23 +477,23 @@
 	     _item_unselect(it);
 	  }
      }
-   if ((!it->down) || (it->wd->on_hold) || (it->wd->longpressed))
+   if ((it->dragging) && (it->down))
      {
         if (it->long_timer)
           {
              ecore_timer_del(it->long_timer);
              it->long_timer = NULL;
           }
+        evas_object_smart_callback_call(it->wd->obj, "drag", it);
         return;
      }
-   if (it->dragging)
+   if ((!it->down)/* || (it->wd->on_hold)*/ || (it->wd->longpressed))
      {
         if (it->long_timer)
           {
              ecore_timer_del(it->long_timer);
              it->long_timer = NULL;
           }
-        evas_object_smart_callback_call(it->wd->obj, "drag", it);
         return;
      }
    if (!it->display_only)
@@ -577,6 +577,7 @@
    evas_object_geometry_get(obj, &x, &y, NULL, NULL);
    it->dx = ev->canvas.x - x;
    it->dy = ev->canvas.y - y;
+   it->wd->longpressed = EINA_FALSE;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
    it->wd->wasselected = it->selected;
@@ -599,6 +600,7 @@
    it->down = 0;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) it->wd->on_hold = EINA_TRUE;
    else it->wd->on_hold = EINA_FALSE;
+   it->wd->longpressed = EINA_FALSE;
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
@@ -612,7 +614,6 @@
      }
    if (it->wd->on_hold)
      {
-        it->wd->longpressed = EINA_FALSE;
 	it->wd->on_hold = EINA_FALSE;
 	return;
      }

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-02-26 06:01:09 UTC (rev 46504)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-02-26 06:30:17 UTC (rev 46505)
@@ -398,6 +398,7 @@
    if (ev->button != 1) return;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) wd->on_hold = EINA_TRUE;
    else wd->on_hold = EINA_FALSE;
+   wd->longpressed = EINA_FALSE;
    if (it->long_timer)
      {
         ecore_timer_del(it->long_timer);
@@ -410,7 +411,6 @@
      }
    if (wd->longpressed)
      {
-        wd->longpressed = EINA_FALSE;
         if (!wd->wasselected) _item_unselect(it);
         wd->wasselected = 0;
         return;

Log:
  more comprehensive flip test with multiple children etc.
  
  
Author:       raster
Date:         2010-03-08 20:00:08 -0800 (Mon, 08 Mar 2010)
New Revision: 47072

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/lib/elm_flip.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-03-09 02:55:47 UTC (rev 47071)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-03-09 04:00:08 UTC (rev 47072)
@@ -57,6 +57,7 @@
 void test_map(void *data, Evas_Object *obj, void *event_info);
 void test_weather(void *data, Evas_Object *obj, void *event_info);
 void test_flip(void *data, Evas_Object *obj, void *event_info);
+void test_flip2(void *data, Evas_Object *obj, void *event_info);
 void test_label(void *data, Evas_Object *obj, void *event_info);
 void test_conformant(void *data, Evas_Object *obj, void *event_info);
 void test_multi(void *data, Evas_Object *obj, void *event_info);
@@ -202,6 +203,7 @@
    elm_list_item_append(li, "Map", NULL, NULL, test_map, NULL);
    elm_list_item_append(li, "Weather", NULL, NULL, test_weather, NULL);
    elm_list_item_append(li, "Flip", NULL, NULL, test_flip, NULL);
+   elm_list_item_append(li, "Flip 2", NULL, NULL, test_flip2, NULL);
    elm_list_item_append(li, "Label", NULL, NULL, test_label, NULL);
    elm_list_item_append(li, "Conformant", NULL, NULL, test_conformant, NULL);
    elm_list_item_append(li, "Multi Touch", NULL, NULL, test_multi, NULL);

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2010-03-09 02:55:47 UTC (rev 47071)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2010-03-09 04:00:08 UTC (rev 47072)
@@ -49,8 +49,6 @@
    elm_win_resize_object_add(win, bx);
    evas_object_show(bx);
    
-#if 1 // working on it
-   
    fl = elm_flip_add(win);
    evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -128,9 +126,149 @@
    
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
-#endif
 
    evas_object_resize(win, 320, 480);
    evas_object_show(win);
 }
+
+void
+test_flip2(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *tb, *ic, *li;
+   char buf[PATH_MAX];
+   
+   win = elm_win_add(NULL, "flip2", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Flip 2");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, "sky_01.jpg");
+   elm_bg_file_set(bg, buf, NULL);
+   elm_win_resize_object_add(win, bg);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bx);
+   evas_object_show(bx);
+   
+   fl = elm_flip_add(win);
+   evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_pack_end(bx, fl);
+
+   o = elm_box_add(win);
+   evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   
+   tb = elm_toolbar_add(win);
+   elm_toolbar_homogenous_set(tb, 0);
+   evas_object_size_hint_weight_set(tb, 0.0, 0.0);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0);
+
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_toolbar_item_add(tb, ic, "Hello", NULL, NULL);
+   
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_toolbar_item_add(tb, ic, "Out", NULL, NULL);
+   
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_toolbar_item_add(tb, ic, "There", NULL, NULL);
+   
+   ic = elm_icon_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   elm_icon_file_set(ic, buf, NULL);
+   elm_toolbar_item_add(tb, ic, "World", NULL, NULL);
+   
+   elm_box_pack_end(o, tb);
+   evas_object_show(tb);
+   
+   li = elm_list_add(win);
+   evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   
+   elm_list_item_append(li, "This is a list", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Second item", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "3rd", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Fourth", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Number five is alive!", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "The quick brown fox jumps over the lazy dog", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Booyah", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "And another item", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "More of them", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Get with it", NULL, NULL,  NULL, NULL);
+   
+   elm_list_go(li);
+   
+   elm_box_pack_end(o, li);
+   evas_object_show(li);
+   
+   elm_flip_content_front_set(fl, o);
+   evas_object_show(o);
+   
+   li = elm_list_add(win);
+   evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   
+   elm_list_item_append(li, "This is a list", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Second item", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "3rd", NULL, NULL,  NULL, NULL);
+   
+   elm_list_go(li);
+   
+   elm_flip_content_back_set(fl, li);
+   evas_object_show(li);
+
+   evas_object_show(fl);
+
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "1");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "2");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "3");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "4");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+
+   evas_object_resize(win, 320, 480);
+   evas_object_show(win);
+}
 #endif

Modified: trunk/TMP/st/elementary/src/lib/elm_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-03-09 02:55:47 UTC (rev 47071)
+++ trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-03-09 04:00:08 UTC (rev 47072)
@@ -16,7 +16,7 @@
    double start, len;
    Elm_Flip_Mode mode;
    struct {
-      Evas_Object *content;
+      Evas_Object *content, *clip;
    } front, back;
    Eina_Bool state : 1;
 };
@@ -87,6 +87,7 @@
 	evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                             _changed_size_hints, obj);
 	wd->front.content = NULL;
+        evas_object_hide(wd->front.clip);
 	_sizing_eval(obj);
      }
    else if (sub == wd->back.content)
@@ -94,6 +95,7 @@
 	evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                             _changed_size_hints, obj);
 	wd->back.content = NULL;
+        evas_object_hide(wd->back.clip);
 	_sizing_eval(obj);
      }
 }
@@ -187,8 +189,8 @@
         evas_map_util_3d_perspective(mf, px, py, 0, foc);
         evas_object_map_set(wd->front.content, mf);
         evas_object_map_enable_set(wd->front.content, 1);
-        if (evas_map_util_clockwise_get(mf)) evas_object_show(wd->front.content);
-        else evas_object_hide(wd->front.content);
+        if (evas_map_util_clockwise_get(mf)) evas_object_show(wd->front.clip);
+        else evas_object_hide(wd->front.clip);
      }
       
    if (wd->back.content)
@@ -197,8 +199,8 @@
         evas_map_util_3d_perspective(mb, px, py, 0, foc);
         evas_object_map_set(wd->back.content, mb);
         evas_object_map_enable_set(wd->back.content, 1);
-        if (evas_map_util_clockwise_get(mb)) evas_object_show(wd->back.content);
-        else evas_object_hide(wd->back.content);
+        if (evas_map_util_clockwise_get(mb)) evas_object_show(wd->back.clip);
+        else evas_object_hide(wd->back.clip);
      }
    
    evas_map_free(mf);
@@ -280,6 +282,20 @@
    elm_widget_del_hook_set(obj, _del_hook);
    elm_widget_theme_hook_set(obj, _theme_hook);
 
+   wd->front.clip = evas_object_rectangle_add(e);
+   evas_object_color_set(wd->front.clip, 255, 255, 255, 255);
+   evas_object_move(wd->front.clip, -49999, -49999);
+   evas_object_resize(wd->front.clip, 99999, 99999);
+   elm_widget_sub_object_add(wd->front.clip, obj);
+   evas_object_smart_member_add(wd->front.clip, obj);
+   
+   wd->back.clip = evas_object_rectangle_add(e);
+   evas_object_color_set(wd->back.clip, 255, 255, 255, 255);
+   evas_object_move(wd->back.clip, -49999, -49999);
+   evas_object_resize(wd->back.clip, 99999, 99999);
+   elm_widget_sub_object_add(wd->back.clip, obj);
+   evas_object_smart_member_add(wd->back.clip, obj);
+
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
@@ -306,6 +322,7 @@
    if (wd->front.content == content) return;
    if ((wd->front.content != content) && (wd->front.content))
      {
+        evas_object_clip_set(wd->front.content, NULL);
         elm_widget_sub_object_del(obj, wd->front.content);
         evas_object_smart_member_del(wd->front.content);
      }
@@ -314,13 +331,16 @@
      {
 	elm_widget_sub_object_add(content, obj);
         evas_object_smart_member_add(content, obj);
+        evas_object_clip_set(content, wd->front.clip);
 	evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
 	_sizing_eval(obj);
+        if (!elm_flip_front_get(obj)) evas_object_hide(wd->front.clip);
+        else evas_object_show(wd->front.clip);
      }
-   //XXX use clips
-   if (!elm_flip_front_get(obj)) evas_object_hide(wd->front.content);
+   else
+     evas_object_hide(wd->front.clip);     
    _configure(obj);
 }
 
@@ -340,6 +360,7 @@
    if (wd->back.content == content) return;
    if ((wd->back.content != content) && (wd->back.content))
      {
+        evas_object_clip_set(wd->back.content, NULL);
         elm_widget_sub_object_del(obj, wd->back.content);
         evas_object_smart_member_del(wd->back.content);
      }
@@ -348,13 +369,16 @@
      {
 	elm_widget_sub_object_add(content, obj);
         evas_object_smart_member_add(content, obj);
+        evas_object_clip_set(content, wd->back.clip);
 	evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
 	_sizing_eval(obj);
+        if (elm_flip_front_get(obj)) evas_object_hide(wd->back.clip);
+        else evas_object_show(wd->back.clip);
      }
-   //XXX use clips
-   if (elm_flip_front_get(obj)) evas_object_hide(wd->back.content);
+   else
+     evas_object_hide(wd->back.clip);
    _configure(obj);
 }

Log:
  and make entry api's acutally work - and be tested.
  
  
Author:       raster
Date:         2010-03-10 22:35:07 -0800 (Wed, 10 Mar 2010)
New Revision: 47127

Modified:
  trunk/TMP/st/elementary/src/bin/test_entry.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_entry.c	2010-03-11 06:34:20 UTC (rev 47126)
+++ trunk/TMP/st/elementary/src/bin/test_entry.c	2010-03-11 06:35:07 UTC (rev 47127)
@@ -442,7 +442,6 @@
 my_ent_bt_sbe(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *en = data;
-   // broken
    elm_scrolled_entry_cursor_selection_begin(en);
 }
 
@@ -450,7 +449,6 @@
 my_ent_bt_sen(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *en = data;
-   // broken
    elm_scrolled_entry_cursor_selection_end(en);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-03-11 06:34:20 UTC (rev 47126)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-03-11 06:35:07 UTC (rev 47127)
@@ -1446,9 +1446,7 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   edje_object_part_text_select_all(wd->ent, "elm.text");
-   edje_object_part_text_cursor_copy(wd->ent, "elm.text", EDJE_CURSOR_MAIN, EDJE_CURSOR_SELECTION_BEGIN);
-   edje_object_part_text_cursor_copy(wd->ent, "elm.text", EDJE_CURSOR_MAIN, EDJE_CURSOR_SELECTION_END);
+   edje_object_part_text_select_begin(wd->ent, "elm.text");
 }
 
 EAPI void
@@ -1457,7 +1455,7 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   edje_object_part_text_cursor_copy(wd->ent, "elm.text", EDJE_CURSOR_MAIN, EDJE_CURSOR_SELECTION_END);
+   edje_object_part_text_select_extend(wd->ent, "elm.text");
 }
 
 EAPI Eina_Bool

Log:
  fix more runtime wornings... added ELM_ERROR_ABORT! :)
  
  
Author:       raster
Date:         2010-03-13 19:48:22 -0800 (Sat, 13 Mar 2010)
New Revision: 47195

Modified:
  trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/lib/elm_conform.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_list.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_slideshow.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -68,7 +68,7 @@
    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_flip_content_back_set(fl, ly);
-//   evas_object_show(ly);
+   evas_object_show(ly);
 
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Button 1");

Modified: trunk/TMP/st/elementary/src/lib/elm_conform.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_conform.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -220,7 +220,7 @@
    evas = evas_object_evas_get(parent);
 
    obj = elm_widget_add(evas);
-   ELM_SET_WIDTYPE(widtype, "conform");
+   ELM_SET_WIDTYPE(widtype, "conformant");
    elm_widget_type_set(obj, "conformant");
    elm_widget_sub_object_add(parent, obj);
    elm_widget_data_set(obj, wd);

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -860,7 +860,7 @@
 	     const Eina_List *l;
 	     const char *key;
 
-	     it->labels = _stringlist_get(edje_object_data_get(it->base, "labels"));
+	     it->labels = _elm_stringlist_get(edje_object_data_get(it->base, "labels"));
 	     EINA_LIST_FOREACH(it->labels, l, key)
 	       {
 		  char *s = it->itc->func.label_get(it->data, it->wd->obj, l->data);
@@ -877,7 +877,7 @@
 	     const Eina_List *l;
 	     const char *key;
 
-	     it->icons = _stringlist_get(edje_object_data_get(it->base, "icons"));
+	     it->icons = _elm_stringlist_get(edje_object_data_get(it->base, "icons"));
 	     EINA_LIST_FOREACH(it->icons, l, key)
 	       {
 		  Evas_Object *ic = it->itc->func.icon_get(it->data, it->wd->obj, l->data);
@@ -896,7 +896,7 @@
 	     const Eina_List *l;
 	     const char *key;
 
-	     it->states = _stringlist_get(edje_object_data_get(it->base, "states"));
+	     it->states = _elm_stringlist_get(edje_object_data_get(it->base, "states"));
 	     EINA_LIST_FOREACH(it->states, l, key)
 	       {
 		  Eina_Bool on = it->itc->func.state_get(it->data, it->wd->obj, l->data);
@@ -943,11 +943,11 @@
    it->base = NULL;
    evas_object_del(it->spacer);
    it->spacer = NULL;
-   _stringlist_free(it->labels);
+   _elm_stringlist_free(it->labels);
    it->labels = NULL;
-   _stringlist_free(it->icons);
+   _elm_stringlist_free(it->icons);
    it->icons = NULL;
-   _stringlist_free(it->states);
+   _elm_stringlist_free(it->states);
 
    EINA_LIST_FREE(it->icon_objs, icon) 
      evas_object_del(icon);

Modified: trunk/TMP/st/elementary/src/lib/elm_list.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_list.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_list.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -181,10 +181,13 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord minw = -1, minh = -1, maxw = -1, maxh = -1;
    if (!wd) return;
-   evas_object_size_hint_min_get(wd->scr, &minw, &minh);
-   evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
-   evas_object_size_hint_min_set(obj, minw, minh);
-   evas_object_size_hint_max_set(obj, maxw, maxh);
+   if (wd->scr)
+     {
+        evas_object_size_hint_min_get(wd->scr, &minw, &minh);
+        evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
+        evas_object_size_hint_min_set(obj, minw, minh);
+        evas_object_size_hint_max_set(obj, maxw, maxh);
+     }
 }
 
 static void
@@ -195,8 +198,11 @@
    Eina_List *n;
    
    if (!wd) return;
-   elm_smart_scroller_theme_set(wd->scr, "list", "base", elm_widget_style_get(obj));
-   edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+   if (wd->scr)
+     {
+        elm_smart_scroller_theme_set(wd->scr, "list", "base", elm_widget_style_get(obj));
+        edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+     }
    EINA_LIST_FOREACH(wd->items, n, it)
      {
         it->fixed = 0;
@@ -232,24 +238,30 @@
    Elm_List_Item *it;
 
    if (!wd) return;
-   EINA_LIST_FOREACH(wd->items, l, it)
+   if (sub == NULL) abort();
+   if (sub == wd->scr)
+     wd->scr = NULL;
+   else
      {
-	if ((sub == it->icon) || (sub == it->end))
-	  {
-	     if (it->icon == sub) it->icon = NULL;
-	     if (it->end == sub) it->end = NULL;
-	     evas_object_event_callback_del_full(sub,
-                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                            _changed_size_hints, obj);
-	     if (!wd->walking)
-	       {
-		  _fix_items(obj);
-		  _sizing_eval(obj);
-	       }
-	     else
-	       wd->fix_pending = EINA_TRUE;
-	     break;
-	  }
+        EINA_LIST_FOREACH(wd->items, l, it)
+          {
+             if ((sub == it->icon) || (sub == it->end))
+               {
+                  if (it->icon == sub) it->icon = NULL;
+                  if (it->end == sub) it->end = NULL;
+                  evas_object_event_callback_del_full
+                    (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, 
+                     obj);
+                  if (!wd->walking)
+                    {
+                       _fix_items(obj);
+                       _sizing_eval(obj);
+                    }
+                  else
+                    wd->fix_pending = EINA_TRUE;
+                  break;
+               }
+          }
      }
 }
 
@@ -631,10 +643,13 @@
 
    mw = 0; mh = 0;
    evas_object_size_hint_min_get(wd->box, &mw, &mh);
-   if (wd->mode == ELM_LIST_LIMIT)
-     elm_scroller_content_min_limit(wd->scr, 1, 0);
-   else
-     elm_scroller_content_min_limit(wd->scr, 0, 0);
+   if (wd->scr)
+     {
+        if (wd->mode == ELM_LIST_LIMIT)
+          elm_scroller_content_min_limit(wd->scr, 1, 0);
+        else
+          elm_scroller_content_min_limit(wd->scr, 0, 0);
+     }
    _sizing_eval(obj);
 }
 
@@ -643,7 +658,8 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_widget_scroll_hold_push(wd->scr);
+   if (wd->scr)
+     elm_widget_scroll_hold_push(wd->scr);
 }
 
 static void
@@ -651,7 +667,8 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_widget_scroll_hold_pop(wd->scr);
+   if (wd->scr)
+     elm_widget_scroll_hold_pop(wd->scr);
 }
 
 static void
@@ -659,7 +676,8 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_widget_scroll_hold_push(wd->scr);
+   if (wd->scr)
+     elm_widget_scroll_hold_push(wd->scr);
 }
 
 static void
@@ -667,7 +685,8 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_widget_scroll_hold_pop(wd->scr);
+   if (wd->scr)
+     elm_widget_scroll_hold_pop(wd->scr);
 }
 
 EAPI Evas_Object *
@@ -852,10 +871,13 @@
    if (!wd) return;
    if (wd->mode == mode) return;
    wd->mode = mode;
-   if (wd->mode == ELM_LIST_LIMIT)
-     elm_scroller_content_min_limit(wd->scr, 1, 0);
-   else
-     elm_scroller_content_min_limit(wd->scr, 0, 0);
+   if (wd->scr)
+     {
+        if (wd->mode == ELM_LIST_LIMIT)
+          elm_scroller_content_min_limit(wd->scr, 1, 0);
+        else
+          elm_scroller_content_min_limit(wd->scr, 0, 0);
+     }
 }
 
 EAPI Elm_List_Mode
@@ -950,7 +972,8 @@
    evas_object_geometry_get(it->base, &x, &y, &w, &h);
    x -= bx;
    y -= by;
-   elm_scroller_region_show(wd->scr, x, y, w, h);
+   if (wd->scr)
+     elm_scroller_region_show(wd->scr, x, y, w, h);
 }
 
 EAPI void
@@ -1111,7 +1134,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
+   if (wd->scr)
+     elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
 }
 
 /**
@@ -1135,5 +1159,6 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_scroller_policy_set(wd->scr, policy_h, policy_v);
+   if (wd->scr)
+     elm_scroller_policy_set(wd->scr, policy_h, policy_v);
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-03-14 03:48:22 UTC (rev 47195)
@@ -148,11 +148,14 @@
 EAPI void         elm_widget_type_set(Evas_Object *obj, const char *type);
 EAPI const char  *elm_widget_type_get(const Evas_Object *obj);
 
-EAPI Eina_List   *_stringlist_get(const char *str);
-EAPI void         _stringlist_free(Eina_List *list);
+EAPI Eina_List   *_elm_stringlist_get(const char *str);
+EAPI void         _elm_stringlist_free(Eina_List *list);
 
+Eina_Bool         _elm_widget_type_check(Evas_Object *obj, const char *type);
+    
 #define ELM_SET_WIDTYPE(widtype, type) if (!widtype) widtype = eina_stringshare_add(type)
-#define ELM_CHECK_WIDTYPE(obj, widtype) if (elm_widget_type_get(obj) != widtype) return
+//#define ELM_CHECK_WIDTYPE(obj, widtype) if (elm_widget_type_get(obj) != widtype) return
+#define ELM_CHECK_WIDTYPE(obj, widtype) if (!_elm_widget_type_check((Evas_Object *)(obj), (const char *)(widtype))) return
 
 extern char *_elm_appname;
 extern Elm_Config *_elm_config;

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -64,8 +64,11 @@
    
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_theme_set(wd->scr, "scroller", "base", elm_widget_style_get(obj));
-   edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+   if (wd->scr)
+     {
+        elm_smart_scroller_theme_set(wd->scr, "scroller", "base", elm_widget_style_get(obj));
+        edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
+     }
    _sizing_eval(obj);
 }
 
@@ -77,7 +80,8 @@
    Evas_Coord x, y, w, h;
    if (!wd) return;
    elm_widget_show_region_get(obj, &x, &y, &w, &h);
-   elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
+   if (wd->scr)
+     elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
 }
 
 static void
@@ -92,26 +96,29 @@
    evas_object_size_hint_min_get(wd->content, &minw, &minh);
    evas_object_size_hint_max_get(wd->content, &maxw, &maxh);
    evas_object_size_hint_weight_get(wd->content, &xw, &xy);
-   elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
-   if (xw > 0.0)
+   if (wd->scr)
      {
-	if ((minw > 0) && (vw < minw)) vw = minw;
-	else if ((maxw > 0) && (vw > maxw)) vw = maxw;
+        elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
+        if (xw > 0.0)
+          {
+             if ((minw > 0) && (vw < minw)) vw = minw;
+             else if ((maxw > 0) && (vw > maxw)) vw = maxw;
+          }
+        else if (minw > 0) vw = minw;
+        if (xy > 0.0)
+          {
+             if ((minh > 0) && (vh < minh)) vh = minh;
+             else if ((maxh > 0) && (vh > maxh)) vh = maxh;
+          }
+        else if (minh > 0) vh = minh;
+        evas_object_resize(wd->content, vw, vh);
+        w = -1;
+        h = -1;
+        edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
+        if (wd->min_w) w = vmw + minw;
+        if (wd->min_h) h = vmh + minh;
+        evas_object_size_hint_min_set(obj, w, h);
      }
-   else if (minw > 0) vw = minw;
-   if (xy > 0.0)
-     {
-	if ((minh > 0) && (vh < minh)) vh = minh;
-	else if ((maxh > 0) && (vh > maxh)) vh = maxh;
-     }
-   else if (minh > 0) vh = minh;
-   evas_object_resize(wd->content, vw, vh);
-   w = -1;
-   h = -1;
-   edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
-   if (wd->min_w) w = vmw + minw;
-   if (wd->min_h) h = vmh + minh;
-   evas_object_size_hint_min_set(obj, w, h);
 }
 
 static void
@@ -136,6 +143,8 @@
 	wd->content = NULL;
 	_sizing_eval(obj);
      }
+   else if (sub == wd->scr)
+     wd->scr = NULL;
 }
 
 static void
@@ -145,7 +154,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
-   elm_smart_scroller_hold_set(wd->scr, 1);
+   if (wd->scr)
+     elm_smart_scroller_hold_set(wd->scr, 1);
 }
 
 static void
@@ -155,7 +165,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
-   elm_smart_scroller_hold_set(wd->scr, 0);
+   if (wd->scr)
+     elm_smart_scroller_hold_set(wd->scr, 0);
 }
 
 static void
@@ -165,7 +176,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
-   elm_smart_scroller_freeze_set(wd->scr, 1);
+   if (wd->scr)
+     elm_smart_scroller_freeze_set(wd->scr, 1);
 }
 
 static void
@@ -175,7 +187,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
 
    if (!wd) return;
-   elm_smart_scroller_freeze_set(wd->scr, 0);
+   if (wd->scr)
+     elm_smart_scroller_freeze_set(wd->scr, 0);
 }
 
 static void
@@ -317,7 +330,8 @@
      {
 	elm_widget_on_show_region_hook_set(content, _show_region_hook, obj);
 	elm_widget_sub_object_add(obj, content);
-	elm_smart_scroller_child_set(wd->scr, content);
+        if (wd->scr)
+          elm_smart_scroller_child_set(wd->scr, content);
 	evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
 	_sizing_eval(obj);
@@ -369,7 +383,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
+   if (wd->scr)
+     elm_smart_scroller_child_region_show(wd->scr, x, y, w, h);
 }
 
 /**
@@ -400,7 +415,8 @@
      };
    if (!wd) return;
    if ((policy_h >= 3) || (policy_v >= 3)) return;
-   elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]);
+   if (wd->scr)
+     elm_smart_scroller_policy_set(wd->scr, map[policy_h], map[policy_v]);
 }
 
 /**
@@ -424,8 +440,11 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   if ((x) && (y)) elm_smart_scroller_child_pos_get(wd->scr, x, y);
-   if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
+   if (wd->scr)
+     {
+        if ((x) && (y)) elm_smart_scroller_child_pos_get(wd->scr, x, y);
+        if ((w) && (h)) elm_smart_scroller_child_viewport_size_get(wd->scr, w, h);
+     }
 }
 
 /**
@@ -474,7 +493,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
+   if (wd->scr)
+     elm_smart_scroller_bounce_allow_set(wd->scr, h_bounce, v_bounce);
 }
 
 /**
@@ -505,8 +525,9 @@
    if (!wd) return;
    wd->pagerel_h = h_pagerel;
    wd->pagerel_v = v_pagerel;
-   elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
-                                 wd->pagesize_h, wd->pagesize_v);
+   if (wd->scr)
+     elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
+                                   wd->pagesize_h, wd->pagesize_v);
 }
 
 /**
@@ -530,8 +551,9 @@
    if (!wd) return;
    wd->pagesize_h = h_pagesize;
    wd->pagesize_v = v_pagesize;
-   elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
-                                 wd->pagesize_h, wd->pagesize_v);
+   if (wd->scr)
+     elm_smart_scroller_paging_set(wd->scr, wd->pagerel_h, wd->pagerel_v,
+                                   wd->pagesize_h, wd->pagesize_v);
 }
 
 /**
@@ -559,5 +581,6 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   elm_smart_scroller_region_bring_in(wd->scr, x, y, w, h);
+   if (wd->scr)
+     elm_smart_scroller_region_bring_in(wd->scr, x, y, w, h);
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_slideshow.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_slideshow.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_slideshow.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -60,7 +60,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    elm_slideshow_clear(obj);
-   _stringlist_free(wd->transitions);
+   _elm_stringlist_free(wd->transitions);
    if (wd->timer) ecore_timer_del(wd->timer);
    free(wd);
 }
@@ -232,7 +232,7 @@
    elm_widget_resize_object_set(obj, wd->slideshow);
    evas_object_show(wd->slideshow);
 
-   wd->transitions = _stringlist_get(edje_object_data_get(wd->slideshow, "transitions"));
+   wd->transitions = _elm_stringlist_get(edje_object_data_get(wd->slideshow, "transitions"));
    if (eina_list_count(wd->transitions) > 0)
      wd->transition = eina_stringshare_add(eina_list_data_get(wd->transitions));
 

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-03-14 01:07:20 UTC (rev 47194)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-03-14 03:48:22 UTC (rev 47195)
@@ -236,6 +236,7 @@
 elm_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj)
 {
    API_ENTRY return;
+   if (!sobj) return;
    sd->subobjs = eina_list_remove(sd->subobjs, sobj);
    if (!sd->child_can_focus)
      {
@@ -887,7 +888,7 @@
 	sobj = sd->resize_obj;
 	sd->resize_obj = NULL;
 	evas_object_event_callback_del_full(sobj, EVAS_CALLBACK_DEL, _sub_obj_del, sd);
-	evas_object_smart_callback_call(sd->obj, "sub-object-del", sd->resize_obj);
+	evas_object_smart_callback_call(sd->obj, "sub-object-del", sobj);
 	evas_object_del(sobj);
      }
    if (sd->hover_obj)
@@ -1001,9 +1002,10 @@
      }
 }
 
+/* utilities */
 
 Eina_List *
-_stringlist_get(const char *str)
+_elm_stringlist_get(const char *str)
 {
    Eina_List *list = NULL;
    const char *s, *b;
@@ -1028,9 +1030,32 @@
 }
 
 void
-_stringlist_free(Eina_List *list)
+_elm_stringlist_free(Eina_List *list)
 {
    const char *s;
-   EINA_LIST_FREE(list, s)
-     eina_stringshare_del(s);
+   EINA_LIST_FREE(list, s) eina_stringshare_del(s);
 }
+
+Eina_Bool
+_elm_widget_type_check(Evas_Object *obj, const char *type)
+{
+   const char *provided, *expected = "(unknown)";
+   static int abort_on_warn = -1;
+   if (EINA_LIKELY(elm_widget_type_get(obj) == type)) return 1;
+   if (type) expected = type;
+   provided = elm_widget_type_get(obj);
+   if ((!provided) || (provided[0] == 0))
+     {
+        provided = evas_object_type_get(obj);
+        if ((!provided) || (provided[0] == 0))
+          provided = "(unknown)";
+     }
+   ERR("Passing Object: %p, of type: '%s' when expecting type: '%s'", obj, provided, expected);
+   if (abort_on_warn == -1)
+     {
+        if (getenv("ELM_ERROR_ABORT")) abort_on_warn = 1;
+        else abort_on_warn = 0;
+     }
+   if (abort_on_warn == 1) abort();
+   return 1;
+}

Log:
  aaah typo! fix from lupan.
  
  
Author:       raster
Date:         2010-03-14 15:33:52 -0700 (Sun, 14 Mar 2010)
New Revision: 47225

Modified:
  trunk/TMP/st/elementary/src/bin/test_button.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_button.c 

Modified: trunk/TMP/st/elementary/src/bin/test_button.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_button.c	2010-03-14 20:48:52 UTC (rev 47224)
+++ trunk/TMP/st/elementary/src/bin/test_button.c	2010-03-14 22:33:52 UTC (rev 47225)
@@ -82,7 +82,7 @@
    elm_box_pack_end(bx, bt);
    evas_object_smart_callback_add(bt, "repeated", _bt_repeated, NULL);
    elm_button_autorepeat_set(bt, 1);
-   elm_button_autorepeat_initital_timeout_set(bt, 2.0);
+   elm_button_autorepeat_initial_timeout_set(bt, 2.0);
    elm_button_autorepeat_gap_timeout_set(bt, 0.5);
    evas_object_show(bt);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-03-14 20:48:52 UTC (rev 47224)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-03-14 22:33:52 UTC (rev 47225)
@@ -382,7 +382,7 @@
    EAPI void         elm_button_icon_set(Evas_Object *obj, Evas_Object *icon);
    EAPI Evas_Object *elm_button_icon_get(Evas_Object *obj);
    EAPI void         elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on);
-   EAPI void         elm_button_autorepeat_initital_timeout_set(Evas_Object *obj, double t);
+   EAPI void         elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t);
    EAPI void         elm_button_autorepeat_gap_timeout_set(Evas_Object *obj, double t);
    /* available styles:
     * default

Modified: trunk/TMP/st/elementary/src/lib/elm_button.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_button.c	2010-03-14 20:48:52 UTC (rev 47224)
+++ trunk/TMP/st/elementary/src/lib/elm_button.c	2010-03-14 22:33:52 UTC (rev 47225)
@@ -349,7 +349,7 @@
  * @ingroup Button
  */
 EAPI void
-elm_button_autorepeat_initital_timeout_set(Evas_Object *obj, double t)
+elm_button_autorepeat_initial_timeout_set(Evas_Object *obj, double t)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);

Log:
  1. if window is transient for another.. if parent del - nuke reference to it
  in transient.
  2. addd flush button in genlist test - for exposing memory issues.
  
  
Author:       raster
Date:         2010-04-04 21:58:43 -0700 (Sun, 04 Apr 2010)
New Revision: 47757

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_win.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-04-05 00:43:12 UTC (rev 47756)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-04-05 04:58:43 UTC (rev 47757)
@@ -312,6 +312,16 @@
    elm_genlist_item_selected_set(gli, 1);
 }
 
+static void
+my_gl_flush(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *gl = data;
+   evas_image_cache_flush(evas_object_evas_get(obj));
+   evas_font_cache_flush(evas_object_evas_get(obj));
+   edje_file_cache_flush();
+   edje_collection_cache_flush();
+}
+
 void
 test_genlist2(void *data, Evas_Object *obj, void *event_info)
 {
@@ -466,6 +476,14 @@
    elm_box_pack_end(bx3, bt);
    evas_object_show(bt);
 
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Flush");
+   evas_object_smart_callback_add(bt, "clicked", my_gl_flush, gl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx3, bt);
+   evas_object_show(bt);
+
    elm_box_pack_end(bx, bx3);
    evas_object_show(bx3);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_win.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_win.c	2010-04-05 00:43:12 UTC (rev 47756)
+++ trunk/TMP/st/elementary/src/lib/elm_win.c	2010-04-05 04:58:43 UTC (rev 47757)
@@ -29,6 +29,7 @@
 
 static const char *widtype = NULL;
 static void _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
+static void _elm_win_obj_callback_parent_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _elm_win_obj_intercept_show(void *data, Evas_Object *obj);
 static void _elm_win_move(Ecore_Evas *ee);
 static void _elm_win_resize(Ecore_Evas *ee);
@@ -111,6 +112,12 @@
    Elm_Win *win = data;
    Evas_Object *child;
 
+   if (win->parent)
+     {
+        evas_object_event_callback_del_full(win->parent, EVAS_CALLBACK_DEL,
+                                            _elm_win_obj_callback_parent_del, win);
+        win->parent = NULL;
+     }
    if (win->autodel_clear) *(win->autodel_clear) = -1;
    _elm_win_list = eina_list_remove(_elm_win_list, win->win_obj);
    while (win->subobjs) elm_win_resize_object_del(obj, win->subobjs->data);
@@ -128,11 +135,11 @@
      {
 	evas_object_del(child);
      }
-   evas_image_cache_flush(win->evas);
-   evas_font_cache_flush(win->evas);
 // FIXME: Why are we flushing edje on every window destroy ??
-   edje_file_cache_flush();
-   edje_collection_cache_flush();
+//   evas_image_cache_flush(win->evas);
+//   evas_font_cache_flush(win->evas);
+//   edje_file_cache_flush();
+//   edje_collection_cache_flush();
 // FIXME: we are in the del handler for the object and delete the canvas
 // that lives under it from the handler... nasty. deferring doesnt help either
    ecore_job_add(_deferred_ecore_evas_free, win->ee);
@@ -142,11 +149,22 @@
    if ((!_elm_win_list) &&
        (elm_policy_get(ELM_POLICY_QUIT) == ELM_POLICY_QUIT_LAST_WINDOW_CLOSED))
      {
+        evas_image_cache_flush(e);
+        evas_font_cache_flush(e);
+        edje_file_cache_flush();
+        edje_collection_cache_flush();
 	elm_exit();
      }
 }
 
 static void
+_elm_win_obj_callback_parent_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Elm_Win *win = data;
+   if (obj == win->parent) win->parent = NULL;
+}
+
+static void
 _elm_win_obj_intercept_show(void *data __UNUSED__, Evas_Object *obj)
 {
    // this is called to make sure all smart containers have calculated their
@@ -445,6 +463,9 @@
 
    win->type = type;
    win->parent = parent;
+   if (win->parent)
+     evas_object_event_callback_add(win->parent, EVAS_CALLBACK_DEL,
+                                    _elm_win_obj_callback_parent_del, win);
 
    win->evas = ecore_evas_get(win->ee);
    win->win_obj = elm_widget_add(win->evas);

Log:
  support flush and dump protocol - also add call to do this by requuest from
  the app itself.
  
  
Author:       raster
Date:         2010-04-12 01:27:10 -0700 (Mon, 12 Apr 2010)
New Revision: 47949

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_main.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_win.c 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-04-12 08:27:10 UTC (rev 47949)
@@ -68,6 +68,7 @@
 void test_multi(void *data, Evas_Object *obj, void *event_info);
 void test_floating(void *data, Evas_Object *obj, void *event_info);
 void test_launcher(void *data, Evas_Object *obj, void *event_info);
+void test_launcher2(void *data, Evas_Object *obj, void *event_info);
 void test_anim(void *data, Evas_Object *obj, void *event_info);
 
 
@@ -257,6 +258,7 @@
    ADD_TEST("Multi Touch", test_multi);
    ADD_TEST("Floating Objects", test_floating);
    ADD_TEST("Launcher", test_launcher);
+   ADD_TEST("Launcher 2", test_launcher2);
    ADD_TEST("Animation", test_anim);
 #undef ADD_TEST
 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-04-12 08:27:10 UTC (rev 47949)
@@ -312,14 +312,17 @@
    elm_genlist_item_selected_set(gli, 1);
 }
 
+static int
+my_gl_flush_delay(void *data)
+{
+   elm_all_flush();
+   return 0;
+}
+
 static void
 my_gl_flush(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *gl = data;
-   evas_image_cache_flush(evas_object_evas_get(obj));
-   evas_font_cache_flush(evas_object_evas_get(obj));
-   edje_file_cache_flush();
-   edje_collection_cache_flush();
+   ecore_timer_add(1.2, my_gl_flush_delay, NULL);
 }
 
 void

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-04-12 08:27:10 UTC (rev 47949)
@@ -249,4 +249,128 @@
    evas_object_resize(win, 480, 800);
    evas_object_show(win);
 }
+
+void
+test_launcher2(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *rc, *ly;
+   int i, j, k, n, m;
+   char buf[PATH_MAX];
+   Eina_List *mbs = NULL;
+   
+   win = elm_win_add(NULL, "launcher", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Launcher");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR);
+   elm_bg_file_set(bg, buf, NULL);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bg);
+   evas_object_show(bg);
+   
+   bx = elm_box_add(win);
+   elm_box_homogenous_set(bx, 1);
+   elm_box_horizontal_set(bx, 1);
+   
+   for (k = 0 ; k < 8; k++)
+     {
+        ly = elm_layout_add(win);
+        snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR);
+        elm_layout_file_set(ly, buf, "layout");
+        evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+        
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Button 1");
+        elm_layout_content_set(ly, "element1", bt);
+        evas_object_show(bt);
+        
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Button 2");
+        elm_layout_content_set(ly, "element2", bt);
+        evas_object_show(bt);
+        
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Button 3");
+        elm_layout_content_set(ly, "element3", bt);
+        evas_object_show(bt);
+        
+        mb = elm_mapbuf_add(win);
+        elm_mapbuf_content_set(mb, ly);
+        evas_object_show(ly);
+        
+        elm_box_pack_end(bx, mb);
+        evas_object_show(mb);
+        
+        mbs = eina_list_append(mbs, mb);
+     }
+
+   // fixme: free mbs
+   evas_object_data_set(win, "mbs", mbs);
+   
+   sc = elm_scroller_add(win);
+   elm_scroller_bounce_set(sc, 1, 0);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, sc);
+   
+   elm_scroller_content_set(sc, bx);
+   evas_object_show(bx);
+   
+   elm_scroller_page_relative_set(sc, 1.0, 1.0);
+   evas_object_show(sc);
+
+   tb2 = elm_table_add(win);
+   evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, tb2);
+   
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "Map");
+   elm_check_state_set(ck, 0);
+   evas_object_smart_callback_add(ck, "changed", mode_cb, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.05, 0.99);
+   elm_table_pack(tb2, ck, 0, 0, 1, 1);
+   evas_object_show(ck);
+   
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "A");
+   elm_check_state_set(ck, 1);
+   evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.20, 0.99);
+   elm_table_pack(tb2, ck, 1, 0, 1, 1);
+   evas_object_show(ck);
+   
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "Smo");
+   elm_check_state_set(ck, 1);
+   evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.40, 0.99);
+   elm_table_pack(tb2, ck, 2, 0, 1, 1);
+   evas_object_show(ck);
+   
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "FS");
+   elm_check_state_set(ck, 0);
+   evas_object_smart_callback_add(ck, "changed", full_cb, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.5, 0.99);
+   elm_table_pack(tb2, ck, 3, 0, 1, 1);
+   evas_object_show(ck);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Close");
+   evas_object_smart_callback_add(bt, "clicked", close_cb, win);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(bt, 0.95, 0.99);
+   elm_table_pack(tb2, bt, 4, 0, 1, 1);
+   evas_object_show(bt);
+   
+   evas_object_show(tb2);
+
+   evas_object_resize(win, 480, 800);
+   evas_object_show(win);
+}
 #endif

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-04-12 08:27:10 UTC (rev 47949)
@@ -226,7 +226,9 @@
 
    EAPI Eina_Bool    elm_policy_set(unsigned int policy, int value);
    EAPI int          elm_policy_get(unsigned int policy);
-
+   
+   EAPI void         elm_all_flush(void);
+       
    EAPI void         elm_object_scale_set(Evas_Object *obj, double scale);
    EAPI double       elm_object_scale_get(const Evas_Object *obj);
    EAPI void         elm_object_style_set(Evas_Object *obj, const char *style);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2010-04-12 08:27:10 UTC (rev 47949)
@@ -1331,6 +1331,25 @@
    return _elm_policies[policy];
 }
 
+/**
+ * Flush all caches & dump all data that can be to lean down to use less memory
+ */
+EAPI void
+elm_all_flush(void)
+{
+   const Eina_List *l;
+   Evas_Object *obj;
+   
+   EINA_LIST_FOREACH(_elm_win_list, l, obj)
+     {
+        Evas *e = evas_object_evas_get(obj);
+        edje_file_cache_flush();
+        edje_collection_cache_flush();
+        evas_image_cache_flush(e);
+        evas_font_cache_flush(e);
+        evas_render_dump(e);
+     }
+}
 
 /**
  * @defgroup Scaling Selective Widget Scaling

Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-04-12 08:27:10 UTC (rev 47949)
@@ -168,6 +168,8 @@
 extern const char *_elm_lib_dir;
 extern int _elm_log_dom;
 
+extern Eina_List *_elm_win_list;
+
 #define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__)
 #define ERR(...) EINA_LOG_DOM_ERR(_elm_log_dom, __VA_ARGS__)
 #define WRN(...) EINA_LOG_DOM_WARN(_elm_log_dom, __VA_ARGS__)

Modified: trunk/TMP/st/elementary/src/lib/elm_win.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_win.c	2010-04-12 08:24:19 UTC (rev 47948)
+++ trunk/TMP/st/elementary/src/lib/elm_win.c	2010-04-12 08:27:10 UTC (rev 47949)
@@ -16,7 +16,10 @@
    Evas *evas;
    Evas_Object *parent, *win_obj;
    Eina_List *subobjs;
+#ifdef HAVE_ELEMENTARY_X
    Ecore_X_Window xwin;
+   Ecore_Event_Handler *client_message_handler;
+#endif   
    Ecore_Job *deferred_resize_job;
    Ecore_Job *deferred_child_eval_job;
 
@@ -44,7 +47,7 @@
 static void _elm_win_subobj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_info);
 static void _elm_win_subobj_callback_changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
 
-static Eina_List *_elm_win_list = NULL;
+Eina_List *_elm_win_list = NULL;
 
 static void
 _elm_win_move(Ecore_Evas *ee)
@@ -137,6 +140,10 @@
      {
 	evas_object_del(child);
      }
+#ifdef HAVE_ELEMENTARY_X
+   if (win->client_message_handler)
+     ecore_event_handler_del(win->client_message_handler);
+#endif   
 // FIXME: Why are we flushing edje on every window destroy ??
 //   evas_image_cache_flush(win->evas);
 //   evas_font_cache_flush(win->evas);
@@ -212,6 +219,7 @@
      }
 }
 
+#ifdef HAVE_ELEMENTARY_X
 static void
 _elm_win_xwindow_get(Elm_Win *win)
 {
@@ -244,11 +252,12 @@
 	break;
      }
 }
+#endif
 
+#ifdef HAVE_ELEMENTARY_X
 static void
 _elm_win_xwin_update(Elm_Win *win)
 {
-#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
    if (win->parent)
      {
@@ -295,8 +304,8 @@
      }
    ecore_x_e_virtual_keyboard_state_set
      (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode);
+}
 #endif
-}
 
 static void
 _elm_win_eval_subobjs(Evas_Object *obj)
@@ -374,6 +383,47 @@
      elm_widget_theme(obj);
 }
 
+#ifdef HAVE_ELEMENTARY_X
+static int
+_elm_win_client_message(void *data, int type __UNUSED__, void *event)
+{
+   Elm_Win *win = data;
+   Ecore_X_Event_Client_Message *e = event;
+
+   if (e->format != 32) return 1;
+   if (e->message_type == ECORE_X_ATOM_E_COMP_FLUSH)
+     {
+        if (e->data.l[0] == win->xwin)
+          {
+             Evas *e = evas_object_evas_get(win->win_obj);
+             if (e)
+               {
+                  edje_file_cache_flush();
+                  edje_collection_cache_flush();
+                  evas_image_cache_flush(e);
+                  evas_font_cache_flush(e);
+               }
+          }
+     }
+   else if (e->message_type == ECORE_X_ATOM_E_COMP_DUMP)
+     {
+        if (e->data.l[0] == win->xwin)
+          {
+             Evas *e = evas_object_evas_get(win->win_obj);
+             if (e)
+               {
+                  edje_file_cache_flush();
+                  edje_collection_cache_flush();
+                  evas_image_cache_flush(e);
+                  evas_font_cache_flush(e);
+                  evas_render_dump(e);
+               }
+          }
+     }
+   return 1;
+}
+#endif
+
 /**
  * Adds a window object. If this is the first window created, pass NULL as
  * @p parent.
@@ -406,6 +456,10 @@
      {
       case ELM_SOFTWARE_X11:
 	win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
+#ifdef HAVE_ELEMENTARY_X
+        win->client_message_handler = ecore_event_handler_add
+          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+#endif        
 	break;
       case ELM_SOFTWARE_FB:
 	win->ee = ecore_evas_fb_new(NULL, 0, 1, 1);
@@ -420,6 +474,10 @@
              CRITICAL("Software-16 engine create failed. Try software.");
              win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
           }
+#ifdef HAVE_ELEMENTARY_X
+        win->client_message_handler = ecore_event_handler_add
+          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+#endif        
 	break;
       case ELM_XRENDER_X11:
 	win->ee = ecore_evas_xrender_x11_new(NULL, 0, 0, 0, 1, 1);
@@ -428,6 +486,10 @@
              CRITICAL("XRender engine create failed. Try software.");
              win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
           }
+#ifdef HAVE_ELEMENTARY_X
+        win->client_message_handler = ecore_event_handler_add
+          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+#endif        
 	break;
       case ELM_OPENGL_X11:
 	win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1);
@@ -436,6 +498,10 @@
              CRITICAL("OpenGL engine create failed. Try software.");
              win->ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 1, 1);
           }
+#ifdef HAVE_ELEMENTARY_X
+        win->client_message_handler = ecore_event_handler_add
+          (ECORE_X_EVENT_CLIENT_MESSAGE, _elm_win_client_message, win);
+#endif        
 	break;
       case ELM_SOFTWARE_WIN32:
 	win->ee = ecore_evas_software_gdi_new(NULL, 0, 0, 1, 1);
@@ -476,7 +542,9 @@
 	free(win);
 	return NULL;
      }
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
+#endif   
    if ((_elm_config->bgpixmap) && (!_elm_config->compositing))
      ecore_evas_avoid_damage_set(win->ee, ECORE_EVAS_AVOID_DAMAGE_EXPOSE);
 // bg pixmap done by x - has other issues like can be redrawn by x before it
@@ -526,8 +594,10 @@
    else if (_elm_config->font_hinting == 2)
      evas_font_hinting_set(win->evas, EVAS_FONT_HINTING_BYTECODE);
 
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
-
+#endif
+   
    _elm_win_list = eina_list_append(_elm_win_list, win->win_obj);
 
    switch (_elm_config->engine)
@@ -547,6 +617,7 @@
       default:
 	break;
      }
+   
    return win->win_obj;
 }
 
@@ -708,7 +779,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_borderless_set(win->ee, borderless);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -745,7 +818,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_shaped_set(win->ee, shaped);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -781,6 +856,7 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      {
 	if (alpha)
@@ -795,6 +871,7 @@
 	_elm_win_xwin_update(win);
      }
    else
+#endif
      ecore_evas_alpha_set(win->ee, alpha);
 }
 
@@ -832,12 +909,14 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    
+#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      {
        ecore_evas_transparent_set(win->ee, transparent);	  
 	_elm_win_xwin_update(win);
      }
    else
+#endif
      ecore_evas_transparent_set(win->ee, transparent);
 }
 
@@ -876,7 +955,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_override_set(win->ee, override);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -920,7 +1001,9 @@
 	break;
      default:
 	ecore_evas_fullscreen_set(win->ee, fullscreen);
+#ifdef HAVE_ELEMENTARY_X
 	_elm_win_xwin_update(win);
+#endif
 	break;
      }
 }
@@ -970,7 +1053,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_maximized_set(win->ee, maximized);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1007,7 +1092,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_iconified_set(win->ee, iconified);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1043,8 +1130,10 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
-   ecore_evas_layer_set(win->ee, layer);
+   ecore_evas_layer_set(win->ee, layer); 
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1086,7 +1175,9 @@
    evas_object_size_hint_min_set(obj, -1, -1);
    evas_object_size_hint_max_set(obj, -1, -1);
    _elm_win_eval_subobjs(obj);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1110,7 +1201,9 @@
    evas_object_size_hint_min_set(obj, -1, -1);
    evas_object_size_hint_max_set(obj, -1, -1);
    _elm_win_eval_subobjs(obj);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1147,7 +1240,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    ecore_evas_sticky_set(win->ee, sticky);
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwin_update(win);
+#endif
 }
 
 /**
@@ -1200,7 +1295,9 @@
    win = elm_widget_data_get(obj);
    if (!win) return;
    if (mode == win->kbdmode) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
+#endif
    win->kbdmode = mode;
 #ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
@@ -1224,8 +1321,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_virtual_keyboard_set(win->xwin, is_keyboard);
 #endif
@@ -1266,8 +1363,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_illume_conformant_set(win->xwin, conformant);
 #endif
@@ -1288,8 +1385,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    win = elm_widget_data_get(obj);
    if (!win) return EINA_FALSE;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      return ecore_x_e_illume_conformant_get(win->xwin);
 #endif
@@ -1313,8 +1410,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      {
         ecore_x_e_illume_quickpanel_set(win->xwin, quickpanel);
@@ -1346,8 +1443,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    win = elm_widget_data_get(obj);
    if (!win) return EINA_FALSE;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      return ecore_x_e_illume_quickpanel_get(win->xwin);
 #endif
@@ -1369,8 +1466,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_illume_quickpanel_priority_major_set(win->xwin, priority);
 #endif
@@ -1391,8 +1488,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype) -1;
    win = elm_widget_data_get(obj);
    if (!win) return -1;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      return ecore_x_e_illume_quickpanel_priority_major_get(win->xwin);
 #endif
@@ -1414,8 +1511,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_illume_quickpanel_priority_minor_set(win->xwin, priority);
 #endif
@@ -1436,8 +1533,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype) -1;
    win = elm_widget_data_get(obj);
    if (!win) return -1;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      return ecore_x_e_illume_quickpanel_priority_minor_get(win->xwin);
 #endif
@@ -1459,8 +1556,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    win = elm_widget_data_get(obj);
    if (!win) return;
+#ifdef HAVE_ELEMENTARY_X
    _elm_win_xwindow_get(win);
-#ifdef HAVE_ELEMENTARY_X
    if (win->xwin)
      ecore_x_e_illume_quickpanel_zone_set(win->xwin, zone);
 #endif
@@ -1630,9 +1727,12 @@
 {
    Ecore_X_Window xwin = 0;
    Ecore_Evas *ee = NULL;
-   
    if (!obj) return 0;
+#ifdef HAVE_ELEMENTARY_X
    ee = ecore_evas_ecore_evas_get(evas_object_evas_get(obj));
    if (ee) xwin = (Ecore_X_Window)ecore_evas_window_get(ee);
    return xwin;
+#else
+   return 0;
+#endif
 }

Log:
  support items in anchorblock/view too.
  
  
Author:       raster
Date:         2010-04-27 23:13:06 -0700 (Tue, 27 Apr 2010)
New Revision: 48384

Modified:
  trunk/TMP/st/elementary/src/bin/test_anchorblock.c trunk/TMP/st/elementary/src/bin/test_anchorview.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elc_anchorblock.c trunk/TMP/st/elementary/src/lib/elc_anchorview.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test_anchorblock.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_anchorblock.c	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/bin/test_anchorblock.c	2010-04-28 06:13:06 UTC (rev 48384)
@@ -185,7 +185,7 @@
 			   "of information. This of course can be later explicitly "
 			   "done by links maybe running local apps or even being "
 			   "web URL's too that launch the web browser and point it "
-			   "to that URL.");
+			   "to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
    evas_object_smart_callback_add(av, "anchor,clicked", my_anchorblock_anchor, av);
    elm_bubble_content_set(bb, av);
    evas_object_show(av);
@@ -209,7 +209,7 @@
    av = elm_anchorblock_add(win);
    elm_anchorblock_hover_style_set(av, "popout");
    elm_anchorblock_hover_parent_set(av, win);
-   elm_anchorblock_text_set(av, "This is a short message");
+   elm_anchorblock_text_set(av, "This is a short message. <item relsize=16x16 vsize=full href=emoticon/haha></item>");
    evas_object_smart_callback_add(av, "anchor,clicked", 
                                   my_anchorblock_anchor, av);
    elm_bubble_content_set(bb, av);

Modified: trunk/TMP/st/elementary/src/bin/test_anchorview.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_anchorview.c	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/bin/test_anchorview.c	2010-04-28 06:13:06 UTC (rev 48384)
@@ -91,7 +91,7 @@
 		       "<a href=X><link>links in the text</></a>, so enter text<br>"
 		       "in here to edit it. By the way, links are<br>"
 		       "called <a href=anc-02>Anchors</a> so you will need<br>"
-		       "to refer to them this way.");
+		       "to refer to them this way. <item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>");
    evas_object_size_hint_weight_set(av, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_smart_callback_add(av, "anchor,clicked", my_anchorview_anchor, av);
    elm_win_resize_object_add(win, av);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-04-28 06:13:06 UTC (rev 48384)
@@ -481,7 +481,7 @@
    EAPI Eina_Bool    elm_label_line_wrap_get(const Evas_Object *obj);
    EAPI void         elm_label_wrap_width_set(Evas_Object *obj, Evas_Coord w);
    EAPI Evas_Coord   elm_label_wrap_width_get(const Evas_Object *obj);
-/* available styles:
+   /* available styles:
     * default
     * marker
     */
@@ -759,6 +759,9 @@
    EAPI void         elm_anchorview_hover_style_set(Evas_Object *obj, const char *style);
    EAPI void         elm_anchorview_hover_end(Evas_Object *obj);
    EAPI void         elm_anchorview_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
+   EAPI void         elm_anchorview_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
+   EAPI void         elm_anchorview_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
+   EAPI void         elm_anchorview_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data);
    /* smart callbacks called:
     * "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorview_Info
     */
@@ -784,6 +787,9 @@
    EAPI void         elm_anchorblock_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
    EAPI void         elm_anchorblock_hover_style_set(Evas_Object *obj, const char *style);
    EAPI void         elm_anchorblock_hover_end(Evas_Object *obj);
+   EAPI void         elm_anchorblock_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
+   EAPI void         elm_anchorblock_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
+   EAPI void         elm_anchorblock_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data);
    /* smart callbacks called:
     * "anchor,clicked" - achor called was clicked | event_info = Elm_Entry_Anchorblock_Info
     */

Modified: trunk/TMP/st/elementary/src/lib/elc_anchorblock.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_anchorblock.c	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/lib/elc_anchorblock.c	2010-04-28 06:13:06 UTC (rev 48384)
@@ -16,15 +16,23 @@
  * Elm_Entry_Anchorview_Info
  */
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Anchorblock_Item_Provider Elm_Anchorblock_Item_Provider;
 
 struct _Widget_Data
 {
    Evas_Object *entry;
    Evas_Object *hover_parent;
    Evas_Object *pop, *hover;
+   Eina_List *item_providers;
    const char *hover_style;
 };
 
+struct _Elm_Anchorblock_Item_Provider
+{
+   Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item);
+   void *data;
+};
+
 static const char *widtype = NULL;
 
 static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked";
@@ -56,8 +64,13 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Anchorblock_Item_Provider *ip;
    if (!wd) return;
    if (wd->hover_style) eina_stringshare_del(wd->hover_style);
+   EINA_LIST_FREE(wd->item_providers, ip)
+     {
+        free(ip);
+     }
    free(wd);
 }
 
@@ -138,6 +151,22 @@
    wd->hover_parent = NULL;
 }
 
+static Evas_Object *
+_item_provider(void *data, Evas_Object *entry, const char *item)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   Evas_Object *o;
+   Eina_List *l;
+   Elm_Anchorblock_Item_Provider *ip;
+   
+   EINA_LIST_FOREACH(wd->item_providers, l, ip)
+     {
+        o = ip->func(ip->data, data, item);
+        if (o) return o;
+     }
+   return NULL;
+}
+
 /**
  * Add a new Anchorblock object
  *
@@ -164,6 +193,7 @@
    elm_widget_del_hook_set(obj, _del_hook);
 
    wd->entry = elm_entry_add(parent);
+   elm_entry_item_provider_prepend(wd->entry, _item_provider, obj);
    elm_widget_resize_object_set(obj, wd->entry);
    elm_entry_editable_set(wd->entry, 0);
    evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0);
@@ -296,3 +326,91 @@
    wd->hover = NULL;
    wd->pop = NULL;
 }
+
+/**
+ * This appends a custom item provider to the list for that anchorblock
+ *
+ * This appends the given callback. The list is walked from beginning to end
+ * with each function called given the item href string in the text. If the
+ * function returns an object handle other than NULL (it should create an
+ * and object to do this), then this object is used to replace that item. If
+ * not the next provider is called until one provides an item object, or the
+ * default provider in anchorblock does.
+ * 
+ * @param obj The anchorblock object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorblock
+ */
+EAPI void
+elm_anchorblock_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (!func) return;
+   Elm_Anchorblock_Item_Provider *ip = calloc(1, sizeof(Elm_Anchorblock_Item_Provider));
+   if (!ip) return;
+   ip->func = func;
+   ip->data = data;
+   wd->item_providers = eina_list_append(wd->item_providers, ip);
+}
+
+/**
+ * This prepends a custom item provider to the list for that anchorblock
+ *
+ * This prepends the given callback. See elm_anchorblock_item_provider_append() for
+ * more information
+ * 
+ * @param obj The anchorblock object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorblock
+ */
+EAPI void
+elm_anchorblock_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (!func) return;
+   Elm_Anchorblock_Item_Provider *ip = calloc(1, sizeof(Elm_Anchorblock_Item_Provider));
+   if (!ip) return;
+   ip->func = func;
+   ip->data = data;
+   wd->item_providers = eina_list_prepend(wd->item_providers, ip);
+}
+
+/**
+ * This removes a custom item provider to the list for that anchorblock
+ *
+ * This removes the given callback. See elm_anchorblock_item_provider_append() for
+ * more information
+ * 
+ * @param obj The anchorblock object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorblock
+ */
+EAPI void
+elm_anchorblock_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorblock, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Eina_List *l;
+   Elm_Anchorblock_Item_Provider *ip;
+   if (!wd) return;
+   if (!func) return;
+   EINA_LIST_FOREACH(wd->item_providers, l, ip)
+     {
+        if ((ip->func == func) && (ip->data == data))
+          {
+             wd->item_providers = eina_list_remove_list(wd->item_providers, l);
+             free(ip);
+             return;
+          }
+     }
+}

Modified: trunk/TMP/st/elementary/src/lib/elc_anchorview.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elc_anchorview.c	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/lib/elc_anchorview.c	2010-04-28 06:13:06 UTC (rev 48384)
@@ -13,15 +13,23 @@
  * Elm_Entry_Anchorview_Info
  */
 typedef struct _Widget_Data Widget_Data;
+typedef struct _Elm_Anchorview_Item_Provider Elm_Anchorview_Item_Provider;
 
 struct _Widget_Data
 {
    Evas_Object *scroller, *entry;
    Evas_Object *hover_parent;
    Evas_Object *pop, *hover;
+   Eina_List *item_providers;
    const char *hover_style;
 };
 
+struct _Elm_Anchorview_Item_Provider
+{
+   Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item);
+   void *data;
+};
+
 static const char *widtype = NULL;
 
 static const char SIG_ANCHOR_CLICKED[] = "anchor,clicked";
@@ -49,8 +57,13 @@
 _del_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   Elm_Anchorview_Item_Provider *ip;
    if (!wd) return;
    if (wd->hover_style) eina_stringshare_del(wd->hover_style);
+   EINA_LIST_FREE(wd->item_providers, ip)
+     {
+        free(ip);
+     }
    free(wd);
 }
 
@@ -129,6 +142,22 @@
    wd->hover_parent = NULL;
 }
 
+static Evas_Object *
+_item_provider(void *data, Evas_Object *entry, const char *item)
+{
+   Widget_Data *wd = elm_widget_data_get(data);
+   Evas_Object *o;
+   Eina_List *l;
+   Elm_Anchorview_Item_Provider *ip;
+   
+   EINA_LIST_FOREACH(wd->item_providers, l, ip)
+     {
+        o = ip->func(ip->data, data, item);
+        if (o) return o;
+     }
+   return NULL;
+}
+
 /**
  * Add a new Anchorview object
  *
@@ -157,6 +186,7 @@
    wd->scroller = elm_scroller_add(parent);
    elm_widget_resize_object_set(obj, wd->scroller);
    wd->entry = elm_entry_add(parent);
+   elm_entry_item_provider_prepend(wd->entry, _item_provider, obj);
    elm_entry_editable_set(wd->entry, 0);
    evas_object_size_hint_weight_set(wd->entry, 1.0, 1.0);
    evas_object_size_hint_align_set(wd->entry, -1.0, -1.0);
@@ -311,3 +341,91 @@
    if (!wd) return;
    elm_scroller_bounce_set(wd->scroller, h_bounce, v_bounce);
 }
+
+/**
+ * This appends a custom item provider to the list for that anchorview
+ *
+ * This appends the given callback. The list is walked from beginning to end
+ * with each function called given the item href string in the text. If the
+ * function returns an object handle other than NULL (it should create an
+ * and object to do this), then this object is used to replace that item. If
+ * not the next provider is called until one provides an item object, or the
+ * default provider in anchorview does.
+ * 
+ * @param obj The anchorview object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorview
+ */
+EAPI void
+elm_anchorview_item_provider_append(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (!func) return;
+   Elm_Anchorview_Item_Provider *ip = calloc(1, sizeof(Elm_Anchorview_Item_Provider));
+   if (!ip) return;
+   ip->func = func;
+   ip->data = data;
+   wd->item_providers = eina_list_append(wd->item_providers, ip);
+}
+
+/**
+ * This prepends a custom item provider to the list for that anchorview
+ *
+ * This prepends the given callback. See elm_anchorview_item_provider_append() for
+ * more information
+ * 
+ * @param obj The anchorview object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorview
+ */
+EAPI void
+elm_anchorview_item_provider_prepend(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (!func) return;
+   Elm_Anchorview_Item_Provider *ip = calloc(1, sizeof(Elm_Anchorview_Item_Provider));
+   if (!ip) return;
+   ip->func = func;
+   ip->data = data;
+   wd->item_providers = eina_list_prepend(wd->item_providers, ip);
+}
+
+/**
+ * This removes a custom item provider to the list for that anchorview
+ *
+ * This removes the given callback. See elm_anchorview_item_provider_append() for
+ * more information
+ * 
+ * @param obj The anchorview object
+ * @param func The function called to provide the item object
+ * @param data The data passed to @p func
+ *
+ * @ingroup Anchorview
+ */
+EAPI void
+elm_anchorview_item_provider_remove(Evas_Object *obj, Evas_Object *(*func) (void *data, Evas_Object *anchorview, const char *item), void *data)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype);
+   Widget_Data *wd = elm_widget_data_get(obj);
+   Eina_List *l;
+   Elm_Anchorview_Item_Provider *ip;
+   if (!wd) return;
+   if (!func) return;
+   EINA_LIST_FOREACH(wd->item_providers, l, ip)
+     {
+        if ((ip->func == func) && (ip->data == data))
+          {
+             wd->item_providers = eina_list_remove_list(wd->item_providers, l);
+             free(ip);
+             return;
+          }
+     }
+}

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-04-28 05:14:02 UTC (rev 48383)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-04-28 06:13:06 UTC (rev 48384)
@@ -13,7 +13,7 @@
  * 
  * You can also insert "items" in the entry with:
  * 
- * <item size=16x16 vsize=full href=emoticon/haha></item>
+ * \<item size=16x16 vsize=full href=emoticon/haha\>\</item\>
  * 
  * for example. sizing can be set bu size=WxH, relsize=WxH or absize=WxH with
  * vsize=ascent or vsize=full. the href=NAME sets the item name. Entry

Log:
  scroller in scroller.... works! well with scrollers for now (elm_scroller).
  need to fix up some other instances of use of elm_smart_scroller. it's a 1
  liner.
  
  
Author:       raster
Date:         2010-05-07 06:21:45 -0700 (Fri, 07 May 2010)
New Revision: 48667

Modified:
  trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/bin/test_scroller.c trunk/TMP/st/elementary/src/lib/elm_genlist.c trunk/TMP/st/elementary/src/lib/elm_priv.h trunk/TMP/st/elementary/src/lib/elm_scroller.c trunk/TMP/st/elementary/src/lib/elm_widget.c trunk/TMP/st/elementary/src/lib/els_scroller.c trunk/TMP/st/elementary/src/lib/els_scroller.h 

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -51,6 +51,7 @@
 void test_fileselector(void *data, Evas_Object *obj, void *event_info);
 void test_separator(void *data, Evas_Object *obj, void *event_info);
 void test_scroller(void *data, Evas_Object *obj, void *event_info);
+void test_scroller2(void *data, Evas_Object *obj, void *event_info);
 void test_spinner(void *data, Evas_Object *obj, void *event_info);
 void test_index(void *data, Evas_Object *obj, void *event_info);
 void test_photocam(void *data, Evas_Object *obj, void *event_info);
@@ -243,6 +244,7 @@
    ADD_TEST("File Selector", test_fileselector);
    ADD_TEST("Separator", test_separator);
    ADD_TEST("Scroller", test_scroller);
+   ADD_TEST("Scroller 2", test_scroller2);
    ADD_TEST("Spinner", test_spinner);
    ADD_TEST("Index", test_index);
    ADD_TEST("Photocam", test_photocam);

Modified: trunk/TMP/st/elementary/src/bin/test_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_scroller.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/bin/test_scroller.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -126,4 +126,138 @@
    evas_object_resize(win, 320, 320);
    evas_object_show(win);
 }
+
+void
+click_through(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("click went through on %p\n", obj);
+}
+
+void
+test_scroller2(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *win, *bt, *bx, *bx2, *bg, *sc, *tb, *tb2, *rc;
+   int i, j;
+
+   win = elm_win_add(NULL, "scroller2", ELM_WIN_BASIC);
+   elm_win_title_set(win, "Scroller 2");
+   elm_win_autodel_set(win, 1);
+
+   bg = elm_bg_add(win);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, bg);
+   evas_object_show(bg);
+
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);
+
+   /* { */
+   for (i = 0; i < 3; i++)
+     {
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Vertical");
+        evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
+        evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
+        elm_box_pack_end(bx, bt);
+        evas_object_show(bt);
+     }
+   /* } */
+   
+   /* { */
+   sc = elm_scroller_add(win);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5);
+   elm_scroller_bounce_set(sc, 1, 0);
+   elm_scroller_content_min_limit(sc, 0, 1);
+   elm_box_pack_end(bx, sc);
+   evas_object_show(sc);
+   
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+
+   for (i = 0; i < 10; i++)
+     {
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "... Horizontal scrolling ...");
+        evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
+        elm_box_pack_end(bx2, bt);
+        evas_object_show(bt);
+     }
+   
+   elm_scroller_content_set(sc, bx2);
+   evas_object_show(bx2);
+   /* } */
+
+   /* { */
+   for (i = 0; i < 3; i++)
+     {
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Vertical");
+        evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
+        evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
+        elm_box_pack_end(bx, bt);
+        evas_object_show(bt);
+     }
+   /* } */
+   
+   /* { */
+   tb = elm_table_add(win);
+   evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, tb);
+   evas_object_show(tb);
+   
+   rc = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_size_hint_min_set(rc, 200, 120);
+   elm_table_pack(tb, rc, 0, 0, 1, 1);
+   
+   sc = elm_scroller_add(win);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(tb, sc, 0, 0, 1, 1);
+   evas_object_show(sc);
+   
+   tb2 = elm_table_add(win);
+
+   for (j = 0; j < 16; j++)
+     {
+        for (i = 0; i < 16; i++)
+          {
+             bt = elm_button_add(win);
+             elm_button_label_set(bt, "Both");
+             evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
+             elm_table_pack(tb2, bt, i, j, 1, 1);
+             evas_object_show(bt);
+          }
+     }
+   
+   elm_scroller_content_set(sc, tb2);
+   evas_object_show(tb2);
+   /* } */
+   
+   for (i = 0; i < 24; i++)
+     {
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, "Vertical");
+        evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
+        evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
+        elm_box_pack_end(bx, bt);
+        evas_object_show(bt);
+     }
+   
+   sc = elm_scroller_add(win);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_scroller_bounce_set(sc, 0, 1);
+   elm_win_resize_object_add(win, sc);
+   elm_scroller_content_set(sc, bx);
+   evas_object_show(bx);
+   evas_object_show(sc);
+   
+   evas_object_resize(win, 320, 480);
+   evas_object_show(win);
+}
 #endif

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -412,6 +412,19 @@
    evas_object_size_hint_max_get(wd->scr, &maxw, &maxh);
    minh = -1;
    if (wd->mode != ELM_LIST_LIMIT) minw = -1;
+   else
+     {
+        Evas_Coord  vmw, vmh, vw, vh;
+        
+        minw = wd->minw;
+        maxw = -1;
+        elm_smart_scroller_child_viewport_size_get(wd->scr, &vw, &vh);
+        if ((minw > 0) && (vw < minw)) vw = minw;
+        else if ((maxw > 0) && (vw > maxw)) vw = maxw;
+        minw = -1;
+        edje_object_size_min_calc(elm_smart_scroller_edje_object_get(wd->scr), &vmw, &vmh);
+        minw = vmw + minw;
+     }
    evas_object_size_hint_min_set(obj, minw, minh);
    evas_object_size_hint_max_set(obj, maxw, maxh);
 }
@@ -2876,10 +2889,7 @@
    if (!wd) return;
    if (wd->mode == mode) return;
    wd->mode = mode;
-   if (wd->mode == ELM_LIST_LIMIT)
-     elm_scroller_content_min_limit(wd->scr, 1, 0);
-   else
-     elm_scroller_content_min_limit(wd->scr, 0, 0);
+   _sizing_eval(obj);
 }
 
 /**

Modified: trunk/TMP/st/elementary/src/lib/elm_priv.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/elm_priv.h	2010-05-07 13:21:45 UTC (rev 48667)
@@ -148,7 +148,13 @@
 EAPI const char  *elm_widget_style_get(const Evas_Object *obj);
 EAPI void         elm_widget_type_set(Evas_Object *obj, const char *type);
 EAPI const char  *elm_widget_type_get(const Evas_Object *obj);
-
+EAPI void         elm_widget_drag_lock_x_set(Evas_Object *obj, Eina_Bool lock);
+EAPI void         elm_widget_drag_lock_y_set(Evas_Object *obj, Eina_Bool lock);
+EAPI Eina_Bool    elm_widget_drag_lock_x_get(Evas_Object *obj);
+EAPI Eina_Bool    elm_widget_drag_lock_y_get(Evas_Object *obj);
+EAPI int          elm_widget_drag_child_locked_x_get(Evas_Object *obj);
+EAPI int          elm_widget_drag_child_locked_y_get(Evas_Object *obj);
+    
 EAPI Eina_Bool    elm_widget_is(const Evas_Object *obj);
 EAPI Evas_Object *elm_widget_parent_widget_get(const Evas_Object *obj);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_scroller.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/elm_scroller.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -307,6 +307,7 @@
    wd->widget_base = eina_stringshare_add("base");
    
    wd->scr = elm_smart_scroller_add(e);
+   elm_smart_scroller_widget_set(wd->scr, obj);
 //   elm_smart_scroller_theme_set(wd->scr, 
 //                                wd->widget_name, 
 //                                wd->widget_base,

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -40,10 +40,16 @@
    int            scroll_freeze;
    double         scale;
    const char    *style;
-   unsigned char  can_focus : 1;
-   unsigned char  child_can_focus : 1;
-   unsigned char  focused : 1;
-   unsigned char  disabled : 1;
+   
+   int            child_drag_x_locked;
+   int            child_drag_y_locked;
+   Eina_Bool      drag_x_locked : 1;
+   Eina_Bool      drag_y_locked : 1;
+   
+   Eina_Bool      can_focus : 1;
+   Eina_Bool      child_can_focus : 1;
+   Eina_Bool      focused : 1;
+   Eina_Bool      disabled : 1;
 };
 
 /* local subsystem functions */
@@ -82,10 +88,12 @@
 _sub_obj_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Evas_Object *o = obj;
-   do {
-      if (_elm_widget_is(o)) break;
-      o = evas_object_smart_parent_get(o);
-   } while (o);
+   do 
+     {
+        if (_elm_widget_is(o)) break;
+        o = evas_object_smart_parent_get(o);
+     }
+   while (o);
    if (!o) return;
    if (!elm_widget_can_focus_get(o)) return;
    elm_widget_focus_steal(o);
@@ -911,6 +919,104 @@
    return "";
 }
 
+
+
+
+
+
+
+
+
+static void
+_propagate_x_drag_lock(Evas_Object *obj, int dir)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (sd->parent_obj)
+     {
+        Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj);
+        if (sd2)
+          {
+             sd2->child_drag_x_locked += dir;
+             _propagate_x_drag_lock(sd->parent_obj, dir);
+          }
+     }
+}
+
+static void
+_propagate_y_drag_lock(Evas_Object *obj, int dir)
+{
+   Smart_Data *sd = evas_object_smart_data_get(obj);
+   if (sd->parent_obj)
+     {
+        Smart_Data *sd2 = evas_object_smart_data_get(sd->parent_obj);
+        if (sd2)
+          {
+             sd2->child_drag_y_locked += dir;
+             _propagate_y_drag_lock(sd->parent_obj, dir);
+          }
+     }
+}
+
+EAPI void
+elm_widget_drag_lock_x_set(Evas_Object *obj, Eina_Bool lock)
+{
+   API_ENTRY return;
+   if (sd->drag_x_locked == lock) return;
+   sd->drag_x_locked = lock;
+   if (sd->drag_x_locked) _propagate_x_drag_lock(obj, 1);
+   else _propagate_x_drag_lock(obj, -1);
+}
+
+EAPI void
+elm_widget_drag_lock_y_set(Evas_Object *obj, Eina_Bool lock)
+{
+   API_ENTRY return;
+   if (sd->drag_y_locked == lock) return;
+   sd->drag_y_locked = lock;
+   if (sd->drag_y_locked) _propagate_y_drag_lock(obj, 1);
+   else _propagate_y_drag_lock(obj, -1);
+}
+
+EAPI Eina_Bool
+elm_widget_drag_lock_x_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   printf("check %p x lock %i\n", obj, sd->drag_x_locked);
+   return sd->drag_x_locked;
+}
+
+EAPI Eina_Bool
+elm_widget_drag_lock_y_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   printf("check %p y lock %i\n", obj, sd->drag_y_locked);
+   return sd->drag_y_locked;
+}
+
+EAPI int
+elm_widget_drag_child_locked_x_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   return sd->child_drag_x_locked;
+}
+
+EAPI int
+elm_widget_drag_child_locked_y_get(Evas_Object *obj)
+{
+   API_ENTRY return 0;
+   return sd->child_drag_y_locked;
+}
+
+
+
+
+
+
+
+
+
+
+
 /* local subsystem functions */
 static void
 _smart_reconfigure(Smart_Data *sd)

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.c	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.c	2010-05-07 13:21:45 UTC (rev 48667)
@@ -19,6 +19,8 @@
    Evas_Object *edje_obj;
    Evas_Object *event_obj;
 
+   Evas_Object *widget;
+   
    Elm_Smart_Scroller_Policy hbar_flags, vbar_flags;
 
    struct {
@@ -46,10 +48,12 @@
       Ecore_Animator *bounce_y_animator;
       Evas_Coord locked_x, locked_y;
       unsigned char now : 1;
+      unsigned char want_dragged : 1;
       unsigned char dragged : 1;
+      unsigned char dragged_began : 1;
       unsigned char dir_x : 1;
       unsigned char dir_y : 1;
-      unsigned char dir_none : 1;
+//      unsigned char dir_none : 1;
       unsigned char locked : 1;
       unsigned char bounce_x_hold : 1;
       unsigned char bounce_y_hold : 1;
@@ -624,40 +628,48 @@
    if (py > my) py = my;
    b2x = px;
    b2y = py;
-   if (!sd->down.bounce_x_animator)
+   if ((!sd->widget) || 
+       (!elm_widget_drag_child_locked_x_get(sd->widget)))
      {
-        if (sd->bouncemex)
+        if (!sd->down.bounce_x_animator)
           {
-             if (sd->scrollto.x.animator)
+             if (sd->bouncemex)
                {
-                  ecore_animator_del(sd->scrollto.x.animator);
-                  sd->scrollto.x.animator = NULL;
+                  if (sd->scrollto.x.animator)
+                    {
+                       ecore_animator_del(sd->scrollto.x.animator);
+                       sd->scrollto.x.animator = NULL;
+                    }
+                  sd->down.bounce_x_animator = ecore_animator_add(_smart_bounce_x_animator, sd);
+                  sd->down.anim_start2 = ecore_loop_time_get();
+                  sd->down.bx = bx;
+                  sd->down.bx0 = bx;
+                  sd->down.b2x = b2x;
+                  if (sd->down.momentum_animator) sd->down.b0x = sd->down.ax;
+                  else sd->down.b0x = 0;
                }
-             sd->down.bounce_x_animator = ecore_animator_add(_smart_bounce_x_animator, sd);
-             sd->down.anim_start2 = ecore_loop_time_get();
-             sd->down.bx = bx;
-             sd->down.bx0 = bx;
-             sd->down.b2x = b2x;
-             if (sd->down.momentum_animator) sd->down.b0x = sd->down.ax;
-             else sd->down.b0x = 0;
           }
      }
-   if (!sd->down.bounce_y_animator)
+   if ((!sd->widget) || 
+       (!elm_widget_drag_child_locked_y_get(sd->widget)))
      {
-        if (sd->bouncemey)
+        if (!sd->down.bounce_y_animator)
           {
-             if (sd->scrollto.y.animator)
+             if (sd->bouncemey)
                {
-                  ecore_animator_del(sd->scrollto.y.animator);
-                  sd->scrollto.y.animator = NULL;
+                  if (sd->scrollto.y.animator)
+                    {
+                       ecore_animator_del(sd->scrollto.y.animator);
+                       sd->scrollto.y.animator = NULL;
+                    }
+                  sd->down.bounce_y_animator = ecore_animator_add(_smart_bounce_y_animator, sd);
+                  sd->down.anim_start3 = ecore_loop_time_get();
+                  sd->down.by = by;
+                  sd->down.by0 = by;
+                  sd->down.b2y = b2y;
+                  if (sd->down.momentum_animator) sd->down.b0y = sd->down.ay;
+                  else sd->down.b0y = 0;
                }
-             sd->down.bounce_y_animator = ecore_animator_add(_smart_bounce_y_animator, sd);
-             sd->down.anim_start3 = ecore_loop_time_get();
-             sd->down.by = by;
-             sd->down.by0 = by;
-             sd->down.b2y = b2y;
-             if (sd->down.momentum_animator) sd->down.b0y = sd->down.ay;
-             else sd->down.b0y = 0;
           }
      }
 }
@@ -1050,6 +1062,13 @@
    _smart_scrollto_y(sd, _elm_config->bring_in_scroll_friction, y);
 }
 
+void
+elm_smart_scroller_widget_set(Evas_Object *obj, Evas_Object *wid)
+{
+   API_ENTRY return;
+   sd->widget = wid;
+}
+
 /* local subsystem functions */
 static void
 _smart_edje_drag_v_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
@@ -1239,7 +1258,7 @@
 
    sd = data;
    ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
+//   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
    if (_elm_config->thumbscroll_enable)
      {
         if ((sd->down.bounce_x_animator) || (sd->down.bounce_y_animator) ||
@@ -1291,7 +1310,7 @@
 	     sd->down.dragged = 0;
 	     sd->down.dir_x = 0;
 	     sd->down.dir_y = 0;
-	     sd->down.dir_none = 0;
+//	     sd->down.dir_none = 0;
 	     sd->down.x = ev->canvas.x;
 	     sd->down.y = ev->canvas.y;
 	     elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
@@ -1307,6 +1326,7 @@
 	     sd->down.history[0].x = ev->canvas.x;
 	     sd->down.history[0].y = ev->canvas.y;
 	  }
+        sd->down.dragged_began = 0;
      }
 }
 
@@ -1314,10 +1334,44 @@
 _smart_hold_animator(void *data)
 {
    Smart_Data *sd = data;
-   elm_smart_scroller_child_pos_set(sd->smart_obj, sd->down.hold_x, sd->down.hold_y);
+   Evas_Coord ox, oy;
+   
+   elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
+   if (sd->down.dir_x)
+     {
+        if ((!sd->widget) || 
+            (!elm_widget_drag_child_locked_x_get(sd->widget)))
+          {
+             ox = sd->down.hold_x;
+          }
+     }
+   if (sd->down.dir_y)
+     {
+        if ((!sd->widget) || 
+            (!elm_widget_drag_child_locked_y_get(sd->widget)))
+          {
+             oy = sd->down.hold_y;
+          }
+     }
+   elm_smart_scroller_child_pos_set(sd->smart_obj, ox, oy);
    return 1;
 }
 
+static Eina_Bool
+_smart_event_post_up(void *data, Evas *e)
+{
+   Smart_Data *sd = data;
+   if (sd->widget)
+     {
+        if (sd->down.dragged)
+          {
+             elm_widget_drag_lock_x_set(sd->widget, 0);
+             elm_widget_drag_lock_y_set(sd->widget, 0);
+          }
+     }
+   return 1;
+}
+
 static void
 _smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
 {
@@ -1327,7 +1381,8 @@
 
    sd = data;
    ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
+//   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
+   evas_post_event_callback_push(e, _smart_event_post_up, sd);
    // FIXME: respect elm_widget_scroll_hold_get of parent container
    if (_elm_config->thumbscroll_enable)
      {
@@ -1419,10 +1474,18 @@
                        Evas_Coord pgx, pgy;
 
                        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
-                       pgx = _smart_page_x_get(sd, ox);
-                       if (pgx != x) _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx);
-                       pgy = _smart_page_y_get(sd, oy);
-                       if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
+                       if ((!sd->widget) || 
+                           (!elm_widget_drag_child_locked_x_get(sd->widget)))
+                         {
+                            pgx = _smart_page_x_get(sd, ox);
+                            if (pgx != x) _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx);
+                         }
+                       if ((!sd->widget) || 
+                           (!elm_widget_drag_child_locked_y_get(sd->widget)))
+                         {
+                            pgy = _smart_page_y_get(sd, oy);
+                            if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
+                         }
                     }
 	       }
              else
@@ -1432,12 +1495,29 @@
                        Evas_Coord pgx, pgy;
 
                        elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
-                       pgx = _smart_page_x_get(sd, ox);
-                       if (pgx != x) _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx);
-                       pgy = _smart_page_y_get(sd, oy);
-                       if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
+                       if ((!sd->widget) || 
+                           (!elm_widget_drag_child_locked_x_get(sd->widget)))
+                         {
+                            pgx = _smart_page_x_get(sd, ox);
+                            if (pgx != x) _smart_scrollto_x(sd, _elm_config->page_scroll_friction, pgx);
+                         }
+                       if ((!sd->widget) || 
+                           (!elm_widget_drag_child_locked_y_get(sd->widget)))
+                         {
+                            pgy = _smart_page_y_get(sd, oy);
+                            if (pgy != y) _smart_scrollto_y(sd, _elm_config->page_scroll_friction, pgy);
+                         }
                     }
+                  if (sd->down.hold_animator)
+                    {
+                       ecore_animator_del(sd->down.hold_animator);
+                       sd->down.hold_animator = NULL;
+                    }
                }
+             sd->down.dragged_began = 0;
+             sd->down.dir_x = 0;
+             sd->down.dir_y = 0;
+             sd->down.want_dragged = 0;
 	     sd->down.dragged = 0;
 	     sd->down.now = 0;
              elm_smart_scroller_child_pos_get(sd->smart_obj, &x, &y);
@@ -1464,12 +1544,31 @@
         vx = sd->down.onhold_vx * td * (double)_elm_config->thumbscroll_threshhold * 2.0;
         vy = sd->down.onhold_vy * td * (double)_elm_config->thumbscroll_threshhold * 2.0;
         elm_smart_scroller_child_pos_get(sd->smart_obj, &ox, &oy);
-        sd->down.onhold_vxe += vx;
-        sd->down.onhold_vye += vy;
-        x = ox + (int)sd->down.onhold_vxe;
-        y = oy + (int)sd->down.onhold_vye;
-        sd->down.onhold_vxe -= (int)sd->down.onhold_vxe;
-        sd->down.onhold_vye -= (int)sd->down.onhold_vye;
+        x = ox;
+        y = oy;
+        
+        if (sd->down.dir_x)
+          {
+             if ((!sd->widget) || 
+                 (!elm_widget_drag_child_locked_x_get(sd->widget)))
+               {
+                  sd->down.onhold_vxe += vx;
+                  x = ox + (int)sd->down.onhold_vxe;
+                  sd->down.onhold_vxe -= (int)sd->down.onhold_vxe;
+               }
+          }
+        
+        if (sd->down.dir_y)
+          {
+             if ((!sd->widget) || 
+                 (!elm_widget_drag_child_locked_y_get(sd->widget)))
+               {
+                  sd->down.onhold_vye += vy;
+                  y = oy + (int)sd->down.onhold_vye;
+                  sd->down.onhold_vye -= (int)sd->down.onhold_vye;
+               }
+          }
+        
         elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);
 //        printf("scroll %i %i\n", sd->down.hold_x, sd->down.hold_y);
      }
@@ -1477,6 +1576,51 @@
    return 1;
 }
 
+static Eina_Bool
+_smart_event_post_move(void *data, Evas *e)
+{
+   Smart_Data *sd = data;
+   if (sd->down.want_dragged)
+     {
+        int start = 0;
+        
+        if (sd->down.dir_x)
+          {
+             if ((!sd->widget) || 
+                 (!elm_widget_drag_child_locked_x_get(sd->widget)))
+               {
+                  sd->down.want_dragged = 0;
+                  sd->down.dragged = 1;
+                  if (sd->widget)
+                    {
+                       elm_widget_drag_lock_x_set(sd->widget, 1);
+                    }
+                  start = 1;
+               }
+             else
+               sd->down.dir_x = 0;
+          }
+        if (sd->down.dir_y)
+          {
+             if ((!sd->widget) || 
+                 (!elm_widget_drag_child_locked_y_get(sd->widget)))
+               {
+                  sd->down.want_dragged = 0;
+                  sd->down.dragged = 1;
+                  if (sd->widget)
+                    {
+                       elm_widget_drag_lock_y_set(sd->widget, 1);
+                    }
+                  start = 1;
+               }
+             else
+               sd->down.dir_y = 0;
+          }
+        if (start) _smart_drag_start(sd->smart_obj);
+     }
+   return 1;
+}
+
 static void
 _smart_event_mouse_move(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info)
 {
@@ -1486,13 +1630,14 @@
 
    sd = data;
    ev = event_info;
-   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
+//   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return ;
+   evas_post_event_callback_push(e, _smart_event_post_move, sd);
    // FIXME: respect elm_widget_scroll_hold_get of parent container
    if (_elm_config->thumbscroll_enable)
      {
 	if (sd->down.now)
 	  {
-             int faildir = 0;
+             int dodir = 0;
 
 #ifdef SCROLLDBG
              printf("::: %i %i\n", ev->cur.canvas.x, ev->cur.canvas.y);
@@ -1507,33 +1652,47 @@
 	     sd->down.history[0].x = ev->cur.canvas.x;
 	     sd->down.history[0].y = ev->cur.canvas.y;
 
-	     x = ev->cur.canvas.x - sd->down.x;
-	     if (x < 0) x = -x;
-	     y = ev->cur.canvas.y - sd->down.y;
-	     if (y < 0) y = -y;
-	     if ((sd->one_dir_at_a_time) &&
-		 (!sd->down.dir_x) && (!sd->down.dir_y) && (!sd->down.dir_none))
-	       {
-                  if (x > _elm_config->thumbscroll_threshhold)
+             if (!sd->down.dragged_began)
+               {
+                  x = ev->cur.canvas.x - sd->down.x;
+                  if (x < 0) x = -x;
+                  y = ev->cur.canvas.y - sd->down.y;
+                  if (y < 0) y = -y;
+                  if ((sd->one_dir_at_a_time) &&
+                      (!((sd->down.dir_x) || (sd->down.dir_y))))
+                    /* && (!sd->down.dir_none))*/
                     {
-                       if (x > (y * 2))
+                       if (x > _elm_config->thumbscroll_threshhold)
                          {
-			    sd->down.dir_x = 1;
-			    sd->down.dir_y = 0;
-			 }
-                       else faildir++;
-		    }
-                  if (y > _elm_config->thumbscroll_threshhold)
-		    {
-                       if (y > (x * 2))
-			 {
-			    sd->down.dir_x = 0;
-			    sd->down.dir_y = 1;
+                            if (x > (y * 2))
+                              {
+                                 sd->down.dir_x = 1;
+                                 sd->down.dir_y = 0;
+                                 dodir++;
+                              }
                          }
-                       else faildir++;
-		    }
-                  if (faildir) sd->down.dir_none = 1;
-	       }
+                       if (y > _elm_config->thumbscroll_threshhold)
+                         {
+                            if (y > (x * 2))
+                              {
+                                 sd->down.dir_x = 0;
+                                 sd->down.dir_y = 1;
+                                 dodir++;
+                              }
+                         }
+                       if (!dodir)
+                         {
+                            //sd->down.dir_none = 1;
+                            sd->down.dir_x = 1;
+                            sd->down.dir_y = 1;
+                         }
+                    }
+                  else
+                    {
+                       sd->down.dir_x = 1;
+                       sd->down.dir_y = 1;
+                    }
+               }
              if ((!sd->hold) && (!sd->freeze))
                {
                   if ((sd->down.dragged) ||
@@ -1541,15 +1700,27 @@
                        (_elm_config->thumbscroll_threshhold *
                         _elm_config->thumbscroll_threshhold)))
                     {
+                       sd->down.dragged_began = 1;
                        if (!sd->down.dragged)
                          {
-                            evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
-                            _smart_drag_start(sd->smart_obj);
+                            sd->down.want_dragged = 1;
+//                            evas_event_feed_hold(e, 1, ev->timestamp, ev->data);
+//                            _smart_drag_start(sd->smart_obj);
                          }
-                       ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
-                       sd->down.dragged = 1;
-                       x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
-                       y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
+                       if (sd->down.dragged)
+                         {
+                            ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+                         }
+//                       ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+//                       sd->down.dragged = 1;
+                       if (sd->down.dir_x)
+                         x = sd->down.sx - (ev->cur.canvas.x - sd->down.x);
+                       else
+                         x = sd->down.sx;
+                       if (sd->down.dir_y)
+                         y = sd->down.sy - (ev->cur.canvas.y - sd->down.y);
+                       else
+                         y = sd->down.sy;
                        if ((sd->down.dir_x) || (sd->down.dir_y))
                          {
                             if (!sd->down.locked)
@@ -1558,15 +1729,17 @@
                                  sd->down.locked_y = y;
                                  sd->down.locked = 1;
                               }
-                            if (sd->down.dir_x) y = sd->down.locked_y;
-                            else x = sd->down.locked_x;
+                            if (!((sd->down.dir_x) && (sd->down.dir_y)))
+                              {
+                                 if (sd->down.dir_x) y = sd->down.locked_y;
+                                 else x = sd->down.locked_x;
+                              }
                          }
                        sd->down.hold_x = x;
                        sd->down.hold_y = y;
                        if (!sd->down.hold_animator)
-                         {
-                            sd->down.hold_animator = ecore_animator_add(_smart_hold_animator, sd);
-                         }
+                         sd->down.hold_animator = 
+                         ecore_animator_add(_smart_hold_animator, sd);
 //                       printf("a %i %i\n", sd->down.hold_x, sd->down.hold_y);
 //                       _smart_onhold_animator(sd);
 //                       elm_smart_scroller_child_pos_set(sd->smart_obj, x, y);

Modified: trunk/TMP/st/elementary/src/lib/els_scroller.h
===================================================================
--- trunk/TMP/st/elementary/src/lib/els_scroller.h	2010-05-07 12:42:31 UTC (rev 48666)
+++ trunk/TMP/st/elementary/src/lib/els_scroller.h	2010-05-07 13:21:45 UTC (rev 48667)
@@ -30,3 +30,4 @@
 void elm_smart_scroller_bounce_allow_get        (const Evas_Object *obj, Eina_Bool *horiz, Eina_Bool *vert);
 void elm_smart_scroller_paging_set              (Evas_Object *obj, double pagerel_h, double pagerel_v, Evas_Coord pagesize_h, Evas_Coord pagesize_v);
 void elm_smart_scroller_region_bring_in         (Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+void elm_smart_scroller_widget_set              (Evas_Object *obj, Evas_Object *wid);

Log:
  working much better elm config stuff. hs old config sliders still there, now
  adding theme tab. not complete tho.
  
  
Author:       raster
Date:         2010-05-12 09:32:12 -0700 (Wed, 12 May 2010)
New Revision: 48778

Modified:
  trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_flip.c 

Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c	2010-05-12 15:43:54 UTC (rev 48777)
+++ trunk/TMP/st/elementary/src/bin/config.c	2010-05-12 16:32:12 UTC (rev 48778)
@@ -56,6 +56,576 @@
 }
 
 static void
+_status_basic(Evas_Object *win, Evas_Object *bx0)
+{
+   Evas_Object *lb, *fr;
+   
+   fr = elm_frame_add(win);
+   evas_object_size_hint_weight_set(fr, 1.0, 1.0);
+   elm_frame_label_set(fr, "Information");
+   elm_box_pack_end(bx0, fr);
+   evas_object_show(fr);
+   
+   lb = elm_label_add(win);
+   elm_label_label_set(lb,
+                       "Applying configuration change"
+                       );
+   elm_frame_content_set(fr, lb);
+   evas_object_show(lb);
+}
+
+static void
+_status_config(Evas_Object *win, Evas_Object *bx0)
+{
+   Evas_Object *lb, *pd, *bx2, *fr, *sl, *sp;
+   
+   fr = elm_frame_add(win);
+   evas_object_size_hint_weight_set(fr, 1.0, 1.0);
+   evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_frame_label_set(fr, "Sizing");
+   elm_box_pack_end(bx0, fr);
+   evas_object_show(fr);
+   
+   bx2 = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5);
+   
+   pd = elm_frame_add(win);
+   evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+   elm_object_style_set(pd, "pad_medium");
+   elm_box_pack_end(bx2, pd);
+   evas_object_show(pd);
+   
+   lb = elm_label_add(win);
+   evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+   elm_label_label_set(lb,"<hilight>Scale</>");
+   elm_frame_content_set(pd, lb);
+   evas_object_show(lb);
+   
+   sl = elm_slider_add(win);
+   evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_unit_format_set(sl, "%1.2f");
+   elm_slider_indicator_format_set(sl, "%1.2f");
+   elm_slider_min_max_set(sl, 0.25, 5.0);
+   elm_slider_value_set(sl, elm_scale_get());
+   elm_box_pack_end(bx2, sl);
+   evas_object_show(sl);
+   
+   evas_object_smart_callback_add(sl, "changed", sc_round, NULL);
+   evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
+   
+   sp = elm_separator_add(win);
+   elm_separator_horizontal_set(sp, 1);
+   evas_object_size_hint_weight_set(sp, 1.0, 0.0);
+   evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
+   elm_box_pack_end(bx2, sp);
+   evas_object_show(sp);
+   
+   pd = elm_frame_add(win);
+   evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+   elm_object_style_set(pd, "pad_medium");
+   elm_box_pack_end(bx2, pd);
+   evas_object_show(pd);
+   
+   lb = elm_label_add(win);
+   evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+   elm_label_label_set(lb, "<hilight>Finger Size</><br>");
+   elm_frame_content_set(pd, lb);
+   evas_object_show(lb);
+   
+   sl = elm_slider_add(win);
+   evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_unit_format_set(sl, "%1.0f");
+   elm_slider_indicator_format_set(sl, "%1.0f");
+   elm_slider_min_max_set(sl, 5, 200);
+   elm_slider_value_set(sl, elm_finger_size_get());
+   elm_box_pack_end(bx2, sl);
+   evas_object_show(sl);
+   
+   evas_object_smart_callback_add(sl, "changed", fs_round, NULL);
+   evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL);
+   
+   // FIXME: add theme selector (basic mode and advanced for fallbacks)
+   // FIXME: save config
+   // FIXME: profile selector / creator etc.
+   // 
+   elm_frame_content_set(fr, bx2);
+   evas_object_show(bx2);
+}
+
+static void
+_flip_to(Evas_Object *win, const char *name)
+{
+   Evas_Object *wid, *fl, *holder, *front, *back;
+   int front_vis;
+   wid        = evas_object_data_get(win, name);
+   fl         = evas_object_data_get(win, "flip");
+   holder     = evas_object_data_get(win, "holder");
+   front_vis  = elm_flip_front_get(fl);
+   if (front_vis)
+     {
+        front = elm_flip_content_front_get(fl);
+        back  = elm_flip_content_back_get(fl);
+        elm_table_pack(holder, back, 0, 0, 1, 1);
+        evas_object_hide(back);
+//        elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table
+        elm_flip_content_back_set(fl, wid);
+     }
+   else
+     {
+        front = elm_flip_content_front_get(fl);
+        back  = elm_flip_content_back_get(fl);
+        elm_table_pack(holder, front, 0, 0, 1, 1);
+        evas_object_hide(front);
+//        elm_table_unpack(holder, wid); // this should NOT be needed - but in evas_table/elm_table
+        elm_flip_content_front_set(fl, wid);
+     }
+   
+   evas_object_show(wid);
+   elm_flip_go(fl, ELM_FLIP_ROTATE_Y_CENTER_AXIS);
+}
+
+static void
+_cf_sizing(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "sizing");
+}
+
+static void
+_cf_themes(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "themes");
+}
+
+static void
+_cf_fonts(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "fonts");
+}
+
+static void
+_cf_profiles(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "profiles");
+}
+
+static void
+_cf_scrolling(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "scrolling");
+}
+
+static void
+_cf_rendering(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "rendering");
+}
+
+static void
+_cf_caches(void *data, Evas_Object *obj, void *event_info)
+{
+   _flip_to(data, "caches");
+}
+
+static void
+_theme_use(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("not implemented\n");
+}
+
+static void
+_theme_browse(void *data, Evas_Object *obj, void *event_info)
+{
+   printf("not implemented\n");
+}
+
+static void
+_status_config_sizing(Evas_Object *win, Evas_Object *holder)
+{
+   Evas_Object *lb, *pd, *bx2, *sl, *sp;
+   
+   bx2 = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5);
+   
+   pd = elm_frame_add(win);
+   evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+   elm_object_style_set(pd, "pad_medium");
+   elm_box_pack_end(bx2, pd);
+   evas_object_show(pd);
+   
+   lb = elm_label_add(win);
+   evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+   elm_label_label_set(lb,"<hilight>Scale</>");
+   elm_frame_content_set(pd, lb);
+   evas_object_show(lb);
+   
+   sl = elm_slider_add(win);
+   evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_unit_format_set(sl, "%1.2f");
+   elm_slider_indicator_format_set(sl, "%1.2f");
+   elm_slider_min_max_set(sl, 0.25, 5.0);
+   elm_slider_value_set(sl, elm_scale_get());
+   elm_box_pack_end(bx2, sl);
+   evas_object_show(sl);
+   
+   evas_object_smart_callback_add(sl, "changed", sc_round, NULL);
+   evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
+   
+   sp = elm_separator_add(win);
+   elm_separator_horizontal_set(sp, 1);
+   evas_object_size_hint_weight_set(sp, 1.0, 0.0);
+   evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
+   elm_box_pack_end(bx2, sp);
+   evas_object_show(sp);
+   
+   pd = elm_frame_add(win);
+   evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
+   elm_object_style_set(pd, "pad_medium");
+   elm_box_pack_end(bx2, pd);
+   evas_object_show(pd);
+   
+   lb = elm_label_add(win);
+   evas_object_size_hint_weight_set(lb, 1.0, 0.0);
+   evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
+   elm_label_label_set(lb, "<hilight>Finger Size</><br>");
+   elm_frame_content_set(pd, lb);
+   evas_object_show(lb);
+   
+   sl = elm_slider_add(win);
+   evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_unit_format_set(sl, "%1.0f");
+   elm_slider_indicator_format_set(sl, "%1.0f");
+   elm_slider_min_max_set(sl, 5, 200);
+   elm_slider_value_set(sl, elm_finger_size_get());
+   elm_box_pack_end(bx2, sl);
+   evas_object_show(sl);
+   
+   evas_object_smart_callback_add(sl, "changed", fs_round, NULL);
+   evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL);
+
+   evas_object_data_set(win, "sizing", bx2);
+   
+   elm_table_pack(holder, bx2, 0, 0, 1, 1);
+}
+
+static Evas_Object *
+_sample_theme_new(Evas_Object *win)
+{
+   Evas_Object *base, *bg, *bt, *ck, *rd, *rdg, *sl, *fr, *li, *rc, *sp;
+   
+   base = elm_table_add(win);
+   evas_object_size_hint_weight_set(base, 1.0, 1.0);
+   evas_object_size_hint_align_set(base, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   
+   bg = elm_bg_add(win);
+   evas_object_size_hint_weight_set(bg, 1.0, 1.0);
+   evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(base, bg, 0, 0, 2, 4);
+   evas_object_show(bg);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "Button");
+   elm_table_pack(base, bt, 0, 0, 1, 1);
+   evas_object_show(bt);
+
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "Check");
+   elm_table_pack(base, ck, 0, 1, 1, 1);
+   evas_object_show(ck);
+   
+   rd = elm_radio_add(win);
+   elm_radio_state_value_set(rd, 0);
+   elm_radio_label_set(rd, "Radio 1");
+   elm_table_pack(base, rd, 1, 0, 1, 1);
+   evas_object_show(rd);
+   rdg = rd;
+   
+   rd = elm_radio_add(win);
+   elm_radio_state_value_set(rd, 1);
+   elm_radio_label_set(rd, "Radio 2");
+   elm_radio_group_add(rd, rdg);
+   elm_table_pack(base, rd, 1, 1, 1, 1);
+   evas_object_show(rd);
+   
+   sp = elm_separator_add(win);
+   elm_separator_horizontal_set(sp, 1);
+   evas_object_size_hint_weight_set(sp, 1.0, 0.0);
+   evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
+   elm_table_pack(base, sl, 0, 2, 2, 1);
+   evas_object_show(sp);
+   
+   sl = elm_slider_add(win);
+   elm_slider_label_set(sl, "Slider");
+   elm_slider_span_size_set(sl, 120);
+   elm_slider_min_max_set(sl, 1, 10);
+   elm_slider_value_set(sl, 4);
+   evas_object_size_hint_weight_set(sl, 1.0, 0.0);
+   evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(base, sl, 0, 3, 2, 1);
+   evas_object_show(sl);
+
+   fr = elm_frame_add(win);
+   elm_frame_label_set(fr, "Frame");
+   elm_table_pack(base, fr, 0, 4, 2, 1);
+   evas_object_size_hint_weight_set(fr, 1.0, 1.0);
+   evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(fr);
+   
+   li = elm_list_add(win);
+   evas_object_size_hint_weight_set(li, 1.0, 1.0);
+   evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_frame_content_set(fr, li);
+   evas_object_show(li);
+   
+   elm_list_item_append(li, "List Item 1", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Second Item", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "Third Item", NULL, NULL,  NULL, NULL);
+   elm_list_go(li);
+
+   rc = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_size_hint_min_set(rc, 120, 120);
+   elm_table_pack(base, rc, 0, 4, 2, 1);
+   
+   return base;
+}
+
+static void
+_status_config_themes(Evas_Object *win, Evas_Object *holder)
+{
+   Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample;
+   
+   tb = elm_table_add(win);
+   evas_object_size_hint_weight_set(tb, 1.0, 1.0);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   
+   rc = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_size_hint_min_set(rc, 240, 120);
+   elm_table_pack(tb, rc, 0, 0, 1, 1);
+
+   rc = evas_object_rectangle_add(evas_object_evas_get(win));
+   evas_object_size_hint_min_set(rc, 240, 240);
+   elm_table_pack(tb, rc, 0, 1, 1, 1);
+   
+   /////////////////////////////////////////////
+   
+   pd = elm_frame_add(win);
+   elm_object_style_set(pd, "pad_medium");
+   evas_object_size_hint_weight_set(pd, 1.0, 1.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(tb, pd, 0, 0, 1, 1);
+   evas_object_show(pd);
+   
+   li = elm_list_add(win);
+   evas_object_size_hint_weight_set(li, 1.0, 1.0);
+   evas_object_size_hint_align_set(li, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_frame_content_set(pd, li);
+   evas_object_show(li);
+   
+   // FIXME: list all themes:
+   // ~/.elementary/themes/*.edj
+   // $PREFIX/datadir/themes/*.edj
+   
+   elm_list_item_append(li, "theme 1", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 2", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 3", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 4", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 5", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 6", NULL, NULL,  NULL, NULL);
+   elm_list_item_append(li, "theme 7", NULL, NULL,  NULL, NULL);
+
+   elm_list_go(li);
+   
+   pd = elm_frame_add(win);
+   elm_object_style_set(pd, "pad_medium");
+   evas_object_size_hint_weight_set(pd, 1.0, 1.0);
+   evas_object_size_hint_align_set(pd, 0.9, 0.9);
+   elm_table_pack(tb, pd, 0, 0, 1, 1);
+   evas_object_show(pd);
+   
+   bt = elm_button_add(win);
+   evas_object_smart_callback_add(bt, "clicked", _theme_browse, win);
+   elm_button_label_set(bt, "Browse...");
+   evas_object_size_hint_weight_set(bt, 1.0, 1.0);
+   evas_object_size_hint_align_set(bt, 0.9, 0.9);
+   elm_frame_content_set(pd, bt);
+   evas_object_show(bt);
+   
+   pd = elm_frame_add(win);
+   elm_object_style_set(pd, "pad_medium");
+   evas_object_size_hint_weight_set(pd, 1.0, 0.0);
+   evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(tb, pd, 0, 1, 1, 1);
+   evas_object_show(pd);
+
+   fr = elm_frame_add(win);
+   elm_frame_label_set(fr, "Preview");
+   evas_object_size_hint_weight_set(fr, 1.0, 1.0);
+   evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_frame_content_set(pd, fr);
+   evas_object_show(fr);
+   
+   sc = elm_scroller_add(win);
+   elm_scroller_bounce_set(sc, 0, 0);
+   evas_object_size_hint_weight_set(sc, 1.0, 1.0);
+   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_frame_content_set(fr, sc);
+   evas_object_show(sc);
+   
+   sample = _sample_theme_new(win);
+   elm_scroller_content_set(sc, sample);
+   evas_object_show(sample);
+   evas_object_data_set(win, "sample", sample);
+   
+   /////////////////////////////////////////////
+   sp = elm_separator_add(win);
+   elm_separator_horizontal_set(sp, 1);
+   evas_object_size_hint_weight_set(sp, 1.0, 0.0);
+   evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
+   elm_table_pack(tb, sp, 0, 2, 1, 1);
+   evas_object_show(sp);
+   
+   pd = elm_frame_add(win);
+   elm_object_style_set(pd, "pad_medium");
+   evas_object_size_hint_weight_set(pd, 0.0, 0.0);
+   evas_object_size_hint_align_set(pd, 0.5, 0.5);
+   elm_table_pack(tb, pd, 0, 3, 1, 1);
+   evas_object_show(pd);
+   
+   bt = elm_button_add(win);
+   evas_object_smart_callback_add(bt, "clicked", _theme_use, win);
+   elm_button_label_set(bt, "Use Theme");
+   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
+   evas_object_size_hint_align_set(bt, 0.5, 0.5);
+   elm_frame_content_set(pd, bt);
+   evas_object_show(bt);
+   
+   evas_object_data_set(win, "themes", tb);
+   
+   elm_table_pack(holder, tb, 0, 0, 1, 1);
+}
+
+static void
+_unimplemented(Evas_Object *win, Evas_Object *holder, const char *name)
+{
+   Evas_Object *lb, *pd, *bx2;
+   
+   bx2 = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5);
+   
+   pd = elm_frame_add(win);
+   evas_object_size_hint_weight_set(pd, 0.0, 0.0);
+   evas_object_size_hint_align_set(pd, 0.5, 0.5);
+   elm_object_style_set(pd, "pad_medium");
+   elm_box_pack_end(bx2, pd);
+   evas_object_show(pd);
+   
+   lb = elm_label_add(win);
+   evas_object_size_hint_weight_set(lb, 0.0, 0.0);
+   evas_object_size_hint_align_set(lb, 0.5, 0.5);
+   elm_label_label_set(lb,"<hilight>Not implemented yet</>");
+   elm_frame_content_set(pd, lb);
+   evas_object_show(lb);
+   
+   evas_object_data_set(win, name, bx2);
+   
+   elm_table_pack(holder, bx2, 0, 0, 1, 1);
+}
+
+static void
+_status_config_fonts(Evas_Object *win, Evas_Object *holder)
+{
+   _unimplemented(win, holder, "fonts");
+}
+
+static void
+_status_config_profiles(Evas_Object *win, Evas_Object *holder)
+{
+   _unimplemented(win, holder, "profiles");
+}
+
+static void
+_status_config_scrolling(Evas_Object *win, Evas_Object *holder)
+{
+   _unimplemented(win, holder, "scrolling");
+}
+
+static void
+_status_config_rendering(Evas_Object *win, Evas_Object *holder)
+{
+   _unimplemented(win, holder, "rendering");
+}
+
+static void
+_status_config_caches(Evas_Object *win, Evas_Object *holder)
+{
+   _unimplemented(win, holder, "caches");
+}
+
+static void
+_status_config_full(Evas_Object *win, Evas_Object *bx0)
+{
+   Evas_Object *tb, *holder, *fl;
+   Elm_Toolbar_Item *it;
+   
+   tb = elm_toolbar_add(win);
+   elm_toolbar_homogenous_set(tb, 0);
+   evas_object_size_hint_weight_set(tb, 1.0, 0.0);
+   evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   it = elm_toolbar_item_add(tb, NULL, "Sizing", _cf_sizing, win);
+   elm_toolbar_item_add(tb, NULL, "Theme", _cf_themes, win);
+   
+   elm_toolbar_item_add(tb, NULL, "Fonts", _cf_fonts, win);
+   elm_toolbar_item_add(tb, NULL, "Profiles", _cf_profiles, win);
+   elm_toolbar_item_add(tb, NULL, "Scrolling", _cf_scrolling, win);
+   elm_toolbar_item_add(tb, NULL, "Rendering", _cf_rendering, win);
+   elm_toolbar_item_add(tb, NULL, "Caches", _cf_caches, win);
+   elm_box_pack_end(bx0, tb);
+   evas_object_show(tb);
+   
+   holder = elm_table_add(win);
+   evas_object_size_hint_align_set(holder, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(holder, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_pack_end(bx0, holder);
+   evas_object_show(holder);
+   evas_object_data_set(win, "holder", holder);
+   
+   _status_config_sizing(win, holder);
+   _status_config_themes(win, holder);
+   _status_config_fonts(win, holder);
+   _status_config_profiles(win, holder);
+   _status_config_rendering(win, holder);
+   _status_config_scrolling(win, holder);
+   _status_config_caches(win, holder);
+   
+   fl = elm_flip_add(win);
+   evas_object_size_hint_align_set(fl, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(fl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_table_pack(holder, fl, 0, 0, 1, 1);
+   evas_object_show(fl);
+   evas_object_data_set(win, "flip", fl);
+   
+   elm_toolbar_item_select(it);
+}
+
+static void
 status_win(void)
 {
    Evas_Object *win, *bg, *bx0;
@@ -74,109 +644,10 @@
    elm_win_resize_object_add(win, bx0);
    evas_object_show(bx0);
 
-   if (!interactive)
-     {
-        Evas_Object *lb, *fr;
-        
-        fr = elm_frame_add(win);
-        evas_object_size_hint_weight_set(fr, 1.0, 1.0);
-        elm_frame_label_set(fr, "Information");
-        elm_box_pack_end(bx0, fr);
-        evas_object_show(fr);
-        
-        lb = elm_label_add(win);
-        elm_label_label_set(lb,
-                            "Applying configuration change"
-                            );
-        elm_frame_content_set(fr, lb);
-        evas_object_show(lb);
-     }
-   else
-     {
-        Evas_Object *lb, *pd, *bx2, *fr, *sl, *sp;
-        
-        fr = elm_frame_add(win);
-        evas_object_size_hint_weight_set(fr, 1.0, 1.0);
-        evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_frame_label_set(fr, "Sizing");
-        elm_box_pack_end(bx0, fr);
-        evas_object_show(fr);
-        
-        bx2 = elm_box_add(win);
-        evas_object_size_hint_weight_set(bx2, 1.0, 0.0);
-        evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, 0.5);
-        
-        pd = elm_frame_add(win);
-        evas_object_size_hint_weight_set(pd, 1.0, 0.0);
-        evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
-        elm_object_style_set(pd, "pad_medium");
-        elm_box_pack_end(bx2, pd);
-        evas_object_show(pd);
-        
-        lb = elm_label_add(win);
-        evas_object_size_hint_weight_set(lb, 1.0, 0.0);
-        evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
-        elm_label_label_set(lb,"<hilight>Scale</>");
-        elm_frame_content_set(pd, lb);
-        evas_object_show(lb);
-        
-        sl = elm_slider_add(win);
-        evas_object_size_hint_weight_set(sl, 1.0, 0.0);
-        evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
-        elm_slider_span_size_set(sl, 120);
-        elm_slider_unit_format_set(sl, "%1.2f");
-        elm_slider_indicator_format_set(sl, "%1.2f");
-        elm_slider_min_max_set(sl, 0.25, 5.0);
-        elm_slider_value_set(sl, elm_scale_get());
-        elm_box_pack_end(bx2, sl);
-        evas_object_show(sl);
-
-        evas_object_smart_callback_add(sl, "changed", sc_round, NULL);
-        evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
-        
-        sp = elm_separator_add(win);
-        elm_separator_horizontal_set(sp, 1);
-        evas_object_size_hint_weight_set(sp, 1.0, 0.0);
-        evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
-        elm_box_pack_end(bx2, sp);
-        evas_object_show(sp);
-        
-        pd = elm_frame_add(win);
-        evas_object_size_hint_weight_set(pd, 1.0, 0.0);
-        evas_object_size_hint_align_set(pd, EVAS_HINT_FILL, 0.5);
-        elm_object_style_set(pd, "pad_medium");
-        elm_box_pack_end(bx2, pd);
-        evas_object_show(pd);
-        
-        lb = elm_label_add(win);
-        evas_object_size_hint_weight_set(lb, 1.0, 0.0);
-        evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5);
-        elm_label_label_set(lb, "<hilight>Finger Size</><br>");
-        elm_frame_content_set(pd, lb);
-        evas_object_show(lb);
-        
-        sl = elm_slider_add(win);
-        evas_object_size_hint_weight_set(sl, 1.0, 0.0);
-        evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
-        elm_slider_span_size_set(sl, 120);
-        elm_slider_unit_format_set(sl, "%1.0f");
-        elm_slider_indicator_format_set(sl, "%1.0f");
-        elm_slider_min_max_set(sl, 5, 200);
-        elm_slider_value_set(sl, elm_finger_size_get());
-        elm_box_pack_end(bx2, sl);
-        evas_object_show(sl);
-
-        evas_object_smart_callback_add(sl, "changed", fs_round, NULL);
-        evas_object_smart_callback_add(sl, "delay,changed", fs_change, NULL);
-        
-        // FIXME: add theme selector (basic mode and advanced for fallbacks)
-        // FIXME: save config
-        // FIXME: profile selector / creator etc.
-
-        elm_frame_content_set(fr, bx2);
-        evas_object_show(bx2);
-     }
-
+   if (!interactive) _status_basic(win, bx0);
+//   else _status_config(win, bx0);
+   else _status_config_full(win, bx0);
+   
    evas_object_show(win);
 }
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-05-12 15:43:54 UTC (rev 48777)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-05-12 16:32:12 UTC (rev 48778)
@@ -273,7 +273,7 @@
    EAPI void         elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, Evas_Coord *h);
 
    EAPI Elm_Theme   *elm_theme_new(void);
-   EAPI void         elm_theme_free(Elm_Theme *th);
+  EAPI void         elm_theme_free(Elm_Theme *th);
    EAPI void         elm_theme_overlay_add(Elm_Theme *th, const char *item);
    EAPI void         elm_theme_overlay_del(Elm_Theme *th, const char *item);
    EAPI void         elm_theme_extension_add(Elm_Theme *th, const char *item);
@@ -543,9 +543,11 @@
 
    EAPI Evas_Object *elm_table_add(Evas_Object *parent);
    EAPI void         elm_table_homogenous_set(Evas_Object *obj, Eina_Bool homogenous);
-   EAPI void         elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
    EAPI void	     elm_table_padding_set(Evas_Object *obj, Evas_Coord horizontal, Evas_Coord vertical);
-
+   EAPI void         elm_table_pack(Evas_Object *obj, Evas_Object *subobj, int x, int y, int w, int h);
+   EAPI void         elm_table_unpack(Evas_Object *obj, Evas_Object *subobj);
+   EAPI void         elm_table_clear(Evas_Object *obj, Eina_Bool clear);
+       
    typedef struct _Elm_Grid_Cell_Class Elm_Grid_Cell_Class;
    typedef struct _Elm_Grid_Cell_Class_Func Elm_Grid_Cell_Class_Func;
    typedef struct _Elm_Grid_Cell Elm_Grid_Cell;
@@ -1427,30 +1429,10 @@
    EAPI void                  elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
    EAPI Elm_Panel_Orient      elm_panel_orient_get(Evas_Object *obj);
    EAPI void                  elm_panel_content_set(Evas_Object *obj, Evas_Object *content);
-EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
-EAPI Eina_Bool elm_panel_hidden_get(Evas_Object *obj);
-EAPI void elm_panel_toggle(Evas_Object *obj);
+   EAPI void                  elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
+   EAPI Eina_Bool             elm_panel_hidden_get(Evas_Object *obj);
+   EAPI void                  elm_panel_toggle(Evas_Object *obj);
 
-
-#if 1 // working on it
-   // flip types:
-   //  rotate around y axis 180 degrees
-   //  rotate around x axis 180 degrees
-   // 
-   // properties
-   //  perspective focal dist, x, y
-   // 
-   // FIXME:
-   // custom value
-   //  map 1/0
-   // 
-   //  center x, y, z
-   //  angle x, y, z
-   // 
-   //  light 1/0
-   //  light rgb
-   //  light ambient rgb
-   //  light x, y, z
    typedef enum _Elm_Flip_Mode
      {
         ELM_FLIP_ROTATE_Y_CENTER_AXIS,
@@ -1462,13 +1444,14 @@
    EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
    EAPI void         elm_flip_content_front_set(Evas_Object *obj, Evas_Object *content);
    EAPI void         elm_flip_content_back_set(Evas_Object *obj, Evas_Object *content);
+   EAPI Evas_Object *elm_flip_content_front_get(const Evas_Object *obj);
+   EAPI Evas_Object *elm_flip_content_back_get(const Evas_Object *obj);
    EAPI Eina_Bool    elm_flip_front_get(const Evas_Object *obj);
    EAPI void         elm_flip_perspective_set(Evas_Object *obj, Evas_Coord foc, Evas_Coord x, Evas_Coord y);
    EAPI void         elm_flip_go(Evas_Object *obj, Elm_Flip_Mode mode);
    /* smart callbacks called:
     * "animate,done" - when a flip animation is finished
     */
-#endif
    
    EAPI Evas_Object *elm_scrolled_entry_add(Evas_Object *parent);
    EAPI void         elm_scrolled_entry_single_line_set(Evas_Object *obj, Eina_Bool single_line);

Modified: trunk/TMP/st/elementary/src/lib/elm_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-05-12 15:43:54 UTC (rev 48777)
+++ trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-05-12 16:32:12 UTC (rev 48778)
@@ -400,6 +400,22 @@
    _configure(obj);
 }
 
+EAPI Evas_Object *
+elm_flip_content_front_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->front.content;
+}
+
+EAPI Evas_Object *
+elm_flip_content_back_get(const Evas_Object *obj)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   return wd->back.content;
+}
+
 /**
  * Get flip front visibility state
  *

Log:
  fix some most unfortunate lack of clip honorning :)
  
  
Author:       raster
Date:         2010-08-30 23:20:33 -0700 (Mon, 30 Aug 2010)
New Revision: 51773

Modified:
  trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/elm_flip.c trunk/TMP/st/elementary/src/lib/elm_mapbuf.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-08-31 05:02:16 UTC (rev 51772)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-08-31 06:20:33 UTC (rev 51773)
@@ -59,22 +59,140 @@
    evas_object_del(data);
 }
 
+static Eina_Bool
+tim_cb(void *data)
+{
+   Evas_Object *tb, *sc, *mb;
+   Eina_List *list, *l;
+   
+   printf("timeout!\n");
+   evas_object_data_del(data, "timer");
+   tb = evas_object_data_get(data, "tb");
+   sc = evas_object_data_get(data, "sc");
+   mb = evas_object_data_get(data, "mb");
+   elm_object_scroll_freeze_push(sc);
+   evas_object_data_set(data, "dragging", (void *)(1));
+   evas_object_color_set(data, 255, 255, 255, 255);
+   list = (Eina_List *)evas_object_data_get
+      (elm_object_top_widget_get(data), "mbs");
+   EINA_LIST_FOREACH(list, l, mb)
+      evas_object_color_set(mb, 128, 128, 128, 128);
+   elm_table_unpack(tb, data);
+   return EINA_FALSE;
+}
+
 static void
+ic_del_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Ecore_Timer *tim;
+   
+   tim = evas_object_data_get(obj, "timer");
+   if (tim)
+     {
+        printf("nmotim\n");
+        evas_object_data_del(obj, "timer");
+        ecore_timer_del(tim);
+     }
+}
+
+static void
 ic_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
+   Evas_Event_Mouse_Down *ev = event_info;
+   Ecore_Timer *tim;
+   Evas_Coord x, y, w, h;
+   
    evas_object_color_set(data, 128, 0, 0, 128);
+   
+   tim = evas_object_data_get(obj, "timer");
+   if (tim) evas_object_data_del(obj, "timer");
+   tim = ecore_timer_add(1.0, tim_cb, obj);
+   evas_object_data_set(obj, "timer", tim);
+
+   evas_object_geometry_get(data, &x, &y, &w, &h);
+   evas_object_data_set(obj, "x", (void *)(ev->canvas.x));
+   evas_object_data_set(obj, "y", (void *)(ev->canvas.y));
+   evas_object_data_set(obj, "px", (void *)(x));
+   evas_object_data_set(obj, "py", (void *)(y));
+   
+   if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
+     {
+        printf("double click %p\n", obj);
+     }
 }
 
 static void
 ic_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
 {
+   Evas_Event_Mouse_Up *ev = event_info;
+   Ecore_Timer *tim;
+   
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
    evas_object_color_set(data, 255, 255, 255, 255);
+   tim = evas_object_data_get(obj, "timer");
+   if (tim)
+     {
+        printf("nmotim2\n");
+        evas_object_data_del(obj, "timer");
+        ecore_timer_del(tim);
+     }
+   if (evas_object_data_get(obj, "dragging"))
+     {
+        Evas_Object *tb, *sc, *mb;
+        Eina_List *list, *l;
+        int tbx, tby;
+        
+        evas_object_data_del(obj, "dragging");
+        tb = evas_object_data_get(obj, "tb");
+        sc = evas_object_data_get(obj, "sc");
+        mb = evas_object_data_get(data, "mb");
+        elm_object_scroll_freeze_pop(sc);
+        tbx = (int)evas_object_data_get(obj, "tbx");
+        tby = (int)evas_object_data_get(obj, "tby");
+        elm_table_pack(tb, obj, tbx, tby, 1, 1);
+        list = (Eina_List *)evas_object_data_get
+           (elm_object_top_widget_get(obj), "mbs");
+        EINA_LIST_FOREACH(list, l, mb)
+           evas_object_color_set(mb, 255, 255, 255, 255);
+     }
 }
 
+static void
+ic_move_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
+{
+   Evas_Event_Mouse_Move *ev = event_info;
+   if (evas_object_data_get(obj, "dragging"))
+     {
+        Evas_Coord x, y, px, py;
+        
+        x = (Evas_Coord)evas_object_data_get(obj, "x");
+        y = (Evas_Coord)evas_object_data_get(obj, "y");
+        px = (Evas_Coord)evas_object_data_get(obj, "px");
+        py = (Evas_Coord)evas_object_data_get(obj, "py");
+        evas_object_move(obj, 
+                         px + ev->cur.canvas.x - x, 
+                         py + ev->cur.canvas.y - y);
+    }
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
+     {
+        Ecore_Timer *tim;
+        
+        tim = evas_object_data_get(obj, "timer");
+        if (tim)
+          {
+             printf("nmotim3\n");
+             evas_object_data_del(obj, "timer");
+             ecore_timer_del(tim);
+          }
+        evas_object_color_set(data, 255, 255, 255, 255);
+        return;
+     }
+}
+
 void
 test_launcher(void *data, Evas_Object *obj, void *event_info)
 {
-   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *rc;
+   Evas_Object *win, *bg, *sc, *tb, *pad, *bt, *ic, *lb, *tb2, *mb, *ck, *bx, *bx2;
    int i, j, k, n, m;
    char buf[PATH_MAX];
    const char *names[] =
@@ -96,11 +214,17 @@
    evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, bg);
    evas_object_show(bg);
-   
+
    bx = elm_box_add(win);
    elm_box_homogenous_set(bx, 1);
    elm_box_horizontal_set(bx, 1);
    
+   sc = elm_scroller_add(win);
+   elm_scroller_bounce_set(sc, 1, 0);
+   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   
    n = 0; m = 0;
    for (k = 0 ; k < 8; k++)
      {
@@ -132,6 +256,10 @@
         evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL);
         elm_table_pack(tb, pad, 6, 1, 1, 10);
 
+        mb = elm_mapbuf_add(win);
+        elm_mapbuf_content_set(mb, tb);
+        evas_object_show(tb);
+        
         for (j = 0; j < 5; j++)
           {
              for (i = 0; i < 5; i++)
@@ -154,26 +282,24 @@
                   elm_table_pack(tb, lb, 1 + i, 1 + (j * 2) + 1, 1, 1);
                   evas_object_show(lb);
                   
-                  rc = evas_object_rectangle_add(evas_object_evas_get(win));
-                  evas_object_color_set(rc, 0, 0, 0, 0);
-                  evas_object_size_hint_weight_set(rc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                  evas_object_size_hint_align_set(rc, EVAS_HINT_FILL, EVAS_HINT_FILL);
-                  elm_table_pack(tb, rc, 1 + i, 1 + (j * 2), 1, 2);
-                  evas_object_show(rc);
+                  evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, ic_del_cb, ic);
                   
-                  evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_DOWN, ic_down_cb, lb);
-                  evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_UP,   ic_up_cb,   lb);
+                  evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_DOWN, ic_down_cb, ic);
+                  evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_UP,   ic_up_cb,   ic);
+                  evas_object_event_callback_add(ic, EVAS_CALLBACK_MOUSE_MOVE, ic_move_cb, ic);
                   
-                  evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_DOWN, ic_down_cb, ic);
-                  evas_object_event_callback_add(rc, EVAS_CALLBACK_MOUSE_UP,   ic_up_cb,   ic);
+                  evas_object_data_set(ic, "lb", lb);
+                  evas_object_data_set(ic, "tb", tb);
+                  evas_object_data_set(ic, "sc", sc);
+                  evas_object_data_set(ic, "bx", bx);
+                  evas_object_data_set(ic, "mb", mb);
+                  evas_object_data_set(ic, "tbx", (void *)(1 + i));
+                  evas_object_data_set(ic, "tby", (void *)(1 + (j * 2)));
                   
                   n++; if (n > 23) n = 0;
                   m++; if (m > 15) m = 0;
                }
           }
-        mb = elm_mapbuf_add(win);
-        elm_mapbuf_content_set(mb, tb);
-        evas_object_show(tb);
         
         elm_box_pack_end(bx, mb);
         evas_object_show(mb);
@@ -184,11 +310,11 @@
    // fixme: free mbs
    evas_object_data_set(win, "mbs", mbs);
    
-   sc = elm_scroller_add(win);
-   elm_scroller_bounce_set(sc, 1, 0);
-   elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-   evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, sc);
+   bx2 = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_box_horizontal_set(bx2, 0);
+   elm_win_resize_object_add(win, bx2);
+   evas_object_show(bx2);
    
    elm_scroller_content_set(sc, bx);
    evas_object_show(bx);
@@ -197,8 +323,11 @@
    evas_object_show(sc);
 
    tb2 = elm_table_add(win);
-   evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, tb2);
+   evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_fill_set(tb2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx2, tb2);
+
+   elm_box_pack_end(bx2, sc);
    
    ck = elm_check_add(win);
    elm_check_label_set(ck, "Map");

Modified: trunk/TMP/st/elementary/src/lib/elm_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-08-31 05:02:16 UTC (rev 51772)
+++ trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-08-31 06:20:33 UTC (rev 51773)
@@ -335,6 +335,7 @@
    evas_object_resize(wd->front.clip, 99999, 99999);
    elm_widget_sub_object_add(wd->front.clip, obj);
    evas_object_smart_member_add(wd->front.clip, obj);
+   evas_object_clip_set(wd->front.clip, evas_object_clip_get(obj));
    
    wd->back.clip = evas_object_rectangle_add(e);
    evas_object_color_set(wd->back.clip, 255, 255, 255, 255);
@@ -342,6 +343,7 @@
    evas_object_resize(wd->back.clip, 99999, 99999);
    elm_widget_sub_object_add(wd->back.clip, obj);
    evas_object_smart_member_add(wd->back.clip, obj);
+   evas_object_clip_set(wd->back.clip, evas_object_clip_get(obj));
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);

Modified: trunk/TMP/st/elementary/src/lib/elm_mapbuf.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_mapbuf.c	2010-08-31 05:02:16 UTC (rev 51772)
+++ trunk/TMP/st/elementary/src/lib/elm_mapbuf.c	2010-08-31 06:20:33 UTC (rev 51773)
@@ -197,7 +197,9 @@
      {
 	elm_widget_sub_object_add(content, obj);
 	evas_object_smart_member_add(content, obj);
-	evas_object_event_callback_add(content, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+        evas_object_clip_set(content, evas_object_clip_get(obj));
+	evas_object_event_callback_add(content,
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
      }
    _sizing_eval(obj);
@@ -225,6 +227,7 @@
    content = wd->content;
    elm_widget_sub_object_del(obj, wd->content);
    evas_object_smart_member_del(wd->content);
+   evas_object_clip_unset(wd->content);
    wd->content = NULL;
    return content;
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-08-31 05:02:16 UTC (rev 51772)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-08-31 06:20:33 UTC (rev 51773)
@@ -1250,37 +1250,67 @@
 static void
 _smart_show(Evas_Object *obj)
 {
+   Eina_List *list, *l;
+   Evas_Object *o;
    INTERNAL_ENTRY;
-   evas_object_show(sd->resize_obj);
+   list = evas_object_smart_members_get(obj);
+   EINA_LIST_FOREACH(list, l, o)
+     {
+        evas_object_show(o);
+     }
 }
 
 static void
 _smart_hide(Evas_Object *obj)
 {
+   Eina_List *list, *l;
+   Evas_Object *o;
    INTERNAL_ENTRY;
-   evas_object_hide(sd->resize_obj);
+   list = evas_object_smart_members_get(obj);
+   EINA_LIST_FOREACH(list, l, o)
+     {
+        evas_object_hide(o);
+     }
    _if_focused_revert(obj);
 }
 
 static void
 _smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
 {
+   Eina_List *list, *l;
+   Evas_Object *o;
    INTERNAL_ENTRY;
-   evas_object_color_set(sd->resize_obj, r, g, b, a);
+   list = evas_object_smart_members_get(obj);
+   EINA_LIST_FOREACH(list, l, o)
+     {
+        evas_object_color_set(o, r, g, b, a);
+     }
 }
 
 static void
 _smart_clip_set(Evas_Object *obj, Evas_Object *clip)
 {
+   Eina_List *list, *l;
+   Evas_Object *o;
    INTERNAL_ENTRY;
-   evas_object_clip_set(sd->resize_obj, clip);
+   list = evas_object_smart_members_get(obj);
+   EINA_LIST_FOREACH(list, l, o)
+     {
+        evas_object_clip_set(o, clip);
+     }
 }
 
 static void
 _smart_clip_unset(Evas_Object *obj)
 {
+   Eina_List *list, *l;
+   Evas_Object *o;
    INTERNAL_ENTRY;
-   evas_object_clip_unset(sd->resize_obj);
+   list = evas_object_smart_members_get(obj);
+   EINA_LIST_FOREACH(list, l, o)
+     {
+        evas_object_clip_unset(o);
+     }
 }
 
 static void

Log:
  ooof flippidy-do-da... working much better.
  
  
Author:       raster
Date:         2010-09-02 02:58:52 -0700 (Thu, 02 Sep 2010)
New Revision: 51831

Modified:
  trunk/TMP/st/elementary/src/bin/test_flip.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_flip.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_flip.c	2010-09-02 09:40:23 UTC (rev 51830)
+++ trunk/TMP/st/elementary/src/bin/test_flip.c	2010-09-02 09:58:52 UTC (rev 51831)
@@ -44,6 +44,20 @@
 }
 
 void
+my_fl_7(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_CUBE_UP);
+}
+
+void
+my_fl_8(void *data, Evas_Object *obj, void *event_info)
+{
+   Evas_Object *fl = data;
+   elm_flip_go(fl, ELM_FLIP_CUBE_DOWN);
+}
+
+void
 test_flip(void *data, Evas_Object *obj, void *event_info)
 {
    Evas_Object *win, *bg, *bx, *bx2, *fl, *o, *bt, *ly;
@@ -138,6 +152,14 @@
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
 
+   elm_box_pack_end(bx, bx2);
+   evas_object_show(bx2);
+   
+   bx2 = elm_box_add(win);
+   elm_box_horizontal_set(bx2, 1);
+   evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
+   
    bt = elm_button_add(win);
    elm_button_label_set(bt, "5");
    evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl);
@@ -154,6 +176,22 @@
    elm_box_pack_end(bx2, bt);
    evas_object_show(bt);
    
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "7");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_7, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
+   bt = elm_button_add(win);
+   elm_button_label_set(bt, "8");
+   evas_object_smart_callback_add(bt, "clicked", my_fl_8, fl);
+   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+   elm_box_pack_end(bx2, bt);
+   evas_object_show(bt);
+   
    elm_box_pack_end(bx, bx2);
    evas_object_show(bx2);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-02 09:40:23 UTC (rev 51830)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-02 09:58:52 UTC (rev 51831)
@@ -1525,7 +1525,9 @@
           ELM_FLIP_ROTATE_XZ_CENTER_AXIS,
           ELM_FLIP_ROTATE_YZ_CENTER_AXIS,
           ELM_FLIP_CUBE_LEFT,
-          ELM_FLIP_CUBE_RIGHT
+          ELM_FLIP_CUBE_RIGHT,
+          ELM_FLIP_CUBE_UP,
+          ELM_FLIP_CUBE_DOWN
      } Elm_Flip_Mode;
 
    EAPI Evas_Object *elm_flip_add(Evas_Object *parent);

Modified: trunk/TMP/st/elementary/src/lib/elm_flip.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-09-02 09:40:23 UTC (rev 51830)
+++ trunk/TMP/st/elementary/src/lib/elm_flip.c	2010-09-02 09:58:52 UTC (rev 51831)
@@ -114,6 +114,34 @@
      }
 }
 
+static void
+flip_show_hide(Evas_Object *obj)
+{
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (elm_flip_front_get(obj))
+     {
+        if (wd->front.content)
+           evas_object_show(wd->front.clip);
+        else
+           evas_object_hide(wd->front.clip);
+        if (wd->back.content)
+           evas_object_hide(wd->back.clip);
+        else
+           evas_object_hide(wd->back.clip);
+     }
+   else
+     {
+        if (wd->front.content)
+           evas_object_hide(wd->front.clip);
+        else
+           evas_object_hide(wd->front.clip);
+        if (wd->back.content)
+           evas_object_show(wd->back.clip);
+        else
+           evas_object_hide(wd->back.clip);
+     }
+}
+
 static Eina_Bool
 _flip(Evas_Object *obj)
 {
@@ -222,7 +250,36 @@
             evas_map_util_3d_rotate(mb, 0.0, deg, 0.0, cx, cy, w / 2);
           }
         break;
-    
+     case ELM_FLIP_CUBE_UP:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        deg = -90.0 * p;
+        if (wd->state)
+          {
+            evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2);
+            evas_map_util_3d_rotate(mb, deg + 90, 0.0, 0.0, cx, cy, h / 2);
+          }
+        else
+          {
+            evas_map_util_3d_rotate(mf, deg + 90, 0.0, 0.0, cx, cy, h / 2);
+            evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2);
+          }
+        break;
+     case ELM_FLIP_CUBE_DOWN:
+        p = 1.0 - t;
+        p = 1.0 - (p * p);
+        deg = 90.0 * p;
+        if (wd->state)
+          {
+            evas_map_util_3d_rotate(mf, deg, 0.0, 0.0, cx, cy, h / 2);
+            evas_map_util_3d_rotate(mb, deg - 90, 0.0, 0.0, cx, cy, h / 2);
+          }
+        else
+          {
+            evas_map_util_3d_rotate(mf, deg - 90, 0.0, 0.0, cx, cy, h / 2);
+            evas_map_util_3d_rotate(mb, deg, 0.0, 0.0, cx, cy, h / 2);
+          }
+        break;
      default:
         break;
      }
@@ -333,7 +390,7 @@
    evas_object_color_set(wd->front.clip, 255, 255, 255, 255);
    evas_object_move(wd->front.clip, -49999, -49999);
    evas_object_resize(wd->front.clip, 99999, 99999);
-   elm_widget_sub_object_add(wd->front.clip, obj);
+   elm_widget_sub_object_add(obj, wd->front.clip);
    evas_object_smart_member_add(wd->front.clip, obj);
    evas_object_clip_set(wd->front.clip, evas_object_clip_get(obj));
    
@@ -342,7 +399,7 @@
    evas_object_move(wd->back.clip, -49999, -49999);
    evas_object_resize(wd->back.clip, 99999, 99999);
    elm_widget_sub_object_add(wd->back.clip, obj);
-   evas_object_smart_member_add(wd->back.clip, obj);
+   evas_object_smart_member_add(obj, wd->back.clip);
    evas_object_clip_set(wd->back.clip, evas_object_clip_get(obj));
 
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
@@ -386,11 +443,8 @@
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
 	_sizing_eval(obj);
-        if (!elm_flip_front_get(obj)) evas_object_hide(wd->front.clip);
-        else evas_object_show(wd->front.clip);
      }
-   else
-     evas_object_hide(wd->front.clip);     
+   flip_show_hide(obj);
    _configure(obj);
 }
 
@@ -425,11 +479,8 @@
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
 	_sizing_eval(obj);
-        if (elm_flip_front_get(obj)) evas_object_hide(wd->back.clip);
-        else evas_object_show(wd->back.clip);
      }
-   else
-     evas_object_hide(wd->back.clip);
+   flip_show_hide(obj);
    _configure(obj);
 }
 
@@ -514,6 +565,9 @@
  * ELM_FLIP_ROTATE_YZ_CENTER_AXIS
  * ELM_FLIP_CUBE_LEFT
  * ELM_FLIP_CUBE_RIGHT
+ * 
+ * FIXME: add - ELM_FLIP_CUBE_UP
+ * FIXMEL add - ELM_FLIP_CUBE_DOWN
  *
  * @ingroup Flip
  */
@@ -524,7 +578,9 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    if (!wd->animator) wd->animator = ecore_animator_add(_animate, obj);
+   flip_show_hide(obj);
    wd->mode = mode;
    wd->start = ecore_loop_time_get();
    wd->len = 0.5;
+   _flip(obj);
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-02 09:40:23 UTC (rev 51830)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-09-02 09:58:52 UTC (rev 51831)
@@ -1256,6 +1256,14 @@
    list = evas_object_smart_members_get(obj);
    EINA_LIST_FOREACH(list, l, o)
      {
+        Evas_Object *obj2;
+        
+        obj2 = evas_object_clip_get(o);
+        if (obj2)
+          {
+             obj2 = evas_object_smart_parent_get(obj2);
+             if (obj2 == obj) continue;
+          }
         evas_object_show(o);
      }
 }
@@ -1269,6 +1277,14 @@
    list = evas_object_smart_members_get(obj);
    EINA_LIST_FOREACH(list, l, o)
      {
+        Evas_Object *obj2;
+        
+        obj2 = evas_object_clip_get(o);
+        if (obj2)
+          {
+             obj2 = evas_object_smart_parent_get(obj2);
+             if (obj2 == obj) continue;
+          }
         evas_object_hide(o);
      }
    _if_focused_revert(obj);
@@ -1283,6 +1299,14 @@
    list = evas_object_smart_members_get(obj);
    EINA_LIST_FOREACH(list, l, o)
      {
+        Evas_Object *obj2;
+        
+        obj2 = evas_object_clip_get(o);
+        if (obj2)
+          {
+             obj2 = evas_object_smart_parent_get(obj2);
+             if (obj2 == obj) continue;
+          }
         evas_object_color_set(o, r, g, b, a);
      }
 }
@@ -1296,6 +1320,14 @@
    list = evas_object_smart_members_get(obj);
    EINA_LIST_FOREACH(list, l, o)
      {
+        Evas_Object *obj2;
+        
+        obj2 = evas_object_clip_get(o);
+        if (obj2)
+          {
+             obj2 = evas_object_smart_parent_get(obj2);
+             if (obj2 == obj) continue;
+          }
         evas_object_clip_set(o, clip);
      }
 }
@@ -1309,6 +1341,14 @@
    list = evas_object_smart_members_get(obj);
    EINA_LIST_FOREACH(list, l, o)
      {
+        Evas_Object *obj2;
+        
+        obj2 = evas_object_clip_get(o);
+        if (obj2)
+          {
+             obj2 = evas_object_smart_parent_get(obj2);
+             if (obj2 == obj) continue;
+          }
         evas_object_clip_unset(o);
      }
 }

Log:
  make theme browser in elm config util actually work. add api's needed.
  it's simple. only allows 1 level of theme. would need an advanced
  dialog to allow:
  
  theme1:theme2:theme3:theme4... etc.
  
  also no browsing for themes - just whats instaleld n system and user
  dirs atm.
  
  
Author:       raster
Date:         2010-09-23 22:11:33 -0700 (Thu, 23 Sep 2010)
New Revision: 52667

Modified:
  trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_frame.c trunk/TMP/st/elementary/src/lib/elm_theme.c 

Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c	2010-09-24 04:42:24 UTC (rev 52666)
+++ trunk/TMP/st/elementary/src/bin/config.c	2010-09-24 05:11:33 UTC (rev 52667)
@@ -1,6 +1,19 @@
 #include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
+typedef struct _Theme Theme;
+
+struct _Theme
+{
+   const char *label;
+   const char *name;
+   const char *path;
+   Eina_Bool in_search_path;
+};
+
+static Theme *tsel = NULL;
+static Eina_List *themes = NULL;
+
 static int quiet = 0;
 static int interactive = 1;
 
@@ -238,10 +251,66 @@
 static void
 _theme_use(void *data, Evas_Object *obj, void *event_info)
 {
-   printf("not implemented\n");
+   const char *defth;
+   char *newth;
+   Theme *t = tsel;
+   
+   if (!t) return;
+   defth = elm_theme_get(NULL);
+   newth = malloc(strlen(defth) + 1 + strlen(t->name) + 1);
+   if (newth)
+     {
+        char *rest;
+
+        newth[0] = 0;
+        rest = strchr(defth, ':');
+        if (!rest)
+           strcpy(newth, t->name);
+        else
+          {
+             strcpy(newth, t->name);
+             strcat(newth, rest);
+          }
+        elm_theme_all_set(newth);
+        free(newth);
+     }
 }
 
 static void
+_theme_sel(void *data, Evas_Object *obj, void *event_info)
+{
+   Theme *t = data;
+   Evas_Object *win = elm_object_top_widget_get(obj);
+   Evas_Object *sample = evas_object_data_get(win, "sample");
+   Elm_Theme *th;
+   const char *defth;
+   char *newth;
+
+   tsel = t;
+   defth = elm_theme_get(NULL);
+   newth = malloc(strlen(defth) + 1 + strlen(t->name) + 1);
+   th = elm_theme_new();
+   if (newth)
+     {
+        char *rest;
+
+        newth[0] = 0;
+        rest = strchr(defth, ':');
+        if (!rest)
+           strcpy(newth, t->name);
+        else
+          {
+             strcpy(newth, t->name);
+             strcat(newth, rest);
+          }
+        elm_theme_set(th, newth);
+        free(newth);
+     }
+   elm_object_theme_set(sample, th);
+   elm_theme_free(th);
+}
+
+static void
 _theme_browse(void *data, Evas_Object *obj, void *event_info)
 {
    printf("not implemented\n");
@@ -336,7 +405,7 @@
    bg = elm_bg_add(win);
    evas_object_size_hint_weight_set(bg, 1.0, 1.0);
    evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_table_pack(base, bg, 0, 0, 2, 4);
+   elm_table_pack(base, bg, 0, 0, 2, 5);
    evas_object_show(bg);
    
    bt = elm_button_add(win);
@@ -409,6 +478,8 @@
 _status_config_themes(Evas_Object *win, Evas_Object *holder)
 {
    Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample;
+   Eina_List *list, *l;
+   char *th, *s, *ext;
    
    tb = elm_table_add(win);
    evas_object_size_hint_weight_set(tb, 1.0, 1.0);
@@ -437,17 +508,49 @@
    elm_frame_content_set(pd, li);
    evas_object_show(li);
    
-   // FIXME: list all themes:
-   // ~/.elementary/themes/*.edj
-   // $PREFIX/datadir/themes/*.edj
-   
-   elm_list_item_append(li, "theme 1", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 2", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 3", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 4", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 5", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 6", NULL, NULL,  NULL, NULL);
-   elm_list_item_append(li, "theme 7", NULL, NULL,  NULL, NULL);
+   list = elm_theme_name_available_list_new();
+   EINA_LIST_FOREACH(list, l, th)
+     {
+        Theme *t;
+        
+        t = calloc(1, sizeof(Theme));
+        t->name = eina_stringshare_add(th);
+        s = elm_theme_list_item_path_get(th, &(t->in_search_path));
+        if (s)
+          {
+             t->path = eina_stringshare_add(s);
+             free(s);
+          }
+        if (t->in_search_path)
+          {
+             s = strdup(th);
+             if (s)
+               {
+                  s[0] = toupper(s[0]);
+                  t->label = eina_stringshare_add(s);
+                  free(s);
+               }
+             else
+                t->label = eina_stringshare_add(s);
+          }
+        else
+          {
+             s = strdup(ecore_file_file_get(th));
+             if (s)
+               {
+                  s[0] = toupper(s[0]);
+                  ext = strrchr(s, '.');
+                  if (ext) *ext = 0;
+                  t->label = eina_stringshare_add(s);
+                  free(s);
+               }
+             else
+                t->label = eina_stringshare_add(s);
+          }
+        themes = eina_list_append(themes, t);
+        elm_list_item_append(li, t->label, NULL, NULL,  _theme_sel, t);
+     }
+   elm_theme_name_available_list_free(list);
 
    elm_list_go(li);
    
@@ -458,6 +561,7 @@
    elm_table_pack(tb, pd, 0, 0, 1, 1);
    evas_object_show(pd);
    
+/* FIXME: not implemented yet
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _theme_browse, win);
    elm_button_label_set(bt, "Browse...");
@@ -465,7 +569,7 @@
    evas_object_size_hint_align_set(bt, 0.9, 0.9);
    elm_frame_content_set(pd, bt);
    evas_object_show(bt);
-   
+ */ 
    pd = elm_frame_add(win);
    elm_object_style_set(pd, "pad_medium");
    evas_object_size_hint_weight_set(pd, 1.0, 0.0);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-24 04:42:24 UTC (rev 52666)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-09-24 05:11:33 UTC (rev 52667)
@@ -339,11 +339,16 @@
    EAPI void         elm_theme_extension_del(Elm_Theme *th, const char *item);
    EAPI void         elm_theme_set(Elm_Theme *th, const char *theme);
    EAPI const char  *elm_theme_get(Elm_Theme *th);
+   EAPI const Eina_List *elm_theme_list_get(Elm_Theme *th);
+   EAPI char        *elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path);
    EAPI void         elm_theme_flush(Elm_Theme *th);
    EAPI void         elm_theme_full_flush(void);
 
    EAPI void         elm_theme_all_set(const char *theme);
-
+   
+   EAPI Eina_List   *elm_theme_name_available_list_new(void);
+   EAPI void         elm_theme_name_available_list_free(Eina_List *list);
+         
    EAPI void         elm_object_theme_set(Evas_Object *obj, Elm_Theme *th);
    EAPI Elm_Theme   *elm_object_theme_get(Evas_Object *obj);
 

Modified: trunk/TMP/st/elementary/src/lib/elm_frame.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_frame.c	2010-09-24 04:42:24 UTC (rev 52666)
+++ trunk/TMP/st/elementary/src/lib/elm_frame.c	2010-09-24 05:11:33 UTC (rev 52667)
@@ -14,6 +14,7 @@
 {
    Evas_Object *frm;
    Evas_Object *content;
+   const char *label;
 };
 
 static const char *widtype = NULL;
@@ -28,6 +29,7 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   if (wd->label) eina_stringshare_del(wd->label);
    free(wd);
 }
 
@@ -37,6 +39,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    _elm_theme_object_set(obj, wd->frm, "frame", "base", elm_widget_style_get(obj));
+   edje_object_part_text_set(wd->frm, "elm.text", wd->label);
    if (wd->content)
      edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
    edje_object_scale_set(wd->frm, elm_widget_scale_get(obj) * _elm_config->scale);
@@ -129,7 +132,8 @@
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   edje_object_part_text_set(wd->frm, "elm.text", label);
+   eina_stringshare_replace(&(wd->label), label);
+   edje_object_part_text_set(wd->frm, "elm.text", wd->label);
    _sizing_eval(obj);
 }
 
@@ -147,8 +151,8 @@
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if ((!wd) || (!wd->frm)) return NULL;
-   return edje_object_part_text_get(wd->frm, "elm.text");
+   if (!wd) return NULL;
+   return wd->label;
 }
 
 /**

Modified: trunk/TMP/st/elementary/src/lib/elm_theme.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_theme.c	2010-09-24 04:42:24 UTC (rev 52666)
+++ trunk/TMP/st/elementary/src/lib/elm_theme.c	2010-09-24 05:11:33 UTC (rev 52667)
@@ -433,6 +433,7 @@
 EAPI const char *
 elm_theme_get(Elm_Theme *th)
 {
+   if (!th) th = &(theme_default);
    if (!th->theme)
      {
         Eina_List *l;
@@ -459,6 +460,90 @@
 }
 
 /**
+ * Return a list of theme elements to be used in a theme.
+ * 
+ * @param th Theme to get the list of theme elements from.
+ * @return The internal list of theme elements
+ * 
+ * This returns the internal list of theme elements (will only be valid as
+ * long as the theme is not modified by elm_theme_set() or theme is not
+ * freed by elm_theme_free(). This is a list of strings which must not be
+ * altered as they are also internal. If @p th is NULL, then the default
+ * theme element list is returned.
+ */
+EAPI const Eina_List *
+elm_theme_list_get(Elm_Theme *th)
+{
+   if (!th) th = &(theme_default);
+   return th->themes;
+}
+
+/**
+ * Return the full patrh for a theme element
+ * 
+ * @param f The theme element name
+ * @param in_search_path Pointer to a boolean to indicate if item is in the search path or not
+ * @return The full path to the file found.
+ * 
+ * This returns a string you should free with free() on success, NULL on
+ * failure. This will search for the given theme element, and if it is a
+ * full or relative path element or a simple searchable name. The returned
+ * path is the full path to the file, if searched, and the file exists, or it
+ * is simply the full path given in the element or a resolved path if
+ * relative to home. The @p in_search_path boolean pointed to is set to
+ * EINA_TRUE if the file was a searchable file andis in the search path,
+ * and EINA_FALSE otherwise.
+ */
+EAPI char *
+elm_theme_list_item_path_get(const char *f, Eina_Bool *in_search_path)
+{
+   static const char *home = NULL;
+   char buf[PATH_MAX];
+   
+   if (!f)
+     {
+        if (in_search_path) *in_search_path = EINA_FALSE;
+        return NULL;
+     }
+   
+   if (!home)
+     {
+	home = getenv("HOME");
+	if (!home) home = "";
+     }
+   
+   if ((f[0] == '/') || ((f[0] == '.') && (f[1] == '/')) ||
+       ((f[0] == '.') && (f[1] == '.') && (f[2] == '/')) ||
+       (isalpha(f[0]) && f[1] == ':'))
+     {
+        if (in_search_path) *in_search_path = EINA_FALSE;
+        return strdup(f);
+     }
+   else if (((f[0] == '~') && (f[1] == '/')))
+     {
+        if (in_search_path) *in_search_path = EINA_FALSE;
+	snprintf(buf, sizeof(buf), "%s/%s", home, f + 2);
+        return strdup(buf);
+     }
+   snprintf(buf, sizeof(buf), "%s/.elementary/themes/%s.edj", home, f);
+   if (ecore_file_exists(buf))
+     {
+        if (in_search_path) *in_search_path = EINA_TRUE;
+        return strdup(buf);
+     }
+   
+   snprintf(buf, sizeof(buf), "%s/themes/%s.edj", _elm_data_dir, f);
+   if (ecore_file_exists(buf))
+     {
+        if (in_search_path) *in_search_path = EINA_TRUE;
+        return strdup(buf);
+     }
+   
+   if (in_search_path) *in_search_path = EINA_FALSE;
+   return NULL;
+}
+
+/**
  * Flush the current theme.
  * 
  * @param th Theme to flush
@@ -522,6 +607,97 @@
 }
 
 /**
+ * Return a list of theme elements in the theme search path
+ * 
+ * @return A list of strings that are the theme element names.
+ * 
+ * This lists all available theme files in the standard Elementary search path
+ * for theme elements, and returns them in alphabetical order as theme
+ * element names in a list of strings. Free this with 
+ * elm_theme_name_available_list_free() when you are done with the list.
+ */
+EAPI Eina_List *
+elm_theme_name_available_list_new(void)
+{
+   Eina_List *list = NULL;
+   Eina_List *dir, *l;
+   char buf[PATH_MAX], *file, *s, *th;
+   static const char *home = NULL;
+   
+   if (!home)
+     {
+        home = getenv("HOME");
+        if (!home) home = "";
+     }
+   
+   snprintf(buf, sizeof(buf), "%s/.elementary/themes", home);
+   dir = ecore_file_ls(buf);
+   EINA_LIST_FREE(dir, file)
+     {
+        snprintf(buf, sizeof(buf), "%s/.elementary/themes/%s", home, file);
+        if ((!ecore_file_is_dir(buf)) && (ecore_file_size(buf) > 0))
+          {
+             s = strchr(file, '.');
+             if ((s) && (!strcasecmp(s, ".edj")))
+               {
+                  th = strdup(file);
+                  s = strchr(th, '.');
+                  *s = 0;
+                  list = eina_list_append(list, th);
+               }
+          }
+        free(file);
+     }
+
+   snprintf(buf, sizeof(buf), "%s/themes", _elm_data_dir);
+   dir = ecore_file_ls(buf);
+   EINA_LIST_FREE(dir, file)
+     {
+        snprintf(buf, sizeof(buf), "%s/themes/%s", _elm_data_dir, file);
+        if ((!ecore_file_is_dir(buf)) && (ecore_file_size(buf) > 0))
+          {
+             s = strchr(file, '.');
+             if ((s) && (!strcasecmp(s, ".edj")))
+               {
+                  int dup;
+                  
+                  th = strdup(file);
+                  s = strchr(th, '.');
+                  *s = 0;
+                  dup = 0;
+                  EINA_LIST_FOREACH(list, l, s)
+                    {
+                       if (!strcmp(s, th))
+                         {
+                            dup = 1;
+                            break;
+                         }
+                    }
+                  if (dup) free(th);
+                  else list = eina_list_append(list, th);
+               }
+          }
+        free(file);
+     }
+   list = eina_list_sort(list, 0, EINA_COMPARE_CB(strcasecmp));
+   return list;
+}
+
+/**
+ * Free the list returned by elm_theme_name_available_list_new()
+ * 
+ * This frees the list of themes returned by 
+ * elm_theme_name_available_list_new(). Once freed the list should no longer
+ * be used. a new list mys be created.
+ */
+EAPI void
+elm_theme_name_available_list_free(Eina_List *list)
+{
+   char *s;
+   EINA_LIST_FREE(list, s) free(s);
+}
+
+/**
  * Set a specific theme to be used for this object and its children
  * 
  * @param obj The object to set the theme on

Log:
  quicklaunch works again. yes - it's semi-broken. but it works.
  
  
Author:       raster
Date:         2010-10-20 07:12:17 -0700 (Wed, 20 Oct 2010)
New Revision: 53669

Modified:
  trunk/TMP/st/elementary/src/bin/quicklaunch.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_main.c 

Modified: trunk/TMP/st/elementary/src/bin/quicklaunch.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-10-20 14:10:55 UTC (rev 53668)
+++ trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-10-20 14:12:17 UTC (rev 53669)
@@ -281,7 +281,7 @@
 		  handle_run(fd, bytes);
 	       }
 	  }
-	elm_quicklaunch_sub_shutdown();
+	while (elm_quicklaunch_sub_shutdown() > 0);
      }
    elm_quicklaunch_shutdown();
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-20 14:10:55 UTC (rev 53668)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-20 14:12:17 UTC (rev 53669)
@@ -289,15 +289,15 @@
 
 /**************************************************************************/
    /* General calls */
-   EAPI void         elm_init(int argc, char **argv);
-   EAPI void         elm_shutdown(void);
+   EAPI int          elm_init(int argc, char **argv);
+   EAPI int          elm_shutdown(void);
    EAPI void         elm_run(void);
    EAPI void         elm_exit(void);
 
-   EAPI void         elm_quicklaunch_init(int argc, char **argv);
-   EAPI void         elm_quicklaunch_sub_init(int argc, char **argv);
-   EAPI void         elm_quicklaunch_sub_shutdown(void);
-   EAPI void         elm_quicklaunch_shutdown(void);
+   EAPI int          elm_quicklaunch_init(int argc, char **argv);
+   EAPI int          elm_quicklaunch_sub_init(int argc, char **argv);
+   EAPI int          elm_quicklaunch_sub_shutdown(void);
+   EAPI int          elm_quicklaunch_shutdown(void);
    EAPI void         elm_quicklaunch_seed(void);
    EAPI Eina_Bool    elm_quicklaunch_prepare(int argc, char **argv);
    EAPI Eina_Bool    elm_quicklaunch_fork(int argc, char **argv, char *cwd, void (postfork_func) (void *data), void *postfork_data);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-20 14:10:55 UTC (rev 53668)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-20 14:12:17 UTC (rev 53669)
@@ -15,6 +15,8 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
+#define SEMI_BROKEN_QUICKLANCH 1
+
 static Elm_Version _version = { VMAJ, VMIN, VMIC, VREV };
 EAPI Elm_Version *elm_version = &_version;
 
@@ -294,6 +296,8 @@
 EAPI int ELM_EVENT_POLICY_CHANGED = 0;
 
 static int _elm_init_count = 0;
+static int _elm_sub_init_count = 0;
+static int _elm_ql_init_count = 0;
 static int _elm_policies[ELM_POLICY_LAST];
 static Ecore_Event_Handler *_elm_exit_handler = NULL;
 
@@ -317,36 +321,42 @@
 
 /**
  * Inititalise Elementary
- *
+ * 
+ * @return The init counter value.
+ * 
  * This call is exported only for use by the ELM_MAIN() macro. There is no
  * need to use this if you use this macro (which is highly advisable).
  * @ingroup General
  */
-EAPI void
+EAPI int
 elm_init(int argc, char **argv)
 {
    _elm_init_count++;
-   if (_elm_init_count != 1) return;
+   if (_elm_init_count > 1) return _elm_init_count;
    elm_quicklaunch_init(argc, argv);
    elm_quicklaunch_sub_init(argc, argv);
+   return _elm_init_count;
 }
 
 /**
  * Shut down Elementary
  *
+ * @return The init counter value.
+ * 
  * This should be called at the end of your application just before it ceases
  * to do any more processing. This will clean up any permanent resources your
  * application may have allocated via Elementary that would otherwise persist
  * on an exit without this call.
  * @ingroup General
  */
-EAPI void
+EAPI int
 elm_shutdown(void)
 {
    _elm_init_count--;
-   if (_elm_init_count != 0) return;
+   if (_elm_init_count > 0) return _elm_init_count;
    elm_quicklaunch_sub_shutdown();
    elm_quicklaunch_shutdown();
+   return _elm_init_count;
 }
 
 #ifdef ELM_EDBUS
@@ -415,11 +425,13 @@
 #endif
 }
 
-EAPI void
+EAPI int
 elm_quicklaunch_init(int argc, char **argv)
 {
    char buf[PATH_MAX], *s;
    
+   _elm_ql_init_count++;
+   if (_elm_ql_init_count > 1) return _elm_ql_init_count;
    eina_init();
    _elm_log_dom = eina_log_domain_register("elementary", EINA_COLOR_LIGHTBLUE);
    if (!_elm_log_dom)
@@ -513,49 +525,75 @@
      _elm_lib_dir = eina_stringshare_add("/");
 
    _elm_config_init();
+   return _elm_ql_init_count;
 }
 
-EAPI void
+EAPI int
 elm_quicklaunch_sub_init(int argc, char **argv)
 {
+   _elm_sub_init_count++;
+   if (_elm_sub_init_count > 1) return _elm_sub_init_count;
+#ifndef SEMI_BROKEN_QUICKLANCH  
    ecore_app_args_set(argc, (const char **)argv);
    evas_init();
    edje_init();
+   _elm_config_sub_init();
+   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+       (_elm_config->engine == ELM_XRENDER_X11) ||
+       (_elm_config->engine == ELM_OPENGL_X11))
+     {
+#ifdef HAVE_ELEMENTARY_X
+	ecore_x_init(NULL);
+#endif
+     }
    ecore_evas_init(); // FIXME: check errors
    ecore_imf_init();
    _elm_module_init();
-   _elm_config_sub_init();
+#endif   
+   return _elm_sub_init_count;
 }
 
-EAPI void
+EAPI int
 elm_quicklaunch_sub_shutdown(void)
 {
+   _elm_sub_init_count--;
+   if (_elm_sub_init_count > 0) return _elm_sub_init_count;
+#ifndef SEMI_BROKEN_QUICKLANCH  
    _elm_win_shutdown();
+   _elm_module_shutdown();
+   ecore_imf_shutdown();
+   ecore_evas_shutdown();
    if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
        (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
        (_elm_config->engine == ELM_XRENDER_X11) ||
+       (_elm_config->engine == ELM_OPENGL_X11))
+     {
+#ifdef HAVE_ELEMENTARY_X
+	ecore_x_disconnect();
+#endif
+     }
+   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+       (_elm_config->engine == ELM_XRENDER_X11) ||
        (_elm_config->engine == ELM_OPENGL_X11) ||
        (_elm_config->engine == ELM_SOFTWARE_SDL) ||
        (_elm_config->engine == ELM_SOFTWARE_16_SDL) ||
        (_elm_config->engine == ELM_OPENGL_SDL) ||
        (_elm_config->engine == ELM_SOFTWARE_WIN32) ||
        (_elm_config->engine == ELM_SOFTWARE_16_WINCE))
-     {
-#ifdef HAVE_ELEMENTARY_X
-	ecore_x_disconnect();
-#endif
-	evas_cserve_disconnect();
-     }
-   _elm_module_shutdown();
-   ecore_imf_shutdown();
-   ecore_evas_shutdown();
+      evas_cserve_disconnect();
    edje_shutdown();
    evas_shutdown();
+#endif   
+   return _elm_sub_init_count;
 }
 
-EAPI void
+EAPI int
 elm_quicklaunch_shutdown(void)
 {
+   _elm_ql_init_count--;
+   if (_elm_ql_init_count > 0) return _elm_ql_init_count;
    eina_stringshare_del(_elm_data_dir);
    _elm_data_dir = NULL;
    eina_stringshare_del(_elm_lib_dir);
@@ -586,11 +624,13 @@
    _elm_widget_type_clear();
    
    eina_shutdown();
+   return _elm_ql_init_count;
 }
 
 EAPI void
 elm_quicklaunch_seed(void)
 {
+#ifndef SEMI_BROKEN_QUICKLANCH  
    Evas_Object *win, *bg, *bt;
 
    win = elm_win_add(NULL, "seed", ELM_WIN_BASIC);
@@ -613,6 +653,7 @@
 #endif
       }
    ecore_main_loop_iterate();
+#endif   
 }
 
 static void *qr_handle = NULL;
@@ -744,7 +785,26 @@
 	return EINA_FALSE;
      }
    if (postfork_func) postfork_func(postfork_data);
-
+   
+#ifdef SEMI_BROKEN_QUICKLANCH
+   ecore_app_args_set(argc, (const char **)argv);
+   evas_init();
+   edje_init();
+   _elm_config_sub_init();
+   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+       (_elm_config->engine == ELM_XRENDER_X11) ||
+       (_elm_config->engine == ELM_OPENGL_X11))
+     {
+#ifdef HAVE_ELEMENTARY_X
+	ecore_x_init(NULL);
+#endif
+     }
+   ecore_evas_init(); // FIXME: check errors
+   ecore_imf_init();
+   _elm_module_init();
+#endif
+   
    setsid();
    if (chdir(cwd) != 0)
      perror("could not chdir");

Log:
  aaah fix non quicklaunch mode too.
  
  
Author:       raster
Date:         2010-10-20 21:05:35 -0700 (Wed, 20 Oct 2010)
New Revision: 53703

Modified:
  trunk/TMP/st/elementary/src/bin/quicklaunch.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_main.c 

Modified: trunk/TMP/st/elementary/src/bin/quicklaunch.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-10-21 01:10:30 UTC (rev 53702)
+++ trunk/TMP/st/elementary/src/bin/quicklaunch.c	2010-10-21 04:05:35 UTC (rev 53703)
@@ -177,6 +177,7 @@
 	CRITICAL("listen(sock=%d, 4096): %s", sock, strerror(errno));
 	exit(-1);
      }
+   elm_quicklaunch_mode_set(EINA_TRUE);
    elm_quicklaunch_init(argc, argv);
    restart_time = ecore_time_get();
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-21 01:10:30 UTC (rev 53702)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-21 04:05:35 UTC (rev 53703)
@@ -294,6 +294,7 @@
    EAPI void         elm_run(void);
    EAPI void         elm_exit(void);
 
+   EAPI void         elm_quicklaunch_mode_set(Eina_Bool ql_on);
    EAPI int          elm_quicklaunch_init(int argc, char **argv);
    EAPI int          elm_quicklaunch_sub_init(int argc, char **argv);
    EAPI int          elm_quicklaunch_sub_shutdown(void);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-21 01:10:30 UTC (rev 53702)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-21 04:05:35 UTC (rev 53703)
@@ -15,7 +15,7 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 
-#define SEMI_BROKEN_QUICKLANCH 1
+#define SEMI_BROKEN_QUICKLAUNCH 1
 
 static Elm_Version _version = { VMAJ, VMIN, VMIC, VREV };
 EAPI Elm_Version *elm_version = &_version;
@@ -300,6 +300,7 @@
 static int _elm_ql_init_count = 0;
 static int _elm_policies[ELM_POLICY_LAST];
 static Ecore_Event_Handler *_elm_exit_handler = NULL;
+static Eina_Bool quicklaunch_on = 0;
 
 static Eina_Bool
 _elm_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
@@ -425,6 +426,12 @@
 #endif
 }
 
+EAPI void
+elm_quicklaunch_mode_set(Eina_Bool ql_on)
+{
+   quicklaunch_on = ql_on;
+}
+
 EAPI int
 elm_quicklaunch_init(int argc, char **argv)
 {
@@ -533,27 +540,31 @@
 {
    _elm_sub_init_count++;
    if (_elm_sub_init_count > 1) return _elm_sub_init_count;
-#ifndef SEMI_BROKEN_QUICKLANCH  
-   ecore_app_args_set(argc, (const char **)argv);
-   evas_init();
-   edje_init();
-   _elm_config_sub_init();
-   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
-       (_elm_config->engine == ELM_XRENDER_X11) ||
-       (_elm_config->engine == ELM_OPENGL_X11))
+   if (quicklaunch_on)
      {
+#ifdef SEMI_BROKEN_QUICKLAUNCH
+        return _elm_sub_init_count;
+#endif
+     }
+   if (!quicklaunch_on)
+     {
+        ecore_app_args_set(argc, (const char **)argv);
+        evas_init();
+        edje_init();
+        _elm_config_sub_init();
+        if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+            (_elm_config->engine == ELM_XRENDER_X11) ||
+            (_elm_config->engine == ELM_OPENGL_X11))
+          {
 #ifdef HAVE_ELEMENTARY_X
-	ecore_x_init(NULL);
+             ecore_x_init(NULL);
 #endif
+          }
+        ecore_evas_init(); // FIXME: check errors
+        ecore_imf_init();
+        _elm_module_init();
      }
-   ecore_evas_init(); // FIXME: check errors
-   ecore_imf_init();
-   _elm_module_init();
-#else
-   (void) argc;
-   (void) argv;
-#endif
    return _elm_sub_init_count;
 }
 
@@ -562,33 +573,40 @@
 {
    _elm_sub_init_count--;
    if (_elm_sub_init_count > 0) return _elm_sub_init_count;
-#ifndef SEMI_BROKEN_QUICKLANCH  
-   _elm_win_shutdown();
-   _elm_module_shutdown();
-   ecore_imf_shutdown();
-   ecore_evas_shutdown();
-   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
-       (_elm_config->engine == ELM_XRENDER_X11) ||
-       (_elm_config->engine == ELM_OPENGL_X11))
+   if (quicklaunch_on)
      {
+#ifdef SEMI_BROKEN_QUICKLAUNCH
+        return _elm_sub_init_count;
+#endif
+     }
+   if (!quicklaunch_on)
+     {
+        _elm_win_shutdown();
+        _elm_module_shutdown();
+        ecore_imf_shutdown();
+        ecore_evas_shutdown();
+        if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+            (_elm_config->engine == ELM_XRENDER_X11) ||
+            (_elm_config->engine == ELM_OPENGL_X11))
+          {
 #ifdef HAVE_ELEMENTARY_X
-	ecore_x_disconnect();
+             ecore_x_disconnect();
 #endif
+          }
+        if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+            (_elm_config->engine == ELM_XRENDER_X11) ||
+            (_elm_config->engine == ELM_OPENGL_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_SDL) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_SDL) ||
+            (_elm_config->engine == ELM_OPENGL_SDL) ||
+            (_elm_config->engine == ELM_SOFTWARE_WIN32) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_WINCE))
+           evas_cserve_disconnect();
+        edje_shutdown();
+        evas_shutdown();
      }
-   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
-       (_elm_config->engine == ELM_XRENDER_X11) ||
-       (_elm_config->engine == ELM_OPENGL_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_SDL) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_SDL) ||
-       (_elm_config->engine == ELM_OPENGL_SDL) ||
-       (_elm_config->engine == ELM_SOFTWARE_WIN32) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_WINCE))
-      evas_cserve_disconnect();
-   edje_shutdown();
-   evas_shutdown();
-#endif   
    return _elm_sub_init_count;
 }
 
@@ -633,29 +651,32 @@
 EAPI void
 elm_quicklaunch_seed(void)
 {
-#ifndef SEMI_BROKEN_QUICKLANCH  
-   Evas_Object *win, *bg, *bt;
-
-   win = elm_win_add(NULL, "seed", ELM_WIN_BASIC);
-   bg = elm_bg_add(win);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-   bt = elm_button_add(win);
-   elm_button_label_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?");
-   elm_win_resize_object_add(win, bt);
-   ecore_main_loop_iterate();
-   evas_object_del(win);
-   ecore_main_loop_iterate();
-   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
-       (_elm_config->engine == ELM_XRENDER_X11) ||
-       (_elm_config->engine == ELM_OPENGL_X11))
+#ifndef SEMI_BROKEN_QUICKLAUNCH  
+   if (quicklaunch_on)
      {
-#ifdef HAVE_ELEMENTARY_X
-	ecore_x_sync();
-#endif
-      }
-   ecore_main_loop_iterate();
+        Evas_Object *win, *bg, *bt;
+        
+        win = elm_win_add(NULL, "seed", ELM_WIN_BASIC);
+        bg = elm_bg_add(win);
+        elm_win_resize_object_add(win, bg);
+        evas_object_show(bg);
+        bt = elm_button_add(win);
+        elm_button_label_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?");
+        elm_win_resize_object_add(win, bt);
+        ecore_main_loop_iterate();
+        evas_object_del(win);
+        ecore_main_loop_iterate();
+        if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+            (_elm_config->engine == ELM_XRENDER_X11) ||
+            (_elm_config->engine == ELM_OPENGL_X11))
+          {
+# ifdef HAVE_ELEMENTARY_X
+             ecore_x_sync();
+# endif
+          }
+        ecore_main_loop_iterate();
+     }
 #endif   
 }
 
@@ -789,24 +810,27 @@
      }
    if (postfork_func) postfork_func(postfork_data);
    
-#ifdef SEMI_BROKEN_QUICKLANCH
-   ecore_app_args_set(argc, (const char **)argv);
-   evas_init();
-   edje_init();
-   _elm_config_sub_init();
-   if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
-       (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
-       (_elm_config->engine == ELM_XRENDER_X11) ||
-       (_elm_config->engine == ELM_OPENGL_X11))
+   if (quicklaunch_on)
      {
-#ifdef HAVE_ELEMENTARY_X
-	ecore_x_init(NULL);
+#ifdef SEMI_BROKEN_QUICKLAUNCH
+        ecore_app_args_set(argc, (const char **)argv);
+        evas_init();
+        edje_init();
+        _elm_config_sub_init();
+        if ((_elm_config->engine == ELM_SOFTWARE_X11) ||
+            (_elm_config->engine == ELM_SOFTWARE_16_X11) ||
+            (_elm_config->engine == ELM_XRENDER_X11) ||
+            (_elm_config->engine == ELM_OPENGL_X11))
+          {
+# ifdef HAVE_ELEMENTARY_X
+             ecore_x_init(NULL);
+# endif
+          }
+        ecore_evas_init(); // FIXME: check errors
+        ecore_imf_init();
+        _elm_module_init();
 #endif
      }
-   ecore_evas_init(); // FIXME: check errors
-   ecore_imf_init();
-   _elm_module_init();
-#endif
    
    setsid();
    if (chdir(cwd) != 0)

Log:
  1. need calls return runtime failure if elm doesnt have the feature.
  2. elm config dont use desktops if no efreet.
  
  
Author:       raster
Date:         2010-10-27 21:13:09 -0700 (Wed, 27 Oct 2010)
New Revision: 53945

Modified:
  trunk/TMP/st/elementary/src/bin/config.c trunk/TMP/st/elementary/src/bin/test_icon_desktops.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_main.c trunk/TMP/st/elementary/src/lib/elm_thumb.c 

Modified: trunk/TMP/st/elementary/src/bin/config.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/config.c	2010-10-28 03:46:52 UTC (rev 53944)
+++ trunk/TMP/st/elementary/src/bin/config.c	2010-10-28 04:13:09 UTC (rev 53945)
@@ -684,13 +684,15 @@
 _profiles_list_selected_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    const char *cur_profile = NULL;
-   Efreet_Desktop *desk = NULL;
    char *pdir, buf[PATH_MAX];
    const char *sel_profile;
    Eina_Bool cur_selected;
    const char *prof_name;
    Evas_Object *en;
-
+#ifdef ELM_EFREET  
+   Efreet_Desktop *desk = NULL;
+#endif
+  
    sel_profile = data;
    if (!sel_profile)
        return;
@@ -708,12 +710,12 @@
    /*                                                  other than curr *\/ */
 
    pdir = elm_profile_dir_get(sel_profile);
+#ifdef ELM_EFREET  
    snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
    desk = efreet_desktop_new(buf);
-
-   if ((desk) && (desk->name))
-     prof_name = desk->name;
+   if ((desk) && (desk->name)) prof_name = desk->name;
    else
+#endif    
      prof_name = cur_profile;
 
    snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br>",
@@ -721,13 +723,15 @@
    elm_label_label_set(evas_object_data_get(obj, "prof_name_lbl"), buf);
 
    en = evas_object_data_get(obj, "prof_desc_entry");
-   if (desk)
-     elm_scrolled_entry_entry_set(en, desk->comment);
+#ifdef ELM_EFREET  
+   if (desk) elm_scrolled_entry_entry_set(en, desk->comment);
    else
+#endif
      elm_scrolled_entry_entry_set(en, "Unknown");
 
-   if (desk)
-       efreet_desktop_free(desk);
+#ifdef ELM_EFREET  
+   if (desk) efreet_desktop_free(desk);
+#endif  
 }
 
 static void
@@ -742,41 +746,40 @@
      return;
 
    elm_list_clear(l_widget);
-   efreet_init();
 
    cur_profile = elm_profile_get();
 
    EINA_LIST_FOREACH(p_names, l, profile)
      {
-        Efreet_Desktop *desk = NULL;
         char buf[PATH_MAX], *pdir;
         const char *label, *ext;
         Evas_Object *ic;
         Elm_List_Item *it;
-
+#ifdef ELM_EFREET
+       Efreet_Desktop *desk = NULL;
+#endif
+       
         pdir = elm_profile_dir_get(profile);
+        label = profile;
+       
+#ifdef ELM_EFREET
         snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
-
         desk = efreet_desktop_new(buf);
-        label = profile;
-
-        if ((desk) && (desk->name))
-          label = desk->name;
-
+        if ((desk) && (desk->name)) label = desk->name;
+#endif
+       
         buf[0] = 0;
-        if (pdir)
-          snprintf(buf, sizeof(buf), "%s/icon.edj", pdir);
+        if (pdir) snprintf(buf, sizeof(buf), "%s/icon.edj", pdir);
+#ifdef ELM_EFREET
         if ((desk) && (desk->icon) && (pdir))
           snprintf(buf, sizeof(buf), "%s/%s", pdir, desk->icon);
+#endif       
         ic = elm_icon_add(l_widget);
-
         ext = strrchr(buf, '.');
         if (ext)
           {
-             if (!strcmp(ext, ".edj"))
-               elm_icon_file_set(ic, buf, "icon");
-             else
-               elm_icon_file_set(ic, buf, NULL);
+             if (!strcmp(ext, ".edj")) elm_icon_file_set(ic, buf, "icon");
+             else elm_icon_file_set(ic, buf, NULL);
           }
 
         evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,
@@ -792,14 +795,12 @@
         if (pdir)
           free(pdir);
 
-        if (desk)
-          efreet_desktop_free(desk);
+#ifdef ELM_EFREET
+       if (desk) efreet_desktop_free(desk);
+#endif       
      }
 
-   efreet_shutdown();
-
-   if (sel_it)
-     elm_list_item_selected_set(sel_it, EINA_TRUE);
+   if (sel_it) elm_list_item_selected_set(sel_it, EINA_TRUE);
    elm_list_go(l_widget);
 }
 
@@ -1072,6 +1073,9 @@
    /* put here any init code specific to this app like parsing args, etc. */
    if (!quiet)
      {
+#ifdef ELM_EFREET
+        elm_need_efreet();
+#endif       
         status_win(); /* create main window */
         if (!interactive)
           ecore_timer_add(2.0, _exit_timer, NULL);

Modified: trunk/TMP/st/elementary/src/bin/test_icon_desktops.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_icon_desktops.c	2010-10-28 03:46:52 UTC (rev 53944)
+++ trunk/TMP/st/elementary/src/bin/test_icon_desktops.c	2010-10-28 04:13:09 UTC (rev 53945)
@@ -108,16 +108,18 @@
    evas_object_show(gl);
 
 #ifdef ELM_EFREET
-   elm_need_efreet();
-   desktops = efreet_util_desktop_name_glob_list("*");
-   if (desktops)
+   if (elm_need_efreet())
      {
-        Efreet_Desktop *d;
-
-        EINA_LIST_FREE(desktops, d)
-	  elm_genlist_item_append(gl, &it_desk, d,
-				  NULL, ELM_GENLIST_ITEM_NONE,
-				  desktop_sel, NULL);
+       desktops = efreet_util_desktop_name_glob_list("*");
+       if (desktops)
+         {
+           Efreet_Desktop *d;
+          
+           EINA_LIST_FREE(desktops, d)
+             elm_genlist_item_append(gl, &it_desk, d,
+                                    NULL, ELM_GENLIST_ITEM_NONE,
+                                    desktop_sel, NULL);
+         }
      }
 #endif
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-28 03:46:52 UTC (rev 53944)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-10-28 04:13:09 UTC (rev 53945)
@@ -308,9 +308,9 @@
    EAPI int          elm_quicklaunch_fallback(int argc, char **argv);
    EAPI char        *elm_quicklaunch_exe_path_get(const char *exe);
 
-   EAPI void         elm_need_efreet(void);
-   EAPI void         elm_need_e_dbus(void);
-   EAPI void	     elm_need_ethumb(void);
+   EAPI Eina_Bool    elm_need_efreet(void);
+   EAPI Eina_Bool    elm_need_e_dbus(void);
+   EAPI Eina_Bool    elm_need_ethumb(void);
 
    EAPI Eina_Bool    elm_policy_set(unsigned int policy, int value);
    EAPI int          elm_policy_get(unsigned int policy);

Modified: trunk/TMP/st/elementary/src/lib/elm_main.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-28 03:46:52 UTC (rev 53944)
+++ trunk/TMP/st/elementary/src/lib/elm_main.c	2010-10-28 04:13:09 UTC (rev 53945)
@@ -363,13 +363,16 @@
 #ifdef ELM_EDBUS
 static int _elm_need_e_dbus = 0;
 #endif
-EAPI void
+EAPI Eina_Bool
 elm_need_e_dbus(void)
 {
 #ifdef ELM_EDBUS
-   if (_elm_need_e_dbus++) return;
+   if (_elm_need_e_dbus++) return EINA_TRUE;
    e_dbus_init();
    e_hal_init();
+   return EINA_TRUE;
+#else  
+   return EINA_FALSE;
 #endif
 }
 
@@ -388,11 +391,11 @@
 #ifdef ELM_EFREET
 static int _elm_need_efreet = 0;
 #endif
-EAPI void
+EAPI Eina_Bool
 elm_need_efreet(void)
 {
 #ifdef ELM_EFREET
-   if (_elm_need_efreet++) return;
+   if (_elm_need_efreet++) return EINA_TRUE;
    efreet_init();
    efreet_mime_init();
    efreet_trash_init();
@@ -410,6 +413,9 @@
           }
      }
    */
+   return EINA_TRUE;
+#else
+   return EINA_FALSE;
 #endif
 }
 

Modified: trunk/TMP/st/elementary/src/lib/elm_thumb.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_thumb.c	2010-10-28 03:46:52 UTC (rev 53944)
+++ trunk/TMP/st/elementary/src/lib/elm_thumb.c	2010-10-28 04:13:09 UTC (rev 53945)
@@ -392,14 +392,17 @@
  *
  * @ingroup Thumb
  */
-EAPI void
+EAPI Eina_Bool
 elm_need_ethumb(void)
 {
 #ifdef ELM_ETHUMB
-   if (_elm_need_ethumb++) return;
+   if (_elm_need_ethumb++) return EINA_TRUE;
    ELM_ECORE_EVENT_ETHUMB_CONNECT = ecore_event_type_new();
    ethumb_client_init();
    _elm_ethumb_client = ethumb_client_connect(_connect_cb, NULL, NULL);
+   return EINA_TRUE;
+#else
+   return EINA_FALSE;
 #endif
 }

Log:
  mapbuf -> hide/show content absolutely if mapbuf is hidden/shown and
  add test.
  
  
Author:       raster
Date:         2010-10-29 21:01:09 -0700 (Fri, 29 Oct 2010)
New Revision: 54014

Modified:
  trunk/TMP/st/elementary/src/bin/test_launcher.c trunk/TMP/st/elementary/src/lib/elm_mapbuf.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_launcher.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-10-29 22:07:13 UTC (rev 54013)
+++ trunk/TMP/st/elementary/src/bin/test_launcher.c	2010-10-30 04:01:09 UTC (rev 54014)
@@ -553,6 +553,21 @@
 }
 
 static void
+l3_hidden_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Object *win = data;
+   Evas_Object *mb;
+   Eina_List *mbs, *l;
+   
+   mbs = evas_object_data_get(win, "mbs");
+   EINA_LIST_FOREACH(mbs, l, mb)
+     {
+        if (evas_object_visible_get(mb)) evas_object_hide(mb);
+        else evas_object_show(mb);
+     }
+}
+
+static void
 l3_close_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    evas_object_del(data);
@@ -882,12 +897,21 @@
    elm_table_pack(tb2, ck, 3, 0, 1, 1);
    evas_object_show(ck);
    
+   ck = elm_check_add(win);
+   elm_check_label_set(ck, "Hid");
+   elm_check_state_set(ck, 0);
+   evas_object_smart_callback_add(ck, "changed", l3_hidden_cb, win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, 0.5, 0.99);
+   elm_table_pack(tb2, ck, 4, 0, 1, 1);
+   evas_object_show(ck);
+   
    bt = elm_button_add(win);
    elm_button_label_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", l3_close_cb, win);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.95, 0.99);
-   elm_table_pack(tb2, bt, 4, 0, 1, 1);
+   elm_table_pack(tb2, bt, 5, 0, 1, 1);
    evas_object_show(bt);
    
    evas_object_show(tb2);

Modified: trunk/TMP/st/elementary/src/lib/elm_mapbuf.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_mapbuf.c	2010-10-29 22:07:13 UTC (rev 54013)
+++ trunk/TMP/st/elementary/src/lib/elm_mapbuf.c	2010-10-30 04:01:09 UTC (rev 54014)
@@ -11,7 +11,7 @@
 
 struct _Widget_Data
 {
-   Evas_Object *content;
+   Evas_Object *content, *clip;
    Eina_Bool enabled : 1;
    Eina_Bool alpha : 1;
    Eina_Bool smooth : 1;
@@ -85,7 +85,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    Evas_Coord x, y, w, h;
    if (!wd) return;
-   evas_object_geometry_get(obj, &x, &y, &w, &h);
+   evas_object_geometry_get(wd->clip, &x, &y, &w, &h);
    if (wd->enabled)
      {
         Evas_Map *m;
@@ -116,7 +116,7 @@
      {
         Evas_Coord x, y, w, h, x2, y2;
         
-        evas_object_geometry_get(obj, &x, &y, &w, &h);
+        evas_object_geometry_get(wd->clip, &x, &y, &w, &h);
         evas_object_geometry_get(wd->content, &x2, &y2, NULL, NULL);
         if ((x != x2) || (y != y2))
           {
@@ -141,15 +141,15 @@
 }
 
 static void
-_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   _configure(obj);
+   _configure(data);
 }
 
 static void
-_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_resize(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {    
-   _configure(obj);
+   _configure(data);
 }
 
 /**
@@ -178,10 +178,16 @@
    elm_widget_theme_hook_set(obj, _theme_hook);
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
+   wd->clip = evas_object_rectangle_add(e);
+   evas_object_pass_events_set(wd->clip, EINA_TRUE);
+   evas_object_color_set(wd->clip, 0, 0, 0, 0);
+
    evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _move, NULL);
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _resize, NULL);
-
+   evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_MOVE, _move, obj);
+   evas_object_event_callback_add(wd->clip, EVAS_CALLBACK_RESIZE, _resize, obj);
+  
+   elm_widget_resize_object_set(obj, wd->clip);
+  
    wd->enabled = 0;
    wd->alpha = 1;
    wd->smooth = 1;
@@ -213,14 +219,17 @@
    wd->content = content;
    if (content)
      {
-        // FIXME: dont handle del
+        evas_object_data_set(content, "_elm_leaveme", (void *)1);
 	elm_widget_sub_object_add(content, obj);
 	evas_object_smart_member_add(content, obj);
-        evas_object_clip_set(content, evas_object_clip_get(obj));
+        evas_object_clip_set(content, wd->clip);
+        evas_object_color_set(wd->clip, 255, 255, 255, 255);
 	evas_object_event_callback_add(content,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
 				       _changed_size_hints, obj);
      }
+   else
+     evas_object_color_set(wd->clip, 0, 0, 0, 0);
    _sizing_eval(obj);
    _configure(obj);
 }
@@ -263,9 +272,11 @@
    if (!wd) return NULL;
    if (!wd->content) return NULL;
    content = wd->content;
-   elm_widget_sub_object_del(obj, wd->content);
-   evas_object_smart_member_del(wd->content);
-   evas_object_clip_unset(wd->content);
+   elm_widget_sub_object_del(obj, content);
+   evas_object_smart_member_del(content);
+   evas_object_color_set(wd->clip, 0, 0, 0, 0);
+   evas_object_clip_unset(content);
+   evas_object_data_del(content, "_elm_leaveme");
    wd->content = NULL;
    return content;
 }

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-10-29 22:07:13 UTC (rev 54013)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-10-30 04:01:09 UTC (rev 54014)
@@ -2582,8 +2582,6 @@
    Eina_List *list;
    Evas_Object *o;
    INTERNAL_ENTRY;
-//   evas_object_clip_unset(sd->resize_obj);
-//   return;
    if ((list = evas_object_smart_members_get(obj)))
      {
         EINA_LIST_FREE(list, o)

Log:
  improve genlist item realize/nrealize by almost 2x. (4.7->2.7 sec for
  processing of a genlist queue of 20,000 items). added genlist item
  cache to do this. yay!. also wil improve runtime scrolling -
  realiz/unrealize will be also equivalently faster, so less add/del
  overhead for the edje objects in gnelist itself. the icons that apps
  swallow in still get deleted and created. this is another matter for
  anothr day. ant be solved inside of genlist itself. probably need an
  unrealize callback per item and a way to steal your icons back from
  the item.
  
  
Author:       raster
Date:         2010-11-05 23:02:22 -0700 (Fri, 05 Nov 2010)
New Revision: 54214

Modified:
  trunk/TMP/st/elementary/src/bin/test_genlist.c trunk/TMP/st/elementary/src/lib/elm_genlist.c 

Modified: trunk/TMP/st/elementary/src/bin/test_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-06 03:42:35 UTC (rev 54213)
+++ trunk/TMP/st/elementary/src/bin/test_genlist.c	2010-11-06 06:02:22 UTC (rev 54214)
@@ -153,7 +153,7 @@
    evas_object_show(bt_1500);
    elm_box_pack_end(bx, bt_1500);
 
-   for (i = 0; i < 2000; i++)
+   for (i = 0; i < 20000; i++)
      {
         gli = elm_genlist_item_append(gl, &itc1,
                                       (void *)(long)i/* item data */,

Modified: trunk/TMP/st/elementary/src/lib/elm_genlist.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-06 03:42:35 UTC (rev 54213)
+++ trunk/TMP/st/elementary/src/lib/elm_genlist.c	2010-11-06 06:02:22 UTC (rev 54214)
@@ -244,6 +244,7 @@
 typedef struct _Widget_Data Widget_Data;
 typedef struct _Item_Block Item_Block;
 typedef struct _Pan Pan;
+typedef struct _Item_Cache Item_Cache;
 
 struct _Widget_Data
 {
@@ -256,6 +257,7 @@
    Eina_List *queue, *selected;
    Elm_Genlist_Item *show_item;
    Elm_Genlist_Item *last_selected_item;
+   Eina_Inlist *item_cache;
    Elm_List_Mode mode;
    Eina_Bool on_hold : 1;
    Eina_Bool multi : 1;
@@ -272,6 +274,8 @@
    struct {
      Evas_Coord x, y;
    } history[SWIPE_MOVES];
+   int item_cache_count;
+   int item_cache_max;
    int movements;
    int walking;
    int item_width;
@@ -306,11 +310,10 @@
    const Elm_Genlist_Item_Class *itc;
    Elm_Genlist_Item *parent;
    Elm_Genlist_Item_Flags flags;
-   struct 
-     {
-        Evas_Smart_Cb func;
-        const void *data;
-     } func;
+   struct {
+     Evas_Smart_Cb func;
+     const void *data;
+   } func;
 
    Evas_Object *spacer;
    Eina_List *labels, *icons, *states, *icon_objs;
@@ -320,19 +323,19 @@
 
    Elm_Genlist_Item *rel;
 
-   struct
-     {
-        const void *data;
-        Elm_Tooltip_Item_Content_Cb content_cb;
-        Evas_Smart_Cb del_cb;
-        const char *style;
-     } tooltip;
+   struct {
+     const void *data;
+     Elm_Tooltip_Item_Content_Cb content_cb;
+     Evas_Smart_Cb del_cb;
+     const char *style;
+   } tooltip;
 
    const char *mouse_cursor;
 
    int relcount;
    int walking;
    int expanded_depth;
+   int order_num_in;
    
    Eina_Bool before : 1;
 
@@ -352,6 +355,22 @@
    Eina_Bool updateme : 1;
 };
 
+struct _Item_Cache
+{
+  EINA_INLIST;
+
+  Evas_Object *base_view, *spacer;
+  
+  const char *item_style; // it->itc->item_style
+  Eina_Bool tree : 1; // it->flags & ELM_GENLIST_ITEM_SUBITEMS
+  Eina_Bool compress : 1; // it->wd->compress
+  Eina_Bool odd : 1; // in & 0x1
+  
+  Eina_Bool selected : 1; // it->selected
+  Eina_Bool disabled : 1; // it->disabled
+  Eina_Bool expanded : 1; // it->expanded
+};
+
 #define ELM_GENLIST_ITEM_FROM_INLIST(item)      \
   ((item) ? EINA_INLIST_CONTAINER_GET(item, Elm_Genlist_Item) : NULL)
 
@@ -362,6 +381,7 @@
 };
 
 static const char *widtype = NULL;
+static void _item_cache_zero(Widget_Data *wd);
 static void _del_hook(Evas_Object *obj);
 static void _theme_hook(Evas_Object *obj);
 //static void _show_region_hook(void *data, Evas_Object *obj);
@@ -610,6 +630,7 @@
 {
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
+   _item_cache_zero(wd);
    if (wd->calc_job) ecore_job_del(wd->calc_job);
    if (wd->update_job) ecore_job_del(wd->update_job);
    free(wd);
@@ -631,6 +652,7 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    Item_Block *itb;
    if (!wd) return;
+   _item_cache_zero(wd);
    elm_smart_scroller_object_theme_set(obj, wd->scr, "genlist", "base", elm_widget_style_get(obj));
 //   edje_object_scale_set(wd->scr, elm_widget_scale_get(obj) * _elm_config->scale);
    wd->item_width = wd->item_height = 0;
@@ -1143,7 +1165,113 @@
      evas_object_smart_callback_call(it->base.widget, "contract,request", it);
 }
 
+
 static void
+_item_cache_clean(Widget_Data *wd)
+{
+  while ((wd->item_cache) && (wd->item_cache_count > wd->item_cache_max))
+    {
+      Item_Cache *itc;
+      
+      itc = EINA_INLIST_CONTAINER_GET(wd->item_cache->last, Item_Cache);
+      wd->item_cache = eina_inlist_remove(wd->item_cache,
+                                          wd->item_cache->last);
+      wd->item_cache_count--;
+      if (itc->spacer) evas_object_del(itc->spacer);
+      if (itc->base_view) evas_object_del(itc->base_view);
+      if (itc->item_style) eina_stringshare_del(itc->item_style);
+      free(itc);
+    }
+}
+
+static void
+_item_cache_zero(Widget_Data *wd)
+{
+  int pmax = wd->item_cache_max;
+  wd->item_cache_max = 0;
+  _item_cache_clean(wd);
+  wd->item_cache_max = pmax;
+}
+
+static void
+_item_cache_add(Elm_Genlist_Item *it)
+{
+  Item_Cache *itc;
+
+  if (it->wd->item_cache_max <= 0)
+    {
+      evas_object_del(it->base.view);
+      it->base.view = NULL;
+      evas_object_del(it->spacer);
+      it->spacer = NULL;
+      return;
+    }
+  
+  it->wd->item_cache_count++;
+  itc = calloc(1, sizeof(Item_Cache));
+  it->wd->item_cache = eina_inlist_prepend(it->wd->item_cache, EINA_INLIST_GET(itc));
+  itc->spacer = it->spacer;
+  it->spacer = NULL;
+  itc->base_view = it->base.view;
+  it->base.view = NULL;
+  evas_object_hide(itc->base_view);
+  evas_object_move(itc->base_view, -9999, -9999);
+  itc->item_style = eina_stringshare_add(it->itc->item_style);
+  if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) itc->tree = 1;
+  itc->compress = (it->wd->compress);
+  itc->odd = (it->order_num_in & 0x1);
+  itc->selected = it->selected;
+  itc->disabled = it->disabled;
+  itc->expanded = it->expanded;
+  edje_object_signal_callback_del(it->base.view, "elm,action,expand,toggle",
+                                  "elm", _signal_expand_toggle);
+  edje_object_signal_callback_del(it->base.view, "elm,action,expand", "elm",
+                                  _signal_expand);
+  edje_object_signal_callback_del(it->base.view, "elm,action,contract",
+                                  "elm", _signal_contract);
+  evas_object_event_callback_del(it->base.view, EVAS_CALLBACK_MOUSE_DOWN,
+                                 _mouse_down);
+  evas_object_event_callback_del(it->base.view, EVAS_CALLBACK_MOUSE_UP,
+                                 _mouse_up);
+  evas_object_event_callback_del(it->base.view, EVAS_CALLBACK_MOUSE_MOVE,
+                                 _mouse_move);
+  _item_cache_clean(it->wd);
+}
+
+static Item_Cache *
+_item_cache_find(Elm_Genlist_Item *it)
+{
+  Item_Cache *itc;
+  Eina_Bool tree = 0, odd;
+  
+  if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) tree = 1;
+  odd = (it->order_num_in & 0x1);
+  EINA_INLIST_FOREACH(it->wd->item_cache, itc)
+    {
+      if ((itc->tree == tree) && 
+          (itc->odd == odd) && 
+          (itc->compress == it->wd->compress) &&
+         (!strcmp(it->itc->item_style, itc->item_style)))
+        {
+          it->wd->item_cache = eina_inlist_remove(it->wd->item_cache,
+                                                  EINA_INLIST_GET(itc));
+          it->wd->item_cache_count--;
+          return itc;
+        }
+    }
+  return NULL;
+}
+
+static void
+_item_cache_free(Item_Cache *itc)
+{
+  if (itc->spacer) evas_object_del(itc->spacer);
+  if (itc->base_view) evas_object_del(itc->base_view);
+  if (itc->item_style) eina_stringshare_del(itc->item_style);
+  free(itc);
+}
+
+static void
 _item_realize(Elm_Genlist_Item *it, int in, int calc)
 {
    Elm_Genlist_Item *it2;
@@ -1151,26 +1279,40 @@
    const char *treesize;
    char buf[1024];
    int depth, tsize = 20;
-
+   Item_Cache *itc;
+  
    if ((it->realized) || (it->delete_me)) return;
-   it->base.view = edje_object_add(evas_object_evas_get(it->base.widget));
-   edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.widget) * 
-                         _elm_config->scale);
-   evas_object_smart_member_add(it->base.view, it->wd->pan_smart);
-   elm_widget_sub_object_add(it->base.widget, it->base.view);
+   it->order_num_in = in;
 
-   if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) strncpy(buf, "tree", sizeof(buf));
-   else strncpy(buf, "item", sizeof(buf));
-   if (it->wd->compress) strncat(buf, "_compress", sizeof(buf) - strlen(buf));
-
-   if (in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf));
-   strncat(buf, "/", sizeof(buf) - strlen(buf));
-   strncat(buf, it->itc->item_style, sizeof(buf) - strlen(buf));
-   
-   _elm_theme_object_set(it->base.widget, it->base.view, "genlist", buf, elm_widget_style_get(it->base.widget));
-   it->spacer = evas_object_rectangle_add(evas_object_evas_get(it->base.widget));
-   evas_object_color_set(it->spacer, 0, 0, 0, 0);
-   elm_widget_sub_object_add(it->base.widget, it->spacer);
+   itc = _item_cache_find(it);
+   if (itc)
+     {
+        it->base.view = itc->base_view;
+        itc->base_view = NULL;
+        it->spacer = itc->spacer;
+        itc->spacer = NULL;
+     }
+   else
+     {
+       it->base.view = edje_object_add(evas_object_evas_get(it->base.widget));
+       edje_object_scale_set(it->base.view, elm_widget_scale_get(it->base.widget) * 
+                             _elm_config->scale);
+       evas_object_smart_member_add(it->base.view, it->wd->pan_smart);
+       elm_widget_sub_object_add(it->base.widget, it->base.view);
+       
+       if (it->flags & ELM_GENLIST_ITEM_SUBITEMS) strncpy(buf, "tree", sizeof(buf));
+       else strncpy(buf, "item", sizeof(buf));
+       if (it->wd->compress) strncat(buf, "_compress", sizeof(buf) - strlen(buf));
+       
+       if (in & 0x1) strncat(buf, "_odd", sizeof(buf) - strlen(buf));
+       strncat(buf, "/", sizeof(buf) - strlen(buf));
+       strncat(buf, it->itc->item_style, sizeof(buf) - strlen(buf));
+       
+       _elm_theme_object_set(it->base.widget, it->base.view, "genlist", buf, elm_widget_style_get(it->base.widget));
+       it->spacer = evas_object_rectangle_add(evas_object_evas_get(it->base.widget));
+       evas_object_color_set(it->spacer, 0, 0, 0, 0);
+       elm_widget_sub_object_add(it->base.widget, it->spacer);
+     }
    for (it2 = it, depth = 0; it2->parent; it2 = it2->parent) depth += 1;
    it->expanded_depth = depth;
    treesize = edje_object_data_get(it->base.view, "treesize");
@@ -1198,12 +1340,39 @@
                                        _mouse_up, it);
         evas_object_event_callback_add(it->base.view, EVAS_CALLBACK_MOUSE_MOVE,
                                        _mouse_move, it);
-        if (it->selected)
-           edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
-        if (it->disabled)
-           edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
-        if (it->expanded)
-           edje_object_signal_emit(it->base.view, "elm,state,expanded", "elm");
+        if (itc)
+          {
+             if (it->selected != itc->selected)
+               {
+                 if (it->selected)
+                   edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
+                 else
+                   edje_object_signal_emit(it->base.view, "elm,state,unselected", "elm");
+               }
+             if (it->disabled != itc->disabled)
+               {
+                 if (it->disabled)
+                   edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+                 else
+                   edje_object_signal_emit(it->base.view, "elm,state,enabled", "elm");
+               }
+             if (it->expanded != itc->expanded)
+               {
+                 if (it->expanded)
+                   edje_object_signal_emit(it->base.view, "elm,state,expanded", "elm");
+                 else
+                   edje_object_signal_emit(it->base.view, "elm,state,contracted", "elm");
+               }
+          }
+        else
+          {
+            if (it->selected)
+              edje_object_signal_emit(it->base.view, "elm,state,selected", "elm");
+            if (it->disabled)
+              edje_object_signal_emit(it->base.view, "elm,state,disabled", "elm");
+            if (it->expanded)
+              edje_object_signal_emit(it->base.view, "elm,state,expanded", "elm");
+          }
      }
 
    if ((calc) && (it->wd->homogeneous) && (it->wd->item_width))
@@ -1234,6 +1403,8 @@
                        edje_object_part_text_set(it->base.view, l->data, s);
                        free(s);
                     }
+                  else if (itc)
+                    edje_object_part_text_set(it->base.view, l->data, "");
                }
           }
         if (it->itc->func.icon_get)
@@ -1272,6 +1443,11 @@
                        snprintf(buf, sizeof(buf), "elm,state,%s,active", key);
                        edje_object_signal_emit(it->base.view, buf, "elm");
                     }
+                  else if (itc)
+                    {
+                       snprintf(buf, sizeof(buf), "elm,state,%s,passive", key);
+                       edje_object_signal_emit(it->base.view, buf, "elm");
+                    }
                }
           }
         if (!it->mincalcd)
@@ -1311,6 +1487,8 @@
 
    it->realized = EINA_TRUE;
    it->want_unrealize = EINA_FALSE;
+
+   if (itc) _item_cache_free(itc);
 }
 
 static void
@@ -1324,10 +1502,7 @@
         ecore_timer_del(it->long_timer);
         it->long_timer = NULL;
      }
-   evas_object_del(it->base.view);
-   it->base.view = NULL;
-   evas_object_del(it->spacer);
-   it->spacer = NULL;
+   _item_cache_add(it);
    elm_widget_stringlist_free(it->labels);
    it->labels = NULL;
    elm_widget_stringlist_free(it->icons);
@@ -1901,6 +2076,7 @@
    wd->obj = obj;
    wd->mode = ELM_LIST_SCROLL;
    wd->max_items_per_block = 32;
+   wd->item_cache_max = wd->max_items_per_block * 2;
    wd->longpress_timeout = 1.0;
 
    evas_object_smart_callback_add(obj, "scroll-hold-on", _hold_on, obj);
@@ -2128,6 +2304,11 @@
 {
    Widget_Data *wd = data;
 
+  //xxx
+  //static double q_start = 0.0;
+  //if (q_start == 0.0) q_start = ecore_time_get();
+  //xxx
+  
    if (_queue_proecess(wd, 1) > 0)
      {
         if (wd->calc_job) ecore_job_del(wd->calc_job);
@@ -2135,6 +2316,9 @@
      }
    if (!wd->queue)
      {
+       //xxx
+       //printf("PROCESS TIME: %3.3f\n", ecore_time_get() - q_start);
+       //xxx
         wd->queue_idler = NULL;
         return ECORE_CALLBACK_CANCEL;
      }
@@ -3890,6 +4074,8 @@
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    wd->max_items_per_block = n;
+   wd->item_cache_max = wd->max_items_per_block * 2;
+   _item_cache_clean(wd);
 }
 
 /**

Log:
  get rid of carousel - empty junk we dont need.
  
  
Author:       raster
Date:         2010-11-08 21:00:49 -0800 (Mon, 08 Nov 2010)
New Revision: 54354

Removed:
  trunk/TMP/st/elementary/src/bin/test_carousel.c trunk/TMP/st/elementary/src/lib/elm_carousel.c 
Modified:
  trunk/TMP/st/elementary/src/bin/Makefile.am trunk/TMP/st/elementary/src/bin/test.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/Makefile.am 

Modified: trunk/TMP/st/elementary/src/bin/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/bin/Makefile.am	2010-11-09 04:58:54 UTC (rev 54353)
+++ trunk/TMP/st/elementary/src/bin/Makefile.am	2010-11-09 05:00:49 UTC (rev 54354)
@@ -50,7 +50,6 @@
 test_toolbar.c \
 test_hoversel.c \
 test_list.c \
-test_carousel.c \
 test_inwin.c \
 test_scaling.c \
 test_slider.c \

Modified: trunk/TMP/st/elementary/src/bin/test.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test.c	2010-11-09 04:58:54 UTC (rev 54353)
+++ trunk/TMP/st/elementary/src/bin/test.c	2010-11-09 05:00:49 UTC (rev 54354)
@@ -52,7 +52,6 @@
 void test_list3(void *data, Evas_Object *obj, void *event_info);
 void test_list4(void *data, Evas_Object *obj, void *event_info);
 void test_list5(void *data, Evas_Object *obj, void *event_info);
-void test_carousel(void *data, Evas_Object *obj, void *event_info);
 void test_inwin(void *data, Evas_Object *obj, void *event_info);
 void test_inwin2(void *data, Evas_Object *obj, void *event_info);
 void test_scaling(void *data, Evas_Object *obj, void *event_info);
@@ -285,7 +284,6 @@
    ADD_TEST("List 3", test_list3);
    ADD_TEST("List 4", test_list4);
    ADD_TEST("List 5", test_list5);
-   ADD_TEST("Carousel", test_carousel);
    ADD_TEST("Inwin", test_inwin);
    ADD_TEST("Inwin 2", test_inwin2);
    ADD_TEST("Scaling", test_scaling);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 04:58:54 UTC (rev 54353)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-11-09 05:00:49 UTC (rev 54354)
@@ -1508,19 +1508,6 @@
     * "longpressed" - an item in the hoversel list is long-pressed
     */
 
-   // FIXME: incomplete - carousel. don't use this until this comment is removed
-   typedef struct _Elm_Carousel_Item Elm_Carousel_Item; /**< Item of Elm_Carousel. Sub-type of Elm_Widget_Item */
-   EAPI Evas_Object       *elm_carousel_add(Evas_Object *parent);
-   EAPI Elm_Carousel_Item *elm_carousel_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb func, const void *data);
-   EAPI void               elm_carousel_item_del(Elm_Carousel_Item *item);
-
-   EAPI void               elm_carousel_item_select(Elm_Carousel_Item *item);
-   EAPI void               elm_carousel_item_del_cb_set(Elm_Carousel_Item *it, Evas_Smart_Cb func);
-   EAPI void              *elm_carousel_item_data_get(const Elm_Carousel_Item *it);
-   /* smart callbacks called:
-    * "clicked" - when the user clicks on a carousel item and becomes selected
-    */
-
    /* slider */
    EAPI Evas_Object       *elm_slider_add(Evas_Object *parent);
    EAPI void               elm_slider_label_set(Evas_Object *obj, const char *label);

Modified: trunk/TMP/st/elementary/src/lib/Makefile.am
===================================================================
--- trunk/TMP/st/elementary/src/lib/Makefile.am	2010-11-09 04:58:54 UTC (rev 54353)
+++ trunk/TMP/st/elementary/src/lib/Makefile.am	2010-11-09 05:00:49 UTC (rev 54354)
@@ -58,7 +58,6 @@
 elm_photo.c \
 elm_toolbar.c \
 elm_list.c \
-elm_carousel.c \
 elm_slider.c \
 elm_magnetslider.c \
 elm_genlist.c \

Log:
  fix focus revert -> reverting should revert only to widgets that say
  they CAN be focused :) see conform 2 test. focuse the entry in the
  pager then dlete the pager page (pop). before focus vanished. now it
  goes back to the top entry as you'd expect.
  
  
Author:       raster
Date:         2010-11-11 20:16:24 -0800 (Thu, 11 Nov 2010)
New Revision: 54486

Modified:
  trunk/TMP/st/elementary/src/bin/test_conform.c trunk/TMP/st/elementary/src/lib/elm_widget.c 

Modified: trunk/TMP/st/elementary/src/bin/test_conform.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_conform.c	2010-11-12 03:13:38 UTC (rev 54485)
+++ trunk/TMP/st/elementary/src/bin/test_conform.c	2010-11-12 04:16:24 UTC (rev 54486)
@@ -85,15 +85,15 @@
 }
 
 static void 
-delobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
+popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
-  evas_object_del(data);
+  elm_pager_content_pop(data);
 }
 
 void 
 test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) 
 {
-   Evas_Object *win, *bg, *conform, *btn, *bx, *en;
+   Evas_Object *win, *bg, *conform, *btn, *bx, *en, *pg;
 
    win = elm_win_add(NULL, "conformant2", ELM_WIN_BASIC);
    elm_win_title_set(win, "Conformant 2");
@@ -128,14 +128,51 @@
    elm_box_pack_end(bx, btn);
    evas_object_show(btn);
   
+   pg = elm_pager_add(win);
+   evas_object_size_hint_weight_set(pg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(pg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, pg);
+   evas_object_show(pg);
+  
+   evas_object_smart_callback_add(btn, "clicked", popobj, pg);
+  
    conform = elm_conformant_add(win);
    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_box_pack_end(bx, conform);
+   elm_pager_content_push(pg, conform);
    evas_object_show(conform);
 
-   evas_object_smart_callback_add(btn, "clicked", delobj, conform);
+   bx = elm_box_add(win);
+   evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   
+   en = elm_scrolled_entry_add(win);
+   elm_scrolled_entry_bounce_set(en, 0, 1);
+   elm_scrolled_entry_entry_set(en, "This entry and button below get deleted.");
+   evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(en);
+   elm_box_pack_end(bx, en);
+  
+   btn = elm_button_add(win);
+   elm_object_focus_allow_set(btn, 0);
+   elm_button_label_set(btn, "Delete this bottom bit 1");
+   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(bx, btn);
+   evas_object_show(btn);
 
+   evas_object_smart_callback_add(btn, "clicked", popobj, pg);
+  
+   elm_conformant_content_set(conform, bx);
+   evas_object_show(bx);
+   
+   conform = elm_conformant_add(win);
+   evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_pager_content_push(pg, conform);
+   evas_object_show(conform);
+
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -150,13 +187,13 @@
   
    btn = elm_button_add(win);
    elm_object_focus_allow_set(btn, 0);
-   elm_button_label_set(btn, "Delete this bottom bit");
+   elm_button_label_set(btn, "Delete this bottom bit 2");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);
    evas_object_show(btn);
 
-   evas_object_smart_callback_add(btn, "clicked", delobj, conform);
+   evas_object_smart_callback_add(btn, "clicked", popobj, pg);
   
    elm_conformant_content_set(conform, bx);
    evas_object_show(bx);

Modified: trunk/TMP/st/elementary/src/lib/elm_widget.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-11-12 03:13:38 UTC (rev 54485)
+++ trunk/TMP/st/elementary/src/lib/elm_widget.c	2010-11-12 04:16:24 UTC (rev 54486)
@@ -102,8 +102,8 @@
 static void _smart_calculate(Evas_Object *obj);
 static void _smart_init(void);
 
-static void _if_focused_revert(Evas_Object *obj);
-static Evas_Object *_newest_focus_order_get(Evas_Object *obj, unsigned int *newest_focus_order);
+static void _if_focused_revert(Evas_Object *obj, Eina_Bool can_focus_only);
+static Evas_Object *_newest_focus_order_get(Evas_Object *obj, unsigned int *newest_focus_order, Eina_Bool can_focus_only);
 
 /* local subsystem globals */
 static Evas_Smart *_e_smart = NULL;
@@ -261,7 +261,7 @@
 	unsigned int i = 0;
 	Evas_Object *ret;
 
-	ret = _newest_focus_order_get(o, &i);
+	ret = _newest_focus_order_get(o, &i, EINA_TRUE);
 
 	/* we don't want to bump a common widget ancestor's
 	   focus_order *twice* while parent focusing */
@@ -2445,7 +2445,7 @@
 }
 
 static Evas_Object *
-_newest_focus_order_get(Evas_Object *obj, unsigned int *newest_focus_order)
+_newest_focus_order_get(Evas_Object *obj, unsigned int *newest_focus_order, Eina_Bool can_focus_only)
 {
    const Eina_List *l;
    Evas_Object *child, *ret, *best;
@@ -2460,31 +2460,33 @@
      }
    EINA_LIST_FOREACH(sd->subobjs, l, child)
      {
-        ret = _newest_focus_order_get(child, newest_focus_order);
+        ret = _newest_focus_order_get(child, newest_focus_order, can_focus_only);
         if (!ret) continue;
         best = ret;
      }
+   if ((can_focus_only) && (!elm_widget_can_focus_get(best))) return NULL;
    return best;
 }
 
 static void
-_if_focused_revert(Evas_Object *obj)
+_if_focused_revert(Evas_Object *obj, Eina_Bool can_focus_only)
 {
    Evas_Object *top;
    Evas_Object *newest = NULL;
    unsigned int newest_focus_order = 0;
    
    INTERNAL_ENTRY;
-   
+
    if (!sd->focused) return;
    if (!sd->parent_obj) return;
 
    top = elm_widget_top_get(sd->parent_obj);
    if (top)
      {
-        newest = _newest_focus_order_get(top, &newest_focus_order);
+        newest = _newest_focus_order_get(top, &newest_focus_order, can_focus_only);
         if (newest)
           {
+             Smart_Data *sd2 = evas_object_smart_data_get(newest);
              elm_object_unfocus(newest);
              elm_object_focus(newest);
           }
@@ -2498,6 +2500,7 @@
    Edje_Signal_Data *esd;
 
    INTERNAL_ENTRY;
+  
    if (sd->del_pre_func) sd->del_pre_func(obj);
    if (sd->resize_obj)
      {
@@ -2533,7 +2536,7 @@
    if (sd->style) eina_stringshare_del(sd->style);
    if (sd->type) eina_stringshare_del(sd->type);
    if (sd->theme) elm_theme_free(sd->theme);
-   _if_focused_revert(obj);
+   _if_focused_revert(obj, EINA_TRUE);
    free(sd);
 }
 
@@ -2583,7 +2586,7 @@
         if (evas_object_data_get(o, "_elm_leaveme")) continue;
         evas_object_hide(o);
      }
-   _if_focused_revert(obj);
+   _if_focused_revert(obj, EINA_TRUE);
 }
 
 static void
@@ -2672,6 +2675,7 @@
      }
 }
 
+#define ELM_DEBUG 1
 /* happy debug functions */
 #ifdef ELM_DEBUG
 static void
@@ -2710,6 +2714,7 @@
    Eina_Bool visible = evas_object_visible_get(obj);
    Eina_Bool disabled = elm_widget_disabled_get(obj);
    Eina_Bool focused = elm_widget_focus_get(obj);
+   Eina_Bool can_focus = elm_widget_can_focus_get(obj);
 
    if (sd->parent_obj)
      {
@@ -2725,8 +2730,8 @@
      }
 
    fprintf(output, "\"%p\" [ label = \"{%p|%s|%s|visible: %d|"
-           "disabled: %d|focused: %d}\"", obj, obj, sd->type,
-           evas_object_name_get(obj), visible,disabled,focused);
+           "disabled: %d|focused: %d/%d}\"", obj, obj, sd->type,
+           evas_object_name_get(obj), visible,disabled,focused,can_focus);
 
    if (focused)
         fprintf(output, ", style=bold");

Log:
From: hyoyoung.chang@...
  
  As we talked last week, I made a version of adding external image in
  elm_entry. It seeks a local file if prefix is 'file://' then it loads image and adds it. If image file can't be loaded, adding
  wft emoticon.
  
  patch in with minor fix for path and an added actual test case in elm
  entry test.
  
  
  

Author:       raster
Date:         2010-12-02 00:25:36 -0800 (Thu, 02 Dec 2010)
New Revision: 55134
Trac:         http://trac.enlightenment.org/e/changeset/55134

Modified:
  trunk/TMP/st/elementary/src/bin/test_entry.c trunk/TMP/st/elementary/src/lib/elm_entry.c 

Modified: trunk/TMP/st/elementary/src/bin/test_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_entry.c	2010-12-02 08:20:32 UTC (rev 55133)
+++ trunk/TMP/st/elementary/src/bin/test_entry.c	2010-12-02 08:25:36 UTC (rev 55134)
@@ -59,6 +59,7 @@
 test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Evas_Object *win, *bg, *bx, *bx2, *bt, *en;
+   char buf[4096];
 
    win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
    elm_win_title_set(win, "Entry");
@@ -76,34 +77,38 @@
 
    en = elm_entry_add(win);
    elm_entry_line_wrap_set(en, 0);
-   elm_entry_entry_set(en,
-		       "This is an entry widget in this window that<br>"
-		       "uses markup <b>like this</> for styling and<br>"
-		       "formatting <em>like this</>, as well as<br>"
-		       "<a href=X><link>links in the text</></a>, so enter text<br>"
-		       "in here to edit it. By the way, links are<br>"
-		       "called <a href=anc-02>Anchors</a> so you will need<br>"
-		       "to refer to them this way.<br>"
-                       "<br>"
-                       
-                       "Also you can stick in items with (relsize + ascent): "
-                       "<item relsize=16x16 vsize=ascent href=emoticon/evil-laugh></item>"
-                       " (full) "
-                       "<item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>"
-                       " (to the left)<br>"
-                       
-                       "Also (size + ascent): "
-                       "<item size=16x16 vsize=ascent href=emoticon/haha></item>"
-                       " (full) "
-                       "<item size=16x16 vsize=full href=emoticon/happy-panting></item>"
-                       " (before this)<br>"
-                       
-                       "And as well (absize + ascent): "
-                       "<item absize=64x64 vsize=ascent href=emoticon/knowing-grin></item>"
-                       " (full) "
-                       "<item absize=64x64 vsize=full href=emoticon/not-impressed></item>"
-                       " ... end."
-                       );
+   snprintf(buf, sizeof(buf),
+            "This is an entry widget in this window that<br>"
+            "uses markup <b>like this</> for styling and<br>"
+            "formatting <em>like this</>, as well as<br>"
+            "<a href=X><link>links in the text</></a>, so enter text<br>"
+            "in here to edit it. By the way, links are<br>"
+            "called <a href=anc-02>Anchors</a> so you will need<br>"
+            "to refer to them this way.<br>"
+            "<br>"
+            
+            "Also you can stick in items with (relsize + ascent): "
+            "<item relsize=16x16 vsize=ascent href=emoticon/evil-laugh></item>"
+            " (full) "
+            "<item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>"
+            " (to the left)<br>"
+            
+            "Also (size + ascent): "
+            "<item size=16x16 vsize=ascent href=emoticon/haha></item>"
+            " (full) "
+            "<item size=16x16 vsize=full href=emoticon/happy-panting></item>"
+            " (before this)<br>"
+            
+            "And as well (absize + ascent): "
+            "<item absize=64x64 vsize=ascent href=emoticon/knowing-grin></item>"
+            " (full) "
+            "<item absize=64x64 vsize=full href=emoticon/not-impressed></item>"
+            " or even paths to image files on disk too like: "
+            "<item absize=96x128 vsize=full href=file://%s/images/sky_01.jpg></item>"
+            " ... end."
+            , PACKAGE_DATA_DIR
+            );
+   elm_entry_entry_set(en, buf);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, en);

Modified: trunk/TMP/st/elementary/src/lib/elm_entry.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-12-02 08:20:32 UTC (rev 55133)
+++ trunk/TMP/st/elementary/src/lib/elm_entry.c	2010-12-02 08:25:36 UTC (rev 55134)
@@ -1515,6 +1515,24 @@
         o = ip->func(ip->data, data, item);
         if (o) return o;
      }
+   if (!strncmp(item, "file://", 7))
+     {
+        char *fname = item + 7;
+       
+        o = evas_object_image_filled_add(evas_object_evas_get(data));
+        evas_object_image_file_set(o, fname, NULL);
+        if (evas_object_image_load_error_get(o) == EVAS_LOAD_ERROR_NONE)
+          {
+             evas_object_show(o);
+          }
+        else
+          {
+             evas_object_del(o);
+             o = edje_object_add(evas_object_evas_get(data));
+             _elm_theme_object_set(data, o, "entry/emoticon", "wtf", elm_widget_style_get(data));
+          }
+        return o;
+     }
    o = edje_object_add(evas_object_evas_get(data));
    if (!_elm_theme_object_set(data, o, "entry", item, elm_widget_style_get(data)))
      _elm_theme_object_set(data, o, "entry/emoticon", "wtf", elm_widget_style_get(data));

Log:
From: ChunEon Park <chuneon.park@...>
  
  003_elm_transit.diff.txt (made all effect context APIs private. But
  expose
  each one fa?\195?\167ade API to use easy.) 
  
  

Author:       raster
Date:         2010-12-15 23:53:42 -0800 (Wed, 15 Dec 2010)
New Revision: 55579
Trac:         http://trac.enlightenment.org/e/changeset/55579

Modified:
  trunk/TMP/st/elementary/src/bin/test_transit.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_transit.c 

Modified: trunk/TMP/st/elementary/src/bin/test_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_transit.c	2010-12-16 07:45:12 UTC (rev 55578)
+++ trunk/TMP/st/elementary/src/bin/test_transit.c	2010-12-16 07:53:42 UTC (rev 55579)
@@ -68,7 +68,6 @@
 _transit_rotation_translation_color(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
@@ -76,44 +75,27 @@
    elm_transit_repeat_times_set(trans, 2);
 
    /* Translation Effect */
-   effect_context = elm_transit_effect_translation_context_new(-70.0, -150.0,
-                                                                 70.0, 150.0);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_translation_op, effect_context,
-                          elm_transit_effect_translation_context_free);
+   elm_transit_effect_translation_add(trans, -70.0, -150.0, 70.0, 150.0);
 
    /* Color Effect */
-   effect_context = elm_transit_effect_color_context_new(100, 255, 100,
-                                                        255, 200, 50, 200, 50);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_color_op, effect_context,
-                          elm_transit_effect_color_context_free);
+   elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50); 
 
    /* Rotation Effect */
-   effect_context = elm_transit_effect_rotation_context_new(0.0,
-                                                            135.0, EINA_FALSE);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_rotation_op, effect_context,
-                          elm_transit_effect_rotation_context_free);
-
+   elm_transit_effect_rotation_add(trans, 0.0, 135.0, EINA_FALSE);
 }
 
 static void
 _transit_wipe(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
    elm_transit_auto_reverse_set(trans, EINA_TRUE);
 
-   effect_context = \
-        elm_transit_effect_wipe_context_new(ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE,
-                                            ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_wipe_op, effect_context,
-                          elm_transit_effect_wipe_context_free);
+   elm_transit_effect_wipe_add(trans, 
+                               ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE,
+                               ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT);
 }
 
 static void
@@ -123,7 +105,6 @@
    char buf[PATH_MAX];
    Elm_Transit *trans;
    Evas_Object *ic = data;
-   void *effect_context;
 
    snprintf(buf, sizeof(buf), "%s/images/icon_19.png", PACKAGE_DATA_DIR);
    images = eina_list_append(images, eina_stringshare_add(buf));
@@ -139,109 +120,75 @@
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, ic);
-
-   effect_context = \
-             elm_transit_effect_image_animation_context_new(images);
-   elm_transit_effect_add(trans,
-                         elm_transit_effect_image_animation_op, effect_context,
-                         elm_transit_effect_image_animation_context_free);
+   
+   elm_transit_effect_image_animation_add(trans, images);
 }
 
 static void
-_transit_resizing(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_transit_resizing(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
 
    trans = elm_transit_add(5.0);
-   effect_context = elm_transit_effect_resizing_context_new(100, 50, 300, 150);
-
-   elm_transit_object_add(trans, obj);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_resizing_op, effect_context,
-                          elm_transit_effect_resizing_context_free);
+   
+   elm_transit_effect_resizing_add(trans, 100, 50, 300, 150);
 }
 
 static void
 _transit_flip(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
    Evas_Object *obj2 = data;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
-   effect_context = elm_transit_effect_flip_context_new(
-                                                ELM_TRANSIT_EFFECT_FLIP_AXIS_X,
-                                                EINA_TRUE);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_flip_op, effect_context,
-                          elm_transit_effect_flip_context_free);
+   elm_transit_effect_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_X, EINA_TRUE);
 }
 
 static void
-_transit_zoom(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
+_transit_zoom(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
 
    trans = elm_transit_add(5.0);
-   elm_transit_object_add(trans, obj);
-   effect_context = elm_transit_effect_zoom_context_new(1.0, 3.0);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_zoom_op, effect_context,
-                          elm_transit_effect_zoom_context_free);
+   elm_transit_effect_zoom_add(trans, 1.0, 3.0);
 }
 
 static void
 _transit_blend(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
    Evas_Object *obj2 = data;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
-   effect_context = elm_transit_effect_blend_context_new();
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_blend_op, effect_context,
-                          elm_transit_effect_blend_context_free);
+   elm_transit_effect_blend_add(trans);
 }
 
 static void
 _transit_fade(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
    Evas_Object *obj2 = data;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
-   effect_context = elm_transit_effect_fade_context_new();
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_fade_op, effect_context,
-                          elm_transit_effect_fade_context_free);
+   elm_transit_effect_fade_add(trans);
 }
 
 static void
 _transit_resizable_flip(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Elm_Transit *trans;
-   void *effect_context;
    Evas_Object *obj2 = data;
 
    trans = elm_transit_add(5.0);
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
-   effect_context = elm_transit_effect_resizable_flip_context_new(
-                                                ELM_TRANSIT_EFFECT_FLIP_AXIS_Y,
-                                                EINA_TRUE);
-   elm_transit_effect_add(trans,
-                          elm_transit_effect_resizable_flip_op, effect_context,
-                          elm_transit_effect_resizable_flip_context_free);
+   elm_transit_effect_resizable_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_Y, EINA_TRUE);
 }
 
 /* Translation, Rotation, Color, Wipe, ImagemAnimation Effect */

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-12-16 07:45:12 UTC (rev 55578)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2010-12-16 07:53:42 UTC (rev 55579)
@@ -2475,50 +2475,18 @@
    EAPI void                   elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode) EINA_ARG_NONNULL(1);
    EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1) EINA_ARG_NONNULL(1);
 
-   EAPI void                  *elm_transit_effect_resizing_context_new(Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
-   EAPI void                   elm_transit_effect_resizing_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_resizing_context_free(void *data, Elm_Transit *transit);
+   EAPI void                  *elm_transit_effect_resizing_add(Elm_Transit* transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
+   EAPI void                  *elm_transit_effect_translation_add(Elm_Transit* transit, Evas_Coord from_dx, Evas_Coord dy, Evas_Coord to_dx, Evas_Coord to_dy);
+   EAPI void                  *elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate);
+   EAPI void                  *elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw);
+   EAPI void                  *elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw);
+   EAPI void                  *elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir);
+   EAPI void                  *elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
+   EAPI void                  *elm_transit_effect_fade_add(Elm_Transit *transit);
+   EAPI void                  *elm_transit_effect_blend_add(Elm_Transit *transit);
+   EAPI void                  *elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw);
+   EAPI void                  *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);       
 
-   EAPI void                  *elm_transit_effect_translation_context_new(Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy);
-   EAPI void                   elm_transit_effect_translation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_translation_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
-
-   EAPI void                  *elm_transit_effect_zoom_context_new(float from_rate, float to_rate);
-   EAPI void                   elm_transit_effect_zoom_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_zoom_context_free(void *data, Elm_Transit *transit);
-
-   EAPI void                  *elm_transit_effect_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw);
-   EAPI void                   elm_transit_effect_flip_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_flip_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1, 2);
-
-   EAPI void                  *elm_transit_effect_resizable_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw);
-   EAPI void                   elm_transit_effect_resizable_flip_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1);
-   EAPI void                   elm_transit_effect_resizable_flip_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
-
-   EAPI void                  *elm_transit_effect_wipe_context_new(Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir);
-   EAPI void                   elm_transit_effect_wipe_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_wipe_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1, 2);
-
-   EAPI void                  *elm_transit_effect_color_context_new(unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
-   EAPI void                   elm_transit_effect_color_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_color_context_free(void *data, Elm_Transit *transit);
-
-   EAPI void                  *elm_transit_effect_fade_context_new(void);
-   EAPI void                   elm_transit_effect_fade_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1);
-   EAPI void                   elm_transit_effect_fade_context_free(void *data, Elm_Transit *tranasit) EINA_ARG_NONNULL(1);
-
-   EAPI void                  *elm_transit_effect_blend_context_new(void);
-   EAPI void                   elm_transit_effect_blend_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_blend_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
-
-   EAPI void                  *elm_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw);
-   EAPI void                   elm_transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_rotation_context_free(void *data, Elm_Transit *transit);
-
-   EAPI void                  *elm_transit_effect_image_animation_context_new(Eina_List *images);
-   EAPI void                   elm_transit_effect_image_animation_op(void *data, Elm_Transit *transit, double progress) EINA_ARG_NONNULL(1, 2);
-   EAPI void                   elm_transit_effect_image_animation_context_free(void *data, Elm_Transit *transit) EINA_ARG_NONNULL(1);
-
   typedef struct _Elm_Store                      Elm_Store;
   typedef struct _Elm_Store_Filesystem           Elm_Store_Filesystem;
   typedef struct _Elm_Store_Item                 Elm_Store_Item;

Modified: trunk/TMP/st/elementary/src/lib/elm_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_transit.c	2010-12-16 07:45:12 UTC (rev 55578)
+++ trunk/TMP/st/elementary/src/lib/elm_transit.c	2010-12-16 07:53:42 UTC (rev 55579)
@@ -784,55 +784,14 @@
      } from, to;
 };
 
-/**
- * The Free function to Resizing Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Risizing effect, which consists of functions:
- * - elm_transit_effect_resizing_context_new()
- * - elm_transit_effect_resizing_op()
- * - elm_transit_effect_resizing_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Resizing context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_resizing_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_resizing_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    free(data);
 }
 
-/**
- * Operation function to the Resizing Effect.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Risizing effect, which consists of functions:
- * - elm_transit_effect_resizing_context_new()
- * - elm_transit_effect_resizing_op()
- * - elm_transit_effect_resizing_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Resizing context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_resizing_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_resizing_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -851,16 +810,35 @@
      evas_object_resize(obj, w, h);
 }
 
+void *
+_transit_effect_resizing_context_new(Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h)
+{
+   Elm_Fx_Resizing *resizing;
+
+   resizing = ELM_NEW(Elm_Fx_Resizing);
+   if (!resizing) return NULL;
+
+   resizing->from.w = from_w;
+   resizing->from.h = from_h;
+   resizing->to.w = to_w - from_w;
+   resizing->to.h = to_h - from_h;
+
+   return resizing;
+}
+
 /**
- * Get a new context data of Resizing Effect.
+ * Add the Resizing Effect to Elm_Transit.
  *
- * This function belongs to the Risizing effect, which consists of functions:
- * - elm_transit_effect_resizing_context_new()
- * - elm_transit_effect_resizing_op()
- * - elm_transit_effect_resizing_context_free()
+ * @note This API is one of the facades. It creates resizing effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect will be applied to the objects that are in the transit,
+ * @note If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
  *
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param from_w Object width size when effect begins.
  * @param from_h Object height size when effect begins.
  * @param to_w Object width size when effect ends.
@@ -868,21 +846,18 @@
  * @return Resizing effect context data.
  *
  * @ingroup Transit
- */
+*/
 EAPI void *
-elm_transit_effect_resizing_context_new(Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h)
+elm_transit_effect_resizing_add(Elm_Transit *transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h)
 {
-   Elm_Fx_Resizing *resizing;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   resizing = ELM_NEW(Elm_Fx_Resizing);
-   if (!resizing) return NULL;
-
-   resizing->from.w = from_w;
-   resizing->from.h = from_h;
-   resizing->to.w = to_w - from_w;
-   resizing->to.h = to_h - from_h;
-
-   return resizing;
+   void *effect_context = _transit_effect_resizing_context_new(from_w, from_h, to_w, to_h);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_resizing_op, effect_context,
+                          _transit_effect_resizing_context_free);
+   return effect_context;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -952,26 +927,8 @@
    return data_list;
 }
 
-/**
- * The Free function to Translation Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Translation effect, which consists of functions:
- * - elm_transit_effect_translation_context_new()
- * - elm_transit_effect_translation_op()
- * - elm_transit_effect_translation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Translation context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_translation_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_translation_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -990,35 +947,8 @@
    free(translation);
 }
 
-/**
- * Operation function to the Translation Effect.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note When this function begins to be called, it gets the current objects in
- * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
- * will not cause any changes in the set of objects that this effect is being
- * applied if these functions are called after the @p transit starts to run.
- *
- * This function belongs to the Translation effect, which consists of functions:
- * - elm_transit_effect_translation_context_new()
- * - elm_transit_effect_translation_op()
- * - elm_transit_effect_translation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Translation context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- */
-EAPI void
-elm_transit_effect_translation_op(void *data, Elm_Transit *transit, double progress __UNUSED__)
+void
+_transit_effect_translation_op(void *data, Elm_Transit *transit, double progress __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1042,16 +972,36 @@
      }
 }
 
+void *
+_transit_effect_translation_context_new(Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy)
+{
+   Elm_Fx_Translation *translation;
+
+   translation = ELM_NEW(Elm_Fx_Translation);
+
+   if (!translation) return NULL;
+
+   translation->from.dx = from_dx;
+   translation->from.dy = from_dy;
+   translation->to.dx = to_dx - from_dx;
+   translation->to.dy = to_dy - from_dy;
+
+   return translation;
+}
+
 /**
- * Get a new context data of Translation Effect
+ * Add the Translation Effect to Elm_Transit.
  *
- * This function belongs to the Translation effect, which consists of functions:
- * - elm_transit_effect_translation_context_new()
- * - elm_transit_effect_translation_op()
- * - elm_transit_effect_translation_context_free()
+ * @note This API is one of the facades. It creates translation effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note When this function is called, it gets the current objects in
+ * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
+ * will not cause any changes in the set of objects that this effect is being
+ * applied.
  *
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param from_dx X Position variation when effect begins.
  * @param from_dy Y Position variation when effect begins.
  * @param to_dx X Position variation when effect ends.
@@ -1059,24 +1009,27 @@
  * @return Translation effect context data.
  *
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_translation_context_new(Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy)
+elm_transit_effect_translation_add(Elm_Transit *transit, Evas_Coord from_dx, Evas_Coord from_dy, Evas_Coord to_dx, Evas_Coord to_dy)
 {
-   Elm_Fx_Translation *translation;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   translation = ELM_NEW(Elm_Fx_Translation);
-
-   if (!translation) return NULL;
-
-   translation->from.dx = from_dx;
-   translation->from.dy = from_dy;
-   translation->to.dx = to_dx - from_dx;
-   translation->to.dy = to_dy - from_dy;
-
-   return translation;
+   void *effect_context = _transit_effect_translation_context_new(from_dx, from_dy, to_dx, to_dy);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_translation_op, effect_context,
+                          _transit_effect_translation_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Zoom FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -1087,61 +1040,14 @@
    float from, to;
 };
 
-/**
- * The Free function to Zoom Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Zoom effect, which consists of functions:
- * - elm_transit_effect_zoom_context_new()
- * - elm_transit_effect_zoom_op()
- * - elm_transit_effect_zoom_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Zoom context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_zoom_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_zoom_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    free(data);
 }
 
-/**
- * Operation function to the Zoom Effect
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Zoom effect, which consists of functions:
- * - elm_transit_effect_zoom_context_new()
- * - elm_transit_effect_zoom_op()
- * - elm_transit_effect_zoom_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Zoom context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_zoom_op(void *data, Elm_Transit *transit , double progress)
+void
+_transit_effect_zoom_op(void *data, Elm_Transit *transit , double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1172,37 +1078,58 @@
    evas_map_free(map);
 }
 
+void *
+_transit_effect_zoom_context_new(float from_rate, float to_rate)
+{
+   Elm_Fx_Zoom *zoom;
+
+   zoom = ELM_NEW(Elm_Fx_Zoom);
+   if (!zoom) return NULL;
+
+   zoom->from = (FOCAL - (from_rate * FOCAL)) * (1 / from_rate);
+   zoom->to = ((FOCAL - (to_rate * FOCAL)) * (1 / to_rate)) - zoom->from;
+
+   return zoom;
+}
+
 /**
- * Get a new context data of Zoom Effect
+ * Add the Zoom Effect to Elm_Transit.
  *
+ * @note This API is one of the facades. It creates zoom effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
+ *
  * @see elm_transit_effect_add()
  *
- * This function belongs to the Zoom effect, which consists of functions:
- * - elm_transit_effect_zoom_context_new()
- * - elm_transit_effect_zoom_op()
- * - elm_transit_effect_zoom_context_free()
- *
+ * @param transit Transit object.
  * @param from_rate Scale rate when effect begins (1 is current rate).
  * @param to_rate Scale rate when effect ends.
  * @return Zoom effect context data.
  *
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_zoom_context_new(float from_rate, float to_rate)
+elm_transit_effect_zoom_add(Elm_Transit *transit, float from_rate, float to_rate)
 {
-   Elm_Fx_Zoom *zoom;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   zoom = ELM_NEW(Elm_Fx_Zoom);
-   if (!zoom) return NULL;
-
-   zoom->from = (FOCAL - (from_rate * FOCAL)) * (1 / from_rate);
-   zoom->to = ((FOCAL - (to_rate * FOCAL)) * (1 / to_rate)) - zoom->from;
-
-   return zoom;
-
+   void *effect_context = _transit_effect_zoom_context_new(from_rate, to_rate);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_zoom_op, effect_context,
+                          _transit_effect_zoom_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Flip FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -1214,26 +1141,8 @@
    Eina_Bool cw:1;
 };
 
-/**
- * The Free function to Flip Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Flip effect, which consists of functions:
- * - elm_transit_effect_flip_context_new()
- * - elm_transit_effect_flip_op()
- * - elm_transit_effect_flip_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Flip context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_flip_context_free(void *data, Elm_Transit *transit)
+void
+_transit_effect_flip_context_free(void *data, Elm_Transit *transit)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1254,41 +1163,8 @@
    free(data);
 }
 
-/**
- * Operation function to the Flip Effect.
- *
- * This effect is applied to each pair of objects in the order they are listed
- * in the transit list of objects. The first object in the pair will be the
- * "front" object and the second will be the "back" object.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Flip effect, which consists of functions:
- * - elm_transit_effect_flip_context_new()
- * - elm_transit_effect_flip_op()
- * - elm_transit_effect_flip_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Flip context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_flip_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_flip_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1378,34 +1254,58 @@
    evas_map_free(map);
 }
 
+void *
+_transit_effect_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw)
+{
+   Elm_Fx_Flip *flip;
+
+   flip = ELM_NEW(Elm_Fx_Flip);
+   if (!flip) return NULL;
+
+   flip->cw = cw;
+   flip->axis = axis;
+
+   return flip;
+}
+
 /**
- * Get a new context data of Flip Effect
+ * Add the Flip Effect to Elm_Transit.
  *
- * This function belongs to the Flip effect, which consists of functions:
- * - elm_transit_effect_flip_context_new()
- * - elm_transit_effect_flip_op()
- * - elm_transit_effect_flip_context_free()
- *
+ * @note This API is one of the facades. It creates flip effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect is applied to each pair of objects in the order they are listed
+ * in the transit list of objects. The first object in the pair will be the
+ * "front" object and the second will be the "back" object.
+ * @note If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
+ * 
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param axis Flipping Axis(X or Y).
  * @param cw Flipping Direction. EINA_TRUE is clock-wise.
  * @return Flip effect context data.
  *
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw)
+elm_transit_effect_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw)
 {
-   Elm_Fx_Flip *flip;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   flip = ELM_NEW(Elm_Fx_Flip);
-   if (!flip) return NULL;
-
-   flip->cw = cw;
-   flip->axis = axis;
-
-   return flip;
+   void *effect_context = _transit_effect_flip_context_new(axis, cw);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_flip_op, effect_context,
+                          _transit_effect_flip_context_free);
+   return effect_context;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1555,33 +1455,8 @@
      }
 }
 
-/**
- * The Free function to Resizable Flip Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Resizable Flip effect, which consists of
- * functions:
- * - elm_transit_effect_resizable_flip_context_new()
- * - elm_transit_effect_resizable_flip_op()
- * - elm_transit_effect_resizing_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Resizable Flip context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_resizable_flip_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_resizable_flip_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1607,40 +1482,8 @@
    free(resizable_flip);
 }
 
-/**
- * Operation function to the Resizable Flip Effect
- *
- * This effect is applied to each pair of objects in the order they are listed
- * in the transit list of objects. The first object in the pair will be the
- * "front" object and the second will be the "back" object.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note When this function begins to be called, it gets the current objects in
- * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
- * will not cause any changes in the set of objects that this effect is being
- * applied if these functions are called after the @p transit starts to run.
- *
- * This function belongs to the Resizable Flip effect, which consists of
- * functions:
- * - elm_transit_effect_resizable_flip_context_new()
- * - elm_transit_effect_resizable_flip_op()
- * - elm_transit_effect_resizing_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Resizable Flip context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- */
-EAPI void
-elm_transit_effect_resizable_flip_op(void *data, Elm_Transit *transit __UNUSED__, double progress)
+void
+_transit_effect_resizable_flip_op(void *data, Elm_Transit *transit __UNUSED__, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1726,37 +1569,62 @@
    evas_map_free(map);
 }
 
+void *
+_transit_effect_resizable_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw)
+{
+   Elm_Fx_ResizableFlip *resizable_flip;
+
+   resizable_flip = ELM_NEW(Elm_Fx_ResizableFlip);
+   if (!resizable_flip) return NULL;
+
+   resizable_flip->cw = cw;
+   resizable_flip->axis = axis;
+
+   return resizable_flip;
+}
+
 /**
- * Get a new context data of Resizable Flip Effect.
+ * Add the Resizable Flip Effect to Elm_Transit.
  *
- * This function belongs to the Resizable Flip effect, which consists of
- * functions:
- * - elm_transit_effect_resizable_flip_context_new()
- * - elm_transit_effect_resizable_flip_op()
- * - elm_transit_effect_resizing_context_free()
- *
+ * @note This API is one of the facades. It creates resizable flip effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect is applied to each pair of objects in the order they are listed
+ * in the transit list of objects. The first object in the pair will be the
+ * "front" object and the second will be the "back" object.
+ * @note When this function is called, it gets the current objects in
+ * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
+ * will not cause any changes in the set of objects that this effect is being
+ * applied.
+ * 
  * @see elm_transit_effect_add()
  *
- * @param axis Flipping Axis.(X or Y).
+ * @param transit Transit object.
+ * @param axis Flipping Axis(X or Y).
  * @param cw Flipping Direction. EINA_TRUE is clock-wise.
- * @return Resizable Flip effect context data.
+ * @return Resizable flip effect context data.
  *
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_resizable_flip_context_new(Elm_Fx_Flip_Axis axis, Eina_Bool cw)
+elm_transit_effect_resizable_flip_add(Elm_Transit *transit, Elm_Fx_Flip_Axis axis, Eina_Bool cw)
 {
-   Elm_Fx_ResizableFlip *resizable_flip;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   resizable_flip = ELM_NEW(Elm_Fx_ResizableFlip);
-   if (!resizable_flip) return NULL;
-
-   resizable_flip->cw = cw;
-   resizable_flip->axis = axis;
-
-   return resizable_flip;
+   void *effect_context = _transit_effect_resizable_flip_context_new(axis, cw);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_resizable_flip_op, effect_context,
+                          _transit_effect_resizable_flip_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Wipe FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -1892,31 +1760,8 @@
    evas_map_util_3d_perspective(map, x + (w / 2), y + (h / 2), 0, FOCAL);
 }
 
-/**
- * The Free function to Wipe Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Wipe effect, which consists of
- * functions:
- * - elm_transit_effect_wipe_context_new()
- * - elm_transit_effect_wipe_op()
- * - elm_transit_effect_wipe_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Wipe context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_wipe_context_free(void *data, Elm_Transit *transit)
+void
+_transit_effect_wipe_context_free(void *data, Elm_Transit *transit)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -1939,34 +1784,8 @@
    free(wipe);
 }
 
-/**
- * Operation function to the Wipe Effect.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Wipe effect, which consists of
- * functions:
- * - elm_transit_effect_wipe_context_new()
- * - elm_transit_effect_wipe_op()
- * - elm_transit_effect_wipe_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Wipe context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_wipe_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_wipe_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2002,37 +1821,59 @@
    evas_map_free(map);
 }
 
+void *
+_transit_effect_wipe_context_new(Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir)
+{
+   Elm_Fx_Wipe *wipe;
+
+   wipe = ELM_NEW(Elm_Fx_Wipe);
+   if (!wipe) return NULL;
+
+   wipe->type = type;
+   wipe->dir = dir;
+
+   return wipe;
+}
+
 /**
- * Get a new context data of Wipe Flip Effect.
+ * Add the Wipe Effect to Elm_Transit.
  *
- * This function belongs to the Wipe effect, which consists of
- * functions:
- * - elm_transit_effect_wipe_context_new()
- * - elm_transit_effect_wipe_op()
- * - elm_transit_effect_wipe_context_free()
- *
+ * @note This API is one of the facades. It creates wipe effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect will be applied to the objects that are in the transit,
+ * If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
+ * 
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param type Wipe type. Hide or show.
  * @param dir Wipe Direction.
  * @return Wipe effect context data.
  *
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_wipe_context_new(Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir)
+elm_transit_effect_wipe_add(Elm_Transit *transit, Elm_Fx_Wipe_Type type, Elm_Fx_Wipe_Dir dir)
 {
-   Elm_Fx_Wipe *wipe;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   wipe = ELM_NEW(Elm_Fx_Wipe);
-   if (!wipe) return NULL;
-
-   wipe->type = type;
-   wipe->dir = dir;
-
-   return wipe;
+   void *effect_context = _transit_effect_wipe_context_new(type, dir);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_wipe_op, effect_context,
+                          _transit_effect_wipe_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Color FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -2050,57 +1891,14 @@
      } to;
 };
 
-/**
- * The Free function to Color Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Color effect, which consists of
- * functions:
- * - elm_transit_effect_color_context_new()
- * - elm_transit_effect_color_op()
- * - elm_transit_effect_color_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Color context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_color_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_color_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    free(data);
 }
 
-/**
- * Operation function to the Color Effect.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Color effect, which consists of
- * functions:
- * - elm_transit_effect_color_context_new()
- * - elm_transit_effect_color_op()
- * - elm_transit_effect_color_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Color context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_color_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_color_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2121,17 +1919,39 @@
      evas_object_color_set(obj, r, g, b, a);
 }
 
+void *
+_transit_effect_color_context_new(unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a)
+{
+   Elm_Fx_Color *color;
+
+   color = ELM_NEW(Elm_Fx_Color);
+   if (!color) return NULL;
+
+   color->from.r = from_r;
+   color->from.g = from_g;
+   color->from.b = from_b;
+   color->from.a = from_a;
+   color->to.r = to_r - from_r;
+   color->to.g = to_g - from_g;
+   color->to.b = to_b - from_b;
+   color->to.a = to_a - from_a;
+
+   return color;
+}
+
 /**
- * Get a new context data of Color Effect.
+ * Add the Color Effect to Elm_Transit.
  *
+ * @note This API is one of the facades. It creates color effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect will be applied to the objects that are in the transit,
+ * If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
+ * 
  * @see elm_transit_effect_add()
  *
- * This function belongs to the Color effect, which consists of
- * functions:
- * - elm_transit_effect_color_context_new()
- * - elm_transit_effect_color_op()
- * - elm_transit_effect_color_context_free()
- *
+ * @param transit        Transit object.
  * @param  from_r        RGB R when effect begins.
  * @param  from_g        RGB G when effect begins.
  * @param  from_b        RGB B when effect begins.
@@ -2145,23 +1965,16 @@
  * @ingroup Transit
  */
 EAPI void *
-elm_transit_effect_color_context_new(unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a)
+elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a)
 {
-   Elm_Fx_Color *color;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   color = ELM_NEW(Elm_Fx_Color);
-   if (!color) return NULL;
-
-   color->from.r = from_r;
-   color->from.g = from_g;
-   color->from.b = from_b;
-   color->from.a = from_a;
-   color->to.r = to_r - from_r;
-   color->to.g = to_g - from_g;
-   color->to.b = to_b - from_b;
-   color->to.a = to_a - from_a;
-
-   return color;
+   void *effect_context = _transit_effect_color_context_new(from_r, from_g, from_b, from_a, to_r, to_g, to_b, to_a);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_color_op, effect_context,
+                          _transit_effect_color_context_free);
+   return effect_context;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -2250,27 +2063,8 @@
    return data_list;
 }
 
-/**
- * The Free function to Fade Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Fade effect, which consists of
- * functions:
- * - elm_transit_effect_fade_context_new()
- * - elm_transit_effect_fade_op()
- * - elm_transit_effect_fade_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Fade context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_fade_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_fade_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2300,42 +2094,8 @@
    free(fade);
 }
 
-/**
- * Operation function to the Fade Effect
- *
- * This effect is applied to each pair of objects in the order they are listed
- * in the transit list of objects. The first object in the pair will be the
- * "before" object and the second will be the "after" object.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note When this function begins to be called, it gets the current objects in
- * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
- * will not cause any changes in the set of objects that this effect is being
- * applied if these functions are called after the @p transit starts to run.
- *
- * This function belongs to the Fade effect, which consists of
- * functions:
- * - elm_transit_effect_fade_context_new()
- * - elm_transit_effect_fade_op()
- * - elm_transit_effect_fade_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Fade context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the color information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_fade_op(void *data, Elm_Transit *transit __UNUSED__, double progress)
+void
+_transit_effect_fade_op(void *data, Elm_Transit *transit __UNUSED__, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2389,30 +2149,55 @@
      }
 }
 
+void *
+_transit_effect_fade_context_new(void)
+{
+   Elm_Fx_Fade *fade;
+   fade = ELM_NEW(Elm_Fx_Fade);
+   if (!fade) return NULL;
+   return fade;
+}
+
 /**
- * Get a new context data of Fade Effect.
+ * Add the Fade Effect to Elm_Transit.
  *
- * This function belongs to the Fade effect, which consists of
- * functions:
- * - elm_transit_effect_fade_context_new()
- * - elm_transit_effect_fade_op()
- * - elm_transit_effect_fade_context_free()
- *
+ * @note This API is one of the facades. It creates fade effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect is applied to each pair of objects in the order they are listed
+ * in the transit list of objects. The first object in the pair will be the
+ * "before" object and the second will be the "after" object.
+ * @note When this function is called, it gets the current objects in
+ * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
+ * will not cause any changes in the set of objects that this effect is being
+ * applied.
+ * 
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @return Fade effect context data.
- *
+ * 
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the color information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_fade_context_new(void)
+elm_transit_effect_fade_add(Elm_Transit *transit)
 {
-   Elm_Fx_Fade *fade;
-   fade = ELM_NEW(Elm_Fx_Fade);
-   if (!fade) return NULL;
-   return fade;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
+
+   void *effect_context = _transit_effect_fade_context_new();
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_fade_op, effect_context,
+                          _transit_effect_fade_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Blend FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -2494,27 +2279,8 @@
    return data_list;
 }
 
-/**
- * The Free function to Blend Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Blend effect, which consists of
- * functions:
- * - elm_transit_effect_blend_context_new()
- * - elm_transit_effect_blend_op()
- * - elm_transit_effect_blend_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Blend context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_blend_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_blend_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2547,42 +2313,8 @@
    free(data);
 }
 
-/**
- * Operation function to the Blend Effect.
- *
- * This effect is applied to each pair of objects in the order they are listed
- * in the transit list of objects. The first object in the pair will be the
- * "before" object and the second will be the "after" object.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note When this function begins to be called, it gets the current objects in
- * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
- * will not cause any changes in the set of objects that this effect is being
- * applied if these functions are called after the @p transit starts to run.
- *
- * This function belongs to the Blend effect, which consists of
- * functions:
- * - elm_transit_effect_blend_context_new()
- * - elm_transit_effect_blend_op()
- * - elm_transit_effect_blend_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Blend context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the color information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_blend_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_blend_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2610,32 +2342,57 @@
      }
 }
 
+void *
+_transit_effect_blend_context_new(void)
+{
+   Elm_Fx_Blend *blend;
+
+   blend = ELM_NEW(Elm_Fx_Blend);
+   if (!blend) return NULL;
+
+   return blend;
+}
+
 /**
- * Get a new context data of Blend Effect.
+ * Add the Blend Effect to Elm_Transit.
  *
+ * @note This API is one of the facades. It creates blend effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect is applied to each pair of objects in the order they are listed
+ * in the transit list of objects. The first object in the pair will be the
+ * "before" object and the second will be the "after" object.
+ * @note When this function be called, it gets the current objects in
+ * the transit, that is, elm_transit_object_remove() and elm_transit_object_add()
+ * will not cause any changes in the set of objects that this effect is being
+ * applied.
+ * 
  * @see elm_transit_effect_add()
  *
- * This function belongs to the Blend effect, which consists of
- * functions:
- * - elm_transit_effect_blend_context_new()
- * - elm_transit_effect_blend_op()
- * - elm_transit_effect_blend_context_free()
- *
+ * @param transit Transit object.
  * @return Blend effect context data.
- *
+ * 
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the color information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_blend_context_new(void)
+elm_transit_effect_blend_add(Elm_Transit *transit)
 {
-   Elm_Fx_Blend *blend;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   blend = ELM_NEW(Elm_Fx_Blend);
-   if (!blend) return NULL;
-
-   return blend;
+   void *effect_context = _transit_effect_blend_context_new();
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_blend_op, effect_context,
+                          _transit_effect_blend_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //Rotation FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -2647,63 +2404,14 @@
    float from, to;
 };
 
-/**
- * The Free function to Rotation Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Rotation effect, which consists of
- * functions:
- * - elm_transit_effect_rotation_context_new()
- * - elm_transit_effect_rotation_op()
- * - elm_transit_effect_rotation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Rotation context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_rotation_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_rotation_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    free(data);
 }
 
-/**
- * Operation function to the Rotation Effect
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Rotation effect, which consists of
- * functions:
- * - elm_transit_effect_rotation_context_new()
- * - elm_transit_effect_rotation_op()
- * - elm_transit_effect_rotation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Rotation context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- * @warning Is higher recommended just create a transit with this effect when
- * the window that the objects of the transit belongs has already been created.
- * This is because this effect needs the geometry information about the objects,
- * and if the window was not created yet, it can get a wrong information.
- * @warning Is not recommended remove or add an object after the transit begins
- * to run, because the order of the objects will be affected.
- */
-EAPI void
-elm_transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_rotation_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2749,39 +2457,61 @@
    evas_map_free(map);
 }
 
+void *
+_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw)
+{
+   Elm_Fx_Rotation *rotation;
+
+   rotation = ELM_NEW(Elm_Fx_Rotation);
+   if (!rotation) return NULL;
+
+   rotation->from = from_degree;
+   rotation->to = to_degree - from_degree;
+   rotation->cw = cw;
+
+   return rotation;
+}
+
 /**
- * Get a new context data of Rotation Effect.
+ * Add the Rotation Effect to Elm_Transit.
  *
- * This function belongs to the Rotation effect, which consists of
- * functions:
- * - elm_transit_effect_rotation_context_new()
- * - elm_transit_effect_rotation_op()
- * - elm_transit_effect_rotation_context_free()
- *
+ * @note This API is one of the facades. It creates rotation effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
+ * @note This effect will be applied to the objects that are in the transit,
+ * If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
+ * 
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param from_degree Degree when effect begins.
  * @param to_degree Degree when effect is ends.
  * @param cw Rotation direction. EINA_TRUE is clock wise.
  * @return Rotation effect context data.
- *
+ * 
  * @ingroup Transit
+ * @warning Is higher recommended just create a transit with this effect when
+ * the window that the objects of the transit belongs has already been created.
+ * This is because this effect needs the geometry information about the objects,
+ * and if the window was not created yet, it can get a wrong information.
+ * @warning Is not recommended remove or add an object after the transit begins
+ * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw)
+elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw)
 {
-   Elm_Fx_Rotation *rotation;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   rotation = ELM_NEW(Elm_Fx_Rotation);
-   if (!rotation) return NULL;
-
-   rotation->from = from_degree;
-   rotation->to = to_degree - from_degree;
-   rotation->cw = cw;
-
-   return rotation;
+   void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree, cw);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_rotation_op, effect_context,
+                          _transit_effect_rotation_context_free);
+   return effect_context;
 }
 
+
 ///////////////////////////////////////////////////////////////////////////////
 // ImageAnimation FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -2792,27 +2522,8 @@
    Eina_List *images;
 };
 
-/**
- * The Free function to Image Animation Effect context data.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- *
- * This function belongs to the Image Animation effect, which consists of
- * functions:
- * - elm_transit_effect_image_animation_context_new()
- * - elm_transit_effect_image_animation_op()
- * - elm_transit_effect_image_animation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Imagem Animation context data.
- * @param transit Transit object.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_image_animation_context_free(void *data, Elm_Transit *transit __UNUSED__)
+void
+_transit_effect_image_animation_context_free(void *data, Elm_Transit *transit __UNUSED__)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2831,34 +2542,8 @@
    free(data);
 }
 
-/**
- * Operation function to the Imagem Animation Effect.
- *
- * This effect changes the image from an icon object in the @p transit.
- *
- * @note You not need to call this function, just pass as parameter to
- * elm_transit_effect_add() function.
- * @note This effect will be applied to the objects that are in the transit,
- * If you change the set of objects in the transit with  elm_transit_object_add()
- * or elm_transit_object_remove(), the set of objects affected by this effect
- * will be changed too.
- *
- * This function belongs to the Image Animation effect, which consists of
- * functions:
- * - elm_transit_effect_image_animation_context_new()
- * - elm_transit_effect_image_animation_op()
- * - elm_transit_effect_image_animation_context_free()
- *
- * @see elm_transit_effect_add()
- *
- * @param data The Imagem Animation context data.
- * @param transit Transit object.
- * @param progress The time progression, it is a double value between 0.0 and 1.0.
- *
- * @ingroup Transit
- */
-EAPI void
-elm_transit_effect_image_animation_op(void *data, Elm_Transit *transit, double progress)
+void
+_transit_effect_image_animation_op(void *data, Elm_Transit *transit, double progress)
 {
    EINA_SAFETY_ON_NULL_RETURN(data);
 
@@ -2890,12 +2575,32 @@
    eina_stringshare_del(type);
 }
 
+void *
+_transit_effect_image_animation_context_new(Eina_List *images)
+{
+   Elm_Fx_Image_Animation *image_animation;
+
+   image_animation = ELM_NEW(Elm_Fx_Image_Animation);
+
+   if (!image_animation) return NULL;
+
+   image_animation->images = images;
+
+   return image_animation;
+}
+
 /**
- * Get a new context data of Imagem Animation Effect.
+ * Add the Rotation Effect to Elm_Transit.
  *
+ * @note This API is one of the facades. It creates image animation effect context 
+ * and add it's required APIs to elm_transit_effect_add. 
  * The @p images parameter is a list images paths. This list and
  * its contents will be deleted at the end of the effect by
  * elm_transit_effect_image_animation_context_free() function.
+ * @note This effect will be applied to the objects that are in the transit,
+ * If you change the set of objects in the transit with  elm_transit_object_add()
+ * or elm_transit_object_remove(), the set of objects affected by this effect
+ * will be changed too.
  *
  * Example:
  * @code
@@ -2908,38 +2613,29 @@
  *
  * snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
  * images = eina_list_append(images, eina_stringshare_add(buf));
+ * elm_transit_effect_image_animation_add(transi, images);
  *
- * elm_transit_effect_add(transit,
- *                      elm_transit_effect_image_animation_op,
- *                      elm_transit_effect_image_animation_context_new(images),
- *                      elm_transit_effect_image_animation_context_free);
  * @endcode
- *
- * This function belongs to the Image Animation effect, which consists of
- * functions:
- * - elm_transit_effect_image_animation_context_new()
- * - elm_transit_effect_image_animation_op()
- * - elm_transit_effect_image_animation_context_free()
- *
+ * 
  * @see elm_transit_effect_add()
  *
+ * @param transit Transit object.
  * @param images Eina_List of images file paths. This list and
  * its contents will be deleted at the end of the effect by
  * elm_transit_effect_image_animation_context_free() function.
  * @return Image Animation effect context data.
- *
+ * 
  * @ingroup Transit
  */
 EAPI void *
-elm_transit_effect_image_animation_context_new(Eina_List *images)
+elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images)
 {
-   Elm_Fx_Image_Animation *image_animation;
+   ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
 
-   image_animation = ELM_NEW(Elm_Fx_Image_Animation);
-
-   if (!image_animation) return NULL;
-
-   image_animation->images = images;
-
-   return image_animation;
+   void *effect_context = _transit_effect_image_animation_context_new(images);
+   if(!effect_context) return NULL;
+   elm_transit_effect_add(transit, 
+                          _transit_effect_image_animation_op, effect_context,
+                          _transit_effect_image_animation_context_free);
+   return effect_context;
 }

Log:
From: ChunEon Park <chuneon.park@...>
  
  Even it looks somewhat alien elm, 
  
  I hope EFL supports basic effect by using c and edc.
  
  In some cases, it is useful for app developers. 
  They want to use effects easily and quickly as Other F/W does
  providing. 
  
  Here is patch again.
  
  Added two lines for elm_transit_duration_set exception handling. 
  
  I guess there are possibilities still to add/modify some functions to
  the
  transit. 
  So, currently the exception cases does not defined yet. 
  
  But I will try patches soon as perfect things.
  
  Please consider about transit.  
  
  And..  if this transit is acceptable, 
  How about deprecate elm_animator as soon as possible? 
  
  

Author:       raster
Date:         2011-01-06 22:23:20 -0800 (Thu, 06 Jan 2011)
New Revision: 55966
Trac:         http://trac.enlightenment.org/e/changeset/55966

Modified:
  trunk/TMP/st/elementary/src/bin/test_transit.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_transit.c 

Modified: trunk/TMP/st/elementary/src/bin/test_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-07 04:58:37 UTC (rev 55965)
+++ trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-07 06:23:20 UTC (rev 55966)
@@ -34,11 +34,11 @@
      {
         h = custom_effect->from.h + custom_effect->to.h;
         w = custom_effect->from.w + \
-                                  (custom_effect->to.w * (progress - 0.5) * 2);
+            (custom_effect->to.w * (progress - 0.5) * 2);
      }
 
    EINA_LIST_FOREACH(objs, elist, obj)
-     evas_object_resize(obj, w, h);
+      evas_object_resize(obj, w, h);
 
 }
 
@@ -69,7 +69,7 @@
 {
    Elm_Transit *trans;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_auto_reverse_set(trans, EINA_TRUE);
    elm_transit_repeat_times_set(trans, 2);
@@ -82,6 +82,9 @@
 
    /* Rotation Effect */
    elm_transit_effect_rotation_add(trans, 0.0, 135.0, EINA_FALSE);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -89,13 +92,16 @@
 {
    Elm_Transit *trans;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_auto_reverse_set(trans, EINA_TRUE);
 
    elm_transit_effect_wipe_add(trans, 
                                ELM_TRANSIT_EFFECT_WIPE_TYPE_HIDE,
                                ELM_TRANSIT_EFFECT_WIPE_DIR_RIGHT);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -118,10 +124,13 @@
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
    images = eina_list_append(images, eina_stringshare_add(buf));
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, ic);
-   
+
    elm_transit_effect_image_animation_add(trans, images);
+
+   elm_transit_duration_set(trans, 5.0); 
+   elm_transit_go(trans);
 }
 
 static void
@@ -129,9 +138,13 @@
 {
    Elm_Transit *trans;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);   
+
    elm_transit_effect_resizing_add(trans, 100, 50, 300, 150);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -140,10 +153,14 @@
    Elm_Transit *trans;
    Evas_Object *obj2 = data;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
+
    elm_transit_effect_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_X, EINA_TRUE);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -151,9 +168,13 @@
 {
    Elm_Transit *trans;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
+
    elm_transit_effect_zoom_add(trans, 1.0, 3.0);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -162,10 +183,14 @@
    Elm_Transit *trans;
    Evas_Object *obj2 = data;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
+
    elm_transit_effect_blend_add(trans);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -174,10 +199,14 @@
    Elm_Transit *trans;
    Evas_Object *obj2 = data;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
+
    elm_transit_effect_fade_add(trans);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 static void
@@ -186,10 +215,14 @@
    Elm_Transit *trans;
    Evas_Object *obj2 = data;
 
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_object_add(trans, obj);
    elm_transit_object_add(trans, obj2);
+
    elm_transit_effect_resizable_flip_add(trans, ELM_TRANSIT_EFFECT_FLIP_AXIS_Y, EINA_TRUE);
+
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 /* Translation, Rotation, Color, Wipe, ImagemAnimation Effect */
@@ -433,7 +466,7 @@
    evas_object_show(bt);
    evas_object_move(bt, 50, 100);
    evas_object_resize(bt, 200, 30); 
-   
+
    bt2 = elm_button_add(win);
    elm_button_label_set(bt2, "Back Button - Resizable Flip Effect");
    evas_object_move(bt2, 50, 100);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-07 04:58:37 UTC (rev 55965)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-07 06:23:20 UTC (rev 55966)
@@ -2470,7 +2470,7 @@
 
    typedef struct _Elm_Transit Elm_Transit;
 
-   EAPI Elm_Transit           *elm_transit_add(double duration);
+   EAPI Elm_Transit           *elm_transit_add();
    EAPI void                   elm_transit_del(Elm_Transit *transit) EINA_ARG_NONNULL(1);
    EAPI void                   elm_transit_effect_add(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit *transit, double progress), void *data, void (*data_free_cb)(void *data, Elm_Transit *transit)) EINA_ARG_NONNULL(1, 2);
    EAPI void                   elm_transit_effect_del(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit *transit, double progress), void *data) EINA_ARG_NONNULL(1, 2);
@@ -2488,6 +2488,9 @@
    EAPI int                    elm_transit_repeat_times_get(Elm_Transit *transit) EINA_ARG_NONNULL(1);
    EAPI void                   elm_transit_tween_mode_set(Elm_Transit *transit, Elm_Transit_Tween_Mode tween_mode) EINA_ARG_NONNULL(1);
    EAPI Elm_Transit_Tween_Mode elm_transit_tween_mode_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1) EINA_ARG_NONNULL(1);
+   EAPI void                   elm_transit_duration_set(Elm_Transit *transit, double duration) EINA_ARG_NONNULL(1); 
+   EAPI double                 elm_transit_duration_get(const Elm_Transit *transit) EINA_ARG_NONNULL(1);
+   EAPI void                   elm_transit_go(Elm_Transit *transit) EINA_ARG_NONNULL(1);
 
    EAPI void                  *elm_transit_effect_resizing_add(Elm_Transit* transit, Evas_Coord from_w, Evas_Coord from_h, Evas_Coord to_w, Evas_Coord to_h);
    EAPI void                  *elm_transit_effect_translation_add(Elm_Transit* transit, Evas_Coord from_dx, Evas_Coord dy, Evas_Coord to_dx, Evas_Coord to_dy);

Modified: trunk/TMP/st/elementary/src/lib/elm_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-07 04:58:37 UTC (rev 55965)
+++ trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-07 06:23:20 UTC (rev 55966)
@@ -30,13 +30,14 @@
  *
  * Example:
  * @code
- * Elm_Transit *trans = elm_transit_add(5.0);
+ * Elm_Transit *trans = elm_transit_add();
  * elm_transit_object_add(trans, obj);
  * void *effect_context = elm_transit_effect_translation_context_new(0.0, 0.0,
  *                                                               280.0, 280.0);
  * elm_transit_effect_add(transit,
  *                        elm_transit_effect_translation_op, effect_context,
  *                        elm_transit_effect_translation_context_free);
+ * elm_transit_duration_set(transit, 5);
  * elm_transit_auto_reverse_set(transit, EINA_TRUE);
  * elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
  * elm_transit_repeat_times_set(transit, -1);
@@ -263,23 +264,17 @@
  * @ingroup Transit
  */
 EAPI Elm_Transit *
-elm_transit_add(double duration)
+elm_transit_add()
 {
    Elm_Transit *transit = ELM_NEW(Elm_Transit);
-   
    if (!transit) return NULL;
    
    EINA_MAGIC_SET(transit, ELM_TRANSIT_MAGIC);
 
    elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_LINEAR);
  	
-   transit->time.duration = duration;
-   transit->time.begin = ecore_loop_time_get();
-   transit->animator = ecore_animator_add(_animator_animate_cb, transit);
-
    return transit;
 }
-
 /**
  * Stops the animation and delete the @p transit object.
  *
@@ -316,7 +311,7 @@
  *
  * Exemple:
  * @code
- * Elm_Transit *transit = elm_transit_add(5.0);
+ * Elm_Transit *transit = elm_transit_add();
  * elm_transit_effect_add(transit,
  *                        elm_transit_effect_blend_op,
  *                        elm_transit_effect_blend_context_new(),
@@ -741,6 +736,64 @@
    return transit->tween_mode;
 }
 
+/**
+ * Set the transit animation time
+ *
+ * @note @p transit can not be NULL
+ *
+ * @param transit The transit object.
+ * @param duration The animation time.
+ *
+ * @ingroup Transit
+ */
+EAPI void
+elm_transit_duration_set(Elm_Transit *transit, double duration)
+{
+   ELM_TRANSIT_CHECK_OR_RETURN(transit);
+   if (transit->animator) return;
+   transit->time.duration = duration;
+}
+
+/**
+ * Get the transit animation time
+ *
+ * @note @p transit can not be NULL
+ *
+ * @param transit The transit object.
+ *
+ * @return The transit animation time.
+ *
+ * @ingroup Transit
+ */
+EAPI double 
+elm_transit_duration_get(const Elm_Transit *transit)
+{
+   ELM_TRANSIT_CHECK_OR_RETURN(transit);
+   return transit->time.duration;
+}
+
+/**
+ * Starts the transition. 
+ * Once this API is called, the transit begins to measure the time.
+ *
+ * @note @p transit can not be NULL
+ *
+ * @param transit The transit object.
+ *
+ * @ingroup Transit
+ */
+EAPI void
+elm_transit_go(Elm_Transit *transit)
+{
+   ELM_TRANSIT_CHECK_OR_RETURN(transit);
+
+   if (transit->animator)
+      ecore_animator_del(transit->animator);
+
+   transit->time.begin = ecore_loop_time_get();
+   transit->animator = ecore_animator_add(_animator_animate_cb, transit);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 //Resizing FX
 ///////////////////////////////////////////////////////////////////////////////
@@ -2496,7 +2549,7 @@
  * @code
  * char buf[PATH_MAX];
  * Eina_List *images = NULL;
- * Elm_Transit *transi = elm_transit_add(4.0);
+ * Elm_Transit *transi = elm_transit_add();
  *
  * snprintf(buf, sizeof(buf), "%s/images/icon_11.png", PACKAGE_DATA_DIR);
  * images = eina_list_append(images, eina_stringshare_add(buf));

Log:
From: Jihoon Kim <jihoon48.kim@...>
  Subject: [E-devel] [PATCH] Change the second parameter type of
  elm_slidershow_timeout_set
  
  Most of APIs related to timeout_set / get uses double type as parameter,
  but elm_slidershow uses integer type.
  
  For uniformity, the second parameter type of elm_slideshow_timeout_set
  is changed into double type.
  
  

Author:       raster
Date:         2011-01-09 21:27:15 -0800 (Sun, 09 Jan 2011)
New Revision: 56015
Trac:         http://trac.enlightenment.org/e/changeset/56015

Modified:
  trunk/TMP/st/elementary/src/bin/test_slideshow.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_slideshow.c 

Modified: trunk/TMP/st/elementary/src/bin/test_slideshow.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_slideshow.c	2011-01-10 02:40:48 UTC (rev 56014)
+++ trunk/TMP/st/elementary/src/bin/test_slideshow.c	2011-01-10 05:27:15 UTC (rev 56015)
@@ -35,7 +35,7 @@
 static void
 _mouse_in(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   elm_notify_timeout_set(data, 0);
+   elm_notify_timeout_set(data, 0.0);
    evas_object_show(data);
 }
 
@@ -43,7 +43,7 @@
 static void
 _mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   elm_notify_timeout_set(data, 3);
+   elm_notify_timeout_set(data, 3.0);
 }
 
 static void
@@ -63,25 +63,25 @@
 static void
 _start(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   elm_slideshow_timeout_set(slideshow, (int)elm_spinner_value_get(data));
+   elm_slideshow_timeout_set(slideshow, elm_spinner_value_get(data));
 
-   elm_object_disabled_set(bt_start, 1);
-   elm_object_disabled_set(bt_stop, 0);
+   elm_object_disabled_set(bt_start, EINA_TRUE);
+   elm_object_disabled_set(bt_stop, EINA_FALSE);
 }
 
 static void
 _stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   elm_slideshow_timeout_set(slideshow, 0);
-   elm_object_disabled_set(bt_start, 0);
-   elm_object_disabled_set(bt_stop, 1);
+   elm_slideshow_timeout_set(slideshow, 0.0);
+   elm_object_disabled_set(bt_start, EINA_FALSE);
+   elm_object_disabled_set(bt_stop, EINA_TRUE);
 }
 
 static void
 _spin(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    if (elm_slideshow_timeout_get(slideshow) > 0)
-     elm_slideshow_timeout_set(slideshow, (int)elm_spinner_value_get(data));
+     elm_slideshow_timeout_set(slideshow, elm_spinner_value_get(data));
 }
 
 static Evas_Object *
@@ -118,7 +118,7 @@
    evas_object_show(bg);
 
    slideshow = elm_slideshow_add(win);
-   elm_slideshow_loop_set(slideshow, 1);
+   elm_slideshow_loop_set(slideshow, EINA_TRUE);
    elm_win_resize_object_add(win, slideshow);
    evas_object_size_hint_weight_set(slideshow, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(slideshow);
@@ -139,10 +139,10 @@
    notify = elm_notify_add(win);
    elm_notify_orient_set(notify, ELM_NOTIFY_ORIENT_BOTTOM);
    elm_win_resize_object_add(win, notify);
-   elm_notify_timeout_set(notify, 3);
+   elm_notify_timeout_set(notify, 3.0);
 
    bx = elm_box_add(win);
-   elm_box_horizontal_set(bx, 1);
+   elm_box_horizontal_set(bx, EINA_TRUE);
    elm_notify_content_set(notify, bx);
    evas_object_show(bx);
 
@@ -200,7 +200,7 @@
    elm_button_label_set(bt, "Stop");
    evas_object_smart_callback_add(bt, "clicked", _stop, spin);
    elm_box_pack_end(bx, bt);
-   elm_object_disabled_set(bt, 1);
+   elm_object_disabled_set(bt, EINA_TRUE);
    evas_object_show(bt);
 
    evas_object_event_callback_add(slideshow, EVAS_CALLBACK_MOUSE_UP,

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-10 02:40:48 UTC (rev 56014)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-10 05:27:15 UTC (rev 56015)
@@ -1849,8 +1849,8 @@
    EAPI const Eina_List    *elm_slideshow_transitions_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void                elm_slideshow_transition_set(Evas_Object *obj, const char *transition) EINA_ARG_NONNULL(1);
    EAPI const char         *elm_slideshow_transition_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
-   EAPI void                elm_slideshow_timeout_set(Evas_Object *obj ,int timeout) EINA_ARG_NONNULL(1);
-   EAPI int                 elm_slideshow_timeout_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI void                elm_slideshow_timeout_set(Evas_Object *obj, double timeout) EINA_ARG_NONNULL(1);
+   EAPI double              elm_slideshow_timeout_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void                elm_slideshow_loop_set(Evas_Object *obj, Eina_Bool loop) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool           elm_slideshow_loop_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void                elm_slideshow_clear(Evas_Object *obj) EINA_ARG_NONNULL(1);

Modified: trunk/TMP/st/elementary/src/lib/elm_slideshow.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_slideshow.c	2011-01-10 02:40:48 UTC (rev 56014)
+++ trunk/TMP/st/elementary/src/lib/elm_slideshow.c	2011-01-10 05:27:15 UTC (rev 56015)
@@ -41,7 +41,7 @@
    const char *transition;
 
    Ecore_Timer *timer;
-   int timeout;
+   double timeout;
    Eina_Bool loop:1;
 
    struct {
@@ -86,9 +86,9 @@
        (!strcmp(ev->keyname, "space")))
      {
         if (wd->timeout)
-          elm_slideshow_timeout_set(obj, 0);
+          elm_slideshow_timeout_set(obj, 0.0);
         else
-          elm_slideshow_timeout_set(obj, 3);
+          elm_slideshow_timeout_set(obj, 3.0);
 
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
@@ -560,7 +560,7 @@
  * @ingroup Slideshow
  */
 EAPI void
-elm_slideshow_timeout_set(Evas_Object *obj ,int timeout)
+elm_slideshow_timeout_set(Evas_Object *obj, double timeout)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -568,7 +568,7 @@
    wd->timeout = timeout;
    if (wd->timer) ecore_timer_del(wd->timer);
    wd->timer = NULL;
-   if (timeout > 0)
+   if (timeout > 0.0)
      wd->timer = ecore_timer_add(timeout, _timer_cb, obj);
 }
 
@@ -580,12 +580,12 @@
  *
  * @ingroup Slideshow
  */
-EAPI int
+EAPI double
 elm_slideshow_timeout_get(const Evas_Object *obj)
 {
-   ELM_CHECK_WIDTYPE(obj, widtype) -1;
+   ELM_CHECK_WIDTYPE(obj, widtype) -1.0;
    Widget_Data *wd = elm_widget_data_get(obj);
-   if (!wd) return -1;
+   if (!wd) return -1.0;
    return wd->timeout;
 }

Log:
From: ChunEon Park <chuneon.park@...>
  Subject: Re: [E-devel] [PATCH] elm_transit
  
  Here is a very small patch for elm_transit 
  
  Removed an unnecessary parameter. 
  
  

Author:       raster
Date:         2011-01-09 21:34:58 -0800 (Sun, 09 Jan 2011)
New Revision: 56016
Trac:         http://trac.enlightenment.org/e/changeset/56016

Modified:
  trunk/TMP/st/elementary/src/bin/test_transit.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_transit.c 

Modified: trunk/TMP/st/elementary/src/bin/test_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-10 05:27:15 UTC (rev 56015)
+++ trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-10 05:34:58 UTC (rev 56016)
@@ -81,7 +81,7 @@
    elm_transit_effect_color_add(trans, 100, 255, 100, 255, 200, 50, 200, 50); 
 
    /* Rotation Effect */
-   elm_transit_effect_rotation_add(trans, 0.0, 135.0, EINA_FALSE);
+   elm_transit_effect_rotation_add(trans, 0.0, 135.0);
 
    elm_transit_duration_set(trans, 5.0);
    elm_transit_go(trans);

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-10 05:27:15 UTC (rev 56015)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-10 05:34:58 UTC (rev 56016)
@@ -2501,7 +2501,7 @@
    EAPI void                  *elm_transit_effect_color_add(Elm_Transit *transit, unsigned int from_r, unsigned int from_g, unsigned int from_b, unsigned int from_a, unsigned int to_r, unsigned int to_g, unsigned int to_b, unsigned int to_a);
    EAPI void                  *elm_transit_effect_fade_add(Elm_Transit *transit);
    EAPI void                  *elm_transit_effect_blend_add(Elm_Transit *transit);
-   EAPI void                  *elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw);
+   EAPI void                  *elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree);
    EAPI void                  *elm_transit_effect_image_animation_add(Elm_Transit *transit, Eina_List *images);       
 
   typedef struct _Elm_Store                      Elm_Store;

Modified: trunk/TMP/st/elementary/src/lib/elm_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-10 05:27:15 UTC (rev 56015)
+++ trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-10 05:34:58 UTC (rev 56016)
@@ -2362,7 +2362,6 @@
 
 struct _Elm_Transit_Effect_Rotation
 {
-   Eina_Bool cw;
    float from, to;
 };
 
@@ -2395,8 +2394,6 @@
         evas_map_util_points_populate_from_object_full(map, obj, 0);
         degree = rotation->from + (float)(progress * rotation->to);
 
-        if (!rotation->cw) degree *= -1;
-        
         evas_object_geometry_get(obj, &x, &y, &w, &h);
 
         half_w = (float)w * 0.5;
@@ -2411,7 +2408,7 @@
 }
 
 static void *
-_transit_effect_rotation_context_new(float from_degree, float to_degree, Eina_Bool cw)
+_transit_effect_rotation_context_new(float from_degree, float to_degree)
 {
    Elm_Transit_Effect_Rotation *rotation;
 
@@ -2420,7 +2417,6 @@
 
    rotation->from = from_degree;
    rotation->to = to_degree - from_degree;
-   rotation->cw = cw;
 
    return rotation;
 }
@@ -2440,7 +2436,6 @@
  * @param transit Transit object.
  * @param from_degree Degree when effect begins.
  * @param to_degree Degree when effect is ends.
- * @param cw Rotation direction. EINA_TRUE is clock wise.
  * @return Rotation effect context data.
  * 
  * @ingroup Transit
@@ -2452,10 +2447,10 @@
  * to run, because the order of the objects will be affected.
  */
 EAPI void *
-elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree, Eina_Bool cw)
+elm_transit_effect_rotation_add(Elm_Transit *transit, float from_degree, float to_degree)
 {
    ELM_TRANSIT_CHECK_OR_RETURN(transit, NULL);
-   void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree, cw);
+   void *effect_context = _transit_effect_rotation_context_new(from_degree, to_degree);
    
    if (!effect_context) return NULL;
    elm_transit_effect_add(transit,

Log:
From: sangho park <gouache95@...>
  Subject: [E-devel] [Patch] elm_map downloading progress info & bug fix
  
  I added one new signal, one new API and fixed seg fault bug.
  
  - signal : "download" (this signal is called when map_tile is
  downloaded)
  - API : elm_map_utils_downloading_status_get(const Evas_Object *obj, int
  *try_num, int *finish_num)
  - seg fault : if user select custom map provider, seg fault occurs,
  because
  there is no url_cb in the custom map provider
  
  you can check download progress using these signal & API.
  the example is in "test_map.c".
  
  

Author:       raster
Date:         2011-01-10 21:48:28 -0800 (Mon, 10 Jan 2011)
New Revision: 56039
Trac:         http://trac.enlightenment.org/e/changeset/56039

Modified:
  trunk/TMP/st/elementary/src/bin/test_map.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_map.c 

Modified: trunk/TMP/st/elementary/src/bin/test_map.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_map.c	2011-01-11 05:43:48 UTC (rev 56038)
+++ trunk/TMP/st/elementary/src/bin/test_map.c	2011-01-11 05:48:28 UTC (rev 56039)
@@ -55,30 +55,18 @@
 }
 
 static void
-my_map_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+my_map_load_detail(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   printf("load\n");
+   printf("load,detail\n");
 }
 
 static void
-my_map_loaded(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+my_map_loaded_detail(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   printf("loaded\n");
+   printf("loaded,detail\n");
 }
 
 static void
-my_map_load_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("load,details\n");
-}
-
-static void
-my_map_loaded_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
-   printf("loaded,details\n");
-}
-
-static void
 my_map_zoom_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    printf("zoom,start\n");
@@ -129,6 +117,14 @@
 }
 
 static void
+my_map_downloaded(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   int try_num, finish_num;
+   elm_map_utils_downloading_status_get(data, &try_num, &finish_num);
+   printf("downloaded : %d / %d\n", finish_num, try_num);
+}
+
+static void
 my_bt_show_reg(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Eina_Bool b = elm_map_paused_get(data);
@@ -445,10 +441,8 @@
         evas_object_smart_callback_add(map, "press", my_map_press, win);
         evas_object_smart_callback_add(map, "longpressed", my_map_longpressed, win);
         evas_object_smart_callback_add(map, "clicked,double", my_map_clicked_double, win);
-        evas_object_smart_callback_add(map, "load", my_map_load, win);
-        evas_object_smart_callback_add(map, "loaded", my_map_loaded, win);
-        evas_object_smart_callback_add(map, "load,details", my_map_load_details, win);
-        evas_object_smart_callback_add(map, "loaded,details", my_map_loaded_details, win);
+        evas_object_smart_callback_add(map, "load,detail", my_map_load_detail, win);
+        evas_object_smart_callback_add(map, "loaded,detail", my_map_loaded_detail, win);
         evas_object_smart_callback_add(map, "zoom,start", my_map_zoom_start, win);
         evas_object_smart_callback_add(map, "zoom,stop", my_map_zoom_stop, win);
         evas_object_smart_callback_add(map, "zoom,change", my_map_zoom_change, win);
@@ -457,6 +451,7 @@
         evas_object_smart_callback_add(map, "scroll,drag,start", my_map_drag_start, win);
         evas_object_smart_callback_add(map, "scroll,drag,stop", my_map_drag_stop, win);
         evas_object_smart_callback_add(map, "scroll", my_map_scroll, win);
+        evas_object_smart_callback_add(map, "downloaded", my_map_downloaded, map);
 
         evas_object_show(map);
 

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-11 05:43:48 UTC (rev 56038)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-11 05:48:28 UTC (rev 56039)
@@ -2071,6 +2071,7 @@
    EAPI Eina_Bool             elm_map_paused_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void                  elm_map_paused_markers_set(Evas_Object *obj, Eina_Bool paused) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool             elm_map_paused_markers_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI void                  elm_map_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num) EINA_ARG_NONNULL(1, 2, 3);
    EAPI void	              elm_map_utils_convert_coord_into_geo(const Evas_Object *obj, int x, int y, int size, double *lon, double *lat);
    EAPI void                  elm_map_utils_convert_geo_into_coord(const Evas_Object *obj, double lon, double lat, int size, int *x, int *y);
    EAPI Elm_Map_Marker       *elm_map_marker_add(Evas_Object *obj, double lon, double lat, Elm_Map_Marker_Class *clas, Elm_Map_Group_Class *clas_group, void *data) EINA_ARG_NONNULL(1, 4, 5);

Modified: trunk/TMP/st/elementary/src/lib/elm_map.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_map.c	2011-01-11 05:43:48 UTC (rev 56038)
+++ trunk/TMP/st/elementary/src/lib/elm_map.c	2011-01-11 05:48:28 UTC (rev 56039)
@@ -19,9 +19,9 @@
  *
  * clicked,double - This is called when a user has double-clicked the photo.
  *
- * load,details - Map detailed data load begins.
+ * load,detail - Map detailed data load begins.
  *
- * loaded,details - This is called when all parts of the map are loaded.
+ * loaded,detail - This is called when all parts of the map are loaded.
  *
  * zoom,start - Zoom animation started.
  *
@@ -39,6 +39,8 @@
  *
  * scroll,drag,stop - dragging the contents around has stopped
  *
+ * downloaded - This is called when map images are downloaded
+ *
  * TODO : doxygen
  */
 
@@ -70,23 +72,30 @@
 #define ZOOM_MAX 18
 
 //Zemm min is supposed to be 0
-static char *_mapnik_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom);
-static char *_osmarender_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom);
-static char *_cyclemap_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom);
-static char *_maplint_url_cb(Evas_Object *obj __UNUSED__,int x, int y, int zoom);
-static char *_module_url_cb(Evas_Object *obj,int x, int y, int zoom);
+static char *_mapnik_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_osmarender_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_cyclemap_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_maplint_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char *_module_url_cb(Evas_Object *obj, int x, int y, int zoom);
+static char * _custom1_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char * _custom2_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char * _custom3_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char * _custom4_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char * _custom5_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+static char * _custom6_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom);
+
 static Map_Sources_Tab map_sources_tab[] =
 {
      {ELM_MAP_SOURCE_MAPNIK, "Mapnik", 0, 18, _mapnik_url_cb},
      {ELM_MAP_SOURCE_OSMARENDER, "Osmarender", 0, 17, _osmarender_url_cb},
      {ELM_MAP_SOURCE_CYCLEMAP, "Cycle Map", 0, 17, _cyclemap_url_cb},
      {ELM_MAP_SOURCE_MAPLINT, "Maplint", 12, 16, _maplint_url_cb},
-     {ELM_MAP_SOURCE_CUSTOM_1, "Custom 1", 0, 18, NULL},
-     {ELM_MAP_SOURCE_CUSTOM_2, "Custom 2", 0, 18, NULL},
-     {ELM_MAP_SOURCE_CUSTOM_3, "Custom 3", 0, 18, NULL},
-     {ELM_MAP_SOURCE_CUSTOM_4, "Custom 4", 0, 18, NULL},
-     {ELM_MAP_SOURCE_CUSTOM_5, "Custom 5", 0, 18, NULL},
-     {ELM_MAP_SOURCE_CUSTOM_6, "Custom 6", 0, 18, NULL},
+     {ELM_MAP_SOURCE_CUSTOM_1, "Custom 1", 0, 18, _custom1_url_cb},
+     {ELM_MAP_SOURCE_CUSTOM_2, "Custom 2", 0, 18, _custom2_url_cb},
+     {ELM_MAP_SOURCE_CUSTOM_3, "Custom 3", 0, 18, _custom3_url_cb},
+     {ELM_MAP_SOURCE_CUSTOM_4, "Custom 4", 0, 18, _custom4_url_cb},
+     {ELM_MAP_SOURCE_CUSTOM_5, "Custom 5", 0, 18, _custom5_url_cb},
+     {ELM_MAP_SOURCE_CUSTOM_6, "Custom 6", 0, 18, _custom6_url_cb},
      {ELM_MAP_SOURCE_MODULE, "Module", 0, 18, _module_url_cb}
 };
 
@@ -252,6 +261,8 @@
    Elm_Map_Sources source;
    Mod_Api *api;
    Eina_List *s_event_list;
+   int try_num;
+   int finish_num;
 };
 
 struct _Mod_Api
@@ -300,6 +311,7 @@
 static const char SIG_ZOOM_CHANGE[] = "zoom,change";
 static const char SIG_ZOOM_START[] = "zoom,start";
 static const char SIG_ZOOM_STOP[] = "zoom,stop";
+static const char SIG_DOWNLOADED[] = "downloaded";
 static const Evas_Smart_Cb_Description _signals[] = {
   {SIG_CHANGED, ""},
   {SIG_CLICKED, ""},
@@ -314,6 +326,7 @@
   {SIG_ZOOM_CHANGE, ""},
   {SIG_ZOOM_START, ""},
   {SIG_ZOOM_STOP, ""},
+  {SIG_DOWNLOADED, ""},
   {NULL, NULL}
 };
 
@@ -713,6 +726,7 @@
 	     ecore_file_download_abort(gi->job);
 	     ecore_file_remove(gi->file);
 	     gi->job = NULL;
+	     wd->try_num--;
 	  }
 	if (gi->file)
 	  eina_stringshare_del(gi->file);
@@ -767,6 +781,10 @@
 	DBG("Download failed %s (%d) ", gi->file, status);
 	ecore_file_remove(gi->file);
      }
+   else
+     gi->wd->finish_num++;
+
+   evas_object_smart_callback_call(gi->wd->obj, SIG_DOWNLOADED, NULL);
 }
 
 static Grid *
@@ -852,14 +870,6 @@
 	  {
 	     if (gi->want)
 	       {
-		  wd->preload_num--;
-		  if (!wd->preload_num)
-		    {
-		       edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
-                                               "elm,state,busy,stop", "elm");
-		       evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL,
-						       NULL);
-		    }
 		  evas_object_hide(gi->img);
 		  //evas_object_hide(gi->txt);
 		  evas_object_image_file_set(gi->img, NULL, NULL);
@@ -872,8 +882,18 @@
 		       ecore_file_download_abort(gi->job);
 		       ecore_file_remove(gi->file);
 		       gi->job = NULL;
+                       wd->try_num--;
 		    }
 		  gi->download = EINA_FALSE;
+		  wd->preload_num--;
+		  if (!wd->preload_num)
+		    {
+		       edje_object_signal_emit(elm_smart_scroller_edje_object_get(wd->scr),
+                                               "elm,state,busy,stop", "elm");
+		       evas_object_smart_callback_call(obj, SIG_LOADED_DETAIL,
+						       NULL);
+		    }
+
 	       }
 	     else if (gi->have)
 	       {
@@ -982,8 +1002,10 @@
 			 {
 			    DBG("DOWNLOAD %s \t in %s", source, buf2);
 			    ecore_file_download(source, buf2, _tile_downloaded, NULL, gi, &(gi->job));
-			    if (!gi->job)
-			      DBG("Can't start to download %s", buf);
+                            if (!gi->job)
+                              DBG("Can't start to download %s", buf);
+                            else
+                              wd->try_num++;
 			 }
 		    }
 		  if (source) free(source);
@@ -2658,6 +2680,35 @@
 }
 
 /**
+ * Get the information of downloading status
+ *
+ * This gets the current downloading status for the map object.
+ *
+ * @param obj The map object
+ * @param try_num the number of download trying map
+ * @param finish_num the number of downloaded map
+ *
+ * @ingroup Map
+ */
+
+EAPI void 
+elm_map_utils_downloading_status_get(const Evas_Object *obj, int *try_num, int *finish_num)
+{
+   ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return EINA_FALSE;
+
+   if (try_num)
+     {
+        *try_num = wd->try_num;
+     }
+
+   if (finish_num)
+     {
+        *finish_num = wd->finish_num;
+     }
+}
+/**
  * Convert a pixel coordinate (x,y) into a geographic coordinate (longitude, latitude).
  *
  * @param obj The map object
@@ -3525,6 +3576,42 @@
 }
 
 static char *
+_custom1_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
+_custom2_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
+_custom3_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
+_custom4_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
+_custom5_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
+_custom6_url_cb(Evas_Object *obj __UNUSED__, int x, int y, int zoom)
+{
+   return strdup("");
+}
+
+static char *
 _module_url_cb(Evas_Object *obj, int x, int y, int zoom)
 {
    char *buf = NULL;

Log:
add in proper declaration of elm_transit_add with void as a param -
  and fix from ChunEon Park <chuneon.park@...> for it tin test
  app.
  
  

Author:       raster
Date:         2011-01-10 21:58:07 -0800 (Mon, 10 Jan 2011)
New Revision: 56040
Trac:         http://trac.enlightenment.org/e/changeset/56040

Modified:
  trunk/TMP/st/elementary/src/bin/test_transit.c trunk/TMP/st/elementary/src/lib/Elementary.h.in trunk/TMP/st/elementary/src/lib/elm_transit.c 

Modified: trunk/TMP/st/elementary/src/bin/test_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-11 05:48:28 UTC (rev 56039)
+++ trunk/TMP/st/elementary/src/bin/test_transit.c	2011-01-11 05:58:07 UTC (rev 56040)
@@ -505,7 +505,7 @@
    evas_object_show(win);
 
    /* Adding Transit */
-   trans = elm_transit_add(5.0);
+   trans = elm_transit_add();
    elm_transit_auto_reverse_set(trans, EINA_TRUE);
    elm_transit_tween_mode_set(trans, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
    elm_transit_repeat_times_set(trans, -1);
@@ -514,6 +514,8 @@
    elm_transit_effect_add(trans,
                           _custom_op, effect_context,
                           _custom_context_free);
+   elm_transit_duration_set(trans, 5.0);
+   elm_transit_go(trans);
 }
 
 #endif

Modified: trunk/TMP/st/elementary/src/lib/Elementary.h.in
===================================================================
--- trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-11 05:48:28 UTC (rev 56039)
+++ trunk/TMP/st/elementary/src/lib/Elementary.h.in	2011-01-11 05:58:07 UTC (rev 56040)
@@ -2482,7 +2482,7 @@
 
    typedef struct _Elm_Transit Elm_Transit;
 
-   EAPI Elm_Transit           *elm_transit_add();
+   EAPI Elm_Transit           *elm_transit_add(void);
    EAPI void                   elm_transit_del(Elm_Transit *transit) EINA_ARG_NONNULL(1);
    EAPI void                   elm_transit_effect_add(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit *transit, double progress), void *data, void (*data_free_cb)(void *data, Elm_Transit *transit)) EINA_ARG_NONNULL(1, 2);
    EAPI void                   elm_transit_effect_del(Elm_Transit *transit, void (*cb)(void *data, Elm_Transit *transit, double progress), void *data) EINA_ARG_NONNULL(1, 2);

Modified: trunk/TMP/st/elementary/src/lib/elm_transit.c
===================================================================
--- trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-11 05:48:28 UTC (rev 56039)
+++ trunk/TMP/st/elementary/src/lib/elm_transit.c	2011-01-11 05:58:07 UTC (rev 56040)
@@ -264,7 +264,7 @@
  * @ingroup Transit
  */
 EAPI Elm_Transit *
-elm_transit_add()
+elm_transit_add(void)
 {
    Elm_Transit *transit = ELM_NEW(Elm_Transit);
    if (!transit) return NULL;