summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/move.c
diff options
context:
space:
mode:
authorreggaemanu <reggaemanu@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-17 16:59:20 +0000
committerreggaemanu <reggaemanu@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-17 16:59:20 +0000
commit63c09a12334318bc757a58d1ee9d5b41cae76857 (patch)
tree7a72dff12e6261d0b2bec3219b134355ed2d5f4f /beryl-plugins/src/move.c
parent25a0bd06c5537ba75813875f6ca1ac75a9920a8a (diff)
downloadmarex-dev-63c09a12334318bc757a58d1ee9d5b41cae76857.tar.gz
marex-dev-63c09a12334318bc757a58d1ee9d5b41cae76857.tar.bz2
Upstream updates...
beryl-core: Add serverWidth serverHeight and serverBorderWidth beryl-plugins: Use serverWidth, serverHeight and serverBorderWidth for place and move plugins git-svn-id: file:///beryl/trunk@666 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/move.c')
-rw-r--r--beryl-plugins/src/move.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/beryl-plugins/src/move.c b/beryl-plugins/src/move.c
index a120a01..cbad048 100644
--- a/beryl-plugins/src/move.c
+++ b/beryl-plugins/src/move.c
@@ -289,8 +289,8 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
/*if (md->opt[MOVE_DISPLAY_OPTION_CONSTRAIN_Y_BOTTOM].value.b)*/
if (!w->shaded && md->opt[MOVE_DISPLAY_OPTION_CONSTRAIN_Y_BOTTOM].value.b)
{
- if (w->attrib.y + dy + w->attrib.height > max)
- dy = max - w->attrib.y - w->attrib.height;
+ if (w->attrib.y + dy + w->serverHeight > max)
+ dy = max - w->attrib.y - w->serverHeight;
}
if (md->opt[MOVE_DISPLAY_OPTION_SNAPOFF_MAXIMIZED].value.b)
@@ -299,7 +299,7 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
{
if (yRoot - ms->snapOffY >= SNAP_OFF)
{
- int width = w->attrib.width;
+ int width = w->serverWidth;
w->saveMask |= CWX | CWY;
@@ -347,8 +347,8 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
max =
screenGetOutputDevAreaY (s, head) + screenGetOutputDevAreaHeight (s,
head)
- - w->input.bottom - w->attrib.height -
- w->attrib.border_width * 2;
+ - w->input.bottom - w->serverHeight -
+ w->serverBorderWidth * 2;
if (w->attrib.y + dy < min)
dy = min - w->attrib.y;
@@ -358,15 +358,15 @@ moveHandleMotionEvent (CompScreen * s, int xRoot, int yRoot)
if (w->state & CompWindowStateMaximizedHorzMask)
{
- if (w->attrib.x > s->width || w->attrib.x + w->width < 0)
+ if (w->attrib.x + w->serverWidth + w->serverBorderWidth < 0)
return;
min = screenGetOutputDevAreaX (s, head) + w->input.left;
max =
screenGetOutputDevAreaX (s, head) + screenGetOutputDevAreaWidth (s,
head)
- - w->input.right - w->attrib.width -
- w->attrib.border_width * 2;
+ - w->input.right - w->serverWidth -
+ w->serverBorderWidth * 2;
if (w->attrib.x + dx < min)
dx = min - w->attrib.x;