diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 9bdd87342..818f80d63 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -895,14 +895,16 @@ ACT_FN_GO(screen_send_to) { E_Zone *zone2; + while (scr >= zone->container->num) scr -= zone->container->num; + while (scr < 0) scr += zone->container->num; if (evas_list_count(e_manager_list()) > 1) zone2 = e_util_container_zone_number_get(scr, 0); else zone2 = e_util_container_zone_number_get(0, scr); if ((zone2) && (zone != zone2)) ecore_x_pointer_warp(zone2->container->win, - zone2->x + (zone->w / 2), - zone2->y + (zone->h / 2)); + zone2->x + (zone2->w / 2), + zone2->y + (zone2->h / 2)); } } } @@ -927,21 +929,21 @@ ACT_FN_GO(screen_send_by) if (evas_list_count(e_manager_list()) > 1) { scr += zone->container->num; - if (scr >= zone->container->num) scr -= zone->container->num; - else if (scr < 0) scr += zone->container->num; + while (scr >= zone->container->num) scr -= zone->container->num; + while (scr < 0) scr += zone->container->num; zone2 = e_util_container_zone_number_get(scr, 0); } else { scr += zone->num; - if (scr >= zone->num) scr -= zone->num; - else if (scr < 0) scr += zone->num; + while (scr >= zone->num) scr -= zone->num; + while (scr < 0) scr += zone->num; zone2 = e_util_container_zone_number_get(0, scr); } if ((zone2) && (zone != zone2)) ecore_x_pointer_warp(zone2->container->win, - zone2->x + (zone->w / 2), - zone2->y + (zone->h / 2)); + zone2->x + (zone2->w / 2), + zone2->y + (zone2->h / 2)); } } } @@ -1595,6 +1597,9 @@ e_actions_init(void) e_register_action_predef_name(_("Window : State"), _("Shade Right Mode Toggle"), "window_shaded_toggle", "Left", EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0); + e_register_action_predef_name(_("Window : State"), _("Shade Mode Toggle"), + "window_shaded_toggle", NULL, + EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 0); ACT_GO(window_shaded); diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 66f8e9ea7..e08779fd8 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -870,6 +870,24 @@ e_config_init(void) CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "d", E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_ALT, 0, "zone_deskshow_toggle", NULL); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Left", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_by", "-1"); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "Right", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_by", "1"); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F1", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_to", "0"); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F2", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_to", "1"); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F3", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_to", "2"); + CFG_KEYBIND(E_BINDING_CONTEXT_ANY, "F4", + E_BINDING_MODIFIER_CTRL | E_BINDING_MODIFIER_SHIFT, 0, + "screen_send_to", "3"); } { E_Config_Binding_Signal *eb;