Commit Graph

213 Commits

Author SHA1 Message Date
Albrecht Schlosser
c79f82edd1 Fix Fl_Text_Editor overstrike mode (STR #3463).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12849 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-04-18 13:20:15 +00:00
Albrecht Schlosser
42d8aba117 Replace FL/x.H with FL/platform.H - step 2 (STR #3435).
This second step replaces FL/x.H with FL/platform.H in all source files.
Dependencies have been adjusted as well.

This commit completes the replacement of FL/x.H with FL/platform.H.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12641 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-01-31 21:17:17 +00:00
Greg Ercolano
0fb2a55fc8 Fixes issued raised in STR #3422; Fl_Text_Display constructor order issues;
organize member initialization first, method calls last.

Also: 
    Reorg'ed member initialization to match order in .H
    to detect missing member inits.

    Noticed member mModifyingTabDistance is unused.
    Tagged with XXX: but left in place, since it's
    a protected member, and might be utilized by user code.
    We should probably remove this member.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12570 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-11-23 19:34:33 +00:00
Manolo Gouy
b74d0b8a94 Fix drawing of tab characters when display is rescaled.
The problem is announced in comment #99 of
http://www.fltk.org/str.php?L3320

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12544 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-11-05 15:47:17 +00:00
Greg Ercolano
127147ca97 Addresses STR# 3423; adds missing scrollbar_size() methods and honors global Fl::scrollbar_size().
Includes mods to unittest's scrollbar size test.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12538 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-11-02 21:14:40 +00:00
Greg Ercolano
a035d10d37 Solves STR# 2682, Albrecht's comment #13. Applied slightly modified version of
chris's test_02.diff patch (comment #19).



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12532 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-28 21:54:38 +00:00
Greg Ercolano
2a3e869210 STR #3395: Revisions as per chris's comment #4.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12530 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-27 17:03:55 +00:00
Greg Ercolano
a27da5e582 Solves STR#3395.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12529 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-26 16:07:53 +00:00
Albrecht Schlosser
eb772d027d Fix scrollbar issue of Fl_Text_Display (STR #3412).
This fix disables a part of the optimization introduced in svn r11208
(STR #3272).

For more information see comments in STR #3412.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12526 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-25 10:58:26 +00:00
Albrecht Schlosser
071f4912a7 Revert accidentally committed part of r12511 (STR #2788).
r12511: "Addresses STR #2788 for cursor positioning with mouse-click ..."

The here reverted part was the proposed patch of STR #3412:
"Fl_Text_Display scroll bug (style table with font != textsize() + wrap)".

See patch file: http://www.fltk.org/strfiles/3412/quickfix.patch


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12518 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-21 10:31:47 +00:00
Greg Ercolano
bc42454074 Addresses STR #2788 for cursor positioning with mouse-click on different sides of character.
Applying guyben's patch (with small mods suggested by albrecht & greg in comments 7-11).


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12511 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-18 07:16:46 +00:00
Albrecht Schlosser
759d2f1c99 Fix line number alignment in Fl_Text_Display/Editor (STR #3363).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12170 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-02-04 21:56:38 +00:00
Albrecht Schlosser
a21f16486a Fl_Text_Display documentation updates.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12168 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-02-01 18:36:23 +00:00
Manolo Gouy
936486cb1c Handle non-ASCII characters when selecting a word or moving the cursor by one word.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12149 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-12-17 07:42:54 +00:00
Albrecht Schlosser
780755e46a Fl_Text_Display documentation clarifications.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12135 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-12-05 17:47:02 +00:00
Greg Ercolano
a82eed18e5 Bringing over fix [r12000] from 1.3 current to the porting branch.
Applying my suggested patch to solve immediate issues with STR #3231.
Probably more needs to be done (see STR), but at least solves the
immediate issues.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@12001 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-10-01 21:22:20 +00:00
Albrecht Schlosser
77f607224c Fix compiler warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11765 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-05-31 12:09:52 +00:00
Manolo Gouy
93d1c43b7a Remove FL_ABI_VERSION directives
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11692 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-24 19:39:27 +00:00
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