Commit Graph

195 Commits

Author SHA1 Message Date
Manolo Gouy
d756822c2b Complete removal of platform-dependent code from Fl_Text_Display.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11499 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-01 15:37:19 +00:00
Manolo Gouy
a53297ebab Begin to remove platform-specific code from Fl_Text_Display.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11498 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-01 14:58:07 +00:00
Manolo Gouy
519673a776 Move dnd and character-composition related functions from Fl_System_Driver to Fl_Screen_Driver
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11489 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-31 19:55:03 +00:00
Manolo Gouy
059664e7d4 Begin to remove platform-dependent code from the Fl.H header file.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11482 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-31 06:24:26 +00:00
Manolo Gouy
aacb5277e7 Rewrite Fl_dnd.cxx under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11455 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-28 17:36:07 +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
Albrecht Schlosser
29a9e89b39 Remove FLTK_ABI_VERSION from all but *tree*.* and documentation.
Everything related to Fl_Tree and its test and demo programs has been
cleaned.

Documentation needs updates.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11428 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-26 02:55:14 +00:00
Albrecht Schlosser
0f7e3ac086 Fix unused variable compiler warning.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11209 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-22 17:33:02 +00:00
Albrecht Schlosser
7e94d7650b Fix Fl_Text_Display line numbers and scrolling (STR #3272).
Fix slow scrolling, line number display, and scrollbars (STR #3272).

Optimized wrap mode - removed unnecessary wrap margin calculations.
The speed-up is significant, but there is still room for improvements.

Refactored parts of the code to make the decisions more modular and
(hopefully) obvious.

This commit also fixes some positioning issues with different scrollbar
alignments and the new line number display.

Fix line number display with wrap mode (hiding text behind scrollbars).

Note: same changes as r11202 and r11205 in branch-1.3.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11208 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-22 17:25:30 +00:00
Matthias Melcher
5d1df0e789 Details on PORTME items. Move fl_parse_color() to screen drivers.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11163 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-13 12:57:00 +00:00
Matthias Melcher
50ee3bcd66 Mark places that need to be refactored with // PORTME:
Searching for __APPLE, WIN32 or X11 did give me many false results. I instead marked most ifdef's that I would like to get rid of with the text // PORTME:, so they can be easily found by a global search.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11155 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-02-11 12:02:36 +00:00
Matthias Melcher
acf6c881d3 Updated platform specific #if's to report unimplemented code when compiling with FL_PORTING defined and WIN32 and __APPLE__ undefined>
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@10989 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-03 22:54:29 +00:00
Manolo Gouy
35704c82a3 Selected text is now displayed using a color that contrasts with the background color
(This commit is in the interest of allowing the release  of FLTK 1.3.4 not to be delayed).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10804 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-21 12:27:54 +00:00
Albrecht Schlosser
63433f9be7 Remove unnecessary include file (STR #3133).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10797 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-07-17 17:53:49 +00:00
Greg Ercolano
f81374166b Fixes STR #3219, deactivate colors issue with Fl_Text_Display/Editor.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10705 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-14 22:28:33 +00:00
Greg Ercolano
d95750ede7 Fix problem with fl_contrast() affecting text color unnecessarily
when drawing normal (unselected) text. 

(See thread on fltk.coredev started 04/07/2015, "RFC: Fl_Text_Display style buffer color weirdness")



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10698 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-13 15:26:57 +00:00
Albrecht Schlosser
4b97d6cbf1 Fix uninitialized variable compiler warning (part of STR #2813).
Thanks to Csaba for finding this and providing a patch.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10662 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-03 10:33:37 +00:00
Manolo Gouy
64ffd414d6 Stop using dynamic_cast when performing text drag (Mac OS only).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10536 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-01-28 17:05:29 +00:00
Albrecht Schlosser
325fec1f45 Update copyright and CHANGES.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10416 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 12:35:36 +00:00
Albrecht Schlosser
c3c5659479 Fix out-of-bounds memory access in Fl_Text_Display (STR #2730).
This bug would only show up in wrap mode.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10415 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-30 11:47:46 +00:00
Manolo Gouy
f300b70a99 Added missing #if FLTK_ABI_VERSION >= 10303, that prevented ABI-preserving compilation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10399 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-28 09:49:50 +00:00
Greg Ercolano
15b6c5f12a Explicitly document NULL is not a valid argument for Fl_Text_Display::linenumber_format().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10397 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-27 20:01:41 +00:00
Greg Ercolano
78127ffdd5 Internally manage alloc'ed copy of linenumber_format().
(As per Alrecht's comment #9 in STR #2621)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10396 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-10-27 19:47:12 +00:00
Greg Ercolano
1fefa174c9 Adding some parameter docs.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-06 20:27:39 +00:00
Greg Ercolano
d785f5b4e8 Removed unused variable last_y to prevent this warning under mingw:
Compiling Fl_Text_Display.cxx...
    Fl_Text_Display.cxx: In member function 'void Fl_Text_Display::draw_line_numbers(bool)':
    Fl_Text_Display.cxx:2875:9: warning: variable 'last_y' set but not used [-Wunused-but-set-variable]



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10223 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-07-21 18:07:09 +00:00
Greg Ercolano
46521bf437 Implements STR #2621: Add line numbers to Fl_Text_Display.
Applied LZA's patch and included some mods to address TODO items and ABI issues.

Also update CREDITS with LZA and a few other notably absent names.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10152 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-21 06:56:59 +00:00
Manolo Gouy
914e7f9b09 Mac OS text input: removed the Fl::marked_text_length() function that's not necessary.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9816 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-02-08 11:58:19 +00:00
Manolo Gouy
482c4a5e0a Mac OS: added support for the text input feature introduced in OS 10.7 "Lion" where pressing and holding
some key opens a window with possible accented characters. This feature is used by the Fl_Input_ and
Fl_Text_Editor widgets. User-defined text input widgets can optionally use this feature, but the default
behavior is to not use it. Fl_Secret_Input turns it off, for example.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9792 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-01-13 15:25:37 +00:00
Manolo Gouy
0c6ad247dd Display the moving insertion point when doing drag&drop to an Fl_Text_Display widget from the widget itself.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9781 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-29 11:58:49 +00:00
Manolo Gouy
cf672dba0d Mac OS text input: defined a small API that user-defined text editing widgets can use to signal marked text.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9774 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-24 11:45:07 +00:00
Manolo Gouy
7ab1a8b204 Mac OS text input: marked text is now underlined.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9767 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-19 08:50:34 +00:00
Manolo Gouy
fd2cc45334 Mac OS text input support: Last change in Fl_Text_Display useless because HIGHLIGHT_MASK
is not used anymore for marked text..

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9764 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-18 14:54:08 +00:00
Manolo Gouy
46abc078b4 Mac OS: improved text input support with visible display of marked text in text widgets.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9761 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-12-17 17:44:15 +00:00
Fabien Costantini
226f425443 STR2731 fixing: potential use of unassigned (Y) value
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9362 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-04-21 03:02:25 +00:00
Fabien Costantini
8809c5d65d Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-04-05 05:12:30 +00:00
Manolo Gouy
32d4bc4099 Fix STR#2810: removed all uses of function Fl_Device::class_name().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9293 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-03-18 18:48:29 +00:00
Albrecht Schlosser
df525e2922 Removed unused variables (gcc 4.6 warning [-Wunused-but-set-variable]).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9137 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-10-18 22:18:39 +00:00
Matthias Melcher
8709753e1b STR 2701: more tolerant Xft Font Attribute interpretation.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9108 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-10-01 15:42:39 +00:00
Matthias Melcher
dde4dbd61f If a vertical scrollbar is added, wrapped lines must be recalculated.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9107 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-10-01 06:48:50 +00:00
Matthias Melcher
b7abad288e Horizontal Scrollbar in TextDisplay is now even smarter.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9097 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-30 10:31:08 +00:00
Matthias Melcher
7446a4d5bb Text area width needs to be recalculated if vertical scrollbar changes visibility.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9094 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-30 10:20:09 +00:00
Matthias Melcher
41876bf00a Horizontal scrollbar in TextDisplay is not shown if text wrappes at the right edge
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9092 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-30 10:09:16 +00:00
Matthias Melcher
7ed9960a28 STR 2677: new cursor shape for Fl_Text_Display
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9078 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-28 20:08:48 +00:00
Matthias Melcher
6a14cfb34e STR #2691: fixed possible invalid text pointer in Text Display
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9065 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-27 17:10:04 +00:00
Matthias Melcher
4a7eb9cb0c STR 2683: calling show_cursor() before a text buffer is assigned to an Fl_Text_Diisplay deos not crash any longer.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-09-27 17:00:35 +00:00
Ian MacArthur
ec42758183 fix typo in debug output, as per #2690
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8911 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-08-03 08:17:34 +00:00
Greg Ercolano
4f4a8fc3c7 Modifications to all LGPL headers for STR #2685.
(to clarify static exception LGPL by changing license references)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-07-19 04:49:30 +00:00
Manolo Gouy
6475f1a424 Fix STR #2668.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8808 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-06-16 13:31:25 +00:00
Matthias Melcher
6892d8a265 STR 2630: added bounds check for very narrow text editing widgets, wishing that Valgrind was available for OS X
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8659 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-05-13 07:58:26 +00:00
Manolo Gouy
2c42334c55 Fix STR #2620. Obeys the tab distance value set by Fl_Text_Buffer::tab_distance(int).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8640 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-05-06 18:15:29 +00:00