Exact computation of scaled clipping region for X11 platform.

Each rectangular component of the clipping region is transformed exactly as by Fl_Xlib_Graphics_Driver::rectf_unscaled()

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12272 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-06-27 07:39:58 +00:00
parent 66200436bf
commit 7fbf318c53

View File

@ -237,14 +237,16 @@ void Fl_Xlib_Graphics_Driver::font_name(int num, const char *name) {
Region Fl_Xlib_Graphics_Driver::scale_clip(float f) { Region Fl_Xlib_Graphics_Driver::scale_clip(float f) {
Region r = rstack[rstackptr]; Region r = rstack[rstackptr];
if (r == 0 || (f == 1 && offset_x_ == 0 && offset_y_ == 0) ) return 0; if (r == 0 || (f == 1 && offset_x_ == 0 && offset_y_ == 0) ) return 0;
float delta = (f >= 2 ? f/3 : 0); int deltaf = f/2;
Region r2 = XCreateRegion(); Region r2 = XCreateRegion();
XRectangle R; XRectangle R;
for (int i = 0; i < r->numRects; i++) { for (int i = 0; i < r->numRects; i++) {
R.x = short((r->rects[i].x1 + offset_x_)*f-delta + line_delta_); int x = (r->rects[i].x1 + offset_x_)*f;
R.y = short((r->rects[i].y1 + offset_y_)*f-delta + line_delta_); int y = (r->rects[i].y1 + offset_y_)*f;
R.width = short(r->rects[i].x2*f) - short(r->rects[i].x1*f); R.x = x - deltaf + line_delta_;
R.height = short(r->rects[i].y2*f) - short(r->rects[i].y1*f); R.y = y - deltaf + line_delta_;
R.width = int((r->rects[i].x2 + offset_x_) * f) - x;
R.height = int((r->rects[i].y2 + offset_y_) * f) - y;
XUnionRectWithRegion(&R, r2, r2); XUnionRectWithRegion(&R, r2, r2);
} }
rstack[rstackptr] = r2; rstack[rstackptr] = r2;