Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h draw.c ewin-ops.c ewins.h ipc.c moveresize.c
Log Message:
Add move/resize functions with action source parameter.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -3 -r1.533 -r1.534
--- E.h 18 Feb 2006 08:30:03 -0000 1.533
+++ E.h 19 Feb 2006 22:23:50 -0000 1.534
@@ -532,6 +532,7 @@
char *machine_name;
} wm;
int mode;
+ int op_source;
char action_inhibit;
EWin *focuswin;
EWin *mouse_over_ewin;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- draw.c 7 Jan 2006 07:20:57 -0000 1.89
+++ draw.c 19 Feb 2006 22:23:50 -0000 1.90
@@ -634,7 +634,7 @@
switch (md)
{
case 0:
- EwinMoveResize(ewin, x, y, w, h);
+ EwinOpMoveResize(ewin, OPSRC_USER, x, y, w, h);
EwinShapeSet(ewin);
CoordsShow(ewin);
break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- ewin-ops.c 18 Feb 2006 08:30:08 -0000 1.88
+++ ewin-ops.c 19 Feb 2006 22:23:50 -0000 1.89
@@ -1281,6 +1281,30 @@
}
void
+EwinOpMove(EWin * ewin, int source, int x, int y)
+{
+ Mode.op_source = source;
+ EwinMove(ewin, x, y);
+ Mode.op_source = 0;
+}
+
+void
+EwinOpResize(EWin * ewin, int source, int w, int h)
+{
+ Mode.op_source = source;
+ EwinResize(ewin, w, h);
+ Mode.op_source = 0;
+}
+
+void
+EwinOpMoveResize(EWin * ewin, int source, int x, int y, int w, int h)
+{
+ Mode.op_source = source;
+ EwinMoveResize(ewin, x, y, w, h);
+ Mode.op_source = 0;
+}
+
+void
EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
{
int x, y, w, h, ww, hh;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewins.h 12 Feb 2006 19:14:14 -0000 1.40
+++ ewins.h 19 Feb 2006 22:23:50 -0000 1.41
@@ -352,6 +352,10 @@
void EwinMoveToLinearArea(EWin * ewin, int a);
void EwinMoveLinearAreaBy(EWin * ewin, int a);
+void EwinOpMove(EWin * ewin, int source, int x, int y);
+void EwinOpResize(EWin * ewin, int source, int w, int h);
+void EwinOpMoveResize(EWin * ewin, int source, int x, int y,
+ int w, int h);
void EwinOpClose(EWin * ewin, int source);
void EwinOpActivate(EWin * ewin, int source);
void EwinOpKill(EWin * ewin, int source);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -3 -r1.254 -r1.255
--- ipc.c 18 Feb 2006 08:30:08 -0000 1.254
+++ ipc.c 19 Feb 2006 22:23:50 -0000 1.255
@@ -569,7 +569,7 @@
else
{
sscanf(params, "%*s %*s %i %i", &a, &b);
- EwinMove(ewin, a, b);
+ EwinOpMove(ewin, OPSRC_USER, a, b);
}
break;
@@ -600,7 +600,7 @@
else
{
sscanf(params, "%*s %*s %i %i", &a, &b);
- EwinResize(ewin, a, b);
+ EwinOpResize(ewin, OPSRC_USER, a, b);
}
break;
@@ -611,7 +611,7 @@
sscanf(params, "%*s %*s %i %i", &a, &b);
a += EoGetX(ewin);
b += EoGetY(ewin);
- EwinMove(ewin, a, b);
+ EwinOpMove(ewin, OPSRC_USER, a, b);
break;
case EWIN_OP_SIZE_REL:
@@ -621,7 +621,7 @@
sscanf(params, "%*s %*s %i %i", &a, &b);
a += ewin->client.w;
b += ewin->client.h;
- EwinResize(ewin, a, b);
+ EwinOpResize(ewin, OPSRC_USER, a, b);
break;
case EWIN_OP_MAX_WIDTH:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- moveresize.c 2 Feb 2006 22:34:06 -0000 1.62
+++ moveresize.c 19 Feb 2006 22:23:50 -0000 1.63
@@ -396,10 +396,10 @@
else
{
if (ewin->state.shaded)
- EwinMove(ewin, ewin->shape_x, ewin->shape_y);
+ EwinOpMove(ewin, OPSRC_USER, ewin->shape_x, ewin->shape_y);
else
- EwinMoveResize(ewin, ewin->shape_x, ewin->shape_y,
- ewin->shape_w, ewin->shape_h);
+ EwinOpMoveResize(ewin, OPSRC_USER, ewin->shape_x, ewin->shape_y,
+ ewin->shape_w, ewin->shape_h);
}
ESync();
@@ -622,7 +622,8 @@
tmp_swapcoord_y = Mode_mr.swapcoord_y;
Mode_mr.swapcoord_x = ewin2->shape_x;
Mode_mr.swapcoord_y = ewin2->shape_y;
- EwinMove(ewin2, tmp_swapcoord_x, tmp_swapcoord_y);
+ EwinOpMove(ewin2, OPSRC_USER,
+ tmp_swapcoord_x, tmp_swapcoord_y);
break;
}
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
