Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h draw.c mod-misc.c moveresize.c settings.c 


Log Message:
Add dialog option to select non-grabbing move/resize modes.

===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -3 -r1.588 -r1.589
--- E.h 11 Jul 2007 09:05:42 -0000      1.588
+++ E.h 11 Jul 2007 09:21:26 -0000      1.589
@@ -321,7 +321,7 @@
       int                 mode_resize;
       int                 mode_info;
       unsigned int        color;
-      char                old_mode;
+      char                avoid_server_grab;
       char                update_while_moving;
       char                enable_sync_request;
    } movres;
===================================================================
RCS file: /cvs/e/e16/e/src/draw.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- draw.c      25 Jun 2007 20:00:50 -0000      1.108
+++ draw.c      11 Jul 2007 09:21:26 -0000      1.109
@@ -323,7 +323,7 @@
 
    EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
 
-   if (md <= 2 && !Conf.movres.old_mode)
+   if (md <= 2 && Conf.movres.avoid_server_grab)
      {
        static ShapeWin    *shape_win = NULL;
 
===================================================================
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- mod-misc.c  16 Jun 2007 11:16:17 -0000      1.57
+++ mod-misc.c  11 Jul 2007 09:21:27 -0000      1.58
@@ -149,7 +149,7 @@
    CFG_ITEM_INT(Conf, movres.mode_resize, 2),
    CFG_ITEM_INT(Conf, movres.mode_info, 1),
    CFG_ITEM_HEX(Conf, movres.color, 0x00ff0000),
-   CFG_ITEM_INT(Conf, movres.old_mode, 0),
+   CFG_ITEM_INT(Conf, movres.avoid_server_grab, 1),
    CFG_ITEM_BOOL(Conf, movres.update_while_moving, 0),
    CFG_ITEM_BOOL(Conf, movres.enable_sync_request, 0),
 
===================================================================
RCS file: /cvs/e/e16/e/src/moveresize.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- moveresize.c        24 Jun 2007 20:10:39 -0000      1.80
+++ moveresize.c        11 Jul 2007 09:21:27 -0000      1.81
@@ -51,7 +51,7 @@
    if (mode == 0)
       return 0;
    if (mode <= 2)
-      return Conf.movres.old_mode;
+      return !Conf.movres.avoid_server_grab;
    return 1;
 }
 
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- settings.c  18 May 2007 21:18:24 -0000      1.167
+++ settings.c  11 Jul 2007 09:21:27 -0000      1.168
@@ -28,6 +28,7 @@
 static int          tmp_move;
 static int          tmp_resize;
 static int          tmp_geominfo;
+static char         tmp_avoid_server_grab;
 static char         tmp_update_while_moving;
 static char         tmp_sync_request;
 
@@ -39,6 +40,7 @@
        Conf.movres.mode_move = tmp_move;
        Conf.movres.mode_resize = tmp_resize;
        Conf.movres.mode_info = tmp_geominfo;
+       Conf.movres.avoid_server_grab = tmp_avoid_server_grab;
        Conf.movres.update_while_moving = tmp_update_while_moving;
        Conf.movres.enable_sync_request = tmp_sync_request;
      }
@@ -53,6 +55,7 @@
    tmp_move = Conf.movres.mode_move;
    tmp_resize = Conf.movres.mode_resize;
    tmp_geominfo = Conf.movres.mode_info;
+   tmp_avoid_server_grab = Conf.movres.avoid_server_grab;
    tmp_update_while_moving = Conf.movres.update_while_moving;
    tmp_sync_request = Conf.movres.enable_sync_request;
 
@@ -126,6 +129,11 @@
    DialogItemRadioButtonGroupSetValPtr(radio1, &tmp_move);
 
    di = DialogAddItem(table, DITEM_NONE);
+
+   di = DialogAddItem(table, DITEM_CHECKBUTTON);
+   DialogItemSetColSpan(di, 2);
+   DialogItemSetText(di, _("Avoid server grab"));
+   DialogItemCheckButtonSetPtr(di, &tmp_avoid_server_grab);
 
    di = DialogAddItem(table, DITEM_SEPARATOR);
    DialogItemSetColSpan(di, 2);



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to