summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2007-04-20 08:57:01 +0200
committerDanny Baumann <dannybaumann@web.de>2007-04-20 08:57:01 +0200
commitcb39b6968deeda54b69264f4f4eb5dcf7cb2887b (patch)
treeb9a066288a56ed730f373c048cd1a76578cec4a1
parent0a7a3286558dce22b9f00964a0c4dcee7d9f41dd (diff)
downloadberyl-premerge-cb39b6968deeda54b69264f4f4eb5dcf7cb2887b.tar.gz
beryl-premerge-cb39b6968deeda54b69264f4f4eb5dcf7cb2887b.tar.bz2
placeWindow is now the name of a core function.
-rw-r--r--src/tile.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/tile.c b/src/tile.c
index a8f3968..775f53b 100644
--- a/src/tile.c
+++ b/src/tile.c
@@ -91,7 +91,7 @@ typedef struct _TileWindow {
#define TILE_WINDOW(w) TileWindow *tw = GET_TILE_WINDOW (w, GET_TILE_SCREEN (w->screen, GET_TILE_DISPLAY (w->screen->display)))
-static Bool placeWindow(CompWindow *w, int x, int y, int width, int height);
+static Bool placeWin(CompWindow *w, int x, int y, int width, int height);
static Bool tileSetNewWindowSize(CompWindow *w);
// window painting function, draws animation
@@ -384,31 +384,31 @@ static void tileResizeNotify(CompWindow * w, int dx, int dy, int dwidth, int dhe
{
case TileToggleTypeTile:
if (prev)
- placeWindow(prev,
- prev->attrib.x, prev->attrib.y,
- w->attrib.x - prev->attrib.x - w->input.left - prev->input.right,
- prev->height);
+ placeWin(prev,
+ prev->attrib.x, prev->attrib.y,
+ w->attrib.x - prev->attrib.x - w->input.left - prev->input.right,
+ prev->height);
if (next)
{
int currentX = w->attrib.x + w->width + w->input.right + next->input.left;
- placeWindow(next, currentX, next->attrib.y,
- next->width + next->attrib.x - currentX, next->height);
+ placeWin(next, currentX, next->attrib.y,
+ next->width + next->attrib.x - currentX, next->height);
}
break;
case TileToggleTypeTileHorizontally:
if (prev)
- placeWindow(prev,
- prev->attrib.x, prev->attrib.y,
- prev->width,
- w->attrib.y - prev->attrib.y - w->input.top - prev->input.bottom);
+ placeWin(prev,
+ prev->attrib.x, prev->attrib.y,
+ prev->width,
+ w->attrib.y - prev->attrib.y - w->input.top - prev->input.bottom);
if (next)
{
int currentY = w->attrib.y + w->height + w->input.bottom + next->input.top;
- placeWindow(next, next->attrib.x, currentY,
- next->width, next->height + next->attrib.y - currentY);
+ placeWin(next, next->attrib.x, currentY,
+ next->width, next->height + next->attrib.y - currentY);
}
break;
case TileToggleTypeLeft:
@@ -428,8 +428,8 @@ static void tileResizeNotify(CompWindow * w, int dx, int dy, int dwidth, int dhe
currentX = workArea.x + w->serverX + w->serverWidth + w->input.right + cw->input.left;
- placeWindow(cw, currentX, cw->attrib.y,
- workArea.width - currentX - w->input.right, cw->attrib.height);
+ placeWin(cw, currentX, cw->attrib.y,
+ workArea.width - currentX - w->input.right, cw->attrib.height);
}
}
else if (next) // windows on the right
@@ -448,10 +448,10 @@ static void tileResizeNotify(CompWindow * w, int dx, int dy, int dwidth, int dhe
if (first)
{
- placeWindow(cw,
- workArea.x + cw->input.left, cw->attrib.y,
- w->serverX - w->input.left - cw->input.left - cw->input.right - workArea.x,
- cw->attrib.height);
+ placeWin(cw,
+ workArea.x + cw->input.left, cw->attrib.y,
+ w->serverX - w->input.left - cw->input.left - cw->input.right - workArea.x,
+ cw->attrib.height);
first = FALSE;
}
@@ -470,7 +470,7 @@ static void tileResizeNotify(CompWindow * w, int dx, int dy, int dwidth, int dhe
x = w->serverX;
width = workArea.width + workArea.x - w->serverX - w->input.right;
- placeWindow(cw, x, y, width, height);
+ placeWin(cw, x, y, width, height);
}
}
}
@@ -571,7 +571,7 @@ static void constrainMinMax(CompWindow * w, int width, int height, int *newWidth
}
// Moves window to [x,y] and resizes to width x height if no animation or starts animation
-static Bool placeWindow(CompWindow *w, int x, int y, int width, int height)
+static Bool placeWin(CompWindow *w, int x, int y, int width, int height)
{
// window existence check
if (!w)
@@ -788,10 +788,10 @@ static Bool applyTiling(CompScreen *s)
switch (ts->tileType)
{
case TileToggleTypeTile:
- placeWindow(w, currentX + border.left,
- currentY + border.top,
- winWidth - (border.left + border.right),
- winHeight - (border.top + border.bottom));
+ placeWin(w, currentX + border.left,
+ currentY + border.top,
+ winWidth - (border.left + border.right),
+ winHeight - (border.top + border.bottom));
tw->isTiled = TRUE;
break;
case TileToggleTypeLeft:
@@ -811,37 +811,37 @@ static Bool applyTiling(CompScreen *s)
winHeight = height;
}
- placeWindow(w, x + border.left, y + border.top,
- winWidth - (border.left + border.right),
- winHeight - (border.top + border.bottom));
+ placeWin(w, x + border.left, y + border.top,
+ winWidth - (border.left + border.right),
+ winHeight - (border.top + border.bottom));
tw->isTiled = TRUE;
break;
case TileToggleTypeTileVertically:
x = workArea.x + (winWidth * i);
- placeWindow(w, x + border.left, y + border.top,
- winWidth - (border.left + border.right),
- winHeight - (border.top + border.bottom));
+ placeWin(w, x + border.left, y + border.top,
+ winWidth - (border.left + border.right),
+ winHeight - (border.top + border.bottom));
tw->isTiled = TRUE;
break;
case TileToggleTypeTileHorizontally:
y = workArea.y + (winHeight * i);
- placeWindow(w, x + border.left, y + border.top,
- winWidth - (border.left + border.right),
- winHeight - (border.top + border.bottom));
+ placeWin(w, x + border.left, y + border.top,
+ winWidth - (border.left + border.right),
+ winHeight - (border.top + border.bottom));
tw->isTiled = TRUE;
break;
case TileToggleTypeCascade:
- placeWindow(w, currentX + border.left,
- currentY + border.top,
- winWidth - (border.left + border.right),
- winHeight - (border.top + border.bottom));
+ placeWin(w, currentX + border.left,
+ currentY + border.top,
+ winWidth - (border.left + border.right),
+ winHeight - (border.top + border.bottom));
tw->isTiled = TRUE;
break;
case TileToggleTypeNum:
if (tw->isTiled)
{
- placeWindow(w, tw->savedCoords.x, tw->savedCoords.y,
- tw->savedCoords.width, tw->savedCoords.height);
+ placeWin(w, tw->savedCoords.x, tw->savedCoords.y,
+ tw->savedCoords.width, tw->savedCoords.height);
tw->savedValid = FALSE;
tw->isTiled = FALSE;
}