diff --git a/src/modules/conf_keybindings/e_int_config_acpibindings.c b/src/modules/conf_keybindings/e_int_config_acpibindings.c index ba6ab9089..ad064a0c4 100644 --- a/src/modules/conf_keybindings/e_int_config_acpibindings.c +++ b/src/modules/conf_keybindings/e_int_config_acpibindings.c @@ -9,24 +9,24 @@ /* local config structure */ struct _E_Config_Dialog_Data { - Eina_List *bindings; - Evas_Object *o_bindings, *o_actions, *o_params; - Evas_Object *o_add, *o_del; - const char *bindex; + Eina_List *bindings; + Evas_Object *o_bindings, *o_actions, *o_params; + Evas_Object *o_add, *o_del; + const char *bindex; E_Config_Dialog *cfd; }; /* local function prototypes */ -static void *_create_data(E_Config_Dialog *cfd); -static void _fill_data(E_Config_Dialog_Data *cfdata); -static void _free_data(E_Config_Dialog *cfd __UNUSED__, - E_Config_Dialog_Data *cfdata); -static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, - E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create(E_Config_Dialog *cfd, - Evas *evas, - E_Config_Dialog_Data *cfdata); +static void *_create_data(E_Config_Dialog *cfd); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void _free_data(E_Config_Dialog *cfd __UNUSED__, + E_Config_Dialog_Data *cfdata); +static int _basic_apply(E_Config_Dialog *cfd __UNUSED__, + E_Config_Dialog_Data *cfdata); +static Evas_Object *_basic_create(E_Config_Dialog *cfd, + Evas *evas, + E_Config_Dialog_Data *cfdata); static void _fill_bindings(E_Config_Dialog_Data *cfdata); static void _fill_actions(E_Config_Dialog_Data *cfdata); static E_Config_Binding_Acpi *_selected_binding_get(E_Config_Dialog_Data *cfdata); @@ -34,18 +34,18 @@ static E_Action_Description *_selected_action_get(E_Config_Dialog_Data *cfdata) static const char *_binding_label_get(E_Config_Binding_Acpi *bind); static void _cb_bindings_changed(void *data); static void _cb_actions_changed(void *data); -static void _cb_entry_changed(void *data, +static void _cb_entry_changed(void *data, void *data2 __UNUSED__); -static void _cb_add_binding(void *data, +static void _cb_add_binding(void *data, void *data2 __UNUSED__); -static void _cb_del_binding(void *data, +static void _cb_del_binding(void *data, void *data2 __UNUSED__); -static Eina_Bool _cb_grab_key_down(void *data, +static Eina_Bool _cb_grab_key_down(void *data, int type __UNUSED__, - void *event); -static Eina_Bool _cb_acpi_event(void *data, - int type, - void *event); + void *event); +static Eina_Bool _cb_acpi_event(void *data, + int type, + void *event); /* local variables */ static E_Dialog *grab_dlg = NULL; @@ -53,7 +53,7 @@ static Ecore_X_Window grab_win = 0; static Eina_List *grab_hdls = NULL; E_Config_Dialog * -e_int_config_acpibindings(E_Container *con, +e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; @@ -179,8 +179,8 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, } static Evas_Object * -_basic_create(E_Config_Dialog *cfd, - Evas *evas, +_basic_create(E_Config_Dialog *cfd, + Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *ol, *of, *ow, *ot; @@ -250,7 +250,7 @@ _fill_bindings(E_Config_Dialog_Data *cfdata) lbl = _binding_label_get(binding); e_widget_ilist_append(cfdata->o_bindings, NULL, lbl, - _cb_bindings_changed, cfdata, buff); + _cb_bindings_changed, cfdata, buff); } e_widget_ilist_go(cfdata->o_bindings); @@ -332,7 +332,7 @@ _selected_action_get(E_Config_Dialog_Data *cfdata) // (strcmp(grp->act_grp, "Launch"))) continue; EINA_LIST_FOREACH(grp->acts, ll, dsc) { - if ((dsc->act_name) && (!strcmp(dsc->act_name, lbl))) + if ((dsc->act_name) && (!strcmp(dsc->act_name, lbl))) return dsc; } } @@ -466,7 +466,7 @@ _cb_actions_changed(void *data) } static void -_cb_entry_changed(void *data, +_cb_entry_changed(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -482,7 +482,7 @@ _cb_entry_changed(void *data, } static void -_cb_add_binding(void *data, +_cb_add_binding(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -524,7 +524,7 @@ _cb_add_binding(void *data, } static void -_cb_del_binding(void *data, +_cb_del_binding(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -587,9 +587,9 @@ _cb_del_binding(void *data, } static Eina_Bool -_cb_grab_key_down(void *data, +_cb_grab_key_down(void *data, int type __UNUSED__, - void *event) + void *event) { E_Config_Dialog_Data *cfdata; Ecore_Event_Key *ev; @@ -619,9 +619,9 @@ _cb_grab_key_down(void *data, } static Eina_Bool -_cb_acpi_event(void *data, +_cb_acpi_event(void *data, __UNUSED__ int type, - void *event) + void *event) { E_Event_Acpi *ev; E_Config_Dialog_Data *cfdata; diff --git a/src/modules/conf_keybindings/e_int_config_keybindings.c b/src/modules/conf_keybindings/e_int_config_keybindings.c index 549d4c8e4..4ddae8164 100644 --- a/src/modules/conf_keybindings/e_int_config_keybindings.c +++ b/src/modules/conf_keybindings/e_int_config_keybindings.c @@ -8,59 +8,59 @@ #define TEXT_NO_MODIFIER_HEADER _("Single key") static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, +static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_data(E_Config_Dialog *cfd, +static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, - Evas *evas, +static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, + Evas *evas, E_Config_Dialog_Data *cfdata); /********* private functions ***************/ -static void _fill_actions_list(E_Config_Dialog_Data *cfdata); +static void _fill_actions_list(E_Config_Dialog_Data *cfdata); /**************** Updates ***********/ -static int _update_key_binding_list(E_Config_Dialog_Data *cfdata, - E_Config_Binding_Key *bi); -static void _update_action_list(E_Config_Dialog_Data *cfdata); -static void _update_action_params(E_Config_Dialog_Data *cfdata); -static void _update_buttons(E_Config_Dialog_Data *cfdata); +static int _update_key_binding_list(E_Config_Dialog_Data *cfdata, + E_Config_Binding_Key *bi); +static void _update_action_list(E_Config_Dialog_Data *cfdata); +static void _update_action_params(E_Config_Dialog_Data *cfdata); +static void _update_buttons(E_Config_Dialog_Data *cfdata); /**************** Callbacks *********/ -static void _binding_change_cb(void *data); -static void _action_change_cb(void *data); -static void _delete_all_key_binding_cb(void *data, - void *data2); -static void _delete_key_binding_cb(void *data, - void *data2); -static void _restore_key_binding_defaults_cb(void *data, - void *data2); -static void _add_key_binding_cb(void *data, - void *data2); -static void _modify_key_binding_cb(void *data, - void *data2); +static void _binding_change_cb(void *data); +static void _action_change_cb(void *data); +static void _delete_all_key_binding_cb(void *data, + void *data2); +static void _delete_key_binding_cb(void *data, + void *data2); +static void _restore_key_binding_defaults_cb(void *data, + void *data2); +static void _add_key_binding_cb(void *data, + void *data2); +static void _modify_key_binding_cb(void *data, + void *data2); /********* Helper *************************/ -static char *_key_binding_header_get(int modifiers); -static char *_key_binding_text_get(E_Config_Binding_Key *bi); -static void _auto_apply_changes(E_Config_Dialog_Data *cfdata); -static void _find_key_binding_action(const char *action, - const char *params, - int *g, - int *a, - int *n); +static char *_key_binding_header_get(int modifiers); +static char *_key_binding_text_get(E_Config_Binding_Key *bi); +static void _auto_apply_changes(E_Config_Dialog_Data *cfdata); +static void _find_key_binding_action(const char *action, + const char *params, + int *g, + int *a, + int *n); /********* Sorting ************************/ -static int _key_binding_sort_cb(const void *d1, - const void *d2); +static int _key_binding_sort_cb(const void *d1, + const void *d2); /**************** grab window *******/ static void _grab_wnd_show(E_Config_Dialog_Data *cfdata); static Eina_Bool _grab_key_down_cb(void *data, - int type, + int type, void *event); static Eina_Bool _grab_mouse_dumb_cb(void *data, - int type, + int type, void *event); struct _E_Config_Dialog_Data @@ -93,7 +93,7 @@ struct _E_Config_Dialog_Data E_Config_Dialog * e_int_config_keybindings(E_Container *con, - const char *params) + const char *params) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; @@ -232,8 +232,8 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, } static Evas_Object * -_basic_create_widgets(E_Config_Dialog *cfd, - Evas *evas, +_basic_create_widgets(E_Config_Dialog *cfd, + Evas *evas, E_Config_Dialog_Data *cfdata) { Evas_Object *o, *ot, *of, *ob; @@ -328,7 +328,7 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata) /**************** Callbacks *********/ static void -_add_key_binding_cb(void *data, +_add_key_binding_cb(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -342,7 +342,7 @@ _add_key_binding_cb(void *data, } static void -_modify_key_binding_cb(void *data, +_modify_key_binding_cb(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -384,7 +384,7 @@ _action_change_cb(void *data) } static void -_delete_all_key_binding_cb(void *data, +_delete_all_key_binding_cb(void *data, void *data2 __UNUSED__) { E_Config_Binding_Key *bi; @@ -414,7 +414,7 @@ _delete_all_key_binding_cb(void *data, } static void -_delete_key_binding_cb(void *data, +_delete_key_binding_cb(void *data, void *data2 __UNUSED__) { Eina_List *l = NULL; @@ -461,13 +461,13 @@ _delete_key_binding_cb(void *data, } else { - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, sel); - e_widget_ilist_nth_show(cfdata->gui.o_binding_list, sel, 0); + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, sel); + e_widget_ilist_nth_show(cfdata->gui.o_binding_list, sel, 0); } } static void -_restore_key_binding_defaults_cb(void *data, +_restore_key_binding_defaults_cb(void *data, void *data2 __UNUSED__) { E_Config_Dialog_Data *cfdata; @@ -680,7 +680,7 @@ _update_action_list(E_Config_Dialog_Data *cfdata) if (j >= 0) { - cnt = e_widget_ilist_count(cfdata->gui.o_action_list); + cnt = e_widget_ilist_count(cfdata->gui.o_action_list); for (i = 0; i < cnt; i++) { if (i > j) break; @@ -1013,9 +1013,9 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata) } static Eina_Bool -_grab_key_down_cb(void *data, +_grab_key_down_cb(void *data, __UNUSED__ int type, - void *event) + void *event) { E_Config_Dialog_Data *cfdata; Ecore_Event_Key *ev; @@ -1091,7 +1091,7 @@ _grab_key_down_cb(void *data, found = 1; } } - + if (!found) { if (cfdata->locals.add) @@ -1125,7 +1125,7 @@ _grab_key_down_cb(void *data, e_widget_entry_text_set(cfdata->gui.o_params, cfdata->params); } } - else + else { e_widget_entry_clear(cfdata->gui.o_params); e_widget_disabled_set(cfdata->gui.o_params, 1); @@ -1134,8 +1134,8 @@ _grab_key_down_cb(void *data, else if (cfdata->locals.cur && cfdata->locals.cur[0]) { char *label; - E_Ilist_Item *it; - int i = 0; + E_Ilist_Item *it; + int i = 0; sscanf(cfdata->locals.cur, "k%d", &n); bi = eina_list_nth(cfdata->binding.key, n); @@ -1147,11 +1147,11 @@ _grab_key_down_cb(void *data, label = _key_binding_text_get(bi); - EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->gui.o_binding_list), l, it) - { - if (it->header) n++; - if (i++ >= n) break; - } + EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->gui.o_binding_list), l, it) + { + if (it->header) n++; + if (i++ >= n) break; + } e_widget_ilist_nth_label_set(cfdata->gui.o_binding_list, n, label); free(label); @@ -1162,10 +1162,10 @@ _grab_key_down_cb(void *data, int i = 0; E_Ilist_Item *it; #if 0 - /* this advice is rather irritating as one sees that the - key is bound to an action. if you want to set a - keybinding you dont care about whether there is - sth else set to it. */ + /* this advice is rather irritating as one sees that the + key is bound to an action. if you want to set a + keybinding you dont care about whether there is + sth else set to it. */ int g, a, j; const char *label = NULL; E_Action_Group *actg = NULL; @@ -1205,7 +1205,7 @@ _grab_key_down_cb(void *data, static Eina_Bool _grab_mouse_dumb_cb(__UNUSED__ void *data, - __UNUSED__ int type, + __UNUSED__ int type, __UNUSED__ void *event) { return ECORE_CALLBACK_RENEW; @@ -1266,9 +1266,9 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata) static void _find_key_binding_action(const char *action, const char *params, - int *g, - int *a, - int *n) + int *g, + int *a, + int *n) { Eina_List *l, *l2; int gg = -1, aa = -1, nn = -1, found; diff --git a/src/modules/conf_keybindings/e_int_config_mousebindings.c b/src/modules/conf_keybindings/e_int_config_mousebindings.c index 07e2b75c7..6b4e08e80 100644 --- a/src/modules/conf_keybindings/e_int_config_mousebindings.c +++ b/src/modules/conf_keybindings/e_int_config_mousebindings.c @@ -1,96 +1,97 @@ #include "e.h" -#define TEXT_NO_PARAMS _("") -#define EXAMPLE_STRING "example : " -#define E_BINDING_CONTEXT_NUMBER 10 +#define TEXT_NO_PARAMS _("") +#define EXAMPLE_STRING "example : " +#define E_BINDING_CONTEXT_NUMBER 10 -#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want
" \ - "and press any button on your mouse,
or roll a" \ - " wheel, to assign mouse binding." \ - "
Press Escape to abort.") +#define TEXT_PRESS_MOUSE_BINIDING_SEQUENCE _("Please hold any modifier you want
" \ + "and press any button on your mouse,
or roll a" \ + " wheel, to assign mouse binding." \ + "
Press Escape to abort.") -static void *_create_data(E_Config_Dialog *cfd); -static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); -static int _basic_apply_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 int _basic_apply_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 void _fill_data(E_Config_Dialog_Data *cfdata); -static void _fill_actions_list(E_Config_Dialog_Data *cfdata); +static void _fill_data(E_Config_Dialog_Data *cfdata); +static void _fill_actions_list(E_Config_Dialog_Data *cfdata); /******************* Callbacks *************/ -static void _binding_change_cb(void *data); -static void _action_change_cb(void *data); -static void _delete_mouse_binding_cb(void *data, void *data2); -static void _delete_all_mouse_binding_cb(void *data, void *data2); -static void _restore_mouse_binding_defaults_cb(void *data, void *data2); -static void _add_mouse_binding_cb(void *data, void *data2); -static void _modify_mouse_binding_cb(void *data, void *data2); +static void _binding_change_cb(void *data); +static void _action_change_cb(void *data); +static void _delete_mouse_binding_cb(void *data, void *data2); +static void _delete_all_mouse_binding_cb(void *data, void *data2); +static void _restore_mouse_binding_defaults_cb(void *data, void *data2); +static void _add_mouse_binding_cb(void *data, void *data2); +static void _modify_mouse_binding_cb(void *data, void *data2); /******************* Updates *****************/ -static void _update_action_list(E_Config_Dialog_Data *cfdata); -static void _update_action_params(E_Config_Dialog_Data *cfdata); -static void _update_mouse_binding_list(E_Config_Dialog_Data *cfdata); -static void _update_buttons(E_Config_Dialog_Data *cfdata); -static void _update_binding_context(E_Config_Dialog_Data *cfdata); +static void _update_action_list(E_Config_Dialog_Data *cfdata); +static void _update_action_params(E_Config_Dialog_Data *cfdata); +static void _update_mouse_binding_list(E_Config_Dialog_Data *cfdata); +static void _update_buttons(E_Config_Dialog_Data *cfdata); +static void _update_binding_context(E_Config_Dialog_Data *cfdata); /****************** Helper *****************/ -static void _find_key_binding_action(const char *action, const char *params, int *g, int *a, int *n); -static char *_helper_button_name_get(E_Config_Binding_Mouse *eb); -static char *_helper_wheel_name_get(E_Config_Binding_Wheel *bw); -static char *_helper_modifier_name_get(int mod); -static void _auto_apply_changes(E_Config_Dialog_Data *cfdata); +static void _find_key_binding_action(const char *action, const char *params, int *g, int *a, int *n); +static char *_helper_button_name_get(E_Config_Binding_Mouse *eb); +static char *_helper_wheel_name_get(E_Config_Binding_Wheel *bw); +static char *_helper_modifier_name_get(int mod); +static void _auto_apply_changes(E_Config_Dialog_Data *cfdata); /********* Sorting ***************/ -static int _mouse_binding_sort_cb(const void *d1, const void *d2); -static int _wheel_binding_sort_cb(const void *d1, const void *d2); +static int _mouse_binding_sort_cb(const void *d1, const void *d2); +static int _wheel_binding_sort_cb(const void *d1, const void *d2); /********* grab window **********/ -static void _grab_wnd_show(E_Config_Dialog_Data *cfdata); -static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata); -static Eina_Bool _grab_mouse_down_cb(void *data, int type, void *event); -static Eina_Bool _grab_mouse_wheel_cb(void *data, int type, void *event); -static Eina_Bool _grab_key_down_cb(void *data, int type, void *event); +static void _grab_wnd_show(E_Config_Dialog_Data *cfdata); +static void _grab_wnd_hide(E_Config_Dialog_Data *cfdata); +static Eina_Bool _grab_mouse_down_cb(void *data, int type, void *event); +static Eina_Bool _grab_mouse_wheel_cb(void *data, int type, void *event); +static Eina_Bool _grab_key_down_cb(void *data, int type, void *event); struct _E_Config_Dialog_Data { - E_Config_Dialog *cfd; + E_Config_Dialog *cfd; - Evas *evas; + Evas *evas; - struct - { - Eina_List *mouse; - Eina_List *wheel; - } binding; + struct + { + Eina_List *mouse; + Eina_List *wheel; + } binding; - struct - { - const char *binding; - const char *action; - char *params; - int context; + struct + { + const char *binding; + const char *action; + char *params; + int context; - const char *cur; - int add; /*just to distinguesh among two buttons add/modify */ + const char *cur; + int add; /*just to distinguesh among two buttons add/modify */ - E_Dialog *dia; - Ecore_X_Window bind_win; - Eina_List *handlers; - } locals; + E_Dialog *dia; + Ecore_X_Window bind_win; + Eina_List *handlers; + } locals; - struct - { - Evas_Object *o_binding_list; - Evas_Object *o_action_list; - Evas_Object *o_params; - Evas_Object *o_del; - Evas_Object *o_mod; - Evas_Object *o_del_all; - struct { - Evas_Object *o_any, *o_window, *o_menu, *o_winlist, *o_popup, *o_zone, - *o_container, *o_manager, *o_none; - } context; - } gui; + struct + { + Evas_Object *o_binding_list; + Evas_Object *o_action_list; + Evas_Object *o_params; + Evas_Object *o_del; + Evas_Object *o_mod; + Evas_Object *o_del_all; + struct + { + Evas_Object *o_any, *o_window, *o_menu, *o_winlist, *o_popup, *o_zone, + *o_container, *o_manager, *o_none; + } context; + } gui; }; E_Config_Dialog * @@ -98,20 +99,20 @@ e_int_config_mousebindings(E_Container *con, const char *params __UNUSED__) { E_Config_Dialog *cfd; E_Config_Dialog_View *v; - + if (e_config_dialog_find("E", "keyboard_and_mouse/mouse_bindings")) return NULL; v = E_NEW(E_Config_Dialog_View, 1); - + v->create_cfdata = _create_data; v->free_cfdata = _free_data; v->basic.apply_cfdata = _basic_apply_data; v->basic.create_widgets = _basic_create_widgets; v->override_auto_apply = 0; - + cfd = e_config_dialog_new(con, - _("Mouse Bindings Settings"), - "E", "keyboard_and_mouse/mouse_bindings", - "preferences-desktop-mouse", 0, v, NULL); + _("Mouse Bindings Settings"), + "E", "keyboard_and_mouse/mouse_bindings", + "preferences-desktop-mouse", 0, v, NULL); return cfd; } @@ -129,34 +130,34 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->binding.mouse = NULL; cfdata->binding.wheel = NULL; cfdata->locals.bind_win = 0; - cfdata->locals.handlers = NULL; + cfdata->locals.handlers = NULL; cfdata->locals.dia = NULL; EINA_LIST_FOREACH(e_config->mouse_bindings, l, eb) { - eb2 = E_NEW(E_Config_Binding_Mouse, 1); - eb2->context = eb->context; - eb2->button = eb->button; - eb2->modifiers = eb->modifiers; - eb2->any_mod = eb->any_mod; - eb2->action = !eb->action ? NULL : eina_stringshare_add(eb->action); - eb2->params = !eb->params ? NULL : eina_stringshare_add(eb->params); + eb2 = E_NEW(E_Config_Binding_Mouse, 1); + eb2->context = eb->context; + eb2->button = eb->button; + eb2->modifiers = eb->modifiers; + eb2->any_mod = eb->any_mod; + eb2->action = !eb->action ? NULL : eina_stringshare_add(eb->action); + eb2->params = !eb->params ? NULL : eina_stringshare_add(eb->params); - cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb2); + cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb2); } EINA_LIST_FOREACH(e_config->wheel_bindings, l, bw) { - bw2 = E_NEW(E_Config_Binding_Wheel, 1); - bw2->context = bw->context; - bw2->direction = bw->direction; - bw2->z = bw->z; - bw2->modifiers = bw->modifiers; - bw2->any_mod = bw->any_mod; - bw2->action = !bw->action ? NULL : eina_stringshare_add(bw->action); - bw2->params = !bw->params ? NULL : eina_stringshare_add(bw->params); + bw2 = E_NEW(E_Config_Binding_Wheel, 1); + bw2->context = bw->context; + bw2->direction = bw->direction; + bw2->z = bw->z; + bw2->modifiers = bw->modifiers; + bw2->any_mod = bw->any_mod; + bw2->action = !bw->action ? NULL : eina_stringshare_add(bw->action); + bw2->params = !bw->params ? NULL : eina_stringshare_add(bw->params); - cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw2); + cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw2); } } @@ -164,9 +165,9 @@ static void * _create_data(E_Config_Dialog *cfd) { E_Config_Dialog_Data *cfdata; - + cfdata = E_NEW(E_Config_Dialog_Data, 1); - + _fill_data(cfdata); cfdata->cfd = cfd; return cfdata; @@ -180,16 +181,16 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) EINA_LIST_FREE(cfdata->binding.mouse, eb) { - eina_stringshare_del(eb->action); - eina_stringshare_del(eb->params); - E_FREE(eb); + eina_stringshare_del(eb->action); + eina_stringshare_del(eb->params); + E_FREE(eb); } EINA_LIST_FREE(cfdata->binding.wheel, bw) { - eina_stringshare_del(bw->action); - eina_stringshare_del(bw->params); - E_FREE(bw); + eina_stringshare_del(bw->action); + eina_stringshare_del(bw->params); + E_FREE(bw); } eina_stringshare_del(cfdata->locals.binding); @@ -202,7 +203,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) static int _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) -{ +{ Eina_List *l; E_Config_Binding_Mouse *eb, *eb2; E_Config_Binding_Wheel *bw, *bw2; @@ -212,51 +213,51 @@ _basic_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) e_border_button_bindings_ungrab_all(); EINA_LIST_FREE(e_config->mouse_bindings, eb) { - e_bindings_mouse_del(eb->context, eb->button, eb->modifiers, eb->any_mod, - eb->action, eb->params); - eina_stringshare_del(eb->action); - eina_stringshare_del(eb->params); - E_FREE(eb); + e_bindings_mouse_del(eb->context, eb->button, eb->modifiers, eb->any_mod, + eb->action, eb->params); + eina_stringshare_del(eb->action); + eina_stringshare_del(eb->params); + E_FREE(eb); } EINA_LIST_FOREACH(cfdata->binding.mouse, l, eb) { - eb2 = E_NEW(E_Config_Binding_Mouse, 1); - eb2->context = eb->context; - eb2->button = eb->button; - eb2->modifiers = eb->modifiers; - eb2->any_mod = eb->any_mod; - eb2->action = !eb->action ? NULL : eina_stringshare_add(eb->action); - eb2->params = !eb->params ? NULL : eina_stringshare_add(eb->params); + eb2 = E_NEW(E_Config_Binding_Mouse, 1); + eb2->context = eb->context; + eb2->button = eb->button; + eb2->modifiers = eb->modifiers; + eb2->any_mod = eb->any_mod; + eb2->action = !eb->action ? NULL : eina_stringshare_add(eb->action); + eb2->params = !eb->params ? NULL : eina_stringshare_add(eb->params); - e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb2); - e_bindings_mouse_add(eb2->context, eb2->button, eb2->modifiers, eb2->any_mod, - eb2->action, eb2->params); + e_config->mouse_bindings = eina_list_append(e_config->mouse_bindings, eb2); + e_bindings_mouse_add(eb2->context, eb2->button, eb2->modifiers, eb2->any_mod, + eb2->action, eb2->params); } EINA_LIST_FREE(e_config->wheel_bindings, bw) { - e_bindings_wheel_del(bw->context, bw->direction, bw->z, bw->modifiers, bw->any_mod, - bw->action, bw->params); - eina_stringshare_del(bw->action); - eina_stringshare_del(bw->params); - E_FREE(bw); + e_bindings_wheel_del(bw->context, bw->direction, bw->z, bw->modifiers, bw->any_mod, + bw->action, bw->params); + eina_stringshare_del(bw->action); + eina_stringshare_del(bw->params); + E_FREE(bw); } EINA_LIST_FOREACH(cfdata->binding.wheel, l, bw) { - bw2 = E_NEW(E_Config_Binding_Wheel, 1); - bw2->context = bw->context; - bw2->direction = bw->direction; - bw2->z = bw->z; - bw2->modifiers = bw->modifiers; - bw2->any_mod = bw->any_mod; - bw2->action = !bw->action ? NULL : eina_stringshare_add(bw->action); - bw2->params = !bw->params ? NULL : eina_stringshare_add(bw->params); + bw2 = E_NEW(E_Config_Binding_Wheel, 1); + bw2->context = bw->context; + bw2->direction = bw->direction; + bw2->z = bw->z; + bw2->modifiers = bw->modifiers; + bw2->any_mod = bw->any_mod; + bw2->action = !bw->action ? NULL : eina_stringshare_add(bw->action); + bw2->params = !bw->params ? NULL : eina_stringshare_add(bw->params); - e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, bw2); - e_bindings_wheel_add(bw2->context, bw2->direction, bw2->z, bw2->modifiers, - bw2->any_mod, bw2->action, bw2->params); + e_config->wheel_bindings = eina_list_append(e_config->wheel_bindings, bw2); + e_bindings_wheel_add(bw2->context, bw2->direction, bw2->z, bw2->modifiers, + bw2->any_mod, bw2->action, bw2->params); } e_border_button_bindings_grab_all(); @@ -269,7 +270,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf { Evas_Object *o, *of, *ot, *ob; E_Radio_Group *rg; - + cfdata->evas = evas; o = e_widget_list_add(evas, 0, 1); ot = e_widget_frametable_add(evas, _("Mouse Bindings"), 0); @@ -293,7 +294,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_disabled_set(ob, 1); e_widget_frametable_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0); ob = e_widget_button_add(evas, _("Restore Default Bindings"), "enlightenment", - _restore_mouse_binding_defaults_cb, cfdata, NULL); + _restore_mouse_binding_defaults_cb, cfdata, NULL); e_widget_frametable_object_append(ot, ob, 0, 3, 2, 1, 1, 0, 1, 0); e_widget_list_object_append(o, ot, 1, 1, 0.5); @@ -304,7 +305,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_size_min_set(ob, 200, 200); e_widget_framelist_object_append(of, ob); e_widget_table_object_append(ot, of, 0, 0, 3, 1, 1, 1, 1, 1); - + of = e_widget_framelist_add(evas, _("Action Params"), 0); ob = e_widget_entry_add(evas, &(cfdata->locals.params), NULL, NULL, NULL); e_widget_disabled_set(ob, 1); @@ -352,10 +353,10 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf e_widget_frametable_object_append(of, ob, 2, 2, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(ot, of, 0, 2, 3, 1, 1, 1, 1, 0); e_widget_list_object_append(o, ot, 1, 1, 0.5); - + _update_mouse_binding_list(cfdata); _fill_actions_list(cfdata); - + e_dialog_resizable_set(cfd->dia, 1); return o; } @@ -372,24 +373,24 @@ _fill_actions_list(E_Config_Dialog_Data *cfdata) evas_event_freeze(evas_object_evas_get(cfdata->gui.o_action_list)); edje_freeze(); e_widget_ilist_freeze(cfdata->gui.o_action_list); - + e_widget_ilist_clear(cfdata->gui.o_action_list); for (l = e_action_groups_get(), g = 0; l; l = l->next, g++) { - actg = l->data; + actg = l->data; - if (!actg->acts) continue; + if (!actg->acts) continue; - e_widget_ilist_header_append(cfdata->gui.o_action_list, NULL, _(actg->act_grp)); + e_widget_ilist_header_append(cfdata->gui.o_action_list, NULL, _(actg->act_grp)); - for (l2 = actg->acts, a = 0; l2; l2 = l2->next, a++) - { - actd = l2->data; + for (l2 = actg->acts, a = 0; l2; l2 = l2->next, a++) + { + actd = l2->data; - snprintf(buf, sizeof(buf), "%d %d", g, a); - e_widget_ilist_append(cfdata->gui.o_action_list, NULL, _(actd->act_name), - _action_change_cb, cfdata, buf); - } + snprintf(buf, sizeof(buf), "%d %d", g, a); + e_widget_ilist_append(cfdata->gui.o_action_list, NULL, _(actd->act_name), + _action_change_cb, cfdata, buf); + } } e_widget_ilist_go(cfdata->gui.o_action_list); e_widget_ilist_thaw(cfdata->gui.o_action_list); @@ -443,7 +444,7 @@ _binding_change_cb(void *data) eina_stringshare_del(cfdata->locals.cur); cfdata->locals.cur = NULL; - if (cfdata->locals.binding[0]) + if (cfdata->locals.binding[0]) cfdata->locals.cur = eina_stringshare_ref(cfdata->locals.binding); _update_buttons(cfdata); @@ -463,16 +464,16 @@ _delete_all_mouse_binding_cb(void *data, void *data2 __UNUSED__) /* FIXME: need confirmation dialog */ EINA_LIST_FREE(cfdata->binding.mouse, eb) { - eina_stringshare_del(eb->action); - eina_stringshare_del(eb->params); - E_FREE(eb); + eina_stringshare_del(eb->action); + eina_stringshare_del(eb->params); + E_FREE(eb); } EINA_LIST_FREE(cfdata->binding.wheel, bw) { - eina_stringshare_del(bw->action); - eina_stringshare_del(bw->params); - E_FREE(bw); + eina_stringshare_del(bw->action); + eina_stringshare_del(bw->params); + E_FREE(bw); } eina_stringshare_del(cfdata->locals.cur); @@ -502,31 +503,31 @@ _delete_mouse_binding_cb(void *data, void *data2 __UNUSED__) sel = e_widget_ilist_selected_get(cfdata->gui.o_binding_list); if (cfdata->locals.binding[0] == 'm') { - sscanf(cfdata->locals.binding, "m%d", &n); - l = eina_list_nth_list(cfdata->binding.mouse, n); - if (l) - { - eb = eina_list_data_get(l); - eina_stringshare_del(eb->action); - eina_stringshare_del(eb->params); - E_FREE(eb); + sscanf(cfdata->locals.binding, "m%d", &n); + l = eina_list_nth_list(cfdata->binding.mouse, n); + if (l) + { + eb = eina_list_data_get(l); + eina_stringshare_del(eb->action); + eina_stringshare_del(eb->params); + E_FREE(eb); - cfdata->binding.mouse = eina_list_remove_list(cfdata->binding.mouse, l); - } + cfdata->binding.mouse = eina_list_remove_list(cfdata->binding.mouse, l); + } } else if (cfdata->locals.binding[0] == 'w') { - sscanf(cfdata->locals.binding, "w%d", &n); - l = eina_list_nth_list(cfdata->binding.wheel, n); - if (l) - { - bw = eina_list_data_get(l); - eina_stringshare_del(bw->action); - eina_stringshare_del(bw->params); - E_FREE(bw); + sscanf(cfdata->locals.binding, "w%d", &n); + l = eina_list_nth_list(cfdata->binding.wheel, n); + if (l) + { + bw = eina_list_data_get(l); + eina_stringshare_del(bw->action); + eina_stringshare_del(bw->params); + E_FREE(bw); - cfdata->binding.wheel = eina_list_remove_list(cfdata->binding.wheel, l); - } + cfdata->binding.wheel = eina_list_remove_list(cfdata->binding.wheel, l); + } } else return; @@ -540,18 +541,18 @@ _delete_mouse_binding_cb(void *data, void *data2 __UNUSED__) if (!e_widget_ilist_count(cfdata->gui.o_binding_list)) { - _update_binding_context(cfdata); - _update_buttons(cfdata); - - e_widget_ilist_unselect(cfdata->gui.o_action_list); - e_widget_entry_clear(cfdata->gui.o_params); - e_widget_disabled_set(cfdata->gui.o_params, 1); + _update_binding_context(cfdata); + _update_buttons(cfdata); + + e_widget_ilist_unselect(cfdata->gui.o_action_list); + e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); } - else - { - if (e_widget_ilist_nth_is_header(cfdata->gui.o_binding_list, sel)) sel++; - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, sel); - e_widget_ilist_nth_show(cfdata->gui.o_binding_list, sel, 0); + else + { + if (e_widget_ilist_nth_is_header(cfdata->gui.o_binding_list, sel)) sel++; + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, sel); + e_widget_ilist_nth_show(cfdata->gui.o_binding_list, sel, 0); } } @@ -566,61 +567,61 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__) EINA_LIST_FREE(cfdata->binding.mouse, eb) { - eina_stringshare_del(eb->action); - eina_stringshare_del(eb->params); - E_FREE(eb); + eina_stringshare_del(eb->action); + eina_stringshare_del(eb->params); + E_FREE(eb); } EINA_LIST_FREE(cfdata->binding.wheel, bw) { - if (bw->action) eina_stringshare_del(bw->action); - if (bw->params) eina_stringshare_del(bw->params); - E_FREE(bw); + if (bw->action) eina_stringshare_del(bw->action); + if (bw->params) eina_stringshare_del(bw->params); + E_FREE(bw); } #define CFG_MOUSEBIND_DFLT(_context, _button, _modifiers, _anymod, _action, _params) \ - eb = E_NEW(E_Config_Binding_Mouse, 1); \ - eb->context = _context; \ - eb->button = _button; \ - eb->modifiers = _modifiers; \ - eb->any_mod = _anymod; \ - eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \ - eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \ - cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb) - - CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL); - CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 2, E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL); - CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 3, E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL); - CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main"); - CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients"); + eb = E_NEW(E_Config_Binding_Mouse, 1); \ + eb->context = _context; \ + eb->button = _button; \ + eb->modifiers = _modifiers; \ + eb->any_mod = _anymod; \ + eb->action = _action == NULL ? NULL : eina_stringshare_add(_action); \ + eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \ + cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb) + + CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL); + CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 2, E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL); + CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 3, E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL); + CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main"); + CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients"); CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites"); #define CFG_WHEELBIND_DFLT(_context, _direction, _z, _modifiers, _anymod, _action, _params) \ - bw = E_NEW(E_Config_Binding_Wheel, 1); \ - bw->context = _context; \ - bw->direction = _direction; \ - bw->z = _z; \ - bw->modifiers = _modifiers; \ - bw->any_mod = _anymod; \ - bw->action = _action == NULL ? NULL : eina_stringshare_add(_action); \ - bw->params = _params == NULL ? NULL : eina_stringshare_add(_params); \ - cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw) - - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, -1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "-1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, -1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "-1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, 1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, 1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, -1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "-1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, -1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "-1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, 1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "1"); - CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, 1, E_BINDING_MODIFIER_ALT, 0, - "desk_linear_flip_by", "1"); + bw = E_NEW(E_Config_Binding_Wheel, 1); \ + bw->context = _context; \ + bw->direction = _direction; \ + bw->z = _z; \ + bw->modifiers = _modifiers; \ + bw->any_mod = _anymod; \ + bw->action = _action == NULL ? NULL : eina_stringshare_add(_action); \ + bw->params = _params == NULL ? NULL : eina_stringshare_add(_params); \ + cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw) + + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, -1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "-1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, -1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "-1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 0, 1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, 1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, -1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "-1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, -1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "-1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, 1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "1"); + CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, 1, E_BINDING_MODIFIER_ALT, 0, + "desk_linear_flip_by", "1"); eina_stringshare_del(cfdata->locals.cur); cfdata->locals.cur = NULL; @@ -647,31 +648,31 @@ _update_action_list(E_Config_Dialog_Data *cfdata) if (cfdata->locals.cur[0] == 'm') { - sscanf(cfdata->locals.cur, "m%d", &n); - eb = eina_list_nth(cfdata->binding.mouse, n); - if (!eb) - { - e_widget_ilist_unselect(cfdata->gui.o_action_list); - e_widget_entry_clear(cfdata->gui.o_params); - e_widget_disabled_set(cfdata->gui.o_params, 1); - return; - } - action = eb->action; - params = eb->params; + sscanf(cfdata->locals.cur, "m%d", &n); + eb = eina_list_nth(cfdata->binding.mouse, n); + if (!eb) + { + e_widget_ilist_unselect(cfdata->gui.o_action_list); + e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); + return; + } + action = eb->action; + params = eb->params; } else if (cfdata->locals.cur[0] == 'w') { - sscanf(cfdata->locals.cur, "w%d", &n); - bw = eina_list_nth(cfdata->binding.wheel, n); - if (!bw) - { - e_widget_ilist_unselect(cfdata->gui.o_action_list); - e_widget_entry_clear(cfdata->gui.o_params); - e_widget_disabled_set(cfdata->gui.o_params, 1); - return; - } - action = bw->action; - params = bw->params; + sscanf(cfdata->locals.cur, "w%d", &n); + bw = eina_list_nth(cfdata->binding.wheel, n); + if (!bw) + { + e_widget_ilist_unselect(cfdata->gui.o_action_list); + e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); + return; + } + action = bw->action; + params = bw->params; } else return; @@ -679,26 +680,26 @@ _update_action_list(E_Config_Dialog_Data *cfdata) _find_key_binding_action(action, params, NULL, NULL, &j); if (j >= 0) { - for (i = 0; i < e_widget_ilist_count(cfdata->gui.o_action_list); i++) - { - if (i > j) break; - if (e_widget_ilist_nth_is_header(cfdata->gui.o_action_list, i)) j++; - } + for (i = 0; i < e_widget_ilist_count(cfdata->gui.o_action_list); i++) + { + if (i > j) break; + if (e_widget_ilist_nth_is_header(cfdata->gui.o_action_list, i)) j++; + } } if (j >= 0) { - if (j == e_widget_ilist_selected_get(cfdata->gui.o_action_list)) - _update_action_params(cfdata); - else - e_widget_ilist_selected_set(cfdata->gui.o_action_list, j); + if (j == e_widget_ilist_selected_get(cfdata->gui.o_action_list)) + _update_action_params(cfdata); + else + e_widget_ilist_selected_set(cfdata->gui.o_action_list, j); } else { - e_widget_ilist_unselect(cfdata->gui.o_action_list); - eina_stringshare_del(cfdata->locals.action); - cfdata->locals.action = eina_stringshare_add(""); - e_widget_entry_clear(cfdata->gui.o_params); + e_widget_ilist_unselect(cfdata->gui.o_action_list); + eina_stringshare_del(cfdata->locals.action); + cfdata->locals.action = eina_stringshare_add(""); + e_widget_entry_clear(cfdata->gui.o_params); } } @@ -715,87 +716,90 @@ _update_mouse_binding_list(E_Config_Dialog_Data *cfdata) evas_event_freeze(evas_object_evas_get(cfdata->gui.o_binding_list)); edje_freeze(); e_widget_ilist_freeze(cfdata->gui.o_binding_list); - + e_widget_ilist_clear(cfdata->gui.o_binding_list); - if (cfdata->binding.mouse) - { - cfdata->binding.mouse = eina_list_sort(cfdata->binding.mouse, - eina_list_count(cfdata->binding.mouse), _mouse_binding_sort_cb); - - e_widget_ilist_header_append(cfdata->gui.o_binding_list, NULL, "Mouse Buttons"); + if (cfdata->binding.mouse) + { + cfdata->binding.mouse = eina_list_sort(cfdata->binding.mouse, + eina_list_count(cfdata->binding.mouse), _mouse_binding_sort_cb); + + e_widget_ilist_header_append(cfdata->gui.o_binding_list, NULL, "Mouse Buttons"); } EINA_LIST_FOREACH(cfdata->binding.mouse, l, eb) { - Evas_Object *ic; + Evas_Object *ic; - button = _helper_button_name_get(eb); - mods = _helper_modifier_name_get(eb->modifiers); + button = _helper_button_name_get(eb); + mods = _helper_modifier_name_get(eb->modifiers); - if (mods && mods[0]) - snprintf(label, sizeof(label), "%s + %s", button ? button : "", mods); - else - snprintf(label, sizeof(label), "%s", button ? button : ""); - if (button) free(button); - if (mods) free(mods); + if (mods && mods[0]) + snprintf(label, sizeof(label), "%s + %s", button ? button : "", mods); + else + snprintf(label, sizeof(label), "%s", button ? button : ""); + if (button) free(button); + if (mods) free(mods); - switch (eb->button) - { - case 1: - icon = "preferences-desktop-mouse-left"; - break; - case 2: - icon = "preferences-desktop-mouse-middle"; - break; - case 3: - icon = "preferences-desktop-mouse-right"; - break; - default: - icon = "preferences-desktop-mouse-extra"; - } + switch (eb->button) + { + case 1: + icon = "preferences-desktop-mouse-left"; + break; - snprintf(val, sizeof(val), "m%d", i); + case 2: + icon = "preferences-desktop-mouse-middle"; + break; - ic = e_icon_add(cfdata->evas); - e_util_icon_theme_set(ic, icon); - e_widget_ilist_append(cfdata->gui.o_binding_list, ic, label, _binding_change_cb, - cfdata, val); + case 3: + icon = "preferences-desktop-mouse-right"; + break; - i++; + default: + icon = "preferences-desktop-mouse-extra"; + } + + snprintf(val, sizeof(val), "m%d", i); + + ic = e_icon_add(cfdata->evas); + e_util_icon_theme_set(ic, icon); + e_widget_ilist_append(cfdata->gui.o_binding_list, ic, label, _binding_change_cb, + cfdata, val); + + i++; } - if (cfdata->binding.wheel) + if (cfdata->binding.wheel) { - cfdata->binding.wheel = eina_list_sort(cfdata->binding.wheel, - eina_list_count(cfdata->binding.wheel), _wheel_binding_sort_cb); - - e_widget_ilist_header_append(cfdata->gui.o_binding_list, NULL, "Mouse Wheels"); + cfdata->binding.wheel = eina_list_sort(cfdata->binding.wheel, + eina_list_count(cfdata->binding.wheel), _wheel_binding_sort_cb); + + e_widget_ilist_header_append(cfdata->gui.o_binding_list, NULL, "Mouse Wheels"); } i = 0; EINA_LIST_FOREACH(cfdata->binding.wheel, l, bw) { - Evas_Object *ic; + Evas_Object *ic; - button = _helper_wheel_name_get(bw); - mods = _helper_modifier_name_get(bw->modifiers); + button = _helper_wheel_name_get(bw); + mods = _helper_modifier_name_get(bw->modifiers); - if (mods && mods[0]) - snprintf(label, sizeof(label), "%s + %s", button ? button : "", mods); - else - snprintf(label, sizeof(label), "%s", button ? button : ""); - if (button) free(button); - if (mods) free(mods); + if (mods && mods[0]) + snprintf(label, sizeof(label), "%s + %s", button ? button : "", mods); + else + snprintf(label, sizeof(label), "%s", button ? button : ""); + if (button) free(button); + if (mods) free(mods); - snprintf(val, sizeof(val), "w%d", i); + snprintf(val, sizeof(val), "w%d", i); - ic = e_icon_add(cfdata->evas); - e_util_icon_theme_set(ic, "preferences-desktop-mouse-wheel"); - e_widget_ilist_append(cfdata->gui.o_binding_list, ic, label, _binding_change_cb, - cfdata, val); + ic = e_icon_add(cfdata->evas); + e_util_icon_theme_set(ic, "preferences-desktop-mouse-wheel"); + e_widget_ilist_append(cfdata->gui.o_binding_list, ic, label, _binding_change_cb, + cfdata, val); - i++; + i++; } e_widget_ilist_go(cfdata->gui.o_binding_list); @@ -819,16 +823,16 @@ _update_action_params(E_Config_Dialog_Data *cfdata) E_Config_Binding_Wheel *bw; const char *action, *params; -#define MB_EXAMPLE_PARAMS \ - if ((!actd->param_example) || (!actd->param_example[0])) \ - e_widget_entry_text_set(cfdata->gui.o_params, TEXT_NO_PARAMS); \ - else \ - e_widget_entry_text_set(cfdata->gui.o_params, actd->param_example) +#define MB_EXAMPLE_PARAMS \ + if ((!actd->param_example) || (!actd->param_example[0])) \ + e_widget_entry_text_set(cfdata->gui.o_params, TEXT_NO_PARAMS); \ + else \ + e_widget_entry_text_set(cfdata->gui.o_params, actd->param_example) if ((!cfdata->locals.action) || (!cfdata->locals.action[0])) { - e_widget_disabled_set(cfdata->gui.o_params, 1); - e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); + e_widget_entry_clear(cfdata->gui.o_params); } sscanf(cfdata->locals.action, "%d %d", &g, &a); @@ -839,16 +843,16 @@ _update_action_params(E_Config_Dialog_Data *cfdata) if (actd->act_params) { - e_widget_disabled_set(cfdata->gui.o_params, 1); - e_widget_entry_text_set(cfdata->gui.o_params, actd->act_params); - return; + e_widget_disabled_set(cfdata->gui.o_params, 1); + e_widget_entry_text_set(cfdata->gui.o_params, actd->act_params); + return; } if ((!cfdata->locals.cur) || (!cfdata->locals.cur[0])) { - e_widget_disabled_set(cfdata->gui.o_params, 1); - MB_EXAMPLE_PARAMS; - return; + e_widget_disabled_set(cfdata->gui.o_params, 1); + MB_EXAMPLE_PARAMS; + return; } if (!actd->editable) @@ -858,48 +862,48 @@ _update_action_params(E_Config_Dialog_Data *cfdata) if (cfdata->locals.cur[0] == 'm') { - sscanf(cfdata->locals.cur, "m%d", &b); - eb = eina_list_nth(cfdata->binding.mouse, b); - if (!eb) - { - e_widget_disabled_set(cfdata->gui.o_params, 1); - MB_EXAMPLE_PARAMS; - return; - } - action = eb->action; - params = eb->params; + sscanf(cfdata->locals.cur, "m%d", &b); + eb = eina_list_nth(cfdata->binding.mouse, b); + if (!eb) + { + e_widget_disabled_set(cfdata->gui.o_params, 1); + MB_EXAMPLE_PARAMS; + return; + } + action = eb->action; + params = eb->params; } else if (cfdata->locals.cur[0] == 'w') { - sscanf(cfdata->locals.cur, "w%d", &b); - bw = eina_list_nth(cfdata->binding.wheel, b); - if (!bw) - { - e_widget_disabled_set(cfdata->gui.o_params, 1); - MB_EXAMPLE_PARAMS; - return; - } - action = bw->action; - params = bw->params; + sscanf(cfdata->locals.cur, "w%d", &b); + bw = eina_list_nth(cfdata->binding.wheel, b); + if (!bw) + { + e_widget_disabled_set(cfdata->gui.o_params, 1); + MB_EXAMPLE_PARAMS; + return; + } + action = bw->action; + params = bw->params; } else - { - e_widget_disabled_set(cfdata->gui.o_params, 1); + { + e_widget_disabled_set(cfdata->gui.o_params, 1); MB_EXAMPLE_PARAMS; - return; + return; } if (action) { - if (!strcmp(action, actd->act_cmd)) - { - if ((!params) || (!params[0])) - MB_EXAMPLE_PARAMS; - else - e_widget_entry_text_set(cfdata->gui.o_params, params); - } - else - MB_EXAMPLE_PARAMS; + if (!strcmp(action, actd->act_cmd)) + { + if ((!params) || (!params[0])) + MB_EXAMPLE_PARAMS; + else + e_widget_entry_text_set(cfdata->gui.o_params, params); + } + else + MB_EXAMPLE_PARAMS; } else MB_EXAMPLE_PARAMS; @@ -914,10 +918,10 @@ _update_buttons(E_Config_Dialog_Data *cfdata) e_widget_disabled_set(cfdata->gui.o_del_all, 1); if (!cfdata->locals.cur) - { - e_widget_disabled_set(cfdata->gui.o_mod, 1); - e_widget_disabled_set(cfdata->gui.o_del, 1); - return; + { + e_widget_disabled_set(cfdata->gui.o_mod, 1); + e_widget_disabled_set(cfdata->gui.o_del, 1); + return; } e_widget_disabled_set(cfdata->gui.o_mod, 0); @@ -948,17 +952,17 @@ _update_binding_context(E_Config_Dialog_Data *cfdata) if (cfdata->locals.cur[0] == 'm') { - sscanf(cfdata->locals.cur, "m%d", &n); - eb = eina_list_nth(cfdata->binding.mouse, n); - if (!eb) return; - ctxt = eb->context; + sscanf(cfdata->locals.cur, "m%d", &n); + eb = eina_list_nth(cfdata->binding.mouse, n); + if (!eb) return; + ctxt = eb->context; } else if (cfdata->locals.cur[0] == 'w') { - sscanf(cfdata->locals.cur, "w%d", &n); - bw = eina_list_nth(cfdata->binding.wheel, n); - if (!bw) return; - ctxt = bw->context; + sscanf(cfdata->locals.cur, "w%d", &n); + bw = eina_list_nth(cfdata->binding.wheel, n); + if (!bw) return; + ctxt = bw->context; } else return; @@ -973,7 +977,7 @@ _update_binding_context(E_Config_Dialog_Data *cfdata) e_widget_disabled_set(cfdata->gui.context.o_manager, 0); e_widget_disabled_set(cfdata->gui.context.o_none, 0); - if (ctxt == E_BINDING_CONTEXT_ANY) + if (ctxt == E_BINDING_CONTEXT_ANY) e_widget_radio_toggle_set(cfdata->gui.context.o_any, 1); else if (ctxt == E_BINDING_CONTEXT_BORDER) e_widget_radio_toggle_set(cfdata->gui.context.o_window, 1); @@ -1009,29 +1013,29 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata) if (cfdata->locals.cur[0] == 'm') { - sscanf(cfdata->locals.cur, "m%d", &n); - eb = eina_list_nth(cfdata->binding.mouse, n); - if (!eb) return; + sscanf(cfdata->locals.cur, "m%d", &n); + eb = eina_list_nth(cfdata->binding.mouse, n); + if (!eb) return; - eb->context = cfdata->locals.context; - action = &(eb->action); - params = &(eb->params); + eb->context = cfdata->locals.context; + action = &(eb->action); + params = &(eb->params); } else if (cfdata->locals.cur[0] == 'w') { - sscanf(cfdata->locals.cur, "w%d", &n); - bw = eina_list_nth(cfdata->binding.wheel, n); - if (!bw) return; + sscanf(cfdata->locals.cur, "w%d", &n); + bw = eina_list_nth(cfdata->binding.wheel, n); + if (!bw) return; - bw->context = cfdata->locals.context; - action = &(bw->action); - params = &(bw->params); - } + bw->context = cfdata->locals.context; + action = &(bw->action); + params = &(bw->params); + } else return; - - if (action && *action) eina_stringshare_del(*action); - if (params && *params) eina_stringshare_del(*params); - if (action) *action = NULL; + + if (action && *action) eina_stringshare_del(*action); + if (params && *params) eina_stringshare_del(*params); + if (action) *action = NULL; if (params) *params = NULL; if ((!cfdata->locals.action) || (!cfdata->locals.action[0])) return; @@ -1044,23 +1048,23 @@ _auto_apply_changes(E_Config_Dialog_Data *cfdata) if (!actd) return; if (actd->act_cmd) *action = eina_stringshare_add(actd->act_cmd); - if (actd->act_params) + if (actd->act_params) *params = eina_stringshare_add(actd->act_params); else { - int ok = 1; - if (cfdata->locals.params) - { - if (!strcmp(cfdata->locals.params, TEXT_NO_PARAMS)) ok = 0; + int ok = 1; + if (cfdata->locals.params) + { + if (!strcmp(cfdata->locals.params, TEXT_NO_PARAMS)) ok = 0; - if ((actd->param_example) && (!strcmp(cfdata->locals.params, actd->param_example))) - ok = 0; - } - else - ok = 0; + if ((actd->param_example) && (!strcmp(cfdata->locals.params, actd->param_example))) + ok = 0; + } + else + ok = 0; - if (ok) - *params = eina_stringshare_add(cfdata->locals.params); + if (ok) + *params = eina_stringshare_add(cfdata->locals.params); } } @@ -1079,57 +1083,57 @@ _find_key_binding_action(const char *action, const char *params, int *g, int *a, found = 0; for (l = e_action_groups_get(), gg = 0, nn = 0; l; l = l->next, gg++) { - actg = l->data; + actg = l->data; - for (l2 = actg->acts, aa = 0; l2; l2 = l2->next, aa++) - { - actd = l2->data; + for (l2 = actg->acts, aa = 0; l2; l2 = l2->next, aa++) + { + actd = l2->data; - if (!strcmp((!action ? "" : action), (!actd->act_cmd ? "" : actd->act_cmd))) - { - if (!params || !params[0]) - { - if ((!actd->act_params) || (!actd->act_params[0])) - { - if (g) *g = gg; - if (a) *a = aa; - if (n) *n = nn; - return; - } - else - continue; - } - else - { - if ((!actd->act_params) || (!actd->act_params[0])) - { - if (g) *g = gg; - if (a) *a = aa; - if (n) *n = nn; - found = 1; - } - else - { - if (!strcmp(params, actd->act_params)) - { - if (g) *g = gg; - if (a) *a = aa; - if (n) *n = nn; - return; - } - } - } - } - nn++; - } - if (found) break; + if (!strcmp((!action ? "" : action), (!actd->act_cmd ? "" : actd->act_cmd))) + { + if (!params || !params[0]) + { + if ((!actd->act_params) || (!actd->act_params[0])) + { + if (g) *g = gg; + if (a) *a = aa; + if (n) *n = nn; + return; + } + else + continue; + } + else + { + if ((!actd->act_params) || (!actd->act_params[0])) + { + if (g) *g = gg; + if (a) *a = aa; + if (n) *n = nn; + found = 1; + } + else + { + if (!strcmp(params, actd->act_params)) + { + if (g) *g = gg; + if (a) *a = aa; + if (n) *n = nn; + return; + } + } + } + } + nn++; + } + if (found) break; } if (!found) { - if (g) *g = -1; - if (a) *a = -1; - if (n) *n = -1; + if (g) *g = -1; + if (a) *a = -1; + if (n) *n = -1; } } @@ -1137,27 +1141,31 @@ static char * _helper_button_name_get(E_Config_Binding_Mouse *eb) { char *name = NULL; - char buf[1024]=""; + char buf[1024] = ""; switch (eb->button) - { + { case 1: - name = strdup("Left Button"); - break; + name = strdup("Left Button"); + break; + case 2: - name = strdup("Middle Button"); - break; - case 3: - name = strdup("Right Button"); - break; + name = strdup("Middle Button"); + break; + + case 3: + name = strdup("Right Button"); + break; + case 4: case 5: case 6: case 7: - break; + break; + default: - snprintf(buf, sizeof(buf), "Extra Button (%d)", eb->button); - name = strdup(buf); + snprintf(buf, sizeof(buf), "Extra Button (%d)", eb->button); + name = strdup(buf); } return name; } @@ -1171,17 +1179,18 @@ _helper_wheel_name_get(E_Config_Binding_Wheel *bw) switch (bw->direction) { case 0: - if (bw->z >= 0) - name = strdup("Mouse Wheel Up"); - else - name = strdup("Mouse Wheel Down"); - break; + if (bw->z >= 0) + name = strdup("Mouse Wheel Up"); + else + name = strdup("Mouse Wheel Down"); + break; + default: - if (bw->z >= 0) - snprintf(buf, sizeof(buf), "Extra Wheel (%d) Up", bw->direction); - else - snprintf(buf, sizeof(buf), "Extra Wheel (%d) Down", bw->direction); - name = strdup(buf); + if (bw->z >= 0) + snprintf(buf, sizeof(buf), "Extra Wheel (%d) Up", bw->direction); + else + snprintf(buf, sizeof(buf), "Extra Wheel (%d) Down", bw->direction); + name = strdup(buf); } return name; } @@ -1196,20 +1205,20 @@ _helper_modifier_name_get(int mod) if (mod & E_BINDING_MODIFIER_CTRL) { - if (mods[0]) strcat(mods, " + "); - strcat(mods, "CTRL"); + if (mods[0]) strcat(mods, " + "); + strcat(mods, "CTRL"); } if (mod & E_BINDING_MODIFIER_ALT) { - if (mods[0]) strcat(mods, " + "); - strcat(mods, "ALT"); + if (mods[0]) strcat(mods, " + "); + strcat(mods, "ALT"); } if (mod & E_BINDING_MODIFIER_WIN) { - if (mods[0]) strcat(mods, " + "); - strcat(mods, "WIN"); + if (mods[0]) strcat(mods, " + "); + strcat(mods, "WIN"); } return strdup(mods); @@ -1225,11 +1234,13 @@ _mouse_binding_sort_cb(const void *d1, const void *d2) eb2 = d2; if (eb->button < eb2->button) return -1; - else if (eb->button > eb2->button) return 1; + else if (eb->button > eb2->button) + return 1; else { - if (eb->modifiers < eb2->modifiers) return -1; - else if (eb->modifiers > eb2->modifiers) return 1; + if (eb->modifiers < eb2->modifiers) return -1; + else if (eb->modifiers > eb2->modifiers) + return 1; } return 0; } @@ -1243,17 +1254,20 @@ _wheel_binding_sort_cb(const void *d1, const void *d2) bw2 = d2; if (bw->direction < bw2->direction) return -1; - else if (bw->direction > bw2->direction) return 1; + else if (bw->direction > bw2->direction) + return 1; else { - if ((bw->z < 0) && (bw2->z > 0)) return 1; - else if ((bw->z > 0) && (bw2->z < 0)) return -1; - else if (((bw->z < 0) && (bw2->z < 0)) || - ((bw->z > 0) && (bw2->z > 0))) - { - if (bw->modifiers < bw2->modifiers) return -1; - else if (bw->modifiers > bw2->modifiers) return 1; - } + if ((bw->z < 0) && (bw2->z > 0)) return 1; + else if ((bw->z > 0) && (bw2->z < 0)) + return -1; + else if (((bw->z < 0) && (bw2->z < 0)) || + ((bw->z > 0) && (bw2->z > 0))) + { + if (bw->modifiers < bw2->modifiers) return -1; + else if (bw->modifiers > bw2->modifiers) + return 1; + } } return 0; } @@ -1267,8 +1281,8 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata) man = e_manager_current_get(); - cfdata->locals.dia = e_dialog_new(e_container_current_get(man), - "E", "_mousebind_getmouse_dialog"); + cfdata->locals.dia = e_dialog_new(e_container_current_get(man), + "E", "_mousebind_getmouse_dialog"); if (!cfdata->locals.dia) return; e_dialog_title_set(cfdata->locals.dia, _("Mouse Binding Sequence")); e_dialog_icon_set(cfdata->locals.dia, "preferences-desktop-mouse", 48); @@ -1277,21 +1291,21 @@ _grab_wnd_show(E_Config_Dialog_Data *cfdata) e_win_borderless_set(cfdata->locals.dia->win, 1); cfdata->locals.bind_win = ecore_x_window_input_new(man->root, 0, 0, - man->w, man->h); + man->w, man->h); ecore_x_window_show(cfdata->locals.bind_win); e_grabinput_get(cfdata->locals.bind_win, 0, cfdata->locals.bind_win); cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers, - ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, - _grab_key_down_cb, cfdata)); + ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, + _grab_key_down_cb, cfdata)); cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers, - ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, - _grab_mouse_down_cb, cfdata)); + ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, + _grab_mouse_down_cb, cfdata)); cfdata->locals.handlers = eina_list_append(cfdata->locals.handlers, - ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, - _grab_mouse_wheel_cb, cfdata)); + ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, + _grab_mouse_wheel_cb, cfdata)); e_dialog_show(cfdata->locals.dia); ecore_x_icccm_transient_for_set(cfdata->locals.dia->win->evas_win, cfdata->cfd->dia->win->evas_win); @@ -1302,9 +1316,9 @@ _grab_wnd_hide(E_Config_Dialog_Data *cfdata) { while (cfdata->locals.handlers) { - ecore_event_handler_del(cfdata->locals.handlers->data); - cfdata->locals.handlers = - eina_list_remove_list(cfdata->locals.handlers, cfdata->locals.handlers); + ecore_event_handler_del(cfdata->locals.handlers->data); + cfdata->locals.handlers = + eina_list_remove_list(cfdata->locals.handlers, cfdata->locals.handlers); } cfdata->locals.handlers = NULL; e_grabinput_release(cfdata->locals.bind_win, cfdata->locals.bind_win); @@ -1325,7 +1339,7 @@ _grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event) int mod = E_BINDING_MODIFIER_NONE, n; Ecore_Event_Mouse_Button *ev; - + ev = event; cfdata = data; @@ -1338,78 +1352,78 @@ _grab_mouse_down_cb(void *data, __UNUSED__ int type, void *event) if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) - mod |= E_BINDING_MODIFIER_WIN; - - if (cfdata->locals.add) - { - eb = E_NEW(E_Config_Binding_Mouse, 1); - eb->context = E_BINDING_CONTEXT_ANY; - eb->button = ev->buttons; - eb->modifiers = mod; - eb->any_mod = 0; - eb->action = NULL; - eb->params = NULL; - - cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb); + mod |= E_BINDING_MODIFIER_WIN; + + if (cfdata->locals.add) + { + eb = E_NEW(E_Config_Binding_Mouse, 1); + eb->context = E_BINDING_CONTEXT_ANY; + eb->button = ev->buttons; + eb->modifiers = mod; + eb->any_mod = 0; + eb->action = NULL; + eb->params = NULL; + + cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb); } else { - if (cfdata->locals.cur[0] == 'm') - { - sscanf(cfdata->locals.cur, "m%d", &n); - eb = eina_list_nth(cfdata->binding.mouse, n); - if (eb) - { - eb->button = ev->buttons; - eb->modifiers = mod; - } - } - else if (cfdata->locals.cur[0] == 'w') - { - sscanf(cfdata->locals.cur, "w%d", &n); - l = eina_list_nth_list(cfdata->binding.wheel, n); - bw = eina_list_data_get(l); + if (cfdata->locals.cur[0] == 'm') + { + sscanf(cfdata->locals.cur, "m%d", &n); + eb = eina_list_nth(cfdata->binding.mouse, n); + if (eb) + { + eb->button = ev->buttons; + eb->modifiers = mod; + } + } + else if (cfdata->locals.cur[0] == 'w') + { + sscanf(cfdata->locals.cur, "w%d", &n); + l = eina_list_nth_list(cfdata->binding.wheel, n); + bw = eina_list_data_get(l); - eb = E_NEW(E_Config_Binding_Mouse, 1); - eb->context = bw->context; - eb->button = ev->buttons; - eb->modifiers = mod; - eb->any_mod = 0; - eb->action = bw->action; - eb->params = bw->params; + eb = E_NEW(E_Config_Binding_Mouse, 1); + eb->context = bw->context; + eb->button = ev->buttons; + eb->modifiers = mod; + eb->any_mod = 0; + eb->action = bw->action; + eb->params = bw->params; - cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb); + cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb); - bw->action = NULL; - bw->params = NULL; - E_FREE(bw); - cfdata->binding.wheel = eina_list_remove_list(cfdata->binding.wheel, l); - } - } - _update_mouse_binding_list(cfdata); + bw->action = NULL; + bw->params = NULL; + E_FREE(bw); + cfdata->binding.wheel = eina_list_remove_list(cfdata->binding.wheel, l); + } + } + _update_mouse_binding_list(cfdata); if (cfdata->locals.add) - { - for (l = cfdata->binding.mouse, n = 0; l; l = l->next, n++) - if (l->data == eb) break; + { + for (l = cfdata->binding.mouse, n = 0; l; l = l->next, n++) + if (l->data == eb) break; - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); - eina_stringshare_del(cfdata->locals.action); - cfdata->locals.action = eina_stringshare_add(""); - e_widget_ilist_unselect(cfdata->gui.o_action_list); - e_widget_entry_clear(cfdata->gui.o_params); - e_widget_disabled_set(cfdata->gui.o_params, 1); + eina_stringshare_del(cfdata->locals.action); + cfdata->locals.action = eina_stringshare_add(""); + e_widget_ilist_unselect(cfdata->gui.o_action_list); + e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); } else - { - for (l = cfdata->binding.mouse, n = 0; l; l = l->next, n++) - if (l->data == eb) break; + { + for (l = cfdata->binding.mouse, n = 0; l; l = l->next, n++) + if (l->data == eb) break; - eina_stringshare_del(cfdata->locals.cur); - cfdata->locals.cur = NULL; + eina_stringshare_del(cfdata->locals.cur); + cfdata->locals.cur = NULL; - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); } _update_buttons(cfdata); _grab_wnd_hide(cfdata); @@ -1424,7 +1438,7 @@ _grab_mouse_wheel_cb(void *data, __UNUSED__ int type, void *event) E_Config_Binding_Wheel *bw = NULL; E_Config_Binding_Mouse *eb = NULL; E_Config_Dialog_Data *cfdata; - Ecore_Event_Mouse_Wheel *ev; + Ecore_Event_Mouse_Wheel *ev; int mod = E_BINDING_MODIFIER_NONE, n; ev = event; @@ -1439,92 +1453,91 @@ _grab_mouse_wheel_cb(void *data, __UNUSED__ int type, void *event) if (ev->modifiers & ECORE_EVENT_MODIFIER_ALT) mod |= E_BINDING_MODIFIER_ALT; if (ev->modifiers & ECORE_EVENT_MODIFIER_WIN) - mod |= E_BINDING_MODIFIER_WIN; - - - if (cfdata->locals.add) - { - bw = E_NEW(E_Config_Binding_Wheel, 1); - bw->context = E_BINDING_CONTEXT_ANY; - bw->direction = ev->direction; - bw->z = ev->z; - bw->modifiers = mod; - bw->any_mod = 0; - bw->action = NULL; - bw->params = NULL; - - cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw); - } - else - { - if (cfdata->locals.cur[0] == 'm') - { - sscanf(cfdata->locals.cur, "m%d", &n); - l = eina_list_nth_list(cfdata->binding.mouse, n); - eb = eina_list_data_get(l); - - bw = E_NEW(E_Config_Binding_Wheel, 1); - bw->context = eb->context; - bw->direction = ev->direction; - bw->z = ev->z; - bw->modifiers = mod; - bw->any_mod = 0; - bw->action = eb->action; - bw->params = eb->params; - - cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw); - - E_FREE(eb); - cfdata->binding.mouse = eina_list_remove_list(cfdata->binding.mouse, l); - } - else if (cfdata->locals.cur[0] == 'w') - { - sscanf(cfdata->locals.cur, "w%d", &n); - bw = eina_list_nth(cfdata->binding.wheel, n); - if (bw) - { - bw->direction = ev->direction; - bw->z = ev->z; - bw->modifiers = mod; - } - } - } - _update_mouse_binding_list(cfdata); + mod |= E_BINDING_MODIFIER_WIN; if (cfdata->locals.add) - { - for (l = cfdata->binding.wheel, n = 0; l; l = l->next, n++) - if (l->data == bw) break; + { + bw = E_NEW(E_Config_Binding_Wheel, 1); + bw->context = E_BINDING_CONTEXT_ANY; + bw->direction = ev->direction; + bw->z = ev->z; + bw->modifiers = mod; + bw->any_mod = 0; + bw->action = NULL; + bw->params = NULL; - if (eina_list_count(cfdata->binding.mouse)) - { - n += eina_list_count(cfdata->binding.mouse) + 2; - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n); - } - else - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); - - e_widget_ilist_unselect(cfdata->gui.o_action_list); - eina_stringshare_del(cfdata->locals.action); - cfdata->locals.action = eina_stringshare_add(""); - e_widget_entry_clear(cfdata->gui.o_params); - e_widget_disabled_set(cfdata->gui.o_params, 1); + cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw); } else { - for (l = cfdata->binding.wheel, n = 0; l; l = l->next, n++) - if (l->data == bw) break; + if (cfdata->locals.cur[0] == 'm') + { + sscanf(cfdata->locals.cur, "m%d", &n); + l = eina_list_nth_list(cfdata->binding.mouse, n); + eb = eina_list_data_get(l); - eina_stringshare_del(cfdata->locals.cur); - cfdata->locals.cur = NULL; + bw = E_NEW(E_Config_Binding_Wheel, 1); + bw->context = eb->context; + bw->direction = ev->direction; + bw->z = ev->z; + bw->modifiers = mod; + bw->any_mod = 0; + bw->action = eb->action; + bw->params = eb->params; - if (eina_list_count(cfdata->binding.mouse)) - { - n += eina_list_count(cfdata->binding.mouse) + 2; - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n); - } - else - e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); + cfdata->binding.wheel = eina_list_append(cfdata->binding.wheel, bw); + + E_FREE(eb); + cfdata->binding.mouse = eina_list_remove_list(cfdata->binding.mouse, l); + } + else if (cfdata->locals.cur[0] == 'w') + { + sscanf(cfdata->locals.cur, "w%d", &n); + bw = eina_list_nth(cfdata->binding.wheel, n); + if (bw) + { + bw->direction = ev->direction; + bw->z = ev->z; + bw->modifiers = mod; + } + } + } + _update_mouse_binding_list(cfdata); + + if (cfdata->locals.add) + { + for (l = cfdata->binding.wheel, n = 0; l; l = l->next, n++) + if (l->data == bw) break; + + if (eina_list_count(cfdata->binding.mouse)) + { + n += eina_list_count(cfdata->binding.mouse) + 2; + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n); + } + else + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); + + e_widget_ilist_unselect(cfdata->gui.o_action_list); + eina_stringshare_del(cfdata->locals.action); + cfdata->locals.action = eina_stringshare_add(""); + e_widget_entry_clear(cfdata->gui.o_params); + e_widget_disabled_set(cfdata->gui.o_params, 1); + } + else + { + for (l = cfdata->binding.wheel, n = 0; l; l = l->next, n++) + if (l->data == bw) break; + + eina_stringshare_del(cfdata->locals.cur); + cfdata->locals.cur = NULL; + + if (eina_list_count(cfdata->binding.mouse)) + { + n += eina_list_count(cfdata->binding.mouse) + 2; + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n); + } + else + e_widget_ilist_selected_set(cfdata->gui.o_binding_list, n + 1); } _update_buttons(cfdata); @@ -1547,8 +1560,9 @@ _grab_key_down_cb(void *data, __UNUSED__ int type, void *event) !(ev->modifiers & ECORE_EVENT_MODIFIER_CTRL) && !(ev->modifiers & ECORE_EVENT_MODIFIER_ALT) && !(ev->modifiers & ECORE_EVENT_MODIFIER_WIN)) - { - _grab_wnd_hide(cfdata); + { + _grab_wnd_hide(cfdata); } return ECORE_CALLBACK_PASS_ON; } + diff --git a/src/modules/conf_keybindings/e_mod_main.c b/src/modules/conf_keybindings/e_mod_main.c index c1175ad8c..b47513be2 100644 --- a/src/modules/conf_keybindings/e_mod_main.c +++ b/src/modules/conf_keybindings/e_mod_main.c @@ -8,18 +8,18 @@ static E_Module *conf_module = NULL; EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, - "Settings - Input Controls" + "Settings - Input Controls" }; EAPI void * e_modapi_init(E_Module *m) { - e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), + e_configure_registry_category_add("keyboard_and_mouse", 40, _("Input"), NULL, "preferences-behavior"); - - e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, - _("Keys"), NULL, - "preferences-desktop-keyboard-shortcuts", + + e_configure_registry_item_add("keyboard_and_mouse/key_bindings", 10, + _("Keys"), NULL, + "preferences-desktop-keyboard-shortcuts", e_int_config_keybindings); e_configure_registry_item_add("keyboard_and_mouse/mouse_bindings", 20, _("Mouse Buttons"), NULL, @@ -40,18 +40,18 @@ e_modapi_shutdown(E_Module *m __UNUSED__) E_Config_Dialog *cfd; while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/acpi_bindings"))) - e_object_del(E_OBJECT(cfd)); + e_object_del(E_OBJECT(cfd)); while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/mouse_bindings"))) - e_object_del(E_OBJECT(cfd)); - while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) - e_object_del(E_OBJECT(cfd)); - + e_object_del(E_OBJECT(cfd)); + while ((cfd = e_config_dialog_get("E", "keyboard_and_mouse/key_bindings"))) + e_object_del(E_OBJECT(cfd)); + e_configure_registry_item_del("keyboard_and_mouse/acpi_bindings"); e_configure_registry_item_del("keyboard_and_mouse/mouse_bindings"); e_configure_registry_item_del("keyboard_and_mouse/key_bindings"); - + e_configure_registry_category_del("keyboard_and_mouse"); - + conf_module = NULL; return 1; } @@ -61,3 +61,4 @@ e_modapi_save(E_Module *m __UNUSED__) { return 1; } +