gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

X11: fix fl_clip_box() coordinates > 16-bit (STR 3134)

Browse Source 
Pre-clip coordinates to 16-bit range before using X11 clipping
functions because X11 supports only 16-bit int's.
This commit is contained in:
Albrecht Schlosser 2021-05-26 15:25:36 +02:00
parent 0f3619ba0e
commit 12c0509806
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.cxx
View File

@ -326,9 +326,18 @@ void Fl_Xlib_Graphics_Driver::push_clip(int x, int y, int w, int h) {
int Fl_Xlib_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y, int& W, int& H) {
X = x; Y = y; W = w; H = h;
// pre-clip rectangle to 16-bit coordinates (STR #3134)
if (clip_rect(X, Y, W, H)) { // entirely clipped (outside)
W = H = 0;
return 2;
}
Fl_Region r = rstack[rstackptr];
if (!r) return 0;
switch (XRectInRegion(r, x, y, w, h)) {
if (!r) { // no clipping region
if (X != x || Y != y || W != w || H != h) // pre-clipped
return 1; // partially outside, region differs
return 0;
}
switch (XRectInRegion(r, X, Y, W, H)) {
case 0: // completely outside
W = H = 0;
return 2;
@ -337,7 +346,7 @@ int Fl_Xlib_Graphics_Driver::clip_box(int x, int y, int w, int h, int& X, int& Y
default: // partial:
break;
}
Fl_Region rr = XRectangleRegion(x,y,w,h);
Fl_Region rr = XRectangleRegion(X, Y, W, H);
Fl_Region temp = XCreateRegion();
XIntersectRegion(r, rr, temp);
XRectangle rect;