Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h areas.c arrange.c borders.c desktops.c dialog.c draw.c
ewin-ops.c ewins.c ewmh.c iconify.c ipc.c menus-misc.c menus.c
moveresize.c pager.c size.c windowmatch.c zoom.c
Log Message:
Trivial namespace cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -3 -r1.464 -r1.465
--- E.h 10 Jul 2005 00:23:52 -0000 1.464
+++ E.h 10 Jul 2005 08:30:46 -0000 1.465
@@ -1215,8 +1215,8 @@
void SetCurrentLinearArea(int a);
int GetCurrentLinearArea(void);
void MoveCurrentLinearAreaBy(int a);
-void MoveEwinToLinearArea(EWin * ewin, int a);
-void MoveEwinLinearAreaBy(EWin * ewin, int a);
+void EwinMoveToLinearArea(EWin * ewin, int a);
+void EwinMoveLinearAreaBy(EWin * ewin, int a);
/* arrange.c */
#define ARRANGE_VERBATIM 0
@@ -1645,10 +1645,10 @@
void SlideEwinsTo(EWin ** ewin, int *fx, int *fy, int *tx,
int *ty, int num_wins, int speed);
void EwinFixPosition(EWin * ewin);
-void MoveEwin(EWin * ewin, int x, int y);
-void ResizeEwin(EWin * ewin, int w, int h);
-void MoveResizeEwin(EWin * ewin, int x, int y, int w, int h);
-void MoveResizeEwinWithGravity(EWin * ewin, int x, int y, int w,
+void EwinMove(EWin * ewin, int x, int y);
+void EwinResize(EWin * ewin, int w, int h);
+void EwinMoveResize(EWin * ewin, int x, int y, int w, int h);
+void EwinMoveResizeWithGravity(EWin * ewin, int x, int y, int w,
int h, int grav);
void EwinIconify(EWin * ewin);
void EwinDeIconify(EWin * ewin);
@@ -1659,9 +1659,9 @@
void EwinShade(EWin * ewin);
void EwinUnShade(EWin * ewin);
void EwinSetFullscreen(EWin * ewin, int on);
-void MoveEwinToArea(EWin * ewin, int ax, int ay);
-void MoveEwinToDesktop(EWin * ewin, int num);
-void MoveEwinToDesktopAt(EWin * ewin, int num, int x, int y);
+void EwinMoveToArea(EWin * ewin, int ax, int ay);
+void EwinMoveToDesktop(EWin * ewin, int num);
+void EwinMoveToDesktopAt(EWin * ewin, int num, int x, int y);
unsigned int OpacityExt(int op);
void EwinOpClose(EWin * ewin);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- areas.c 8 Jul 2005 16:48:05 -0000 1.89
+++ areas.c 10 Jul 2005 08:31:03 -0000 1.90
@@ -101,9 +101,9 @@
if (!EoIsSticky(lst[i]))
{
if (lst[i]->area_x >= ax)
- MoveEwinToArea(lst[i], ax - 1, lst[i]->area_x);
+ EwinMoveToArea(lst[i], ax - 1, lst[i]->area_x);
if (lst[i]->area_y >= ay)
- MoveEwinToArea(lst[i], lst[i]->area_x, ay - 1);
+ EwinMoveToArea(lst[i], lst[i]->area_x, ay - 1);
}
}
@@ -251,9 +251,9 @@
if (EoIsSticky(ewin) ||
(EoIsFloating(ewin) && Conf.movres.mode_move == 0) ||
(!ewin->state.iconified && Conf.desks.slidein))
- MoveEwin(ewin, EoGetX(ewin), EoGetY(ewin));
+ EwinMove(ewin, EoGetX(ewin), EoGetY(ewin));
else
- MoveEwin(ewin, EoGetX(ewin) - dx, EoGetY(ewin) - dy);
+ EwinMove(ewin, EoGetX(ewin) - dx, EoGetY(ewin) - dy);
}
Mode.move.check = 1;
@@ -284,16 +284,16 @@
}
void
-MoveEwinToLinearArea(EWin * ewin, int a)
+EwinMoveToLinearArea(EWin * ewin, int a)
{
int ax, ay;
AreaLinearToXY(a, &ax, &ay);
- MoveEwinToArea(ewin, ax, ay);
+ EwinMoveToArea(ewin, ax, ay);
}
void
-MoveEwinLinearAreaBy(EWin * ewin, int a)
+EwinMoveLinearAreaBy(EWin * ewin, int a)
{
- MoveEwinToLinearArea(ewin, AreaXYToLinear(ewin->area_x, ewin->area_y) + a);
+ EwinMoveToLinearArea(ewin, AreaXYToLinear(ewin->area_x, ewin->area_y) + a);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/arrange.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- arrange.c 8 Jul 2005 16:48:05 -0000 1.76
+++ arrange.c 10 Jul 2005 08:31:03 -0000 1.77
@@ -792,7 +792,7 @@
int x, y;
ArrangeEwinXY(ewin, &x, &y);
- MoveEwin(ewin, x, y);
+ EwinMove(ewin, x, y);
}
void
@@ -801,7 +801,7 @@
int x, y;
ArrangeEwinCenteredXY(ewin, &x, &y);
- MoveEwin(ewin, x, y);
+ EwinMove(ewin, x, y);
if (focus)
FocusToEWin(ewin, FOCUS_SET);
}
@@ -1101,7 +1101,7 @@
{
if ((EoGetX(ewin) != ret[i].x)
|| (EoGetY(ewin) != ret[i].y))
- MoveEwin((EWin *) ret[i].data, ret[i].x, ret[i].y);
+ EwinMove((EWin *) ret[i].data, ret[i].x, ret[i].y);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -3 -r1.267 -r1.268
--- borders.c 8 Jul 2005 16:48:05 -0000 1.267
+++ borders.c 10 Jul 2005 08:31:05 -0000 1.268
@@ -581,7 +581,7 @@
if (apply)
{
EwinBorderSetTo(ewin, b);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin),
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin),
ewin->client.w, ewin->client.h);
}
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- desktops.c 30 Jun 2005 12:50:41 -0000 1.154
+++ desktops.c 10 Jul 2005 08:31:06 -0000 1.155
@@ -653,7 +653,7 @@
for (i = 0; i < num; i++)
{
if (EoGetDesk(lst[i]) >= quantity)
- MoveEwinToDesktop(lst[i], quantity - 1);
+ EwinMoveToDesktop(lst[i], quantity - 1);
}
while (Conf.desks.num > quantity)
@@ -927,7 +927,7 @@
if (ewin->client.transient > 0)
continue;
- MoveEwinToDesktop(ewin, desk);
+ EwinMoveToDesktop(ewin, desk);
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- dialog.c 8 Jul 2005 16:48:05 -0000 1.121
+++ dialog.c 10 Jul 2005 08:31:07 -0000 1.122
@@ -560,7 +560,7 @@
if (ewin)
{
if (EoGetDesk(ewin) != DesksGetCurrent())
- MoveEwinToDesktop(ewin, DesksGetCurrent());
+ EwinMoveToDesktop(ewin, DesksGetCurrent());
RaiseEwin(ewin);
ShowEwin(ewin);
return;
@@ -619,15 +619,15 @@
ewin->client.event_mask |= KeyPressMask | ExposureMask;
ESelectInput(d->win, ewin->client.event_mask);
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
+ EwinMoveToDesktop(ewin, EoGetDesk(ewin));
if (ewin->state.placed)
{
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
}
else
{
- ResizeEwin(ewin, w, h);
+ EwinResize(ewin, w, h);
if (FindADialog() > 1)
ArrangeEwin(ewin);
else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/draw.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- draw.c 8 Jul 2005 16:48:05 -0000 1.77
+++ draw.c 10 Jul 2005 08:31:08 -0000 1.78
@@ -641,7 +641,7 @@
switch (md)
{
case 0:
- MoveResizeEwin(ewin, x, y, w, h);
+ EwinMoveResize(ewin, x, y, w, h);
EwinShapeSet(ewin);
if (Mode.mode != MODE_NONE)
CoordsShow(ewin);
@@ -1031,9 +1031,9 @@
|| (ewin->groups && !check_move))
{
if (ewin->state.shaded)
- MoveEwin(ewin, ewin->shape_x, ewin->shape_y);
+ EwinMove(ewin, ewin->shape_x, ewin->shape_y);
else
- MoveResizeEwin(ewin, ewin->shape_x, ewin->shape_y,
+ EwinMoveResize(ewin, ewin->shape_x, ewin->shape_y,
ewin->shape_w, ewin->shape_h);
}
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewin-ops.c 10 Jul 2005 00:23:52 -0000 1.52
+++ ewin-ops.c 10 Jul 2005 08:31:09 -0000 1.53
@@ -132,7 +132,7 @@
FocusEnable(1);
if (Conf.slidemode == 0)
- MoveEwin(ewin, tx, ty);
+ EwinMove(ewin, tx, ty);
else
DrawEwinShape(ewin, Conf.slidemode, x, y, ewin->client.w, ewin->client.h,
2);
@@ -197,7 +197,7 @@
{
DrawEwinShape(ewin[i], 0, x[i], y[i], ewin[i]->client.w,
ewin[i]->client.h, 2);
- MoveEwin(ewin[i], tx[i], ty[i]);
+ EwinMove(ewin[i], tx[i], ty[i]);
}
}
@@ -237,7 +237,7 @@
y = 0 - EoGetH(ewin) + ewin->border->border.bottom + 1;
if (x != EoGetX(ewin) || y != EoGetY(ewin))
- MoveEwin(ewin, x, y);
+ EwinMove(ewin, x, y);
}
static void
@@ -269,7 +269,7 @@
#define MRF_UNFLOAT (1<<5)
static void
-doMoveResizeEwin(EWin * ewin, int desk, int x, int y, int w, int h, int flags)
+doEwinMoveResize(EWin * ewin, int desk, int x, int y, int w, int h, int flags)
{
static int call_depth = 0;
int dx, dy, sw, sh, xo, yo, pdesk;
@@ -282,7 +282,7 @@
call_depth++;
if (EventDebug(EDBUG_TYPE_MOVERESIZE))
- Eprintf("doMoveResizeEwin(%d,%d) %#lx f=%x d=%d %d+%d %d*%d %s\n",
+ Eprintf("doEwinMoveResize(%d,%d) %#lx f=%x d=%d %d+%d %d*%d %s\n",
call_depth, Mode.mode, ewin->client.win, flags, desk, x, y, w, h,
EwinGetName(ewin));
@@ -467,7 +467,7 @@
{
lst = EwinListTransients(ewin, &num, 0);
for (i = 0; i < num; i++)
- doMoveResizeEwin(lst[i], desk, EoGetX(lst[i]) + dx,
+ doEwinMoveResize(lst[i], desk, EoGetX(lst[i]) + dx,
EoGetY(lst[i]) + dy, 0, 0,
flags & (MRF_DESK | MRF_MOVE |
MRF_FLOAT | MRF_UNFLOAT));
@@ -501,52 +501,52 @@
}
void
-MoveEwin(EWin * ewin, int x, int y)
+EwinMove(EWin * ewin, int x, int y)
{
- doMoveResizeEwin(ewin, 0, x, y, 0, 0, MRF_MOVE);
+ doEwinMoveResize(ewin, 0, x, y, 0, 0, MRF_MOVE);
}
void
-ResizeEwin(EWin * ewin, int w, int h)
+EwinResize(EWin * ewin, int w, int h)
{
- doMoveResizeEwin(ewin, 0, 0, 0, w, h, MRF_RESIZE);
+ doEwinMoveResize(ewin, 0, 0, 0, w, h, MRF_RESIZE);
}
void
-MoveResizeEwin(EWin * ewin, int x, int y, int w, int h)
+EwinMoveResize(EWin * ewin, int x, int y, int w, int h)
{
- doMoveResizeEwin(ewin, 0, x, y, w, h, MRF_MOVE | MRF_RESIZE);
+ doEwinMoveResize(ewin, 0, x, y, w, h, MRF_MOVE | MRF_RESIZE);
}
void
-MoveResizeEwinWithGravity(EWin * ewin, int x, int y, int w, int h, int grav)
+EwinMoveResizeWithGravity(EWin * ewin, int x, int y, int w, int h, int grav)
{
EwinGetPosition(ewin, x, y, ewin->client.bw, grav, &x, &y);
- doMoveResizeEwin(ewin, 0, x, y, w, h, MRF_MOVE | MRF_RESIZE);
+ doEwinMoveResize(ewin, 0, x, y, w, h, MRF_MOVE | MRF_RESIZE);
}
void
-MoveEwinToDesktop(EWin * ewin, int desk)
+EwinMoveToDesktop(EWin * ewin, int desk)
{
- doMoveResizeEwin(ewin, desk, 0, 0, 0, 0, MRF_DESK);
+ doEwinMoveResize(ewin, desk, 0, 0, 0, 0, MRF_DESK);
}
void
-MoveEwinToDesktopAt(EWin * ewin, int desk, int x, int y)
+EwinMoveToDesktopAt(EWin * ewin, int desk, int x, int y)
{
- doMoveResizeEwin(ewin, desk, x, y, 0, 0, MRF_DESK | MRF_MOVE);
+ doEwinMoveResize(ewin, desk, x, y, 0, 0, MRF_DESK | MRF_MOVE);
}
void
EwinFloatAt(EWin * ewin, int x, int y)
{
- doMoveResizeEwin(ewin, 0, x, y, 0, 0, MRF_MOVE | MRF_FLOAT);
+ doEwinMoveResize(ewin, 0, x, y, 0, 0, MRF_MOVE | MRF_FLOAT);
}
void
EwinUnfloatAt(EWin * ewin, int desk, int x, int y)
{
- doMoveResizeEwin(ewin, desk, x, y, 0, 0, MRF_MOVE | MRF_UNFLOAT);
+ doEwinMoveResize(ewin, desk, x, y, 0, 0, MRF_MOVE | MRF_UNFLOAT);
}
void
@@ -671,9 +671,9 @@
dy = y - oy;
if (EoIsSticky(ewin))
- MoveEwin(ewin, x, y);
+ EwinMove(ewin, x, y);
else
- MoveEwinToDesktopAt(ewin, DesksGetCurrent(), x, y);
+ EwinMoveToDesktopAt(ewin, DesksGetCurrent(), x, y);
ModulesSignal(ESIGNAL_EWIN_DEICONIFY, ewin);
@@ -693,9 +693,9 @@
EwinRememberPositionGet(e, &ox, &oy);
if (EoIsSticky(e))
- MoveEwin(e, ox + dx, oy + dy);
+ EwinMove(e, ox + dx, oy + dy);
else
- MoveEwinToDesktopAt(e, DesksGetCurrent(), ox + dx, oy + dy);
+ EwinMoveToDesktopAt(e, DesksGetCurrent(), ox + dx, oy + dy);
e->state.iconified = 0;
@@ -722,7 +722,7 @@
return;
EoSetSticky(ewin, 0);
- MoveEwinToDesktopAt(ewin, DesksGetCurrent(), EoGetX(ewin), EoGetY(ewin));
+ EwinMoveToDesktopAt(ewin, DesksGetCurrent(), EoGetX(ewin), EoGetY(ewin));
EwinBorderUpdateState(ewin);
HintsSetWindowState(ewin);
HintsSetWindowDesktop(ewin);
@@ -750,7 +750,7 @@
y -= dy;
EoSetSticky(ewin, 1);
- MoveEwinToDesktopAt(ewin, DesksGetCurrent(), x, y);
+ EwinMoveToDesktopAt(ewin, DesksGetCurrent(), x, y);
EwinBorderUpdateState(ewin);
HintsSetWindowState(ewin);
HintsSetWindowDesktop(ewin);
@@ -873,7 +873,7 @@
EChangeWindowAttributes(ewin->client.win, CWWinGravity, &att);
ewin->state.shaded = 0;
- MoveResizeEwin(ewin, x, y, ewin->client.w, ewin->client.h);
+ EwinMoveResize(ewin, x, y, ewin->client.w, ewin->client.h);
#if 0 /* FIXME - Remove? */
ESync();
#endif
@@ -1070,7 +1070,7 @@
EShapeCombineShape(ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
ewin->client.h);
#if 0 /* FIXME - Remove? */
ESync();
@@ -1300,7 +1300,7 @@
EShapeCombineShape(ewin->win_container, ShapeBounding, 0, 0,
ewin->client.win, ShapeBounding, ShapeSet);
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
ewin->client.h);
#if 0 /* FIXME - Remove? */
ESync();
@@ -1378,7 +1378,7 @@
}
RaiseEwin(ewin);
- MoveResizeEwin(ewin, x, y, w, h);
+ EwinMoveResize(ewin, x, y, w, h);
ewin->state.fullscreen = 1;
EwinStateUpdate(ewin);
}
@@ -1405,7 +1405,7 @@
ewin->state.fullscreen = 0;
EwinStateUpdate(ewin);
RaiseEwin(ewin);
- MoveResizeEwin(ewin, x, y, w, h);
+ EwinMoveResize(ewin, x, y, w, h);
}
HintsSetWindowState(ewin);
EwinSetBorder(ewin, b, 1);
@@ -1444,10 +1444,10 @@
}
void
-MoveEwinToArea(EWin * ewin, int ax, int ay)
+EwinMoveToArea(EWin * ewin, int ax, int ay)
{
AreaFix(&ax, &ay);
- MoveEwin(ewin, EoGetX(ewin) + (VRoot.w * (ax - ewin->area_x)),
+ EwinMove(ewin, EoGetX(ewin) + (VRoot.w * (ax - ewin->area_x)),
EoGetY(ewin) + (VRoot.h * (ay - ewin->area_y)));
}
@@ -1799,7 +1799,7 @@
EwinOpMoveToDesk(EWin * ewin, int desk)
{
EoSetSticky(ewin, 0);
- MoveEwinToDesktop(ewin, desk);
+ EwinMoveToDesktop(ewin, desk);
RaiseEwin(ewin);
EwinBorderUpdateState(ewin);
HintsSetWindowState(ewin);
@@ -1810,7 +1810,7 @@
void
EwinOpMoveToArea(EWin * ewin, int x, int y)
{
- MoveEwinToArea(ewin, x, y);
+ EwinMoveToArea(ewin, x, y);
SnapshotEwinUpdate(ewin, SNAP_USE_POS);
}
@@ -1823,7 +1823,7 @@
if (params)
{
sscanf(params, "%i", &da);
- MoveEwinToLinearArea(ewin, da);
+ EwinMoveToLinearArea(ewin, da);
}
SnapshotEwinUpdate(ewin, SNAP_USE_POS);
return 0;
@@ -1838,7 +1838,7 @@
if (params)
{
sscanf(params, "%i", &da);
- MoveEwinLinearAreaBy(ewin, da);
+ EwinMoveLinearAreaBy(ewin, da);
}
SnapshotEwinUpdate(ewin, SNAP_USE_POS);
return 0;
@@ -1864,7 +1864,7 @@
{
if ((lst[i]->desktop == DesksGetCurrent()) && (!lst[i]->sticky) &&
(!lst[i]->floating))
- MoveEwin(lst[i], lst[i]->x + x, lst[i]->y + y);
+ EwinMove(lst[i], lst[i]->x + x, lst[i]->y + y);
}
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- ewins.c 10 Jul 2005 00:23:52 -0000 1.85
+++ ewins.c 10 Jul 2005 08:31:09 -0000 1.86
@@ -711,12 +711,12 @@
{
EwinSetFullscreen(ewin, 2);
ewin->state.placed = 1;
- MoveEwinToDesktopAt(ewin, desk, EoGetX(ewin), EoGetY(ewin));
+ EwinMoveToDesktopAt(ewin, desk, EoGetX(ewin), EoGetY(ewin));
ShowEwin(ewin);
goto done;
}
- ResizeEwin(ewin, ewin->client.w, ewin->client.h);
+ EwinResize(ewin, ewin->client.w, ewin->client.h);
doslide = manplace = 0;
if (Mode.place.enable_features)
@@ -784,7 +784,7 @@
/* if the window asked to be iconified at the start */
if (ewin->client.start_iconified)
{
- MoveEwinToDesktopAt(ewin, desk, x, y);
+ EwinMoveToDesktopAt(ewin, desk, x, y);
ewin->state.state = EWIN_STATE_MAPPED;
EwinIconify(ewin);
ewin->state.state = EWIN_STATE_ICONIC;
@@ -810,8 +810,8 @@
ewin->state.placed = 1;
x = Mode.x + 1;
y = Mode.y + 1;
- MoveEwinToDesktopAt(ewin, desk, x, y);
- MoveEwin(ewin, x, y);
+ EwinMoveToDesktopAt(ewin, desk, x, y);
+ EwinMove(ewin, x, y);
ShowEwin(ewin);
GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
Mode.have_place_grab = 1;
@@ -847,7 +847,7 @@
ewin->state.animated = 1;
FocusEnable(0);
- MoveEwinToDesktopAt(ewin, desk, fx, fy);
+ EwinMoveToDesktopAt(ewin, desk, fx, fy);
ShowEwin(ewin);
ewin->req_x = x;
ewin->req_y = y;
@@ -855,7 +855,7 @@
}
else
{
- MoveEwinToDesktopAt(ewin, desk, x, y);
+ EwinMoveToDesktopAt(ewin, desk, x, y);
ShowEwin(ewin);
}
@@ -1128,7 +1128,7 @@
}
Mode.move.check = 0; /* Don't restrict client requests */
- MoveResizeEwin(ewin, x, y, w, h);
+ EwinMoveResize(ewin, x, y, w, h);
Mode.move.check = 1;
ReZoom(ewin);
}
@@ -1151,7 +1151,7 @@
{
if (ewin)
{
- ResizeEwin(ewin, ev->xresizerequest.width, ev->xresizerequest.height);
+ EwinResize(ewin, ev->xresizerequest.width, ev->xresizerequest.height);
ReZoom(ewin);
}
else
@@ -1562,7 +1562,7 @@
if (desk != pdesk && !EoIsSticky(ewin))
{
EoSetDesk(ewin, pdesk);
- MoveEwinToDesktop(ewin, desk);
+ EwinMoveToDesktop(ewin, desk);
}
}
@@ -1611,7 +1611,7 @@
{
ewin = lst[i];
if (EwinIsMapped(ewin))
- MoveEwin(ewin, EoGetX(ewin), EoGetY(ewin));
+ EwinMove(ewin, EoGetX(ewin), EoGetY(ewin));
}
}
@@ -1907,7 +1907,7 @@
{
ewin = ewin_lst[i];
if (EwinIsMapped(ewin))
- ResizeEwin(ewin, ewin->client.w, ewin->client.h);
+ EwinResize(ewin, ewin->client.w, ewin->client.h);
}
break;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- ewmh.c 10 Jul 2005 00:23:52 -0000 1.79
+++ ewmh.c 10 Jul 2005 08:31:09 -0000 1.80
@@ -889,7 +889,7 @@
if (EoIsSticky(ewin))
EwinUnStick(ewin);
else
- MoveEwinToDesktop(ewin, ev->data.l[0]);
+ EwinMoveToDesktop(ewin, ev->data.l[0]);
}
}
else if (ev->message_type == ECORE_X_ATOM_NET_WM_STATE)
@@ -1015,7 +1015,7 @@
y = (flags & 0x200) ? ev->data.l[2] : EoGetY(ewin);
w = (flags & 0x400) ? ev->data.l[3] : ewin->client.w;
h = (flags & 0x800) ? ev->data.l[4] : ewin->client.h;
- MoveResizeEwinWithGravity(ewin, x, y, w, h, grav);
+ EwinMoveResizeWithGravity(ewin, x, y, w, h, grav);
}
else if (ev->message_type == ECORE_X_ATOM_NET_WM_MOVERESIZE)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -3 -r1.164 -r1.165
--- iconify.c 9 Jul 2005 16:42:27 -0000 1.164
+++ iconify.c 10 Jul 2005 08:31:09 -0000 1.165
@@ -568,17 +568,17 @@
if (ewin->state.placed)
{
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
+ EwinMoveToDesktop(ewin, EoGetDesk(ewin));
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), ewin->client.w,
ewin->client.h);
}
else
{
/* The first one */
EwinStick(ewin);
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
- ResizeEwin(ewin, 128, 32);
- MoveEwin(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
+ EwinMoveToDesktop(ewin, EoGetDesk(ewin));
+ EwinResize(ewin, 128, 32);
+ EwinMove(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
}
ShowEwin(ewin);
@@ -1721,7 +1721,7 @@
EWin *ewin = ib->ewin;
ib->do_update = 1;
- ResizeEwin(ib->ewin, ewin->client.w, ewin->client.h);
+ EwinResize(ib->ewin, ewin->client.w, ewin->client.h);
}
static int
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -3 -r1.220 -r1.221
--- ipc.c 8 Jul 2005 16:48:08 -0000 1.220
+++ ipc.c 10 Jul 2005 08:31:11 -0000 1.221
@@ -600,7 +600,7 @@
else
{
sscanf(params, "%*s %*s %i %i", &a, &b);
- MoveEwinToArea(ewin, a, b);
+ EwinMoveToArea(ewin, a, b);
}
break;
@@ -627,7 +627,7 @@
else
{
sscanf(params, "%*s %*s %i %i", &a, &b);
- MoveEwin(ewin, a, b);
+ EwinMove(ewin, a, b);
}
break;
@@ -658,7 +658,7 @@
else
{
sscanf(params, "%*s %*s %i %i", &a, &b);
- ResizeEwin(ewin, a, b);
+ EwinResize(ewin, a, b);
}
break;
@@ -669,7 +669,7 @@
sscanf(params, "%*s %*s %i %i", &a, &b);
a += EoGetX(ewin);
b += EoGetY(ewin);
- MoveEwin(ewin, a, b);
+ EwinMove(ewin, a, b);
break;
case EWIN_OP_SIZE_REL:
@@ -679,7 +679,7 @@
sscanf(params, "%*s %*s %i %i", &a, &b);
a += ewin->client.w;
b += ewin->client.h;
- ResizeEwin(ewin, a, b);
+ EwinResize(ewin, a, b);
break;
case EWIN_OP_FOCUS:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus-misc.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- menus-misc.c 8 Jul 2005 16:48:09 -0000 1.12
+++ menus-misc.c 10 Jul 2005 08:31:13 -0000 1.13
@@ -778,7 +778,7 @@
ewin = FindEwinByMenu(task_menu[desk]);
if (ewin)
{
- MoveEwin(ewin, lx, ly);
+ EwinMove(ewin, lx, ly);
ShowEwin(ewin);
}
Mode.cur_menu[0] = task_menu[desk];
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- menus.c 8 Jul 2005 16:48:09 -0000 1.203
+++ menus.c 10 Jul 2005 08:31:13 -0000 1.204
@@ -315,8 +315,8 @@
ewin->head = head_num;
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
- ResizeEwin(ewin, ewin->client.w, ewin->client.h);
+ EwinMoveToDesktop(ewin, EoGetDesk(ewin));
+ EwinResize(ewin, ewin->client.w, ewin->client.h);
if (Conf.menus.animate)
EwinInstantShade(ewin, 0);
@@ -591,7 +591,7 @@
ewin->client.height.max = h;
ewin->client.width.min = w;
ewin->client.width.max = w;
- ResizeEwin(ewin, w, h);
+ EwinResize(ewin, w, h);
RaiseEwin(ewin);
}
}
@@ -1035,7 +1035,7 @@
ewin = m->ewin;
if (ewin)
{
- MoveEwin(ewin, lx, ly);
+ EwinMove(ewin, lx, ly);
ShowEwin(ewin);
}
}
@@ -1279,7 +1279,7 @@
ewin2 = mi->child->ewin;
if (ewin2)
{
- MoveEwin(ewin2,
+ EwinMove(ewin2,
EoGetX(ewin) + ewin->border->border.left + mx + mw,
EoGetY(ewin) + ewin->border->border.top + my -
ewin2->border->border.top);
@@ -1609,7 +1609,7 @@
}
Mode.move.check = 0; /* Bypass on-screen checks */
- MoveEwin(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo);
+ EwinMove(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo);
Mode.move.check = 1;
EwinFloatAt(ewin2, EoGetX(ewin2), EoGetY(ewin2));
RaiseEwin(ewin2);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/moveresize.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- moveresize.c 8 Jul 2005 16:48:09 -0000 1.43
+++ moveresize.c 10 Jul 2005 08:31:15 -0000 1.44
@@ -594,7 +594,7 @@
tmp_swapcoord_y = move_swapcoord_y;
move_swapcoord_x = ewin2->shape_x;
move_swapcoord_y = ewin2->shape_y;
- MoveEwin(ewin2, tmp_swapcoord_x, tmp_swapcoord_y);
+ EwinMove(ewin2, tmp_swapcoord_x, tmp_swapcoord_y);
break;
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- pager.c 9 Jul 2005 22:57:19 -0000 1.156
+++ pager.c 10 Jul 2005 08:31:15 -0000 1.157
@@ -625,10 +625,10 @@
w = ewin->client.w;
h = ewin->client.h;
- MoveEwinToDesktop(ewin, EoGetDesk(ewin));
+ EwinMoveToDesktop(ewin, EoGetDesk(ewin));
if (ewin->state.placed)
{
- MoveResizeEwin(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
+ EwinMoveResize(ewin, EoGetX(ewin), EoGetY(ewin), w, h);
}
else
{
@@ -638,8 +638,8 @@
GetAreaSize(&ax, &ay);
w = ((48 * VRoot.w) / VRoot.h) * ax;
h = 48 * ay;
- ResizeEwin(ewin, w, h); /* Does layout */
- MoveEwin(ewin, 0,
+ EwinResize(ewin, w, h); /* Does layout */
+ EwinMove(ewin, 0,
VRoot.h - (Conf.desks.num - p->desktop) * EoGetH(ewin));
}
@@ -1522,10 +1522,10 @@
continue;
if (newdesk)
- MoveEwinToDesktopAt(gwins[i], desk, EoGetX(gwins[i]) + dx,
+ EwinMoveToDesktopAt(gwins[i], desk, EoGetX(gwins[i]) + dx,
EoGetY(gwins[i]) + dy);
else
- MoveEwin(gwins[i], EoGetX(gwins[i]) + dx, EoGetY(gwins[i]) + dy);
+ EwinMove(gwins[i], EoGetX(gwins[i]) + dx, EoGetY(gwins[i]) + dy);
}
if (gwins)
Efree(gwins);
@@ -1684,7 +1684,7 @@
{
if (gwins[i]->type != EWIN_TYPE_PAGER)
{
- MoveEwin(gwins[i], gwin_px[i], gwin_py[i]);
+ EwinMove(gwins[i], gwin_px[i], gwin_py[i]);
EwinIconify(gwins[i]);
}
}
@@ -1895,7 +1895,7 @@
{
p = pl[i];
PagerReconfigure(p);
- ResizeEwin(p->ewin, p->ewin->client.w, p->ewin->client.h);
+ EwinResize(p->ewin, p->ewin->client.w, p->ewin->client.h);
}
Efree(pl);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/size.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- size.c 8 Jul 2005 16:48:16 -0000 1.41
+++ size.c 10 Jul 2005 08:31:15 -0000 1.42
@@ -43,7 +43,7 @@
if (ewin->toggle)
{
- MoveResizeEwin(ewin, ewin->lx, ewin->ly, ewin->lw, ewin->lh);
+ EwinMoveResize(ewin, ewin->lx, ewin->ly, ewin->lw, ewin->lh);
ewin->lx = EoGetX(ewin);
ewin->ly = EoGetY(ewin);
ewin->lw = ewin->client.w;
@@ -168,7 +168,7 @@
ewin->ly = EoGetY(ewin);
ewin->lw = ewin->client.w;
ewin->lh = ewin->client.h;
- MoveResizeEwin(ewin, x, y, w, h);
+ EwinMoveResize(ewin, x, y, w, h);
ewin->toggle = 1;
done:;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/windowmatch.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- windowmatch.c 8 Jul 2005 16:48:19 -0000 1.31
+++ windowmatch.c 10 Jul 2005 08:31:15 -0000 1.32
@@ -734,7 +734,7 @@
a = b = 0;
if (sscanf(args, "%u %u", &a, &b) < 2)
break;
- MoveEwinToArea(ewin, a, b); /* FIXME - We should not move here */
+ EwinMoveToArea(ewin, a, b); /* FIXME - We should not move here */
break;
case EWIN_OP_MOVE:
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/zoom.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- zoom.c 7 May 2005 11:20:02 -0000 1.27
+++ zoom.c 10 Jul 2005 08:31:15 -0000 1.28
@@ -206,7 +206,7 @@
{
ewin = zoom_last_ewin;
/* XUngrabPointer(disp, CurrentTime); */
- MoveEwin(ewin, zoom_last_x, zoom_last_y);
+ EwinMove(ewin, zoom_last_x, zoom_last_y);
if (zoom_mask_1)
EDestroyWindow(zoom_mask_1);
if (zoom_mask_2)
@@ -245,7 +245,7 @@
if (y2 < 0)
y2 = 0;
RaiseEwin(ewin);
- MoveEwin(ewin, -ewin->border->border.left + x1,
+ EwinMove(ewin, -ewin->border->border.left + x1,
-ewin->border->border.top + y1);
FocusToEWin(ewin, FOCUS_SET);
XWarpPointer(disp, None, ewin->client.win, 0, 0, 0, 0,
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
