Commit Graph

727 Commits

Author SHA1 Message Date
Albrecht Schlosser
2c043fb5b3 Fix string truncation in fluid (STR #2722 continued).
This commit fixes the truncated string drawing that was partly fixed
in svn r 9112 (FLTK 1.3.1, 2011-10-01).

Combined port of svn r 12057 and 12059. The latter adds sanity checks
and fixes potential buffer overflows.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12060 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-10-28 21:42:42 +00:00
Greg Ercolano
43c98c7c90 Bring over combined fix [r12044] from 1.3 current to the porting branch.
Applied patch from STR #3335 to fix simple GUI issues.
 


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-10-17 19:20:36 +00:00
Greg Ercolano
de4572ffdd Bring over combined fix [r12041/12042] from 1.3 current to the porting branch.
Added line numbers to Edit -> Show Source Code viewer (source + header tabs)
Fixes Aditya Siram's observation today on fltk.coredev.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12043 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-10-17 17:00:58 +00:00
Albrecht Schlosser
e3670dfda6 Fix inconsistent interpretation of ld() in image handling (STR #3308).
Documentation has been fixed and clarified, and ld() handling is now
consistent in Fl_(RGB_)Image, their subclasses and fl_draw_image()
and similar functions.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12029 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-10-14 16:35:52 +00:00
Albrecht Schlosser
26601983c6 Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11957 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-09-20 13:35:44 +00:00
Albrecht Schlosser
eede707852 Update fluid files and copyright.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11956 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-09-20 13:31:38 +00:00
Greg Ercolano
560e2d06ba Bringing over fix [r11880] from 1.3 current to the porting branch.
Limit line numbering to New>Code editor.
(was affecting Properties->Callback and New>Code>Comment editors)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11906 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-08-30 06:00:57 +00:00
Greg Ercolano
4e7603f26e Bringing over fix [11878+11879] from 1.3 current to the porting branch.
Solves STR #3318: options for how to handle external editors on fluid quit
        



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11880 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-08-16 21:20:06 +00:00
Greg Ercolano
5f445ab306 Bringing over fix [r11875] from 1.3 current to the porting branch.
Solves STR #3319: enable line numbers in fluid: Edit -> Show Source Code.
  



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11877 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-08-16 20:23:51 +00:00
Albrecht Schlosser
524fb8ae27 Fix more Windows 64-bit g++ compiler warnings.
Fixed warnings:

  42 cast to pointer from integer of different size [-Wint-to-pointer-cast]


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11852 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-29 10:54:22 +00:00
Greg Ercolano
aa5ac8656d svn property mods..
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11839 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-20 18:40:49 +00:00
Greg Ercolano
d1dd240bd4 Bringing over fix [r11835] from 1.3 current to the porting branch.
Improved fluid-org.png diagram.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11836 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-20 18:06:27 +00:00
Greg Ercolano
8850c5c822 Adds external editor capability to fluid for all platforms.
Solves STR#3213. [CORRECTED]



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11818 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-18 21:12:25 +00:00
Manolo Gouy
b870641f34 Begin to remove platform-specific code.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11705 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-27 17:02:57 +00:00
Albrecht Schlosser
7e04657ce7 Remove obsolete EMX (DOS, OS/2 extender) support.
This commit changes all files except src/Fl_File_Chooser2.cxx.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11590 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-12 17:53:18 +00:00
Albrecht Schlosser
aafd8b6031 Fix VisualC++ build (Visual Studio 2015).
IDE generated with CMake, still many warnings, but compiles and runs.

Note: we *must* get rid of all VisualStudio-specific #define's like:

 #define unlink _unlink

This one led to a compilation error (not a warning).

src/Fl_File_Icon.cxx: I had to add _MSC_VER (WIN32) distinction as in
  previous code (FLTK 1.3). Obviously MinGW is more Unixy than MS VC++
  since MinGW compiled and linked the code. Needs a better fix ...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11580 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-11 00:46:11 +00:00
Albrecht Schlosser
020a96b4a8 Fix more compiler warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-05 21:15:45 +00:00
Albrecht Schlosser
3dfec155ad [CMake] Remove redundant linking in CMake build process (STR #3298).
[CMake] Simplify CMake build files, remove redundancies.

Ports of branch-1.3, svn r 11442 and 11444:

Remove src/fl_call_main.c from non-Windows (static) libraries. It would
be an empty object file anyway.
 
Use CMake variables to set up used files and linked libraries to remove
redundancies. All files and libs are used only in the definition of
CMake variables and used later in static and shared builds, resp.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11447 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-27 20:59:39 +00:00
Manolo Gouy
915d6c643a Isolate the definition of the 3 public, OS-dependent types (Fl_Offscreen, Fl_Region, Fl_Bitmask).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11432 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-26 14:36:11 +00:00
Manolo Gouy
01e991840c Remove a bunch of useless #include <FL/x.H> directives.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11422 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-25 16:06:00 +00:00
Albrecht Schlosser
3d28ff46fb Update dependencies.
Note: the manually edited dep's have not been updated.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11385 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-19 22:23:34 +00:00
Matthias Melcher
b496d18b85 Fixed 'flush()' code for single, double, and overlay buffering
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11359 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-13 22:16:37 +00:00
Matthias Melcher
53859c584f Add support for SDL as a base library on OS X.
This commit adds the basic setup in CMake to allow SDL as a base
library for FLTK on OS X (and probably for other platforms as well).

The SDL library driver set is derived from yet another new driver
set named 'Pico'. 'Pico' is a base class for a driver that will
allow porting of FLTK with the tinyest amount of effort. This 
implementation of the SDL driver shall be documented very well
to explain the porting process.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11262 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-02 00:54:37 +00:00
Albrecht Schlosser
d67e9ccb73 Fix compiler warnings (STR #2988) - final commit.
This commit includes all fixes from branch-1.3 (svn r 11243) and additional
fixes for warnings that crept in during the porting efforts, particularly
C++ ("//") comments in C and included header files, and some more.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11246 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-27 17:27:21 +00:00
Albrecht Schlosser
425867ad2a Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11238 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-27 01:26:10 +00:00
Albrecht Schlosser
12b3e335ed Fix Makefiles (particularly target 'clean').
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11237 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-27 01:24:32 +00:00
Albrecht Schlosser
e1f5f5f7ec Update dependencies.
Note: we should really get rid of that!


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11219 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-26 11:17:48 +00:00
Albrecht Schlosser
00dd296ff2 Bump version numbers for next minor release: FLTK 1.4.0.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11088 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 00:56:42 +00:00
Manolo Gouy
69ec698e41 Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11
to build an X11-using version of FLTK on the Mac OS platform.
This matches the recent support of the --enable-x11 option
by the configure script on the mac.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-31 06:19:59 +00:00
Albrecht Schlosser
4f5e6e7732 Harmonize configure and CMake build system (part 1).
The files "config.h" generated by configure and CMake are now almost
identical, except a few comments and some still missing or failing
config tests, for instance checks for some functions in libraries.
[Note: tested and compared on Linux.]

configh.cmake.in: Fixed many #cmakedefine and #cmakedefine01 statements
  so they #define their variables as 0 or 1, or /* #undef */ it, resp.,
  as it is done in the configure build.

Added tests:
  - libXrender

Fixed tests:
  - function glXGetProcAddressARB

Todo (still failing tests in CMake):
  - HAVE_PNG_GET_VALID
  - HAVE_PNG_SET_TRNS_TO_ALPHA
  - HAVE_DLSYM

Other remaining issues:
  - compiler flags introduced in configure/make build
  - HAVE_SYS_NDIR_H - maybe missing test in configure ?
  - HAVE_SYS_DIR_H  - maybe missing test in configure ?
  - HAVE_NDIR_H     - maybe missing test in configure ?
  - WORDS_BIGENDIAN and #include <mac_endianness.h> ...
    i.e. Mac OS X specific #include needed or not ?



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10984 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-30 14:37:35 +00:00
Manolo Gouy
43bfe74b25 Running FLTK in static initializers (cont'd):
1) Changed the way fluid attaches images to widgets and menu items so
it is compatible with running fluid-generated code containing such images
in a static initializer. Images are now attached calling a function:
  widget->image( image_function_name() );
and this function is defined before in fluid-generated code as:
   static Fl_Image *image_function_name() {
     static Fl_Image *image = new image_type(......);
     return image;
   }

2) Changed src/Fl_File_Chooser.fl so the source code generate by fluid
from it is compatible with running in a static initializer.

3) Changed src/Fl_File_Chooser.cxx and FL/Fl_File_Chooser.H
to the result of running fluid on src/Fl_File_Chooser.fl 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10972 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-18 18:56:58 +00:00
Albrecht Schlosser
3666209659 Finish "rename" of *.xcf.gz - delete uncompressed files.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10930 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 14:43:20 +00:00
Albrecht Schlosser
bf873db029 Rename *.xcf.gz files to *.xcf_gz instead of uncompressing.
This is intended circumvent the Apache/Subversion protocol issue
described by Ian in the previous few commits.

Todo: If this works we can remove the uncompressed files again ...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10929 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 14:37:37 +00:00
Ian MacArthur
a2b8700a82 Replace the "renamed" fluid.xcf[.gz] file that
was blocking repository access for checkouts.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10927 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 11:51:06 +00:00
Ian MacArthur
df12bf6c66 Attempting to unblcok repository access.
The Apache server is currently mis-handling
files with a .gz extension, and this causes
checksum errors and blocks checkouts etc.

Renaming the files does not work (it also
fails) but it seems deleting the files, then
adding them back with a "new" name does work.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10926 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-24 11:49:30 +00:00
Albrecht Schlosser
144c656360 Fixed missing image release as described in STR #2840.
Thanks to OP (Nikego) and Matt!


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10888 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-07 00:11:45 +00:00
Albrecht Schlosser
d7d57f9113 Fixed copyright year, updated CHANGES.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10881 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-03 15:45:41 +00:00
Albrecht Schlosser
2aae73febc Fix out-of-bounds memory access in fluid (STR #3263).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10880 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-11-03 15:08:54 +00:00
Albrecht Schlosser
99c536234e Add light gray separator line to fluid widget browser (STR #2997).
Also fix some comments.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10824 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-08-01 19:04:07 +00:00
Albrecht Schlosser
a2e13ee3a2 Fix documentation, adjust comments in fluid/Fl_Type.cxx.
No code changes.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10813 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-23 00:22:42 +00:00
Albrecht Schlosser
01cbcc8406 Update dependencies.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10811 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-22 23:20:47 +00:00
Albrecht Schlosser
c9d8e0feaa Update fluid .fl files and generated code - remove trailing white space.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10783 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-09 02:09:33 +00:00
Albrecht Schlosser
9488810968 Fix trailing white space in fluid .fl files (STR #3239).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10782 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-09 01:17:33 +00:00
Albrecht Schlosser
5573c35ff1 Fix spelling errors and improve documentation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10759 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-15 20:24:41 +00:00
Albrecht Schlosser
6b8f3c6027 Fix compiler warnings in fluid-generated code (STR #2813).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10696 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-10 19:26:17 +00:00
Manolo Gouy
6496fd33be CMake generation of Xcode project under Mac OS: bundle fluid with its proper icon.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10684 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-07 16:08:54 +00:00
Matthias Melcher
c4b0a2f3bf Tricking Fl_Text_Display into using bearable colors for CodeView in Fluid.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10672 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-04 15:06:30 +00:00
Matthias Melcher
326b64d278 STR #3184: fixed code editor in Fluid to check the previous line for a block comment style in the last character. If so, the previous line is include in the calculation of the current line. This seems to fix issues when changing the block-comment character combination '*/' by deleting a character or adding one in the middle.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10671 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-04 11:17:38 +00:00
Albrecht Schlosser
33f61316fc Fix typo.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10669 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-03 19:39:45 +00:00
Albrecht Schlosser
d6bcdbe375 Remove useless cast that would break Windows 64-bit compilation.
This cast broke Windows 64-bit compilation with a hard error.
$ x86_64-w64-mingw32-g++ --version
x86_64-w64-mingw32-g++ (GCC) 4.8.3
Error message:
widget_panel.cxx:82:41: error: cast from ‘void*’ to ‘long int’ loses precision [-fpermissive]
 wCallback->do_callback(wCallback, (long)v);
                                         ^


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10668 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-03 16:15:14 +00:00