mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add configure and CMake checks for X11/Xregion.h.

Browse Source 
Configure and CMake now both check if X11/Xregion.h exists on the
build system and set HAVE_X11_XREGION_H in config.h accordingly.

src/Fl_Pixmap.cxx: modified to use the configure test as proposed by Manolo
in fltk.coredev on Dec 13 2015 in thread "Using X11 backend on OS X".


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10983 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2015-12-30 12:10:15 +00:00
parent bb4f485708
commit 17c4817592
5 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMake/resources.cmake
View File

@ -4,7 +4,7 @@
# Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org) # Main CMakeLists.txt to build the FLTK project using CMake (www.cmake.org)
# Written by Michael Surette # Written by Michael Surette
# #
# Copyright 1998-2010 by Bill Spitzak and others. # Copyright 1998-2015 by Bill Spitzak and others.
# #
# This library is free software. Distribution and use rights are outlined in # This library is free software. Distribution and use rights are outlined in
# the file "COPYING" which should have been included with this file. If this # the file "COPYING" which should have been included with this file. If this
@ -39,6 +39,7 @@ find_file(HAVE_SYS_DIR_H sys/dir.h)
find_file(HAVE_SYS_NDIR_H sys/ndir.h) find_file(HAVE_SYS_NDIR_H sys/ndir.h)
find_file(HAVE_SYS_SELECT_H sys/select.h) find_file(HAVE_SYS_SELECT_H sys/select.h)
find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h) find_file(HAVE_SYS_STDTYPES_H sys/stdtypes.h)
find_file(HAVE_X11_XREGION_H X11/Xregion.h)
find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions) find_path(HAVE_XDBE_H Xdbe.h PATH_SUFFIXES X11/extensions extensions)
mark_as_advanced(HAVE_ALSA_ASOUNDLIB_H HAVE_DIRENT_H HAVE_DLFCN_H) mark_as_advanced(HAVE_ALSA_ASOUNDLIB_H HAVE_DIRENT_H HAVE_DLFCN_H)

10
configh.cmake.in
View File

@ -4,7 +4,7 @@
* Configuration file for the Fast Light Tool Kit (FLTK). * Configuration file for the Fast Light Tool Kit (FLTK).
* @configure_input@ * @configure_input@
* *
* Copyright 1998-2010 by Bill Spitzak and others. * Copyright 1998-2015 by Bill Spitzak and others.
* *
* This library is free software. Distribution and use rights are outlined in * This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this * the file "COPYING" which should have been included with this file. If this
@ -123,6 +123,14 @@
#cmakedefine01 HAVE_XCURSOR #cmakedefine01 HAVE_XCURSOR
/*
* HAVE_X11_XREGION_H:
*
* Do we have the X11 Xregion.h header file ?
*/
#cmakedefine01 HAVE_X11_XREGION_H
/* /*
* __APPLE_QUARTZ__: * __APPLE_QUARTZ__:
* *

10
configh.in
View File

@ -4,7 +4,7 @@
* Configuration file for the Fast Light Tool Kit (FLTK). * Configuration file for the Fast Light Tool Kit (FLTK).
* @configure_input@ * @configure_input@
* *
* Copyright 1998-2010 by Bill Spitzak and others. * Copyright 1998-2015 by Bill Spitzak and others.
* *
* This library is free software. Distribution and use rights are outlined in * This library is free software. Distribution and use rights are outlined in
* the file "COPYING" which should have been included with this file. If this * the file "COPYING" which should have been included with this file. If this
@ -131,6 +131,14 @@
#define HAVE_XRENDER 0 #define HAVE_XRENDER 0
/*
* HAVE_X11_XREGION_H:
*
* Do we have the X11 Xregion.h header file ?
*/
#define HAVE_X11_XREGION_H 0
/* /*
* __APPLE_QUARTZ__: * __APPLE_QUARTZ__:
* *

4
configure.in
View File

@ -1046,6 +1046,10 @@ case $host_os_gui in
LIBS="-lXrender $LIBS") LIBS="-lXrender $LIBS")
fi fi
dnl Check for the X11/Xregion.h header file...
AC_CHECK_HEADER(X11/Xregion.h, AC_DEFINE(HAVE_X11_XREGION_H),,
[#include <X11/Xlib.h>])
dnl Check for overlay visuals... dnl Check for overlay visuals...
AC_PATH_PROG(XPROP, xprop) AC_PATH_PROG(XPROP, xprop)
AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay, AC_CACHE_CHECK(for X overlay visuals, ac_cv_have_overlay,

10
src/Fl_Pixmap.cxx
View File

@ -33,7 +33,9 @@
#include <FL/Fl_Printer.H> #include <FL/Fl_Printer.H>
#if defined(USE_X11) #if defined(USE_X11)
# ifdef __APPLE_CC__ // allows using on Darwin + X11 even if X11/Xregion.h is absent # 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 { typedef struct {
short x1, x2, y1, y2; short x1, x2, y1, y2;
} BOX; } BOX;
@ -43,10 +45,8 @@ struct _XRegion {
BOX *rects; BOX *rects;
BOX extents; BOX extents;
}; };
# else # endif // HAVE_X11_XREGION_H
# include <X11/Xregion.h> #endif // USE_X11
# endif
#endif
#include <stdio.h> #include <stdio.h>
#include "flstring.h" #include "flstring.h"