Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h buttons.c desktops.c edge.c ewin-ops.c menus.c mod-misc.c 
        screen.c settings.c 


Log Message:
Rename a few configuration items.

===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -3 -r1.561 -r1.562
--- E.h 23 Aug 2006 19:06:21 -0000      1.561
+++ E.h 23 Aug 2006 21:04:53 -0000      1.562
@@ -251,6 +251,10 @@
    } backgrounds;
    struct
    {
+      int                 move_resistance;
+   } buttons;
+   struct
+   {
       unsigned int        num;
       int                 dragdir;
       int                 dragbar_width;
@@ -262,6 +266,7 @@
       int                 areas_nx;
       int                 areas_ny;
       char                areas_wraparound;
+      int                 edge_flip_resistance;
    } desks;
    struct
    {
@@ -329,6 +334,9 @@
       int                 slidespeedcleanup;
       char                ignore_struts;
       char                raise_fullscreen;
+#ifdef HAS_XINERAMA
+      char                extra_head;  /* Not used */
+#endif
    } place;
    struct
    {
@@ -341,6 +349,11 @@
    } session;
    struct
    {
+      char                animate;
+      int                 speed;
+   } shading;
+   struct
+   {
       char                enable;
       int                 edge_snap_dist;
       int                 screen_snap_dist;
@@ -383,6 +396,7 @@
       char                warp_on_select;
       int                 icon_mode;
    } warplist;
+
    struct
    {
       char                argb_internal_objects;
@@ -391,19 +405,10 @@
       char                argb_clients_inherit_attr;
       char                use_sync;
    } testing;
-   int                 deskmode;
-   char                animate_shading;
-   int                 shadespeed;
-   int                 button_move_resistance;
+
    char                autosave;
    char                memory_paranoia;
    char                save_under;
-   int                 edge_flip_resistance;
-
-   /* Not used */
-#ifdef HAS_XINERAMA
-   char                extra_head;     /* Not used */
-#endif
 }
 EConf;
 
===================================================================
RCS file: /cvs/e/e16/e/src/buttons.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- buttons.c   24 Jul 2006 21:10:58 -0000      1.94
+++ buttons.c   23 Aug 2006 21:04:53 -0000      1.95
@@ -584,8 +584,8 @@
           x = -x;
        if (y < 0)
           y = -y;
-       if ((x > Conf.button_move_resistance) ||
-           (y > Conf.button_move_resistance))
+       if ((x > Conf.buttons.move_resistance) ||
+           (y > Conf.buttons.move_resistance))
           Mode_buttons.move_pending = 0;
        Mode_buttons.action_inhibit = 1;
      }
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -3 -r1.248 -r1.249
--- desktops.c  8 Aug 2006 03:58:42 -0000       1.248
+++ desktops.c  23 Aug 2006 21:04:53 -0000      1.249
@@ -2492,10 +2492,10 @@
          {
             if (tmp_edge_resist < 1)
                tmp_edge_resist = 1;
-            Conf.edge_flip_resistance = tmp_edge_resist;
+            Conf.desks.edge_flip_resistance = tmp_edge_resist;
          }
        else
-          Conf.edge_flip_resistance = 0;
+          Conf.desks.edge_flip_resistance = 0;
        EdgeWindowsShow();
      }
    autosave();
@@ -2573,7 +2573,7 @@
    char                s[64];
 
    tmp_area_wraparound = Conf.desks.areas_wraparound;
-   tmp_edge_resist = Conf.edge_flip_resistance;
+   tmp_edge_resist = Conf.desks.edge_flip_resistance;
    if (tmp_edge_resist == 0)
       tmp_edge_flip = 0;
    else
@@ -2927,6 +2927,7 @@
    CFG_FUNC_INT(Conf.desks, areas_nx, 2, AreasCfgFuncSizeX),
    CFG_FUNC_INT(Conf.desks, areas_ny, 1, AreasCfgFuncSizeY),
    CFG_ITEM_BOOL(Conf.desks, areas_wraparound, 0),
+   CFG_ITEM_INT(Conf.desks, edge_flip_resistance, 25),
 };
 #define N_CFG_ITEMS (sizeof(DesksCfgItems)/sizeof(CfgItem))
 
===================================================================
RCS file: /cvs/e/e16/e/src/edge.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- edge.c      29 Apr 2006 19:39:20 -0000      1.30
+++ edge.c      23 Aug 2006 21:04:53 -0000      1.31
@@ -41,7 +41,7 @@
 
    if (MenusActive())
       return;
-   if (!Conf.edge_flip_resistance)
+   if (!Conf.desks.edge_flip_resistance)
       return;
 
    /* Quit if pointer has left screen */
@@ -110,14 +110,14 @@
 #if 0
    Eprintf("EdgeEvent %d -> %d\n", lastdir, dir);
 #endif
-   if (lastdir == dir || !Conf.edge_flip_resistance)
+   if (lastdir == dir || !Conf.desks.edge_flip_resistance)
       return;
 
    RemoveTimerEvent("EDGE_TIMEOUT");
    if (dir >= 0)
      {
        DoIn("EDGE_TIMEOUT",
-            ((double)Conf.edge_flip_resistance) / 100.0, EdgeTimeout,
+            ((double)Conf.desks.edge_flip_resistance) / 100.0, EdgeTimeout,
             dir, NULL);
      }
    lastdir = dir;
@@ -181,7 +181,7 @@
 {
    int                 ax, ay, cx, cy;
 
-   if (Conf.edge_flip_resistance <= 0)
+   if (Conf.desks.edge_flip_resistance <= 0)
      {
        EdgeWindowsHide();
        return;
===================================================================
RCS file: /cvs/e/e16/e/src/ewin-ops.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- ewin-ops.c  7 Aug 2006 20:20:15 -0000       1.100
+++ ewin-ops.c  23 Aug 2006 21:04:53 -0000      1.101
@@ -963,7 +963,7 @@
    if ((ewin->border) && (!strcmp(ewin->border->name, "BORDERLESS")))
       return;
 
-   speed = Conf.shadespeed;
+   speed = Conf.shading.speed;
 
    x = EoGetX(ewin);
    y = EoGetY(ewin);
@@ -983,7 +983,7 @@
        EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att);
        EwinBorderMinShadeSize(ewin, &b, &c);
        a = w;
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1015,7 +1015,7 @@
        EwinBorderMinShadeSize(ewin, &b, &c);
        a = w;
        c = x + w;
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1047,7 +1047,7 @@
        EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att);
        EwinBorderMinShadeSize(ewin, &c, &b);
        a = h;
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1079,7 +1079,7 @@
        EwinBorderMinShadeSize(ewin, &c, &b);
        a = h;
        c = y + h;
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1137,7 +1137,7 @@
    if (!ewin->state.shaded || ewin->state.iconified)
       return;
 
-   speed = Conf.shadespeed;
+   speed = Conf.shading.speed;
 
    x = EoGetX(ewin);
    y = EoGetY(ewin);
@@ -1166,7 +1166,7 @@
                          ewin->client.w, ewin->client.h);
        EMapWindow(EwinGetClientWin(ewin));
        EMapWindow(ewin->win_container);
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1204,7 +1204,7 @@
                          ewin->client.h);
        EMapWindow(EwinGetClientWin(ewin));
        EMapWindow(ewin->win_container);
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1242,7 +1242,7 @@
                          ewin->client.w, ewin->client.h);
        EMapWindow(EwinGetClientWin(ewin));
        EMapWindow(ewin->win_container);
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
@@ -1280,7 +1280,7 @@
                          ewin->client.w, ewin->client.h);
        EMapWindow(EwinGetClientWin(ewin));
        EMapWindow(ewin->win_container);
-       if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU))
+       if ((Conf.shading.animate) || (ewin->type == EWIN_TYPE_MENU))
          {
             ETimedLoopInit(0, 1024, speed);
             for (k = 0; k < 1024;)
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -3 -r1.256 -r1.257
--- menus.c     11 Aug 2006 13:45:48 -0000      1.256
+++ menus.c     23 Aug 2006 21:04:53 -0000      1.257
@@ -1555,7 +1555,7 @@
 
             /* Disable menu item events while sliding */
             MenusSetEvents(0);
-            SlideEwinsTo(menus, fx, fy, tx, ty, i, Conf.shadespeed);
+            SlideEwinsTo(menus, fx, fy, tx, ty, i, Conf.shading.speed);
             MenusSetEvents(1);
 
             if (Conf.menus.warp)
===================================================================
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- mod-misc.c  23 Aug 2006 19:06:21 -0000      1.41
+++ mod-misc.c  23 Aug 2006 21:04:53 -0000      1.42
@@ -108,6 +108,8 @@
 
 static const CfgItem MiscCfgItems[] = {
 
+   CFG_ITEM_INT(Conf, buttons.move_resistance, 10),
+
    CFG_ITEM_BOOL(Conf, dialogs.headers, 0),
    CFG_ITEM_BOOL(Conf, dialogs.button_image, 0),
 
@@ -145,6 +147,9 @@
    CFG_ITEM_STR(Conf, session.cmd_reboot),
    CFG_ITEM_STR(Conf, session.cmd_halt),
 
+   CFG_ITEM_BOOL(Conf, shading.animate, 1),
+   CFG_ITEM_INT(Conf, shading.speed, 8000),
+
    CFG_ITEM_BOOL(Conf, snap.enable, 1),
    CFG_ITEM_INT(Conf, snap.edge_snap_dist, 8),
    CFG_ITEM_INT(Conf, snap.screen_snap_dist, 32),
@@ -158,14 +163,9 @@
    CFG_ITEM_BOOL(Conf, testing.argb_clients_inherit_attr, 0),
    CFG_ITEM_BOOL(Conf, testing.use_sync, 1),
 
-   CFG_ITEM_INT(Conf, deskmode, MODE_NONE),
-   CFG_ITEM_BOOL(Conf, animate_shading, 1),
-   CFG_ITEM_INT(Conf, shadespeed, 8000),
-   CFG_ITEM_INT(Conf, button_move_resistance, 5),
    CFG_ITEM_BOOL(Conf, autosave, 1),
    CFG_ITEM_BOOL(Conf, memory_paranoia, 1),
    CFG_ITEM_BOOL(Conf, save_under, 0),
-   CFG_ITEM_INT(Conf, edge_flip_resistance, 25),
 };
 #define N_CFG_ITEMS ((int)(sizeof(MiscCfgItems)/sizeof(CfgItem)))
 
===================================================================
RCS file: /cvs/e/e16/e/src/screen.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- screen.c    29 Apr 2006 19:39:21 -0000      1.19
+++ screen.c    23 Aug 2006 21:04:53 -0000      1.20
@@ -69,7 +69,6 @@
       return;
 
    Mode.display.xinerama_active = XineramaIsActive(disp);
-   Conf.extra_head = 0;
    if (Mode.display.xinerama_active)
       screens = XineramaQueryScreens(disp, &num_screens);
 
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- settings.c  22 Aug 2006 19:23:36 -0000      1.157
+++ settings.c  23 Aug 2006 21:04:53 -0000      1.158
@@ -207,14 +207,14 @@
        Conf.place.slidespeedmap = tmp_map_slide_speed;
        Conf.place.slidespeedcleanup = tmp_cleanup_slide_speed;
 
-       Conf.animate_shading = tmp_animate_shading;
-       Conf.shadespeed = tmp_shade_speed;
+       Conf.shading.animate = tmp_animate_shading;
+       Conf.shading.speed = tmp_shade_speed;
 
        Conf.place.ignore_struts = tmp_place_ignore_struts;
        Conf.place.raise_fullscreen = tmp_raise_fullscreen;
 #ifdef HAS_XINERAMA
        if (Mode.display.xinerama_active)
-          Conf.extra_head = tmp_extra_head;
+          Conf.place.extra_head = tmp_extra_head;
 #endif
      }
    autosave();
@@ -237,14 +237,14 @@
    tmp_map_slide_speed = Conf.place.slidespeedmap;
    tmp_cleanup_slide_speed = Conf.place.slidespeedcleanup;
 
-   tmp_animate_shading = Conf.animate_shading;
-   tmp_shade_speed = Conf.shadespeed;
+   tmp_animate_shading = Conf.shading.animate;
+   tmp_shade_speed = Conf.shading.speed;
 
    tmp_place_ignore_struts = Conf.place.ignore_struts;
    tmp_raise_fullscreen = Conf.place.raise_fullscreen;
 
 #ifdef HAS_XINERAMA
-   tmp_extra_head = Conf.extra_head;
+   tmp_extra_head = Conf.place.extra_head;
 #endif
 
    DialogItemTableSetOptions(table, 2, 0, 1, 0);
@@ -368,7 +368,7 @@
    DialogItemSetText(di, _("Raise fullscreen windows"));
    DialogItemCheckButtonSetPtr(di, &tmp_raise_fullscreen);
 
-#ifdef HAS_XINERAMA
+#ifdef HAS_XINERAMA_no         /* Not implemented */
    if (Mode.display.xinerama_active)
      {
        di = DialogAddItem(table, DITEM_CHECKBUTTON);



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to