summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/blurfx.c
diff options
context:
space:
mode:
authormaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-14 16:54:15 +0000
committermaniac <maniac@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-11-14 16:54:15 +0000
commitfe9fb956fabeed2d4a2a704dda2976dfc494ca48 (patch)
treea9e8f8fdfb361428a942a432bc274c4ec05c1cb8 /beryl-plugins/src/blurfx.c
parent6049a96eb62c5063f445268bf3493a29fed89fcf (diff)
downloadmarex-dev-fe9fb956fabeed2d4a2a704dda2976dfc494ca48.tar.gz
marex-dev-fe9fb956fabeed2d4a2a704dda2976dfc494ca48.tar.bz2
beryl-core & plugins:
- code cleanup: use have only two functions which retrieve the dimensions of output device and its work area instead of eight - fixed calculation error in organic scale git-svn-id: file:///beryl/trunk@1198 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/blurfx.c')
-rw-r--r--beryl-plugins/src/blurfx.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/beryl-plugins/src/blurfx.c b/beryl-plugins/src/blurfx.c
index d0ded46..53c1030 100644
--- a/beryl-plugins/src/blurfx.c
+++ b/beryl-plugins/src/blurfx.c
@@ -2148,7 +2148,7 @@ updateBlurTexture (CompWindow * w, CompScreen * s,
MULTM (bm, bs->pm, bpm);
MULTM (bpm, bw->mvm, tm);
- XRectangle rect;
+ XRectangle rect, outputRect;
XClipBox (reblurRegion, &rect);
// check region for visibility
@@ -2189,10 +2189,11 @@ updateBlurTexture (CompWindow * w, CompScreen * s,
rect.height) *
tm[7] + tm[15];
- int s_x1 = screenGetOutputDevX (s, bs->output + 1);
- int s_y1 = screenGetOutputDevY (s, bs->output + 1);
- int s_x2 = s_x1 + screenGetOutputDevWidth (s, bs->output + 1);
- int s_y2 = s_y1 + screenGetOutputDevHeight (s, bs->output + 1);
+ screenGetOutputDevRect (s, bs->output + 1, &outputRect);
+ int s_x1 = outputRect.x;
+ int s_y1 = outputRect.y;
+ int s_x2 = s_x1 + outputRect.width;
+ int s_y2 = s_y1 + outputRect.height;
if (bbProj[0][0] >= bbProj[1][0] || bbProj[2][0] >= bbProj[3][0]
|| bbProj[2][1] >= bbProj[0][1]