X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_slider.c;h=8f571a50e6eecc64040bd6cb410e17d486fb93b5;hb=d0781ef9616e0e9fa2d7a7a5d908d66ed7549b4a;hp=0bf95d83d2affa95fdd6cf2e54ba1c5e04247f92;hpb=a80a85d71b2636371705ece3692659b41098c5ae;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 0bf95d8..8f571a5 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -16,11 +16,11 @@ struct _Widget_Data
    const char *units;
    const char *indicator;
 
-   const char *(*indicator_format_func)(double val);
-   void (*indicator_format_free)(const char *str);
+   char *(*indicator_format_func)(double val);
+   void (*indicator_format_free)(char *str);
 
-   const char *(*units_format_func)(double val);
-   void (*units_format_free)(const char *str);
+   char *(*units_format_func)(double val);
+   void (*units_format_free)(char *str);
 
    double val, val_min, val_max, val2;
    Evas_Coord size;
@@ -95,8 +95,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
    ev = event_info;
    if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
    if (elm_widget_disabled_get(obj)) return EINA_FALSE;
-   if ((!strcmp(ev->keyname, "Left"))
-       || (!strcmp(ev->keyname, "KP_Left")))
+   if ((!strcmp(ev->keyname, "Left")) ||
+       ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
      {
         if (!wd->horizontal) return EINA_FALSE;
         if (!wd->inverted) _drag_down(obj, NULL, NULL, NULL);
@@ -104,8 +104,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Right"))
-            || (!strcmp(ev->keyname, "KP_Right")))
+   else if ((!strcmp(ev->keyname, "Right")) ||
+            ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
      {
         if (!wd->horizontal) return EINA_FALSE;
         if (!wd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -113,7 +113,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
+   else if ((!strcmp(ev->keyname, "Up")) ||
+            ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
      {
         if (wd->horizontal) return EINA_FALSE;
         if (wd->inverted) _drag_up(obj, NULL, NULL, NULL);
@@ -121,7 +122,8 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty
         ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
         return EINA_TRUE;
      }
-   else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+   else if ((!strcmp(ev->keyname, "Down")) ||
+            ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
      {
         if (wd->horizontal) return EINA_FALSE;
         if (wd->inverted) _drag_down(obj, NULL, NULL, NULL);
@@ -173,7 +175,7 @@ _labels_foreach_text_set(const Eina_Hash *hash __UNUSED__, const void *key, void
 {
   Widget_Data *wd = fdata;
 
-  edje_object_part_text_set(wd->slider, key, data);
+  edje_object_part_text_escaped_set(wd->slider, key, data);
 
   return 1;
 }
@@ -189,13 +191,10 @@ _theme_hook(Evas_Object *obj)
      _elm_theme_object_set(obj, wd->slider, "slider", "horizontal", elm_widget_style_get(obj));
    else
      _elm_theme_object_set(obj, wd->slider, "slider", "vertical", elm_widget_style_get(obj));
-<<<<<<< HEAD
    if (elm_widget_disabled_get(obj))
      edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm");
    else
      edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm");
-=======
->>>>>>> remotes/origin/upstream
    if (wd->icon)
      {
         edje_object_part_swallow(wd->slider, "elm.swallow.content", wd->icon);
@@ -208,11 +207,7 @@ _theme_hook(Evas_Object *obj)
    if (wd->labels)
      {
         eina_hash_foreach(wd->labels, _labels_foreach_text_set, wd);
-<<<<<<< HEAD
-	    edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
-=======
 	edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm");
->>>>>>> remotes/origin/upstream
      }
 
    if (wd->units)
@@ -359,9 +354,9 @@ _units_set(Evas_Object *obj)
    if (!wd) return;
    if (wd->units_format_func)
      {
-        const char *buf;
+        char *buf;
         buf = wd->units_format_func(wd->val);
-        edje_object_part_text_set(wd->slider, "elm.units", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
         if (wd->units_format_free) wd->units_format_free(buf);
      }
    else if (wd->units)
@@ -369,10 +364,10 @@ _units_set(Evas_Object *obj)
         char buf[1024];
 
         snprintf(buf, sizeof(buf), wd->units, wd->val);
-        edje_object_part_text_set(wd->slider, "elm.units", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
      }
    else
-     edje_object_part_text_set(wd->slider, "elm.units", NULL);
+     edje_object_part_text_escaped_set(wd->slider, "elm.units", NULL);
 }
 
 static void
@@ -382,25 +377,24 @@ _indicator_set(Evas_Object *obj)
    if (!wd) return;
    if (wd->indicator_format_func)
      {
-        const char *buf;
+        char *buf;
         buf = wd->indicator_format_func(wd->val);
-        edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
         if (wd->indicator_format_free) wd->indicator_format_free(buf);
      }
    else if (wd->indicator)
      {
         char buf[1024];
         snprintf(buf, sizeof(buf), wd->indicator, wd->val);
-        edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+        edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
      }
    else
-     edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
+     edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
 }
 
 static void
 _drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-<<<<<<< HEAD
    Widget_Data *wd = elm_widget_data_get((Evas_Object*)data);
    if (elm_widget_disabled_get(data)) return;
    _val_fetch(data);
@@ -408,40 +402,26 @@ _drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__,
    _indicator_set(data);
    edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
    edje_object_message_signal_process(wd->slider);
-=======
-   _val_fetch(data);
-   _units_set(data);
-   _indicator_set(data);
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-<<<<<<< HEAD
    Widget_Data *wd = elm_widget_data_get((Evas_Object*)data);
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
    _val_fetch(data);
    evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
    _units_set(data);
    _indicator_set(data);
    elm_widget_scroll_freeze_push(data);
-<<<<<<< HEAD
    edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
    edje_object_message_signal_process(wd->slider);
-=======
->>>>>>> remotes/origin/upstream
 }
 
 static void
 _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
    _val_fetch(data);
    evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
    _units_set(data);
@@ -452,10 +432,7 @@ _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
 static void
 _drag_step(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
 {
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
    _val_fetch(data);
    _units_set(data);
    _indicator_set(data);
@@ -466,10 +443,7 @@ _drag_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED_
 {
    double step;
    Widget_Data *wd;
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
 
    wd = elm_widget_data_get(data);
    step = 0.05;
@@ -484,10 +458,7 @@ _drag_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE
 {
    double step;
    Widget_Data *wd;
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
 
    wd = elm_widget_data_get(data);
    step = -0.05;
@@ -504,20 +475,14 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
    Evas_Event_Mouse_Down *ev = event_info;
    Evas_Coord x, y, w, h;
    double button_x = 0.0, button_y = 0.0;
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
-=======
->>>>>>> remotes/origin/upstream
 
    wd->spacer_down = EINA_TRUE;
    wd->val2 = wd->val;
    evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
    wd->downx = ev->canvas.x - x;
    wd->downy = ev->canvas.y - y;
-<<<<<<< HEAD
    edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", &button_x, &button_y);
-=======
->>>>>>> remotes/origin/upstream
    if (wd->horizontal)
      {
         button_x = ((double)ev->canvas.x - (double)x) / (double)w;
@@ -536,11 +501,8 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
    _units_set(data);
    _indicator_set(data);
    edje_object_signal_emit(wd->slider, "elm,state,indicator,show", "elm");
-<<<<<<< HEAD
    edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
    edje_object_message_signal_process(wd->slider);
-=======
->>>>>>> remotes/origin/upstream
 }
 
 static void
@@ -548,22 +510,14 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
 {
    Widget_Data *wd = elm_widget_data_get(data);
    Evas_Event_Mouse_Move *ev = event_info;
-<<<<<<< HEAD
-   Evas_Coord x, y, w, h, d = 0;
-   double button_x = 0.0, button_y = 0.0;
-   if (elm_widget_disabled_get(data)) return;
-
-   if  (wd->spacer_down)
-     {
-=======
    Evas_Coord x, y, w, h;
    double button_x = 0.0, button_y = 0.0;
+   if (elm_widget_disabled_get(data)) return;
 
    if  (wd->spacer_down)
      {
         Evas_Coord d = 0;
-        
->>>>>>> remotes/origin/upstream
+
         evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
         if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx);
         else d = abs(ev->cur.canvas.y - y - wd->downy);
@@ -572,19 +526,11 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
              if (!wd->frozen)
                {
                   elm_widget_scroll_freeze_push(data);
-<<<<<<< HEAD
                   wd->frozen = EINA_TRUE;
                }
              ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
           }
 
-=======
-                  wd->frozen = 1;
-               }
-             ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD;
-          }
-             
->>>>>>> remotes/origin/upstream
         if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD)
           {
              if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
@@ -595,11 +541,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
              if (wd->frozen)
                {
                   elm_widget_scroll_freeze_pop(data);
-<<<<<<< HEAD
                   wd->frozen = EINA_FALSE;
-=======
-                  wd->frozen = 0;
->>>>>>> remotes/origin/upstream
                }
              edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
              elm_slider_value_set(data, wd->val2);
@@ -621,11 +563,8 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi
         _val_fetch(data);
         _units_set(data);
         _indicator_set(data);
-<<<<<<< HEAD
         edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
         edje_object_message_signal_process(wd->slider);
-=======
->>>>>>> remotes/origin/upstream
      }
 }
 
@@ -633,16 +572,10 @@ static void
 _spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Widget_Data *wd = elm_widget_data_get(data);
-<<<<<<< HEAD
    if (elm_widget_disabled_get(data)) return;
    if (!wd->spacer_down) return;
 
    wd->spacer_down = EINA_FALSE;
-=======
-
-   if (!wd->spacer_down) return;
-   if (wd->spacer_down) wd->spacer_down = EINA_FALSE;
->>>>>>> remotes/origin/upstream
    _val_fetch(data);
    evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
    _units_set(data);
@@ -650,11 +583,7 @@ _spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
    if (wd->frozen)
      {
         elm_widget_scroll_freeze_pop(data);
-<<<<<<< HEAD
         wd->frozen = EINA_FALSE;
-=======
-        wd->frozen = 0;
->>>>>>> remotes/origin/upstream
      }
    edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm");
 }
@@ -700,7 +629,7 @@ _elm_slider_label_set(Evas_Object *obj, const char *part, const char *label)
         edje_object_message_signal_process(wd->slider);
      }
 
-   edje_object_part_text_set(wd->slider, real_part, label);
+   edje_object_part_text_escaped_set(wd->slider, real_part, label);
    _sizing_eval(obj);
 }
 
@@ -709,14 +638,10 @@ _elm_slider_label_get(const Evas_Object *obj, const char *part)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) NULL;
    Widget_Data *wd = elm_widget_data_get(obj);
-<<<<<<< HEAD
-
-=======
->>>>>>> remotes/origin/upstream
    if (!wd) return NULL;
    if (!wd->labels) return NULL;
 
-   if (!part) 
+   if (!part)
      return eina_hash_find(wd->labels, "elm.text");
    return eina_hash_find(wd->labels, part);
 }
@@ -845,6 +770,41 @@ _hash_labels_free_cb(void* label)
     eina_stringshare_del(label);
 }
 
+static void
+_min_max_set(Evas_Object *obj)
+{
+   char *buf_min = NULL;
+   char *buf_max = NULL;
+
+   Widget_Data *wd = elm_widget_data_get(obj);
+   if (!wd) return;
+   if (wd->units_format_func)
+     {
+        buf_min = wd->units_format_func(wd->val_min);
+        buf_max = wd->units_format_func(wd->val_max);
+     }
+   else if (wd->units)
+     {
+        int length = strlen(wd->units);
+
+        buf_min = alloca(length + 128);
+        buf_max = alloca(length + 128);
+
+        snprintf((char*) buf_min, length + 128, wd->units, wd->val_min);
+        snprintf((char*) buf_max, length + 128, wd->units, wd->val_max);
+     }
+
+   edje_object_part_text_escaped_set(wd->slider, "elm.units.min", buf_min);
+   edje_object_part_text_escaped_set(wd->slider, "elm.units.max", buf_max);
+
+   if (wd->units_format_func && wd->units_format_free)
+     {
+        wd->units_format_free(buf_min);
+        wd->units_format_free(buf_max);
+     }
+}
+
+
 EAPI Evas_Object *
 elm_slider_add(Evas_Object *parent)
 {
@@ -908,36 +868,6 @@ elm_slider_add(Evas_Object *parent)
 }
 
 EAPI void
-elm_slider_label_set(Evas_Object *obj, const char *label)
-{
-   _elm_slider_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_slider_label_get(const Evas_Object *obj)
-{
-   return _elm_slider_label_get(obj, NULL);
-}
-
-EAPI void
-elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon)
-{
-   _content_set_hook(obj, "icon", icon);
-}
-
-EAPI Evas_Object *
-elm_slider_icon_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, "icon");
-}
-
-EAPI Evas_Object *
-elm_slider_icon_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, "icon");
-}
-
-EAPI void
 elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
@@ -983,6 +913,7 @@ elm_slider_unit_format_set(Evas_Object *obj, const char *units)
         edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm");
         edje_object_message_signal_process(wd->slider);
      }
+   _min_max_set(obj);
    _units_set(obj);
    _sizing_eval(obj);
 }
@@ -1047,6 +978,7 @@ elm_slider_min_max_set(Evas_Object *obj, double min, double max)
    wd->val_max = max;
    if (wd->val < wd->val_min) wd->val = wd->val_min;
    if (wd->val > wd->val_max) wd->val = wd->val_max;
+   _min_max_set(obj);
    _val_set(obj);
    _units_set(obj);
    _indicator_set(obj);
@@ -1074,10 +1006,7 @@ elm_slider_value_set(Evas_Object *obj, double val)
    wd->val = val;
    if (wd->val < wd->val_min) wd->val = wd->val_min;
    if (wd->val > wd->val_max) wd->val = wd->val_max;
-<<<<<<< HEAD
    edje_object_signal_emit(wd->slider, "elm,state,drag", "elm");
-=======
->>>>>>> remotes/origin/upstream
    _val_set(obj);
    _units_set(obj);
    _indicator_set(obj);
@@ -1121,7 +1050,7 @@ elm_slider_inverted_get(const Evas_Object *obj)
 }
 
 EAPI void
-elm_slider_indicator_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str))
+elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
@@ -1132,32 +1061,15 @@ elm_slider_indicator_format_function_set(Evas_Object *obj, const char *(*func)(d
 }
 
 EAPI void
-elm_slider_units_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str))
+elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
    wd->units_format_func = func;
    wd->units_format_free = free_func;
-   _indicator_set(obj);
-}
-
-EAPI void
-elm_slider_end_set(Evas_Object *obj, Evas_Object *end)
-{
-   _content_set_hook(obj, "end", end);
-}
-
-EAPI Evas_Object *
-elm_slider_end_unset(Evas_Object *obj)
-{
-   return _content_unset_hook(obj, "end");
-}
-
-EAPI Evas_Object *
-elm_slider_end_get(const Evas_Object *obj)
-{
-   return _content_get_hook(obj, "end");
+   _min_max_set(obj);
+   _units_set(obj);
 }
 
 EAPI void