Enlightenment CVS committal

Author  : raster
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_actions.c e_config.c 


Log Message:


add a description for shade toggle, and some default key bindings for screen
flip (ctrl+shift F1-F4 for the first 4 screens, and ctrl+shift left/right
arrow for flipping up and down).

===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_actions.c 9 Jun 2006 22:15:11 -0000       1.66
+++ e_actions.c 13 Jun 2006 08:26:57 -0000      1.67
@@ -895,14 +895,16 @@
               {
                  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 @@
                  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));
               }
          }
      }
@@ -1594,6 +1596,9 @@
                                 EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS, 
0);
    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);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- e_config.c  9 Jun 2006 22:15:11 -0000       1.181
+++ e_config.c  13 Jun 2006 08:26:57 -0000      1.182
@@ -870,6 +870,24 @@
        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;




_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to