Commit Graph

237 Commits

Author SHA1 Message Date
Matthias Melcher
0b8116ff72 Android: Implemented vector drawing and polygons.
Started to implement arc and pie drawing

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12783 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-22 15:27:02 +00:00
Matthias Melcher
c3573d16f3 Android: Implemented font changing ( Fl::set_font(ix, name); )
and other font stuff. Fixed horizontal and vertical line
         drawing to include last pixel. Added stippling to focus rect.
         Added point drawing (slooow).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12774 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-18 20:04:43 +00:00
Matthias Melcher
5900d824e9 Android: Fixed bug when deleting complex clipping areas
Tested FLTK schemes - nice!
         Fixed crashbug in timer
         Fixed crashbug in mouse handler

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12771 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-18 13:44:37 +00:00
Matthias Melcher
0c8ae29b79 Android: added text clipping in all its uglyness.
Next: intersetcing a complex clipping region with a rectangle

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12769 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-17 21:30:46 +00:00
Matthias Melcher
6bf8fe983d Android: added fontattributes, so formatting works well now.
Next: add clipping

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12768 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-17 20:33:51 +00:00
Matthias Melcher
e599a0194d Android: added font access into Android package via Assets, added font
fallbacks, added emergency font as an asset, added graceful
         behavior when absolutely no font could be loaded.

Next: add other font related calls, add clipping

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12767 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-17 19:32:05 +00:00
Matthias Melcher
0016617ad4 Android: yes, we can unicode; cleanup; documentd
Next: add caching, add other font related calls, add clipping, 
      add font paths for package resources

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-17 16:23:40 +00:00
Matthias Melcher
1084602fec Android: loading and rendering multiple fonts at multiple sizes.
This code is still a total mess and incredibly inefficient.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12763 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-16 21:49:58 +00:00
Matthias Melcher
6a145ed63a Android: window clipping working fl_rectf.
This code is not very beautiful, but the resulting class should be
easy to use. A range-based loop can be used to find all relevant
clipping rectangles for a drawing call.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12754 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-15 21:17:16 +00:00
Matthias Melcher
630fc8e983 Android: implemented good complex clipping, but unoptimized.
fl_rectf is so far the only function that uses the complex clipping
region successfully. Code is slow, but works.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12747 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-15 00:07:53 +00:00
Matthias Melcher
1bb5eea696 Android: implemented complex clipping at the first level.
Clipping areas are calculated for overlapping windows, named "Desktop
Windows". The first level implementation works if the resulting complex
region is just a rectangle. Higher complexity (sub-rectangles) is next.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12746 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-14 23:13:48 +00:00
Matthias Melcher
737d8bef24 Android: adding stress test for complex clipping.
Complex clipping is needed to allow popup dialogs and menu window while 
still correctly rendering windows that are "below" those popups.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12745 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-14 21:46:01 +00:00
Matthias Melcher
b0a514366e Android: added support for Fl::add_timeout() and friends.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12742 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-12 20:10:49 +00:00
Matthias Melcher
1b52ead802 Android: Reinstated working simple cliping functionality based on an
improved Fl_Rect_Region class instead of Fl_Rect. Commented out 
 complex clipping.
 
 Android lib and apps now use C++11 because they can (and I like it).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12741 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-12 12:57:28 +00:00
Matthias Melcher
88ce4aec17 Android: Made Fl_Rect virtual. Maybe a bad idea?
Also, added rectangular clipping which works.
Expanding now to a more complex clipping scheme to make multiple
windows work.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12739 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-11 22:00:59 +00:00
Matthias Melcher
70e629b05d Android: finally taught AndroidStudio where the SVN root directory is
located. No more SVN from the command line.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12732 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-10 17:35:00 +00:00
Matthias Melcher
c0cbf0fbde Android: crude graphics clipping
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12726 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-10 00:46:12 +00:00
Matthias Melcher
626ecbfca0 Android: specific event for Android. Use Fl::add_system_handler() and Fl::event(), for example: FL_ANDROID_EVENT_LOW_MEMORY
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12720 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-07 23:01:50 +00:00
Matthias Melcher
2e5b983f4b Android: moved all Android code from the main app into the driver system. All non-driver-FLTK code and main app are now Android-free.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12719 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-07 22:12:34 +00:00
Matthias Melcher
dcc10a6a0a Android: improvements to Fl:flush() implementation. Initial draw, no wasted draw cycles.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12717 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-07 16:29:31 +00:00
Matthias Melcher
93c59c914e Android: yet another name for the .bat file
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12714 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-06 20:26:44 +00:00
Matthias Melcher
1e96cc6b2f Android: moved include files as well
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-05 23:27:31 +00:00
Matthias Melcher
3ed5e71da7 Android: moved to IDE directory.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12711 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-03-05 23:17:51 +00:00
Albrecht Schlosser
b9b4d85379 Fix more svn properties.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12197 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-03-13 23:51:33 +00:00
Albrecht Schlosser
351736c320 Documentation updates (IDE and CMake support).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-11-01 15:18:31 +00:00
Albrecht Schlosser
96a89d4300 Remove obsolete ide/Xcode4 directory.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11297 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-05 16:41:04 +00:00
Albrecht Schlosser
5bc3f5f5a7 Remove all Windows IDE files.
Todo: remove Xcode4 files as well.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11176 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-14 22:57:48 +00:00
Matthias Melcher
5638a5f471 Just cleaning up a few lines.
Removed a false comment I just added. 
Removed FL_PORTING ifdef that is no longer needed

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11103 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 21:47:25 +00:00
Manolo Gouy
caf2a7e92c Have all test programs buildable with ide/Xcode4 project.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11099 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 12:04:43 +00:00
Albrecht Schlosser
0a6be0a83f Fix compiler warnings (STR 2988), porting from branch-1.3.
This commit is the accumulated patch introduced in branch 1.3
in svn r 11094, 11095, and 11096.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-31 04:33:54 +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
Matthias Melcher
222243bc86 Made OpenGL driver compile by itself instead of including files from another .cxx file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11083 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 15:24:33 +00:00
Manolo Gouy
1c3c544edf Added Fl_Window::capture_titlebar_and_borders a new private member function
that triggers a warning when FL_PORTING is ON and with a default platform-neutral
implementation.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11074 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 11:51:07 +00:00
Matthias Melcher
780f43a4f1 Removed all references to Quartz driver files from library headers in Xcode. Works in Xcode.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11065 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-27 22:35:58 +00:00
Matthias Melcher
cdf6493d95 Removed superfuous IDE again.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11029 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-22 23:28:39 +00:00
Matthias Melcher
112609d361 Commiting a working VC2013 solution. Note to self: do not use a network drive to compile FLTK. VisualC can;t handle network drives unless they are mapped to a drive letter (did I tell you about the time when I used MS-DOS 2.1?)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11027 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-22 11:52:25 +00:00
Matthias Melcher
dae6f682e8 Created (but not yet adapted) VisualC 2013 Solution IDE file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-22 11:15:09 +00:00
Matthias Melcher
eb8207ff1b Trying to create a more detaild way to configure the library, added runtime information, added an OpenGL graphics driver that renders a button on top of an OpenGL window (see test/cube).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11006 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-17 00:44:07 +00:00
Matthias Melcher
b1520373ae Created pseudo code for all FL_PORTED section so that FLTK compiles and links (Xcode, hello, other C flags: -D FL_PORTING -U __APPLE__ -U __APPLE_QUARTZ__)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10993 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-04 23:09:32 +00:00
Manolo Gouy
8ac33d6b71 Mac OS: Enhanced the application bundle for the editor demo
so it is launchable by dropping any file on its icon. This is
done both for the configure/make and the CMake build systems
(the Xcode build system did that already).
The editor demo is the only one calling fl_open_callback().


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10981 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-29 16:41:15 +00:00
Manolo Gouy
6ccbedb5db Better deployment targets for the Release configuration.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10949 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-03 17:27:37 +00:00
Manolo Gouy
403c29267f Mac OS IDE project: localize the application menu of the menubar test app.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10939 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-01 10:19:36 +00:00
Manolo Gouy
3c82a3d736 Mac OS: Show how to localize the "Preferences…" custom application menu item
of the menubar test app.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10938 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-12-01 10:03:23 +00:00
Manolo Gouy
4f6903eed5 The unittests target had wrong product name, and the animated target did not copy the fltk framework.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10802 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-20 12:50:16 +00:00
Albrecht Schlosser
449e15ecee Add copyright comments, improve comments, don't set FL_ABI_VERSION.
FL_ABI_VERSION should not be set in the IDE projects to avoid having to
update the version numbers for each release.

The default is used if FL_ABI_VERSION is not defined.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10788 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-13 18:17:33 +00:00
Albrecht Schlosser
9adb181156 Make FL_ABI_VERSION configurable (STR #3161).
This commit adds the configure option --with-abiversion and the CMake option
OPTION_ABI_VERSION. Both options can be set e.g. to 10304 to build with
FL_ABI_VERSION = 10304 (FLTK 1.3.4).

For IDE builds there are new files ide/<IDE-NAME>/FL/abi-version.h that
can be edited to change the ABI version before the FLTK lib is built.
Note that this file MUST be copied to the include/FL directory if the
IDE-built library is to be installed.

The default is FL_ABI_VERSION = FL_MAJOR*10000 + FL_MINOR*100 + 0, i.e.
10300 for all FLTK 1.3.x versions to keep binary compatibility (ABI).

Todo: more tests and more documentation.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10786 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-12 19:23:55 +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
Manolo Gouy
c0b97d86d4 Simpler target-specific options
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10770 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 08:23:21 +00:00
Manolo Gouy
59914ef57d Removed some warnings
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10769 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 08:08:39 +00:00
Manolo Gouy
d7aa656044 Remove some minor warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10768 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-06-21 07:46:16 +00:00