[copypaste module] fixed ext_mod reference bug and indentations

diff --git a/src/modules/ctxpopup_copypasteUI/copypaste.c b/src/modules/ctxpopup_copypasteUI/copypaste.c
index 74d7bd0..340af36 100644 (file)
--- a/src/modules/ctxpopup_copypasteUI/copypaste.c
+++ b/src/modules/ctxpopup_copypasteUI/copypaste.c
@@ -3,6 +3,7 @@
 #include "elm_priv.h"
 
 Elm_Entry_Extension_data *ext_mod;
+static int _mod_hook_count = 0;
 
 typedef struct _Elm_Entry_Context_Menu_Item Elm_Entry_Context_Menu_Item;
 struct _Elm_Entry_Context_Menu_Item
@@ -22,17 +23,17 @@ _ctxpopup_position(Evas_Object *obj)
    Evas_Coord cx, cy, cw, ch, x, y, mw, mh;
    evas_object_geometry_get(ext_mod->ent, &x, &y, NULL, NULL);
    edje_object_part_text_cursor_geometry_get(ext_mod->ent, "elm.text",
-                                            &cx, &cy, &cw, &ch);
+                                             &cx, &cy, &cw, &ch);
    evas_object_size_hint_min_get(ext_mod->popup, &mw, &mh);
    if (cw < mw)
      {
-       cx += (cw - mw) / 2;
-       cw = mw;
+        cx += (cw - mw) / 2;
+        cw = mw;
      }
    if (ch < mh)
      {
-       cy += (ch - mh) / 2;
-       ch = mh;
+        cy += (ch - mh) / 2;
+        ch = mh;
      }
    evas_object_move(ext_mod->popup, x + cx, y + cy);
    evas_object_resize(ext_mod->popup, cw, ch);
@@ -55,47 +56,47 @@ _select(void *data, Evas_Object *obj, void *event_info)
 static void
 _paste(void *data, Evas_Object *obj, void *event_info)
 {
-       ext_mod->paste(data,obj,event_info);
-       evas_object_hide(obj);
+   ext_mod->paste(data,obj,event_info);
+   evas_object_hide(obj);
 }
 
 static void
 _cut(void *data, Evas_Object *obj, void *event_info)
 {
-       ext_mod->cut(data,obj,event_info);
-       evas_object_hide(obj);
-       elm_object_scroll_freeze_pop(ext_mod->popup);
+   ext_mod->cut(data,obj,event_info);
+   evas_object_hide(obj);
+   elm_object_scroll_freeze_pop(ext_mod->popup);
 }
 
 static void
 _copy(void *data, Evas_Object *obj, void *event_info)
 {
-       ext_mod->copy(data,obj,event_info);
-       evas_object_hide(obj);
-       elm_object_scroll_freeze_pop(ext_mod->popup);
+   ext_mod->copy(data,obj,event_info);
+   evas_object_hide(obj);
+   elm_object_scroll_freeze_pop(ext_mod->popup);
 }
 
 static void
 _cancel(void *data, Evas_Object *obj, void *event_info)
 {
-       ext_mod->cancel(data,obj,event_info);
-       evas_object_hide(obj);
-       elm_object_scroll_freeze_pop(ext_mod->popup);
+   ext_mod->cancel(data,obj,event_info);
+   evas_object_hide(obj);
+   elm_object_scroll_freeze_pop(ext_mod->popup);
 }
 
 static void
 _clipboard_menu(void *data, Evas_Object *obj, void *event_info)
 {
-       // start for cbhm
-       ecore_x_selection_secondary_set(elm_win_xwindow_get(obj), "",1);
-       ext_mod->cnpinit(data,obj,event_info);
-       elm_cbhm_helper_init(obj);
-       if (ext_mod->textonly)
-               elm_cbhm_send_raw_data("show0");
-       else
-               elm_cbhm_send_raw_data("show1");
-       evas_object_hide(obj);
-       // end for cbhm
+   // start for cbhm
+   ecore_x_selection_secondary_set(elm_win_xwindow_get(obj), "",1);
+   ext_mod->cnpinit(data,obj,event_info);
+   elm_cbhm_helper_init(obj);
+   if (ext_mod->textonly)
+      elm_cbhm_send_raw_data("show0");
+   else
+      elm_cbhm_send_raw_data("show1");
+   evas_object_hide(obj);
+   // end for cbhm
 }
 
 static void
@@ -104,8 +105,8 @@ _item_clicked(void *data, Evas_Object *obj, void *event_info)
    Elm_Entry_Context_Menu_Item *it = data;
    Evas_Object *obj2 = it->obj;
 
-       if (it->func) it->func(it->data, obj2, NULL);
-       evas_object_hide(obj);
+   if (it->func) it->func(it->data, obj2, NULL);
+   evas_object_hide(obj);
 }
 
 // module api funcs needed
@@ -125,146 +126,152 @@ elm_modapi_shutdown(void *m)
 EAPI void
 obj_hook(Evas_Object *obj)
 {
-       if(!ext_mod)
-               {
-                       ext_mod = ELM_NEW(Elm_Entry_Extension_data);
-               elm_entry_extension_module_data_get(obj,ext_mod);
-               }
+   _mod_hook_count++;
+
+   if(!ext_mod)
+     {
+        ext_mod = ELM_NEW(Elm_Entry_Extension_data);
+        elm_entry_extension_module_data_get(obj,ext_mod);
+     }
 }
 
 EAPI void
 obj_unhook(Evas_Object *obj)
 {
+   _mod_hook_count--;
+
+   if(_mod_hook_count > 0) return;
+
    if(ext_mod)
-               {
-                       free(ext_mod);
-                       ext_mod = NULL;
-       }
+     {
+        free(ext_mod);
+        ext_mod = NULL;
+     }
 }
 
 EAPI void
 obj_longpress(Evas_Object *obj)
 {      
-       if(!ext_mod) return;
-       Evas_Object *top;
-       const Eina_List *l;
-       const Elm_Entry_Context_Menu_Item *it;
-       const char *context_menu_orientation;
-       char buf[255];
-       Evas_Object* icon;
+   if(!ext_mod) return;
+   Evas_Object *top;
+   const Eina_List *l;
+   const Elm_Entry_Context_Menu_Item *it;
+   const char *context_menu_orientation;
+   char buf[255];
+   Evas_Object* icon;
 
-       /*update*/
-       elm_entry_extension_module_data_get(obj,ext_mod);
-       if (ext_mod->context_menu)
-       {
-               if (ext_mod->popup) evas_object_del(ext_mod->popup);
-//             else elm_widget_scroll_freeze_push(obj);
-               top = elm_widget_top_get(obj);
-               if(top)
-                       ext_mod->popup = elm_ctxpopup_add(top);
-               /*currently below theme not used,when guideline comes a new theme can be created if required*/
-               elm_object_style_set(ext_mod->popup,"extended/entry");
-               context_menu_orientation = edje_object_data_get
-               (ext_mod->ent, "context_menu_orientation");
-               if ((context_menu_orientation) &&
-               (!strcmp(context_menu_orientation, "horizontal")))
-               elm_ctxpopup_horizontal_set(ext_mod->popup, EINA_TRUE);
+   /*update*/
+   elm_entry_extension_module_data_get(obj,ext_mod);
+   if (ext_mod->context_menu)
+     {
+        if (ext_mod->popup) evas_object_del(ext_mod->popup);
+        //else elm_widget_scroll_freeze_push(obj);
+        top = elm_widget_top_get(obj);
+        if(top)
+           ext_mod->popup = elm_ctxpopup_add(top);
+        /*currently below theme not used,when guideline comes a new theme can be created if required*/
+        elm_object_style_set(ext_mod->popup,"extended/entry");
+        context_menu_orientation = edje_object_data_get
+           (ext_mod->ent, "context_menu_orientation");
+        if ((context_menu_orientation) &&
+            (!strcmp(context_menu_orientation, "horizontal")))
+           elm_ctxpopup_horizontal_set(ext_mod->popup, EINA_TRUE);
 
-               elm_widget_sub_object_add(obj, ext_mod->popup);
-               if (!ext_mod->selmode)
-               {       
-                       if (!ext_mod->password)
-                       {
-                               if (!elm_entry_is_empty(obj))
-                               {
-                                       elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
-                                       elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
-                               }
-                       }
-                       if (1) // need way to detect if someone has a selection
-                               {
-                                       if (ext_mod->editable)
-                                               elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
-                               }
-       //              elm_ctxpopup_item_append(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
-       // start for cbhm
-                       if ((!ext_mod->password) && (ext_mod->editable))
-                       {
-                               icon = elm_icon_add(ext_mod->popup);
-                               snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
-                               elm_icon_file_set(icon, buf, NULL);
-                               elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
-                               //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
-                       }
-       // end for cbhm
-               }
-               else
-               {
-                         if (!ext_mod->password)
-                               {
-                                       if (ext_mod->have_selection)
-                                               {
-                                                       elm_ctxpopup_item_append(ext_mod->popup, "Copy", NULL, _copy, obj );
-                                                       if (ext_mod->editable)
-                                                               elm_ctxpopup_item_append(ext_mod->popup, "Cut", NULL, _cut, obj );                                                      
-                                                       if (ext_mod->editable)
-                                                               elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
-                                               }
-                                       else
-                                               {
-                                                       _cancel(obj,ext_mod->popup,NULL);               
-                                                       if (!elm_entry_is_empty(obj))
-                                                       {
-                                                               elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
-                                                               elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
-                                                       }
-                                                       if (1) // need way to detect if someone has a selection
-                                                               {
-                                                                       if (ext_mod->editable)
-                                                                               elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
-                                                               }
-                                               }
-       // start for cbhm
-                                       if (ext_mod->editable)
-                                       {
-                                               icon = elm_icon_add(ext_mod->popup);
-                                               snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
-                                               elm_icon_file_set(icon, buf, NULL);
-                                               elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
-                                               //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
-                                       }
-       // end for cbhm
-                               }
-               }
-               EINA_LIST_FOREACH(ext_mod->items, l, it)
-               {
-                       elm_ctxpopup_item_append(ext_mod->popup, it->label, NULL, _item_clicked, it );
-               }
-               if (ext_mod->popup)
-                       {
-                               elm_object_scroll_freeze_push(ext_mod->popup);
-                               _ctxpopup_position(obj);
-                               evas_object_show(ext_mod->popup);                 
-                       }
-               }
-       ext_mod->longpress_timer = NULL;
-       }
+        elm_widget_sub_object_add(obj, ext_mod->popup);
+        if (!ext_mod->selmode)
+          {
+             if (!ext_mod->password)
+               {
+                  if (!elm_entry_is_empty(obj))
+                    {
+                       elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
+                       elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
+                    }
+               }
+             if (1) // need way to detect if someone has a selection
+               {
+                  if (ext_mod->editable)
+                     elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+               }
+             //elm_ctxpopup_item_append(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
+             // start for cbhm
+             if ((!ext_mod->password) && (ext_mod->editable))
+               {
+                  icon = elm_icon_add(ext_mod->popup);
+                  snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
+                  elm_icon_file_set(icon, buf, NULL);
+                  elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+                  //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
+               }
+             // end for cbhm
+          }
+        else
+          {
+             if (!ext_mod->password)
+               {
+                  if (ext_mod->have_selection)
+                    {
+                       elm_ctxpopup_item_append(ext_mod->popup, "Copy", NULL, _copy, obj );
+                       if (ext_mod->editable)
+                          elm_ctxpopup_item_append(ext_mod->popup, "Cut", NULL, _cut, obj );
+                       if (ext_mod->editable)
+                          elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+                    }
+                  else
+                    {
+                       _cancel(obj,ext_mod->popup,NULL);
+                       if (!elm_entry_is_empty(obj))
+                         {
+                            elm_ctxpopup_item_append(ext_mod->popup, "Select", NULL, _select, obj );
+                            elm_ctxpopup_item_append(ext_mod->popup, "Select All", NULL, _select_all, obj );
+                         }
+                       if (1) // need way to detect if someone has a selection
+                         {
+                            if (ext_mod->editable)
+                               elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
+                         }
+                    }
+                  // start for cbhm
+                  if (ext_mod->editable)
+                    {
+                       icon = elm_icon_add(ext_mod->popup);
+                       snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
+                       elm_icon_file_set(icon, buf, NULL);
+                       elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+                       //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
+                    }
+                  // end for cbhm
+               }
+          }
+        EINA_LIST_FOREACH(ext_mod->items, l, it)
+          {
+             elm_ctxpopup_item_append(ext_mod->popup, it->label, NULL, _item_clicked, it );
+          }
+        if (ext_mod->popup)
+          {
+             elm_object_scroll_freeze_push(ext_mod->popup);
+             _ctxpopup_position(obj);
+             evas_object_show(ext_mod->popup);
+          }
+     }
+   ext_mod->longpress_timer = NULL;
+}
 
 EAPI void
 obj_mouseup(Evas_Object *obj)
 {
-       if (!obj || !ext_mod) {
-               return;
-       }
+   if (!obj || !ext_mod) {
+        return;
+   }
 
-/*update*/
-       elm_entry_extension_module_data_get(obj,ext_mod);
+   /*update*/
+   elm_entry_extension_module_data_get(obj,ext_mod);
    if (ext_mod->longpress_timer)
      {    
-               if (ext_mod->have_selection )
-                       {                               
-                               _cancel(obj,ext_mod->popup,NULL);
-                       }
+        if (ext_mod->have_selection )
+          {
+             _cancel(obj,ext_mod->popup,NULL);
+          }
      }     
 }
 
@@ -272,12 +279,12 @@ obj_mouseup(Evas_Object *obj)
 EAPI void
 obj_hidemenu(Evas_Object *obj)
 {
-       if (!obj || !ext_mod) {
-               return;
-       }
+   if (!obj || !ext_mod) {
+        return;
+   }
 
-       evas_object_hide(ext_mod->popup);
-//     if (ext_mod->popup) evas_object_del(ext_mod->popup);
+   evas_object_hide(ext_mod->popup);
+   // if (ext_mod->popup) evas_object_del(ext_mod->popup);
 }