mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put the code that defines the layout of struct _XRegion in FL/x.H 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11930 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-09-11 07:12:11 +00:00
parent c5960df5fb
commit 35a5148ee8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FL/x.H
View File

@ -107,6 +107,20 @@ extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
extern FL_EXPORT char fl_override_redirect; // hack into Fl_X::make_xid()
extern FL_EXPORT int fl_background_pixel; // hack into Fl_X::make_xid()
#if HAVE_X11_XREGION_H
# include <X11/Xregion.h>
#else // if the X11/Xregion.h header is not available, we assume this is the layout of an X11 Region:
typedef struct {
short x1, x2, y1, y2;
} BOX;
struct _XRegion {
long size;
long numRects;
BOX *rects;
BOX extents;
};
#endif // HAVE_X11_XREGION_H
#endif // FL_LIBRARY || FL_INTERNALS
# endif // X11

14
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_image.cxx
View File

@ -54,20 +54,6 @@
# include "../../Fl_XColor.H"
# include "../../flstring.h"
#if HAVE_X11_XREGION_H
# include <X11/Xregion.h>
#else // if the X11/Xregion.h header is not available, we assume this is the layout of an X11 Region:
typedef struct {
short x1, x2, y1, y2;
} BOX;
struct _XRegion {
long size;
long numRects;
BOX *rects;
BOX extents;
};
#endif // HAVE_X11_XREGION_H
static XImage xi; // template used to pass info to X
static int bytes_per_pixel;
static int scanline_add;