From 55e263ef559915201d6461756bce13523fddf695 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 2 Jul 2012 10:13:27 +0000 Subject: [PATCH] formatting SVN revision: 73147 --- src/modules/gadman/e_mod_config.c | 181 ++++----- src/modules/gadman/e_mod_gadman.c | 626 +++++++++++++++--------------- src/modules/gadman/e_mod_main.c | 49 +-- 3 files changed, 430 insertions(+), 426 deletions(-) diff --git a/src/modules/gadman/e_mod_config.c b/src/modules/gadman/e_mod_config.c index 71639492e..433322c87 100644 --- a/src/modules/gadman/e_mod_config.c +++ b/src/modules/gadman/e_mod_config.c @@ -5,31 +5,31 @@ struct _E_Config_Dialog_Data { - Evas_Object *o_avail; //List of available gadgets - Evas_Object *o_add; //Add button - Evas_Object *o_fm; //Filemanager Object - Evas_Object *o_sf; //Filemanager Scrollframe - Evas_Object *o_btn; //Filemanager updir button - E_Color *color; //Custom Color - int bg_method; //Type of background - int anim_bg; //Anim the background - int anim_gad; //Anim the gadgets - int fmdir; //Filemanager dir (personal or system) + Evas_Object *o_avail; //List of available gadgets + Evas_Object *o_add; //Add button + Evas_Object *o_fm; //Filemanager Object + Evas_Object *o_sf; //Filemanager Scrollframe + Evas_Object *o_btn; //Filemanager updir button + E_Color *color; //Custom Color + int bg_method; //Type of background + int anim_bg; //Anim the background + int anim_gad; //Anim the gadgets + int fmdir; //Filemanager dir (personal or system) }; /* Local protos */ -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static void _fill_gadgets_list(Evas_Object *ilist); -static void _cb_add(void *data, void *data2); -static void _avail_list_cb_change(void *data, Evas_Object *obj); -static void _cb_fm_radio_change(void *data, Evas_Object *obj); -static void _cb_color_changed(void *data, Evas_Object *o); -static void _cb_fm_change(void *data, Evas_Object *obj, void *event_info); -static void _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info); -static void _cb_button_up(void *data1, void *data2); +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _fill_gadgets_list(Evas_Object *ilist); +static void _cb_add(void *data, void *data2); +static void _avail_list_cb_change(void *data, Evas_Object *obj); +static void _cb_fm_radio_change(void *data, Evas_Object *obj); +static void _cb_color_changed(void *data, Evas_Object *o); +static void _cb_fm_change(void *data, Evas_Object *obj, void *event_info); +static void _cb_fm_sel_change(void *data, Evas_Object *obj, void *event_info); +static void _cb_button_up(void *data1, void *data2); E_Config_Dialog * _config_gadman_module(E_Container *con, const char *params __UNUSED__) @@ -48,7 +48,7 @@ _config_gadman_module(E_Container *con, const char *params __UNUSED__) v->free_cfdata = _free_data; v->basic.create_widgets = _basic_create_widgets; v->basic.apply_cfdata = _basic_apply_data; - + snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", Man->module->dir); cfd = e_config_dialog_new(con, _("Gadgets Manager"), "E", "extensions/gadman", @@ -65,12 +65,12 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) cfdata = E_NEW(E_Config_Dialog_Data, 1); cfdata->bg_method = Man->conf->bg_type; - if (Man->conf->custom_bg) + if (Man->conf->custom_bg) { - if (!strstr(Man->conf->custom_bg, e_user_homedir_get())) - cfdata->fmdir = 1; + if (!strstr(Man->conf->custom_bg, e_user_homedir_get())) + cfdata->fmdir = 1; } - + cfdata->color = E_NEW(E_Color, 1); cfdata->color->r = Man->conf->color_r; cfdata->color->g = Man->conf->color_g; @@ -78,9 +78,9 @@ _create_data(E_Config_Dialog *cfd __UNUSED__) cfdata->color->a = Man->conf->color_a; cfdata->anim_bg = Man->conf->anim_bg; cfdata->anim_gad = Man->conf->anim_gad; - + e_color_update_rgb(cfdata->color); - + return cfdata; } @@ -103,7 +103,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale); o = e_widget_list_add(evas, 0, 0); - + of = e_widget_framelist_add(evas, _("Available Gadgets"), 0); //o_avail List of available gadgets @@ -120,17 +120,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf cfdata->o_add = ob; e_widget_size_min_get(ob, &mw, &mh); e_widget_framelist_object_append_full(of, ob, - 1, 1, /* fill */ - 1, 0, /* expand */ - 0.5, 0.5, /* align */ - mw, mh, /* min */ - 99999, 99999 /* max */ - ); + 1, 1, /* fill */ + 1, 0, /* expand */ + 0.5, 0.5, /* align */ + mw, mh, /* min */ + 99999, 99999 /* max */ + ); e_widget_list_object_append(o, of, 1, 1, 0.5); e_dialog_resizable_set(cfd->dia, 1); - - + e_widget_toolbook_page_append(otb, NULL, _("Add Gadget"), o, 1, 1, 1, 1, 0.5, 0.0); ft = e_widget_table_add(evas, 0); @@ -141,16 +140,16 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf //~ evas_object_smart_callback_add(ow, "changed", _cb_method_change, cfdata); e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 0, 1, 0); ow = e_widget_radio_add(evas, _("Custom Image"), BG_CUSTOM, rg); - //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", - //~ _cb_method_change, cfdata); + //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", + //~ _cb_method_change, cfdata); e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0); ow = e_widget_radio_add(evas, _("Custom Color"), BG_COLOR, rg); - //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", - //~ _cb_method_change, cfdata); + //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", + //~ _cb_method_change, cfdata); e_widget_frametable_object_append(of, ow, 0, 2, 1, 1, 1, 0, 1, 0); ow = e_widget_radio_add(evas, _("Transparent"), BG_TRANS, rg); - //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", - //~ _cb_method_change, cfdata); + //~ evas_object_smart_callback_add(cfdata->o_custom, "changed", + //~ _cb_method_change, cfdata); e_widget_frametable_object_append(of, ow, 0, 3, 1, 1, 1, 0, 1, 0); e_widget_table_object_append(ft, of, 0, 0, 1, 1, 1, 1, 1, 1); @@ -158,12 +157,12 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf of = e_widget_frametable_add(evas, _("Animations"), 0); ow = e_widget_check_add(evas, _("Background"), &(cfdata->anim_bg)); e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 0, 1, 0); - + ow = e_widget_check_add(evas, _("Gadgets"), &(cfdata->anim_gad)); e_widget_frametable_object_append(of, ow, 0, 1, 1, 1, 1, 0, 1, 0); - + e_widget_table_object_append(ft, of, 0, 1, 1, 1, 1, 1, 1, 1); - + //Custom Color of = e_widget_framelist_add(evas, _("Custom Color"), 0); ow = e_widget_color_well_add(evas, cfdata->color, 1); @@ -174,21 +173,20 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf //Background filemanager chooser of = e_widget_frametable_add(evas, _("Custom Image"), 0); rg = e_widget_radio_group_new(&(cfdata->fmdir)); - + ow = e_widget_radio_add(evas, _("Personal"), 0, rg); e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata); e_widget_frametable_object_append(of, ow, 0, 0, 1, 1, 1, 1, 0, 0); - + ow = e_widget_radio_add(evas, _("System"), 1, rg); e_widget_on_change_hook_set(ow, _cb_fm_radio_change, cfdata); e_widget_frametable_object_append(of, ow, 1, 0, 1, 1, 1, 1, 0, 0); - cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), - "widgets/up_dir", _cb_button_up, - cfdata, NULL); + cfdata->o_btn = e_widget_button_add(evas, _("Go up a Directory"), + "widgets/up_dir", _cb_button_up, + cfdata, NULL); e_widget_frametable_object_append(of, cfdata->o_btn, 0, 1, 2, 1, 1, 1, 1, 0); - if (cfdata->fmdir == 1) e_prefix_data_concat_static(path, "data/backgrounds"); else @@ -217,23 +215,23 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_fm2_icon_menu_flags_set(ow, E_FM2_MENU_NO_SHOW_HIDDEN); e_fm2_path_set(ow, path, "/"); - evas_object_smart_callback_add(ow, "selection_change", - _cb_fm_sel_change, cfdata); + evas_object_smart_callback_add(ow, "selection_change", + _cb_fm_sel_change, cfdata); evas_object_smart_callback_add(ow, "changed", _cb_fm_change, cfdata); - - cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, - e_fm2_pan_get, - e_fm2_pan_max_get, - e_fm2_pan_child_size_get); + + cfdata->o_sf = e_widget_scrollframe_pan_add(evas, ow, e_fm2_pan_set, + e_fm2_pan_get, + e_fm2_pan_max_get, + e_fm2_pan_child_size_get); e_widget_size_min_set(cfdata->o_sf, 150, 250); e_widget_frametable_object_append(of, cfdata->o_sf, 0, 2, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(ft, of, 2, 0, 1, 3, 1, 1, 1, 1); e_dialog_resizable_set(cfd->dia, 0); - + e_widget_toolbook_page_append(otb, NULL, _("Background Options"), ft, 0, 0, 0, 0, 0.5, 0.0); e_widget_toolbook_page_show(otb, 0); - + e_dialog_resizable_set(cfd->dia, 1); return otb; } @@ -258,25 +256,26 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) sel = e_fm2_selected_list_get(cfdata->o_fm); if (sel && p) { - ic = sel->data; - if (ic->file) - { - snprintf(path, sizeof(path), "%s/%s", p, ic->file); - if (Man->conf->custom_bg) - eina_stringshare_del(Man->conf->custom_bg); - Man->conf->custom_bg = eina_stringshare_add(path); - } - eina_list_free(sel); + ic = sel->data; + if (ic->file) + { + snprintf(path, sizeof(path), "%s/%s", p, ic->file); + if (Man->conf->custom_bg) + eina_stringshare_del(Man->conf->custom_bg); + Man->conf->custom_bg = eina_stringshare_add(path); + } + eina_list_free(sel); } - + gadman_gadget_edit_end(NULL, NULL, NULL, NULL); e_config_save_queue(); gadman_update_bg(); - + return 1; } + //Basic Callbacks -static void +static void _fill_gadgets_list(Evas_Object *ilist) { Eina_List *l = NULL; @@ -288,7 +287,7 @@ _fill_gadgets_list(Evas_Object *ilist) evas = evas_object_evas_get(ilist); - for (l = e_gadcon_provider_list(); l; l = l->next) + for (l = e_gadcon_provider_list(); l; l = l->next) { E_Gadcon_Client_Class *cc; Evas_Object *icon = NULL; @@ -296,7 +295,7 @@ _fill_gadgets_list(Evas_Object *ilist) if (!(cc = l->data)) continue; if (cc->func.is_site && !cc->func.is_site(E_GADCON_SITE_DESKTOP)) - continue; + continue; if (cc->func.label) lbl = cc->func.label(cc); if (!lbl) lbl = cc->name; if (cc->func.icon) icon = cc->func.icon(cc, evas); @@ -310,8 +309,8 @@ _fill_gadgets_list(Evas_Object *ilist) e_widget_ilist_thaw(ilist); } -static void -_cb_add(void *data, void *data2 __UNUSED__) +static void +_cb_add(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; Eina_List *l = NULL; @@ -319,7 +318,7 @@ _cb_add(void *data, void *data2 __UNUSED__) if (!(cfdata = data)) return; - for (i = 0, l = e_widget_ilist_items_get(cfdata->o_avail); l; l = l->next, i++) + for (i = 0, l = e_widget_ilist_items_get(cfdata->o_avail); l; l = l->next, i++) { E_Ilist_Item *item = NULL; E_Gadcon_Client_Class *cc; @@ -338,8 +337,8 @@ _cb_add(void *data, void *data2 __UNUSED__) if (l) eina_list_free(l); } -static void -_avail_list_cb_change(void *data, Evas_Object *obj __UNUSED__) +static void +_avail_list_cb_change(void *data, Evas_Object *obj __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -372,7 +371,7 @@ _cb_fm_radio_change(void *data, Evas_Object *obj __UNUSED__) e_fm2_path_set(cfdata->o_fm, path, "/"); } -static void +static void _cb_fm_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -385,27 +384,27 @@ _cb_fm_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED if (!cfdata->o_fm) return; p = e_fm2_real_path_get(cfdata->o_fm); - if (!p) return; + if (!p) return; if (strncmp(p, Man->conf->custom_bg, strlen(p))) return; len = e_user_dir_concat_static(path, "backgrounds"); - if (!strncmp(Man->conf->custom_bg, path, len)) + if (!strncmp(Man->conf->custom_bg, path, len)) p = Man->conf->custom_bg + len + 1; - else + else { - len = e_prefix_data_concat_static(path, "data/backgrounds"); - if (!strncmp(Man->conf->custom_bg, path, len)) - p = Man->conf->custom_bg + len + 1; - else - p = Man->conf->custom_bg; + len = e_prefix_data_concat_static(path, "data/backgrounds"); + if (!strncmp(Man->conf->custom_bg, path, len)) + p = Man->conf->custom_bg + len + 1; + else + p = Man->conf->custom_bg; } e_fm2_select_set(cfdata->o_fm, p, 1); e_fm2_file_show(cfdata->o_fm, p); } -static void +static void _cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -413,6 +412,7 @@ _cb_fm_sel_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN cfdata = data; e_widget_change(cfdata->o_sf); } + static void _cb_button_up(void *data1, void *data2 __UNUSED__) { @@ -424,3 +424,4 @@ _cb_button_up(void *data1, void *data2 __UNUSED__) e_fm2_parent_go(cfdata->o_fm); e_widget_scrollframe_child_pos_set(cfdata->o_sf, 0, 0); } + diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index 1c242fd0c..88eb7a362 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -4,48 +4,48 @@ #include "e_mod_config.h" /* local protos */ -static void _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu); -static void _save_widget_position(E_Gadcon_Client *gcc); -static void _apply_widget_position(E_Gadcon_Client *gcc); -static char *_get_bind_text(const char* action); -static void _on_menu_layer(E_Gadcon_Client *gcc, Gadman_Layer_Type layer); +static void _attach_menu(void *data, E_Gadcon_Client *gcc, E_Menu *menu); +static void _save_widget_position(E_Gadcon_Client *gcc); +static void _apply_widget_position(E_Gadcon_Client *gcc); +static char *_get_bind_text(const char *action); +static void _on_menu_layer(E_Gadcon_Client *gcc, Gadman_Layer_Type layer); static E_Gadcon_Client *_gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_Config_Gadcon_Client *src_cf); -static Evas_Object* _create_mover(E_Gadcon *gc); -static Evas_Object* _get_mover(E_Gadcon_Client *gcc); -static E_Gadcon* _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location * loc); +static Evas_Object *_create_mover(E_Gadcon *gc); +static Evas_Object *_get_mover(E_Gadcon_Client *gcc); +static E_Gadcon *_gadman_gadcon_new(const char *name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location *loc); -static void on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch); +static void on_shape_change(void *data, E_Container_Shape *es, E_Container_Shape_Change ch); -static void on_top(void *data, Evas_Object *o, const char *em, const char *src); -static void on_right(void *data, Evas_Object *o, const char *em, const char *src); -static void on_down(void *data, Evas_Object *o, const char *em, const char *src); -static void on_left(void *data, Evas_Object *o, const char *em, const char *src); -static void on_move(void *data, Evas_Object *o, const char *em, const char *src); +static void on_top(void *data, Evas_Object *o, const char *em, const char *src); +static void on_right(void *data, Evas_Object *o, const char *em, const char *src); +static void on_down(void *data, Evas_Object *o, const char *em, const char *src); +static void on_left(void *data, Evas_Object *o, const char *em, const char *src); +static void on_move(void *data, Evas_Object *o, const char *em, const char *src); -static void on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void on_bg_click(void *data, Evas_Object *o, const char *em, const char *src); -static void on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__, - const char *em __UNUSED__, const char *src __UNUSED__); +static void on_frame_click(void *data, Evas *e, Evas_Object *obj, void *event_info); +static void on_bg_click(void *data, Evas_Object *o, const char *em, const char *src); +static void on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__, + const char *em __UNUSED__, const char *src __UNUSED__); -static void on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_style_float(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_style_horiz(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_style_vert(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); -static void on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_style_plain(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_style_inset(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_style_float(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_style_horiz(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_style_vert(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_layer_bg(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_layer_top(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_delete(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi); +static void on_menu_add(void *data, E_Menu *m, E_Menu_Item *mi); -static int _e_gadman_client_add (void *data __UNUSED__, const E_Gadcon_Client_Class *cc); -static void _e_gadman_client_remove (void *data __UNUSED__, E_Gadcon_Client *gcc); +static int _e_gadman_client_add(void *data __UNUSED__, const E_Gadcon_Client_Class *cc); +static void _e_gadman_client_remove(void *data __UNUSED__, E_Gadcon_Client *gcc); -static void _e_gadman_handlers_add(void); -static void _e_gadman_handler_del(void); -static Eina_Bool _e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event); -static Eina_Bool _e_gadman_cb_zone_del(void *data __UNUSED__, int type __UNUSED__, void *event); +static void _e_gadman_handlers_add(void); +static void _e_gadman_handler_del(void); +static Eina_Bool _e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event); +static Eina_Bool _e_gadman_cb_zone_del(void *data __UNUSED__, int type __UNUSED__, void *event); E_Gadcon_Client *current = NULL; Manager *Man = NULL; @@ -76,25 +76,25 @@ gadman_init(E_Module *m) e_container_shape_change_callback_add(Man->container, on_shape_change, NULL); /* create and register "desktop" location */ - location = e_gadcon_location_new("Desktop", E_GADCON_SITE_DESKTOP, - _e_gadman_client_add, NULL, - _e_gadman_client_remove, NULL); + location = e_gadcon_location_new("Desktop", E_GADCON_SITE_DESKTOP, + _e_gadman_client_add, NULL, + _e_gadman_client_remove, NULL); e_gadcon_location_set_icon_name(location, "preferences-desktop"); e_gadcon_location_register(location); /* iterating through zones - and making gadmans on each */ EINA_LIST_FOREACH(Man->container->zones, l, zone) { - const char *layer_name[] = {"gadman", "gadman_top"}; - unsigned int layer; + const char *layer_name[] = {"gadman", "gadman_top"}; + unsigned int layer; - for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++) - { - E_Gadcon *gc; + for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++) + { + E_Gadcon *gc; - gc = _gadman_gadcon_new(layer_name[layer], layer, zone, location); - Man->gadcons[layer] = eina_list_append(Man->gadcons[layer], gc); - } + gc = _gadman_gadcon_new(layer_name[layer], layer, zone, location); + Man->gadcons[layer] = eina_list_append(Man->gadcons[layer], gc); + } } _e_gadman_handlers_add(); @@ -107,25 +107,25 @@ gadman_shutdown(void) unsigned int layer; _e_gadman_handler_del(); - + e_gadcon_location_unregister(location); e_container_shape_change_callback_del(Man->container, on_shape_change, NULL); for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++) { - EINA_LIST_FREE(Man->gadcons[layer], gc) - { - e_gadcon_unpopulate(gc); - e_gadcon_custom_del(gc); + EINA_LIST_FREE(Man->gadcons[layer], gc) + { + e_gadcon_unpopulate(gc); + e_gadcon_custom_del(gc); - /* free gadcons */ - e_config->gadcons = eina_list_remove(e_config->gadcons, gc); - eina_stringshare_del(gc->name); + /* free gadcons */ + e_config->gadcons = eina_list_remove(e_config->gadcons, gc); + eina_stringshare_del(gc->name); - if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog)); - } + if (gc->config_dialog) e_object_del(E_OBJECT(gc->config_dialog)); + } - evas_object_del(Man->movers[layer]); + evas_object_del(Man->movers[layer]); } if (Man->icon_name) eina_stringshare_del(Man->icon_name); @@ -151,14 +151,14 @@ gadman_populate_class(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc) EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc) { if (cf_gcc->name && cc->name && !strcmp(cf_gcc->name, cc->name) && (gc->cf->zone == gc->zone->num)) - { - EINA_LIST_FOREACH(Man->gadgets[layer], ll, gcc) - { - if ((gcc->cf) && (gcc->cf->id) && (cf_gcc->id)) - if (gcc->cf->id == cf_gcc->id) break; - } - if (!gcc) gadman_gadget_place(cf_gcc, layer, gc->zone); - } + { + EINA_LIST_FOREACH(Man->gadgets[layer], ll, gcc) + { + if ((gcc->cf) && (gcc->cf->id) && (cf_gcc->id)) + if (gcc->cf->id == cf_gcc->id) break; + } + if (!gcc) gadman_gadget_place(cf_gcc, layer, gc->zone); + } } } @@ -216,7 +216,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone /* swallow the client inside the frame */ edje_object_part_swallow(gcc->o_frame, "e.swallow.content", gcc->o_base); - evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_DOWN, + evas_object_event_callback_add(gcc->o_frame, EVAS_CALLBACK_MOUSE_DOWN, on_frame_click, gcc); /* Call the client orientation function */ @@ -236,7 +236,7 @@ gadman_gadget_place(E_Config_Gadcon_Client *cf, Gadman_Layer_Type layer, E_Zone E_Gadcon_Client * gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer) { - return _gadman_gadget_add(cc, layer, NULL); + return _gadman_gadget_add(cc, layer, NULL); } static E_Gadcon_Client * @@ -247,29 +247,29 @@ _gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_C E_Gadcon *gc; int w, h; - gc = gadman_gadcon_get(e_util_zone_current_get(e_manager_current_get()), - layer); + gc = gadman_gadcon_get(e_util_zone_current_get(e_manager_current_get()), + layer); /* Create Config_Gadcon_Client */ cf = e_gadcon_client_config_new(gc, cc->name); - if (cf) + if (cf) { - if (!src_cf) - { - cf->style = eina_stringshare_add(cc->default_style); - cf->geom.pos_x = DEFAULT_POS_X; - cf->geom.pos_y = DEFAULT_POS_Y; - cf->geom.size_w = DEFAULT_SIZE_W; - cf->geom.size_h = DEFAULT_SIZE_H; - } - else - { - cf->style = eina_stringshare_add(src_cf->style); - cf->geom.pos_x = src_cf->geom.pos_x; - cf->geom.pos_y = src_cf->geom.pos_y; - cf->geom.size_w = src_cf->geom.size_w; - cf->geom.size_h = src_cf->geom.size_h; - } + if (!src_cf) + { + cf->style = eina_stringshare_add(cc->default_style); + cf->geom.pos_x = DEFAULT_POS_X; + cf->geom.pos_y = DEFAULT_POS_Y; + cf->geom.size_w = DEFAULT_SIZE_W; + cf->geom.size_h = DEFAULT_SIZE_H; + } + else + { + cf->style = eina_stringshare_add(src_cf->style); + cf->geom.pos_x = src_cf->geom.pos_x; + cf->geom.pos_y = src_cf->geom.pos_y; + cf->geom.size_w = src_cf->geom.size_w; + cf->geom.size_h = src_cf->geom.size_h; + } } /* Place the new gadget */ @@ -281,13 +281,13 @@ _gadman_gadget_add(const E_Gadcon_Client_Class *cc, Gadman_Layer_Type layer, E_C evas_object_geometry_get(gcc->o_frame, NULL, NULL, &w, &h); if (gcc->aspect.w && gcc->aspect.h) { - if (gcc->aspect.w > gcc->aspect.h) - w = ((float)h / (float)gcc->aspect.h) * (gcc->aspect.w); - else - h = ((float)w / (float)gcc->aspect.w) * (gcc->aspect.h); - if (h < gcc->min.h) h = gcc->min.h; - if (w < gcc->min.w) w = gcc->min.w; - evas_object_resize(gcc->o_frame, w, h); + if (gcc->aspect.w > gcc->aspect.h) + w = ((float)h / (float)gcc->aspect.h) * (gcc->aspect.w); + else + h = ((float)w / (float)gcc->aspect.w) * (gcc->aspect.h); + if (h < gcc->min.h) h = gcc->min.h; + if (w < gcc->min.w) w = gcc->min.w; + evas_object_resize(gcc->o_frame, w, h); } return gcc; @@ -336,13 +336,13 @@ gadman_gadget_edit_end(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const for (layer = 0; layer < GADMAN_LAYER_COUNT; layer++) { - const Eina_List *l; - E_Gadcon *gc; + const Eina_List *l; + E_Gadcon *gc; - evas_object_hide(Man->movers[layer]); + evas_object_hide(Man->movers[layer]); - EINA_LIST_FOREACH(Man->gadcons[layer], l, gc) - gc->editing = 0; + EINA_LIST_FOREACH(Man->gadcons[layer], l, gc) + gc->editing = 0; } if (current) _save_widget_position(current); @@ -356,35 +356,35 @@ gadman_gadgets_show(void) Man->visible = 1; ecore_evas_show(Man->top_ee); - + if (Man->conf->bg_type == BG_STD) { - if (Man->conf->anim_bg) - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,show", "e"); - else - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,show,now", "e"); + if (Man->conf->anim_bg) + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,show", "e"); + else + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,show,now", "e"); } else { - if (Man->conf->anim_bg) - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,show,custom", "e"); - else - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,show,custom,now", "e"); + if (Man->conf->anim_bg) + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,show,custom", "e"); + else + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,show,custom,now", "e"); } /* Showing top gadgets */ EINA_LIST_FOREACH(Man->gadgets[GADMAN_LAYER_TOP], l, gcc) { - if (Man->conf->anim_gad) - edje_object_signal_emit(gcc->o_frame, - "e,state,visibility,show", "e"); - else - edje_object_signal_emit(gcc->o_frame, - "e,state,visibility,show,now", "e"); + if (Man->conf->anim_gad) + edje_object_signal_emit(gcc->o_frame, + "e,state,visibility,show", "e"); + else + edje_object_signal_emit(gcc->o_frame, + "e,state,visibility,show,now", "e"); } } @@ -398,32 +398,32 @@ gadman_gadgets_hide(void) if (Man->conf->bg_type == BG_STD) { - if (Man->conf->anim_bg) - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,hide", "e"); - else - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,hide", "e"); + if (Man->conf->anim_bg) + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,hide", "e"); + else + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,hide", "e"); } else { - if (Man->conf->anim_bg) - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,hide,custom", "e"); - else - edje_object_signal_emit(Man->full_bg, - "e,state,visibility,hide,custom,now", "e"); + if (Man->conf->anim_bg) + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,hide,custom", "e"); + else + edje_object_signal_emit(Man->full_bg, + "e,state,visibility,hide,custom,now", "e"); } /* Hiding top gadgets */ EINA_LIST_FOREACH(Man->gadgets[GADMAN_LAYER_TOP], l, gcc) { - if (Man->conf->anim_gad) - edje_object_signal_emit(gcc->o_frame, - "e,state,visibility,hide", "e"); - else - edje_object_signal_emit(gcc->o_frame, - "e,state,visibility,hide,now", "e"); + if (Man->conf->anim_gad) + edje_object_signal_emit(gcc->o_frame, + "e,state,visibility,hide", "e"); + else + edje_object_signal_emit(gcc->o_frame, + "e,state,visibility,hide,now", "e"); } } @@ -445,48 +445,51 @@ gadman_update_bg(void) obj = edje_object_part_swallow_get(Man->full_bg, "e.swallow.bg"); if (obj) { - edje_object_part_unswallow(Man->full_bg, obj); - evas_object_del(obj); + edje_object_part_unswallow(Man->full_bg, obj); + evas_object_del(obj); } switch (Man->conf->bg_type) { - case BG_STD: - case BG_TRANS: - break; - case BG_COLOR: - obj = evas_object_rectangle_add(Man->gc_top->evas); - evas_object_color_set(obj, Man->conf->color_r, Man->conf->color_g, - Man->conf->color_b, 200); - edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj); - break; - case BG_CUSTOM: - ext = strrchr(Man->conf->custom_bg, '.'); - if (!strcmp(ext, ".edj") || !strcmp(ext, ".EDJ")) - { - //THIS IS FOR E17 backgrounds - obj = edje_object_add(Man->gc_top->evas); - edje_object_file_set(obj, Man->conf->custom_bg, - "e/desktop/background"); - } - else - { - //THIS IS FOR A NORMAL IMAGE - obj = evas_object_image_add(Man->gc_top->evas); - evas_object_image_file_set(obj, Man->conf->custom_bg, NULL); - evas_object_image_fill_set(obj, 0, 0, Man->container->w, - Man->container->h); - } - edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj); - break; - default: - break; + case BG_STD: + case BG_TRANS: + break; + + case BG_COLOR: + obj = evas_object_rectangle_add(Man->gc_top->evas); + evas_object_color_set(obj, Man->conf->color_r, Man->conf->color_g, + Man->conf->color_b, 200); + edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj); + break; + + case BG_CUSTOM: + ext = strrchr(Man->conf->custom_bg, '.'); + if (!strcmp(ext, ".edj") || !strcmp(ext, ".EDJ")) + { + //THIS IS FOR E17 backgrounds + obj = edje_object_add(Man->gc_top->evas); + edje_object_file_set(obj, Man->conf->custom_bg, + "e/desktop/background"); + } + else + { + //THIS IS FOR A NORMAL IMAGE + obj = evas_object_image_add(Man->gc_top->evas); + evas_object_image_file_set(obj, Man->conf->custom_bg, NULL); + evas_object_image_fill_set(obj, 0, 0, Man->container->w, + Man->container->h); + } + edje_object_part_swallow(Man->full_bg, "e.swallow.bg", obj); + break; + + default: + break; } } /* Internals */ -static E_Gadcon* -_gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location * loc) +static E_Gadcon * +_gadman_gadcon_new(const char *name, Gadman_Layer_Type layer, E_Zone *zone, E_Gadcon_Location *loc) { const Eina_List *l; E_Gadcon *gc; @@ -505,10 +508,10 @@ _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Ga if (layer > GADMAN_LAYER_BG) { if (!Man->top_ee) - { - Man->top_ee = e_canvas_new(Man->container->win, 0, 0, 0, 0, 1, 1, - &(Man->top_win)); - } + { + Man->top_ee = e_canvas_new(Man->container->win, 0, 0, 0, 0, 1, 1, + &(Man->top_win)); + } if (Man->use_composite) { @@ -537,7 +540,7 @@ _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Ga "grabber", on_bg_click, NULL); edje_object_signal_callback_add(Man->full_bg, "e,action,hide,stop", "", on_hide_stop, NULL); - + evas_object_move(Man->full_bg, 0, 0); evas_object_resize(Man->full_bg, Man->width, Man->height); evas_object_show(Man->full_bg); @@ -558,7 +561,7 @@ _gadman_gadcon_new(const char* name, Gadman_Layer_Type layer, E_Zone *zone, E_Ga e_gadcon_zone_set(gc, zone); e_gadcon_util_menu_attach_func_set(gc, _attach_menu, NULL); - e_gadcon_populate_callback_set(gc, gadman_populate_class, (void*)layer); + e_gadcon_populate_callback_set(gc, gadman_populate_class, (void *)layer); gc->id = ID_GADMAN_LAYER_BASE + layer; gc->edje.o_parent = NULL; @@ -616,38 +619,38 @@ _create_mover(E_Gadcon *gc) e_theme_edje_object_set(mover, "base/theme/gadman", "e/gadman/control"); edje_object_signal_callback_add(mover, "e,action,move,start", "", - on_move, (void*)DRAG_START); + on_move, (void *)DRAG_START); edje_object_signal_callback_add(mover, "e,action,move,stop", "", - on_move, (void*)DRAG_STOP); + on_move, (void *)DRAG_STOP); edje_object_signal_callback_add(mover, "e,action,move,go", "", - on_move, (void*)DRAG_MOVE); + on_move, (void *)DRAG_MOVE); edje_object_signal_callback_add(mover, "mouse,down,3", "overlay", gadman_gadget_edit_end, NULL); edje_object_signal_callback_add(mover, "e,action,resize,left,start", "", - on_left, (void*)DRAG_START); + on_left, (void *)DRAG_START); edje_object_signal_callback_add(mover, "e,action,resize,left,stop", "", - on_left, (void*)DRAG_STOP); + on_left, (void *)DRAG_STOP); edje_object_signal_callback_add(mover, "e,action,resize,left,go", "", - on_left, (void*)DRAG_MOVE); + on_left, (void *)DRAG_MOVE); edje_object_signal_callback_add(mover, "e,action,resize,down,start", "", - on_down, (void*)DRAG_START); + on_down, (void *)DRAG_START); edje_object_signal_callback_add(mover, "e,action,resize,down,stop", "", - on_down, (void*)DRAG_STOP); + on_down, (void *)DRAG_STOP); edje_object_signal_callback_add(mover, "e,action,resize,down,go", "", - on_down, (void*)DRAG_MOVE); + on_down, (void *)DRAG_MOVE); edje_object_signal_callback_add(mover, "e,action,resize,right,start", "", - on_right, (void*)DRAG_START); + on_right, (void *)DRAG_START); edje_object_signal_callback_add(mover, "e,action,resize,right,stop", "", - on_right, (void*)DRAG_STOP); + on_right, (void *)DRAG_STOP); edje_object_signal_callback_add(mover, "e,action,resize,right,go", "", - on_right, (void*)DRAG_MOVE); + on_right, (void *)DRAG_MOVE); edje_object_signal_callback_add(mover, "e,action,resize,up,start", "", - on_top, (void*)DRAG_START); + on_top, (void *)DRAG_START); edje_object_signal_callback_add(mover, "e,action,resize,up,stop", "", - on_top, (void*)DRAG_STOP); + on_top, (void *)DRAG_STOP); edje_object_signal_callback_add(mover, "e,action,resize,up,go", "", - on_top, (void*)DRAG_MOVE); + on_top, (void *)DRAG_MOVE); evas_object_move(mover, 20, 30); evas_object_resize(mover, 100, 100); @@ -670,7 +673,7 @@ _save_widget_position(E_Gadcon_Client *gcc) evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h); current->cf->geom.pos_x = (double)x / (double)Man->width; current->cf->geom.pos_y = (double)y / (double)Man->height; - current->cf->geom.size_w = (double)w / (double)Man->width;; + current->cf->geom.size_w = (double)w / (double)Man->width; current->cf->geom.size_h = (double)h / (double)Man->height; e_config_save_queue(); @@ -702,9 +705,9 @@ _apply_widget_position(E_Gadcon_Client *gcc) if (x > (zone->x + zone->w)) x = zone->x; if (y > (zone->y + zone->h)) y = zone->y; - if ((y + h) > (zone->y + zone->h + MIN_VISIBLE_MARIGIN)) + if ((y + h) > (zone->y + zone->h + MIN_VISIBLE_MARIGIN)) h = ((zone->y + zone->h + MIN_VISIBLE_MARIGIN) - y); - if ((x + w) > (zone->x + zone->w + MIN_VISIBLE_MARIGIN)) + if ((x + w) > (zone->x + zone->w + MIN_VISIBLE_MARIGIN)) w = ((zone->x + zone->w + MIN_VISIBLE_MARIGIN) - x); evas_object_move(gcc->o_frame, x, y); @@ -734,7 +737,6 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu) e_util_menu_item_theme_icon_set(mi, "transform-scale"); e_menu_item_callback_set(mi, on_menu_edit, gcc); - /* plain / inset */ if (!gcc->cf->style) gcc->cf->style = eina_stringshare_add(E_GADCON_CLIENT_STYLE_INSET); @@ -840,12 +842,12 @@ _attach_menu(void *data __UNUSED__, E_Gadcon_Client *gcc, E_Menu *menu) } static char * -_get_bind_text(const char* action) +_get_bind_text(const char *action) { E_Binding_Key *binding; char b[256] = ""; - binding = e_bindings_key_get(action); + binding = e_bindings_key_get(action); if ((binding) && (binding->key)) { if ((binding->mod) & (E_BINDING_MODIFIER_CTRL)) @@ -891,7 +893,7 @@ on_shape_change(void *data __UNUSED__, E_Container_Shape *es, E_Container_Shape_ const Eina_List *l, *g, *ll; E_Gadcon *gc; E_Config_Gadcon_Client *cf_gcc; - E_Container *con; + E_Container *con; E_Gadcon_Client *gcc; unsigned int layer; @@ -913,7 +915,7 @@ on_shape_change(void *data __UNUSED__, E_Container_Shape *es, E_Container_Shape_ Man->gadgets[layer] = eina_list_remove(Man->gadgets[layer], gcc); if (gcc->gadcon->editing) gadman_gadget_edit_end(NULL, NULL, NULL, NULL); } - + e_gadcon_unpopulate(gc); EINA_LIST_FOREACH(gc->cf->clients, l, cf_gcc) gadman_gadget_place(cf_gcc, layer, gc->zone); @@ -963,34 +965,34 @@ _menu_style_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient) gcc->cf->orient = orient; if (gcc->client_class->func.orient) - gcc->client_class->func.orient(gcc, orient); + gcc->client_class->func.orient(gcc, orient); if (orient == E_GADCON_ORIENT_VERT) - { - w = DEFAULT_SIZE_W * Man->width; - if (w < gcc->min.w) w = gcc->min.w; - - if (gcc->aspect.w && gcc->aspect.h) - h = ((float)gcc->aspect.h / (float)gcc->aspect.w) * w; - else - { - h = DEFAULT_SIZE_H * Man->height; - if (h < gcc->min.h) h = gcc->min.h; - } - } + { + w = DEFAULT_SIZE_W * Man->width; + if (w < gcc->min.w) w = gcc->min.w; + + if (gcc->aspect.w && gcc->aspect.h) + h = ((float)gcc->aspect.h / (float)gcc->aspect.w) * w; + else + { + h = DEFAULT_SIZE_H * Man->height; + if (h < gcc->min.h) h = gcc->min.h; + } + } else - { - h = DEFAULT_SIZE_H * Man->height; - if (h < gcc->min.h) h = gcc->min.h; - - if (gcc->aspect.w && gcc->aspect.h) - w = ((float)gcc->aspect.w / (float)gcc->aspect.h) * h; - else - { - w = DEFAULT_SIZE_W * Man->width; - if (w < gcc->min.w) w = gcc->min.w; - } - } + { + h = DEFAULT_SIZE_H * Man->height; + if (h < gcc->min.h) h = gcc->min.h; + + if (gcc->aspect.w && gcc->aspect.h) + w = ((float)gcc->aspect.w / (float)gcc->aspect.h) * h; + else + { + w = DEFAULT_SIZE_W * Man->width; + if (w < gcc->min.w) w = gcc->min.w; + } + } evas_object_resize(gcc->o_frame, w, h); _save_widget_position(gcc); @@ -1014,35 +1016,35 @@ on_menu_style_vert(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) _menu_style_orient(data, E_GADCON_ORIENT_VERT); } -static void +static void _on_menu_layer(E_Gadcon_Client *gcc, Gadman_Layer_Type layer) { - const E_Gadcon_Client_Class *cc; + const E_Gadcon_Client_Class *cc; - E_Gadcon_Client *new_gcc; - E_Config_Gadcon_Client *cf; + E_Gadcon_Client *new_gcc; + E_Config_Gadcon_Client *cf; - cc = gcc->client_class; - cf = gcc->cf; - - new_gcc = _gadman_gadget_add(cc, layer, cf); - gadman_gadget_del(gcc); - current = new_gcc; - - e_config_save_queue(); + cc = gcc->client_class; + cf = gcc->cf; + + new_gcc = _gadman_gadget_add(cc, layer, cf); + gadman_gadget_del(gcc); + current = new_gcc; + + e_config_save_queue(); } static void on_menu_layer_bg(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { - _on_menu_layer(data, GADMAN_LAYER_BG); + _on_menu_layer(data, GADMAN_LAYER_BG); } static void on_menu_layer_top(void *data, E_Menu *m __UNUSED__, E_Menu_Item *mi __UNUSED__) { - _on_menu_layer(data, GADMAN_LAYER_TOP); - gadman_gadgets_show(); + _on_menu_layer(data, GADMAN_LAYER_TOP); + gadman_gadgets_show(); } static void @@ -1082,17 +1084,17 @@ on_frame_click(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void if (ev->button == 5) { - E_Menu *m; - int cx, cy, cw, ch; + E_Menu *m; + int cx, cy, cw, ch; - m = e_menu_new(); - m = e_gadcon_client_util_menu_items_append(gcc, m, 0); - gcc->menu = m; - e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); - e_menu_activate_mouse(m, - e_util_zone_current_get(e_manager_current_get()), - cx + ev->output.x, cy + ev->output.y, 1, 1, - E_MENU_POP_DIRECTION_DOWN, ev->timestamp); + m = e_menu_new(); + m = e_gadcon_client_util_menu_items_append(gcc, m, 0); + gcc->menu = m; + e_gadcon_canvas_zone_geometry_get(gcc->gadcon, &cx, &cy, &cw, &ch); + e_menu_activate_mouse(m, + e_util_zone_current_get(e_manager_current_get()), + cx + ev->output.x, cy + ev->output.y, 1, 1, + E_MENU_POP_DIRECTION_DOWN, ev->timestamp); } } @@ -1100,8 +1102,8 @@ static void on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const char *src __UNUSED__) { static int ox, oy, ow, oh; //Object coord - static int dy; //Mouse offset - int mx, my; //Mouse coord + static int dy; //Mouse offset + int mx, my; //Mouse coord int action = (int)(long)data; Evas_Object *mover; @@ -1109,15 +1111,15 @@ on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const c if (action == DRAG_START) { - current->resizing = 1; + current->resizing = 1; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); evas_object_geometry_get(mover, &ox, &oy, &ow, &oh); - dy = my - oy; + dy = my - oy; } else if (action == DRAG_STOP) { - current->resizing = 0; - dy = 0; + current->resizing = 0; + dy = 0; _save_widget_position(current); } else if ((action == DRAG_MOVE) && current->resizing) @@ -1129,16 +1131,16 @@ on_top(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const c h = oy + oh + dy - my; if (h < current->min.h) - { - my -= current->min.h - h; - h = current->min.h; - } + { + my -= current->min.h - h; + h = current->min.h; + } /* don't go out of the screen */ - if (my < dy) - { - h += my - dy; - my = dy; - } + if (my < dy) + { + h += my - dy; + my = dy; + } evas_object_resize(mover, ow, h); evas_object_move(mover, ox, my - dy); @@ -1153,8 +1155,8 @@ on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord - static int dx; //Mouse offset - int mx, my; //Mouse coord + static int dx; //Mouse offset + int mx, my; //Mouse coord int action; mover = _get_mover(current); @@ -1162,15 +1164,15 @@ on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const action = (int)(long)data; if (action == DRAG_START) { - current->resizing = 1; + current->resizing = 1; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); evas_object_geometry_get(mover, &ox, &oy, &ow, &oh); - dx = mx - ow; + dx = mx - ow; } else if (action == DRAG_STOP) { - current->resizing = 0; - dx = 0; + current->resizing = 0; + dx = 0; _save_widget_position(current); } else if ((action == DRAG_MOVE) && current->resizing) @@ -1182,7 +1184,7 @@ on_right(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const if (w < current->min.w) w = current->min.w; /* don't go out of the screen */ - if (w > (Man->width - ox)) w = Man->width - ox; + if (w > (Man->width - ox)) w = Man->width - ox; evas_object_resize(mover, w, oh); evas_object_resize(current->o_frame, w, oh); @@ -1194,8 +1196,8 @@ on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord - static int dy; //Mouse offset - int mx, my; //Mouse coord + static int dy; //Mouse offset + int mx, my; //Mouse coord int action; action = (int)(long)data; @@ -1203,15 +1205,15 @@ on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const if (action == DRAG_START) { - current->resizing = 1; + current->resizing = 1; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); evas_object_geometry_get(mover, &ox, &oy, &ow, &oh); - dy = my - oh; + dy = my - oh; } else if (action == DRAG_STOP) { - current->resizing = 0; - dy = 0; + current->resizing = 0; + dy = 0; _save_widget_position(current); } else if ((action == DRAG_MOVE) && current->resizing) @@ -1223,7 +1225,7 @@ on_down(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const if (h < current->min.h) h = current->min.h; /* don't go out of the screen */ - if (h > (Man->height - oy)) h = Man->height - oy; + if (h > (Man->height - oy)) h = Man->height - oy; evas_object_resize(mover, ow, h); evas_object_resize(current->o_frame, ow, h); @@ -1235,8 +1237,8 @@ on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const { Evas_Object *mover; static int ox, oy, ow, oh; //Object coord - static int dx; //Mouse offset - int mx, my; //Mouse coord + static int dx; //Mouse offset + int mx, my; //Mouse coord int action; action = (int)(long)data; @@ -1244,15 +1246,15 @@ on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const if (action == DRAG_START) { - current->resizing = 1; + current->resizing = 1; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); evas_object_geometry_get(mover, &ox, &oy, &ow, &oh); - dx = mx - ox; + dx = mx - ox; } else if (action == DRAG_STOP) { - current->resizing = 0; - dx = 0; + current->resizing = 0; + dx = 0; _save_widget_position(current); } else if ((action == DRAG_MOVE) && current->resizing) @@ -1264,16 +1266,16 @@ on_left(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const w = ox + ow + dx - mx; if (w < current->min.w) - { - mx -= current->min.w - w; - w = current->min.w; - } + { + mx -= current->min.w - w; + w = current->min.w; + } /* don't go out of the screen */ - if (mx < dx) - { - w += mx - dx; - mx = dx; - } + if (mx < dx) + { + w += mx - dx; + mx = dx; + } evas_object_resize(mover, w, oh); evas_object_move(mover, mx - dx, oy); @@ -1290,7 +1292,7 @@ on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const static int dx, dy; //Offset of mouse pointer inside the mover static int ox, oy; //Starting object position static int ow, oh; //Starting object size - int mx, my; //Mouse coord + int mx, my; //Mouse coord int action; action = (int)(long)data; @@ -1299,7 +1301,7 @@ on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const /* DRAG_START */ if (action == DRAG_START) { - current->moving = 1; + current->moving = 1; evas_pointer_output_xy_get(current->gadcon->evas, &mx, &my); evas_object_geometry_get(mover, &ox, &oy, &ow, &oh); @@ -1325,7 +1327,7 @@ on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const dst_zone = e_container_zone_at_point_get(e_container_current_get(e_manager_current_get()), gx, gy); if (dst_zone && (current->gadcon->zone != dst_zone)) { - unsigned int layer = current->gadcon->id - ID_GADMAN_LAYER_BASE; + unsigned int layer = current->gadcon->id - ID_GADMAN_LAYER_BASE; cf = current->cf; current->gadcon->cf->clients = eina_list_remove(current->gadcon->cf->clients, cf); @@ -1357,7 +1359,7 @@ on_move(void *data, Evas_Object *o __UNUSED__, const char *em __UNUSED__, const if (y < 0) y = 0; if (y > (Man->height - oh)) y = Man->height - oh; - evas_object_move(current->o_frame, x , y); + evas_object_move(current->o_frame, x, y); evas_object_move(mover, x, y); evas_object_raise(current->o_frame); evas_object_raise(mover); @@ -1376,30 +1378,30 @@ on_hide_stop(void *data __UNUSED__, Evas_Object *o __UNUSED__, const char *em __ ecore_evas_hide(Man->top_ee); } -static int +static int _e_gadman_client_add(void *data __UNUSED__, const E_Gadcon_Client_Class *cc) { return !!gadman_gadget_add(cc, GADMAN_LAYER_BG); } -static void +static void _e_gadman_client_remove(void *data __UNUSED__, E_Gadcon_Client *gcc) { gadman_gadget_del(gcc); } -static void -_e_gadman_handlers_add(void) +static void +_e_gadman_handlers_add(void) { - _gadman_hdls = - eina_list_append(_gadman_hdls, - ecore_event_handler_add(E_EVENT_ZONE_ADD, - _e_gadman_cb_zone_add, + _gadman_hdls = + eina_list_append(_gadman_hdls, + ecore_event_handler_add(E_EVENT_ZONE_ADD, + _e_gadman_cb_zone_add, NULL)); - _gadman_hdls = - eina_list_append(_gadman_hdls, - ecore_event_handler_add(E_EVENT_ZONE_DEL, - _e_gadman_cb_zone_del, + _gadman_hdls = + eina_list_append(_gadman_hdls, + ecore_event_handler_add(E_EVENT_ZONE_DEL, + _e_gadman_cb_zone_del, NULL)); } @@ -1414,10 +1416,10 @@ _e_gadman_handler_del(void) } static Eina_Bool -_e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Zone_Add *ev; - E_Zone* zone; + E_Zone *zone; E_Gadcon *gc; Eina_List *l; unsigned int layer; @@ -1431,7 +1433,7 @@ _e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event) if (gc->zone == zone) return ECORE_CALLBACK_PASS_ON; } - // Not exist, then add + // Not exist, then add /* iterating through zones - and making gadmans on each */ const char *layer_name[] = {"gadman", "gadman_top"}; @@ -1447,10 +1449,10 @@ _e_gadman_cb_zone_add(void *data __UNUSED__, int type __UNUSED__, void *event) } static Eina_Bool -_e_gadman_cb_zone_del(void *data __UNUSED__, int type __UNUSED__, void *event) +_e_gadman_cb_zone_del(void *data __UNUSED__, int type __UNUSED__, void *event) { E_Event_Zone_Del *ev; - E_Zone* zone; + E_Zone *zone; Eina_List *l, *ll; E_Gadcon *gc; E_Gadcon_Client *gcc; diff --git a/src/modules/gadman/e_mod_main.c b/src/modules/gadman/e_mod_main.c index 7cde5b41d..785a4b7b1 100644 --- a/src/modules/gadman/e_mod_main.c +++ b/src/modules/gadman/e_mod_main.c @@ -9,7 +9,7 @@ static void _gadman_maug_add(void *data, E_Menu *m); static void _gadman_action_cb(E_Object *obj, const char *params); /* public module routines. all modules must have these */ -EAPI E_Module_Api e_modapi = +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Gadman" @@ -22,13 +22,13 @@ e_modapi_init(E_Module *m) /* Set up a new configuration panel */ snprintf(buf, sizeof(buf), "%s/e-module-gadman.edj", m->dir); - e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, + e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "preferences-extensions"); - e_configure_registry_item_add("extensions/gadman", 150, _("Gadgets"), NULL, + e_configure_registry_item_add("extensions/gadman", 150, _("Gadgets"), NULL, buf, _config_gadman_module); /* Set this module to be loaded after all other modules, or we don't see - modules loaded after this */ + modules loaded after this */ e_module_priority_set(m, 100); gadman_init(m); @@ -47,19 +47,19 @@ e_modapi_init(E_Module *m) E_CONFIG_VAL(D, T, anim_bg, INT); E_CONFIG_VAL(D, T, anim_gad, INT); E_CONFIG_VAL(D, T, custom_bg, STR); - + Man->conf = e_config_domain_load("module.gadman", Man->conf_edd); if (!Man->conf) { - Man->conf = E_NEW(Config, 1); - Man->conf->bg_type = 0; - Man->conf->color_r = 255; - Man->conf->color_g = 255; - Man->conf->color_b = 255; - Man->conf->color_a = 255; - Man->conf->anim_bg = 1; - Man->conf->anim_gad = 1; - Man->conf->custom_bg = NULL; + Man->conf = E_NEW(Config, 1); + Man->conf->bg_type = 0; + Man->conf->color_r = 255; + Man->conf->color_g = 255; + Man->conf->color_b = 255; + Man->conf->color_a = 255; + Man->conf->anim_bg = 1; + Man->conf->anim_gad = 1; + Man->conf->custom_bg = NULL; } E_CONFIG_LIMIT(Man->conf->bg_type, 0, 5); E_CONFIG_LIMIT(Man->conf->color_r, 0, 255); @@ -72,17 +72,17 @@ e_modapi_init(E_Module *m) /* Menu augmentation */ Man->icon_name = eina_stringshare_add(buf); Man->maug = NULL; - Man->maug = + Man->maug = e_int_menus_menu_augmentation_add_sorted - ("config/1", _("Gadgets"), _gadman_maug_add, (void *)Man->icon_name, - NULL, NULL); + ("config/1", _("Gadgets"), _gadman_maug_add, (void *)Man->icon_name, + NULL, NULL); /* Create toggle action */ Man->action = e_action_add("gadman_toggle"); if (Man->action) { - Man->action->func.go = _gadman_action_cb; - e_action_predef_name_set(_("Gadgets"), _("Show/hide gadgets"), - "gadman_toggle", NULL, NULL, 0); + Man->action->func.go = _gadman_action_cb; + e_action_predef_name_set(_("Gadgets"), _("Show/hide gadgets"), + "gadman_toggle", NULL, NULL, 0); } gadman_update_bg(); @@ -106,9 +106,9 @@ e_modapi_shutdown(E_Module *m __UNUSED__) } if (Man->action) { - e_action_predef_name_del(_("Gadgets"), _("Show/hide gadgets")); - e_action_del("gadman_toggle"); - Man->action = NULL; + e_action_predef_name_del(_("Gadgets"), _("Show/hide gadgets")); + e_action_del("gadman_toggle"); + Man->action = NULL; } E_CONFIG_DD_FREE(Man->conf_edd); @@ -124,7 +124,7 @@ e_modapi_save(E_Module *m __UNUSED__) return 1; } -static void +static void _gadman_maug_cb(void *data __UNUSED__, E_Menu *m, E_Menu_Item *mi __UNUSED__) { e_configure_registry_call("extensions/gadman", m->zone->container, NULL); @@ -146,3 +146,4 @@ _gadman_action_cb(E_Object *obj __UNUSED__, const char *params __UNUSED__) { gadman_gadgets_toggle(); } +