From e644b575c5f7ae9b78df2bb6985ec352a7c0f0e0 Mon Sep 17 00:00:00 2001 From: Jedidiah Barber Date: Sat, 1 Feb 2025 23:49:05 +1300 Subject: Filled holes in Fl_Text_Display API, fixed some Shortcut subprogram inconsistencies --- body/c_fl_text_display.cpp | 267 +++++- body/c_fl_text_display.h | 63 +- body/fltk-widgets-groups-text_displays.adb | 1220 ++++++++++++++++++++++++++-- body/fltk-widgets-inputs.adb | 8 +- doc/fl_button.html | 4 +- doc/fl_input_.html | 8 +- doc/fl_text_display.html | 627 +++++++++++++- spec/fltk-widgets-groups-text_displays.ads | 372 ++++++++- spec/fltk-widgets-inputs.ads | 8 +- 9 files changed, 2456 insertions(+), 121 deletions(-) diff --git a/body/c_fl_text_display.cpp b/body/c_fl_text_display.cpp index 654d6ce..a50f25d 100644 --- a/body/c_fl_text_display.cpp +++ b/body/c_fl_text_display.cpp @@ -20,6 +20,58 @@ extern "C" int widget_handle_hook(void * ud, int e); +// Non-friend protected access + +class Friend_Text_Display : Fl_Text_Display { +public: + using Fl_Text_Display::buffer_modified_cb; + using Fl_Text_Display::buffer_predelete_cb; + + using Fl_Text_Display::find_line_end; + using Fl_Text_Display::find_x; + using Fl_Text_Display::position_to_line; + using Fl_Text_Display::position_to_linecol; + using Fl_Text_Display::xy_to_position; + using Fl_Text_Display::xy_to_rowcol; + + using Fl_Text_Display::wrap_uses_character; + using Fl_Text_Display::wrapped_line_counter; + + using Fl_Text_Display::calc_last_char; + using Fl_Text_Display::calc_line_starts; + using Fl_Text_Display::offset_line_starts; + + using Fl_Text_Display::absolute_top_line_number; + using Fl_Text_Display::get_absolute_top_line_number; + using Fl_Text_Display::maintain_absolute_top_line_number; + using Fl_Text_Display::maintaining_absolute_top_line_number; + using Fl_Text_Display::reset_absolute_top_line_number; + + using Fl_Text_Display::empty_vlines; + using Fl_Text_Display::longest_vline; + using Fl_Text_Display::vline_length; + + using Fl_Text_Display::measure_proportional_character; + using Fl_Text_Display::measure_vline; + using Fl_Text_Display::string_width; + + using Fl_Text_Display::scroll_; + using Fl_Text_Display::update_h_scrollbar; + using Fl_Text_Display::update_v_scrollbar; + + using Fl_Text_Display::clear_rect; + using Fl_Text_Display::display_insert; + using Fl_Text_Display::draw_cursor; + using Fl_Text_Display::draw_line_numbers; + using Fl_Text_Display::draw_range; + using Fl_Text_Display::draw_string; + using Fl_Text_Display::draw_text; + using Fl_Text_Display::draw_vline; +}; + + + + // Attaching all relevant hooks and friends class My_Text_Display : public Fl_Text_Display { @@ -68,6 +120,16 @@ void fl_text_display_set_buffer(TEXTDISPLAY td, TEXTBUFFER tb) { static_cast(td)->buffer(static_cast(tb)); } +void fl_text_display_buffer_modified_cb(int p, int i, int d, int r, + const char * t, TEXTDISPLAY td) +{ + Friend_Text_Display::buffer_modified_cb(p, i, d, r, t, static_cast(td)); +} + +void fl_text_display_buffer_predelete_cb(int p, int d, TEXTDISPLAY td) { + Friend_Text_Display::buffer_predelete_cb(p, d, static_cast(td)); +} + @@ -87,6 +149,10 @@ void fl_text_display_highlight_data2(TEXTDISPLAY td, TEXTBUFFER tb, void * st, i len, us, reinterpret_cast(cb), a); } +int fl_text_display_position_style(TEXTDISPLAY td, int s, int l, int i) { + return static_cast(td)->position_style(s, l, i); +} + @@ -106,6 +172,32 @@ int fl_text_display_position_to_xy(TEXTDISPLAY td, int p, int * x, int * y) { return static_cast(td)->position_to_xy(p, x, y); } +void fl_text_display_find_line_end(TEXTDISPLAY td, int sp, int spils, int &le, int &nls) { + (static_cast(td)->*(&Friend_Text_Display::find_line_end)) + (sp, spils!=0, &le, &nls); +} + +int fl_text_display_find_x(TEXTDISPLAY td, const char * str, int l, int s, int x) { + return (static_cast(td)->*(&Friend_Text_Display::find_x))(str, l, s, x); +} + +int fl_text_display_position_to_line(TEXTDISPLAY td, int p, int &ln) { + return (static_cast(td)->*(&Friend_Text_Display::position_to_line))(p, &ln); +} + +int fl_text_display_position_to_linecol(TEXTDISPLAY td, int p, int &ln, int &c) { + return (static_cast(td)->*(&Friend_Text_Display::position_to_linecol)) + (p, &ln, &c); +} + +int fl_text_display_xy_to_position(TEXTDISPLAY td, int x, int y, int k) { + return (static_cast(td)->*(&Friend_Text_Display::xy_to_position))(x, y, k); +} + +void fl_text_display_xy_to_rowcol(TEXTDISPLAY td, int x, int y, int &r, int &c, int k) { + (static_cast(td)->*(&Friend_Text_Display::xy_to_rowcol))(x, y, &r, &c, k); +} + @@ -198,10 +290,34 @@ void fl_text_display_previous_word(TEXTDISPLAY td) { static_cast(td)->previous_word(); } + + + void fl_text_display_wrap_mode(TEXTDISPLAY td, int w, int m) { static_cast(td)->wrap_mode(w, m); } +int fl_text_display_wrapped_row(TEXTDISPLAY td, int r) { + return static_cast(td)->wrapped_row(r); +} + +int fl_text_display_wrapped_column(TEXTDISPLAY td, int r, int c) { + return static_cast(td)->wrapped_column(r, c); +} + +int fl_text_display_wrap_uses_character(TEXTDISPLAY td, int lep) { + return (static_cast(td)->*(&Friend_Text_Display::wrap_uses_character))(lep); +} + +void fl_text_display_wrapped_line_counter(TEXTDISPLAY td, void * buf, int startPos, + int maxPos, int maxLines, int spils, int sbo, int &retPos, int &retLines, int &retLineStart, + int &retLineEnd, int cllmnl) +{ + (static_cast(td)->*(&Friend_Text_Display::wrapped_line_counter)) + (static_cast(buf), startPos, maxPos, maxLines, spils!=0, sbo, + &retPos, &retLines, &retLineStart, &retLineEnd, cllmnl!=0); +} + @@ -225,6 +341,59 @@ int fl_text_display_rewind_lines(TEXTDISPLAY td, int s, int l) { return static_cast(td)->rewind_lines(s, l); } +void fl_text_display_calc_last_char(TEXTDISPLAY td) { + (static_cast(td)->*(&Friend_Text_Display::calc_last_char))(); +} + +void fl_text_display_calc_line_starts(TEXTDISPLAY td, int s, int f) { + (static_cast(td)->*(&Friend_Text_Display::calc_line_starts))(s, f); +} + +void fl_text_display_offset_line_starts(TEXTDISPLAY td, int t) { + (static_cast(td)->*(&Friend_Text_Display::offset_line_starts))(t); +} + + + + +void fl_text_display_absolute_top_line_number(TEXTDISPLAY td, int c) { + (static_cast(td)->*(&Friend_Text_Display::absolute_top_line_number))(c); +} + +int fl_text_display_get_absolute_top_line_number(TEXTDISPLAY td) { + return (static_cast(td)->* + (&Friend_Text_Display::get_absolute_top_line_number))(); +} + +void fl_text_display_maintain_absolute_top_line_number(TEXTDISPLAY td, int s) { + (static_cast(td)->* + (&Friend_Text_Display::maintain_absolute_top_line_number))(s); +} + +int fl_text_display_maintaining_absolute_top_line_number(TEXTDISPLAY td) { + return (static_cast(td)->* + (&Friend_Text_Display::maintaining_absolute_top_line_number))(); +} + +void fl_text_display_reset_absolute_top_line_number(TEXTDISPLAY td) { + (static_cast(td)->*(&Friend_Text_Display::reset_absolute_top_line_number))(); +} + + + + +int fl_text_display_empty_vlines(TEXTDISPLAY td) { + return (static_cast(td)->*(&Friend_Text_Display::empty_vlines))(); +} + +int fl_text_display_longest_vline(TEXTDISPLAY td) { + return (static_cast(td)->*(&Friend_Text_Display::longest_vline))(); +} + +int fl_text_display_vline_length(TEXTDISPLAY td, int l) { + return (static_cast(td)->*(&Friend_Text_Display::vline_length))(l); +} + @@ -276,6 +445,32 @@ void fl_text_display_set_linenumber_width(TEXTDISPLAY td, int w) { static_cast(td)->linenumber_width(w); } +const char * fl_text_display_get_linenumber_format(TEXTDISPLAY td) { + return static_cast(td)->linenumber_format(); +} + +void fl_text_display_set_linenumber_format(TEXTDISPLAY td, const char * v) { + static_cast(td)->linenumber_format(v); +} + + + + +double fl_text_display_measure_proportional_character(TEXTDISPLAY td, const char * str, + int xpix, int pos) +{ + return (static_cast(td)->* + (&Friend_Text_Display::measure_proportional_character))(str, xpix, pos); +} + +int fl_text_display_measure_vline(TEXTDISPLAY td, int line) { + return (static_cast(td)->*(&Friend_Text_Display::measure_vline))(line); +} + +double fl_text_display_string_width(TEXTDISPLAY td, const char * str, int len, int s) { + return (static_cast(td)->*(&Friend_Text_Display::string_width))(str, len, s); +} + @@ -298,8 +493,12 @@ int fl_text_display_move_up(TEXTDISPLAY td) { -void fl_text_display_scroll(TEXTDISPLAY td, int l) { - static_cast(td)->scroll(l, 1); +void fl_text_display_scroll(TEXTDISPLAY td, int l, int c) { + static_cast(td)->scroll(l, c); +} + +int fl_text_display_scroll2(TEXTDISPLAY td, int l, int p) { + return (static_cast(td)->*(&Friend_Text_Display::scroll_))(l, p); } unsigned int fl_text_display_get_scrollbar_align(TEXTDISPLAY td) { @@ -318,20 +517,80 @@ void fl_text_display_set_scrollbar_width(TEXTDISPLAY td, int w) { static_cast(td)->scrollbar_width(w); } +void fl_text_display_update_h_scrollbar(TEXTDISPLAY td) { + (static_cast(td)->*(&Friend_Text_Display::update_h_scrollbar))(); +} +void fl_text_display_update_v_scrollbar(TEXTDISPLAY td) { + (static_cast(td)->*(&Friend_Text_Display::update_v_scrollbar))(); +} -void fl_text_display_redisplay_range(TEXTDISPLAY td, int s, int f) { - static_cast(td)->redisplay_range(s,f); + + +int fl_text_display_get_shortcut(TEXTDISPLAY td) { + return static_cast(td)->shortcut(); } +void fl_text_display_set_shortcut(TEXTDISPLAY td, int s) { + static_cast(td)->shortcut(s); +} + + + + +void fl_text_display_resize(TEXTDISPLAY td, int x, int y, int w, int h) { + static_cast(td)->resize(x, y, w, h); +} + + +void fl_text_display_clear_rect(TEXTDISPLAY td, int s, int x, int y, int w, int h) { + (static_cast(td)->*(&Friend_Text_Display::clear_rect))(s, x, y, w, h); +} + +void fl_text_display_display_insert(TEXTDISPLAY td) { + (static_cast(td)->*(&Friend_Text_Display::display_insert))(); +} + +void fl_text_display_redisplay_range(TEXTDISPLAY td, int s, int f) { + static_cast(td)->redisplay_range(s,f); +} void fl_text_display_draw(TEXTDISPLAY td) { static_cast(td)->Fl_Text_Display::draw(); } +void fl_text_display_draw_cursor(TEXTDISPLAY td, int x, int y) { + (static_cast(td)->*(&Friend_Text_Display::draw_cursor))(x, y); +} + +void fl_text_display_draw_line_numbers(TEXTDISPLAY td, int c) { + (static_cast(td)->*(&Friend_Text_Display::draw_line_numbers))(c!=0); +} + +void fl_text_display_draw_range(TEXTDISPLAY td, int s, int f) { + (static_cast(td)->*(&Friend_Text_Display::draw_range))(s, f); +} + +void fl_text_display_draw_string(TEXTDISPLAY td, int s, int x, int y, int r, + const char * str, int n) +{ + (static_cast(td)->*(&Friend_Text_Display::draw_string))(s, x, y, r, str, n); +} + +void fl_text_display_draw_text(TEXTDISPLAY td, int x, int y, int w, int h) { + (static_cast(td)->*(&Friend_Text_Display::draw_text))(x, y, w, h); +} + +void fl_text_display_draw_vline(TEXTDISPLAY td, int line, int left, int right, + int lchar, int rchar) +{ + (static_cast(td)->*(&Friend_Text_Display::draw_vline)) + (line, left, right, lchar, rchar); +} + int fl_text_display_handle(TEXTDISPLAY td, int e) { return static_cast(td)->Fl_Text_Display::handle(e); } diff --git a/body/c_fl_text_display.h b/body/c_fl_text_display.h index ece9a6a..5a39ae1 100644 --- a/body/c_fl_text_display.h +++ b/body/c_fl_text_display.h @@ -19,17 +19,27 @@ extern "C" void free_fl_text_display(TEXTDISPLAY td); extern "C" TEXTBUFFER fl_text_display_get_buffer(TEXTDISPLAY td); extern "C" void fl_text_display_set_buffer(TEXTDISPLAY td, TEXTBUFFER tb); +extern "C" void fl_text_display_buffer_modified_cb(int p, int i, int d, int r, + const char * t, TEXTDISPLAY td); +extern "C" void fl_text_display_buffer_predelete_cb(int p, int d, TEXTDISPLAY td); extern "C" void fl_text_display_highlight_data(TEXTDISPLAY td, TEXTBUFFER tb, void * st, int len); extern "C" void fl_text_display_highlight_data2(TEXTDISPLAY td, TEXTBUFFER tb, void * st, int len, char us, void * cb, void * a); +extern "C" int fl_text_display_position_style(TEXTDISPLAY td, int s, int l, int i); extern "C" double fl_text_display_col_to_x(TEXTDISPLAY td, double c); extern "C" double fl_text_display_x_to_col(TEXTDISPLAY td, double x); extern "C" int fl_text_display_in_selection(TEXTDISPLAY td, int x, int y); extern "C" int fl_text_display_position_to_xy(TEXTDISPLAY td, int p, int * x, int * y); +extern "C" void fl_text_display_find_line_end(TEXTDISPLAY td, int sp, int spils, int &le, int &nls); +extern "C" int fl_text_display_find_x(TEXTDISPLAY td, const char * str, int l, int s, int x); +extern "C" int fl_text_display_position_to_line(TEXTDISPLAY td, int p, int &ln); +extern "C" int fl_text_display_position_to_linecol(TEXTDISPLAY td, int p, int &ln, int &c); +extern "C" int fl_text_display_xy_to_position(TEXTDISPLAY td, int x, int y, int k); +extern "C" void fl_text_display_xy_to_rowcol(TEXTDISPLAY td, int x, int y, int &r, int &c, int k); extern "C" unsigned int fl_text_display_get_cursor_color(TEXTDISPLAY td); @@ -58,7 +68,15 @@ extern "C" int fl_text_display_word_start(TEXTDISPLAY td, int p); extern "C" int fl_text_display_word_end(TEXTDISPLAY td, int p); extern "C" void fl_text_display_next_word(TEXTDISPLAY td); extern "C" void fl_text_display_previous_word(TEXTDISPLAY td); + + extern "C" void fl_text_display_wrap_mode(TEXTDISPLAY td, int w, int m); +extern "C" int fl_text_display_wrapped_row(TEXTDISPLAY td, int r); +extern "C" int fl_text_display_wrapped_column(TEXTDISPLAY td, int r, int c); +extern "C" int fl_text_display_wrap_uses_character(TEXTDISPLAY td, int lep); +extern "C" void fl_text_display_wrapped_line_counter(TEXTDISPLAY td, void * buf, int startPos, + int maxPos, int maxLines, int spils, int sbo, int &retPos, int &retLines, int &retLineStart, + int &retLineEnd, int cllmnl); extern "C" int fl_text_display_line_start(TEXTDISPLAY td, int s); @@ -66,6 +84,21 @@ extern "C" int fl_text_display_line_end(TEXTDISPLAY td, int s, int p); extern "C" int fl_text_display_count_lines(TEXTDISPLAY td, int s, int f, int p); extern "C" int fl_text_display_skip_lines(TEXTDISPLAY td, int s, int l, int p); extern "C" int fl_text_display_rewind_lines(TEXTDISPLAY td, int s, int l); +extern "C" void fl_text_display_calc_last_char(TEXTDISPLAY td); +extern "C" void fl_text_display_calc_line_starts(TEXTDISPLAY td, int s, int f); +extern "C" void fl_text_display_offset_line_starts(TEXTDISPLAY td, int t); + + +extern "C" void fl_text_display_absolute_top_line_number(TEXTDISPLAY td, int c); +extern "C" int fl_text_display_get_absolute_top_line_number(TEXTDISPLAY td); +extern "C" void fl_text_display_maintain_absolute_top_line_number(TEXTDISPLAY td, int s); +extern "C" int fl_text_display_maintaining_absolute_top_line_number(TEXTDISPLAY td); +extern "C" void fl_text_display_reset_absolute_top_line_number(TEXTDISPLAY td); + + +extern "C" int fl_text_display_empty_vlines(TEXTDISPLAY td); +extern "C" int fl_text_display_longest_vline(TEXTDISPLAY td); +extern "C" int fl_text_display_vline_length(TEXTDISPLAY td, int l); extern "C" unsigned int fl_text_display_get_linenumber_align(TEXTDISPLAY td); @@ -80,6 +113,14 @@ extern "C" int fl_text_display_get_linenumber_size(TEXTDISPLAY td); extern "C" void fl_text_display_set_linenumber_size(TEXTDISPLAY td, int s); extern "C" int fl_text_display_get_linenumber_width(TEXTDISPLAY td); extern "C" void fl_text_display_set_linenumber_width(TEXTDISPLAY td, int w); +extern "C" const char * fl_text_display_get_linenumber_format(TEXTDISPLAY td); +extern "C" void fl_text_display_set_linenumber_format(TEXTDISPLAY td, const char * v); + + +extern "C" double fl_text_display_measure_proportional_character(TEXTDISPLAY td, const char * str, + int xpix, int pos); +extern "C" int fl_text_display_measure_vline(TEXTDISPLAY td, int line); +extern "C" double fl_text_display_string_width(TEXTDISPLAY td, const char * str, int len, int s); extern "C" int fl_text_display_move_down(TEXTDISPLAY td); @@ -88,17 +129,35 @@ extern "C" int fl_text_display_move_right(TEXTDISPLAY td); extern "C" int fl_text_display_move_up(TEXTDISPLAY td); -extern "C" void fl_text_display_scroll(TEXTDISPLAY td, int l); +extern "C" void fl_text_display_scroll(TEXTDISPLAY td, int l, int c); +extern "C" int fl_text_display_scroll2(TEXTDISPLAY td, int l, int p); extern "C" unsigned int fl_text_display_get_scrollbar_align(TEXTDISPLAY td); extern "C" void fl_text_display_set_scrollbar_align(TEXTDISPLAY td, unsigned int a); extern "C" int fl_text_display_get_scrollbar_width(TEXTDISPLAY td); extern "C" void fl_text_display_set_scrollbar_width(TEXTDISPLAY td, int w); +extern "C" void fl_text_display_update_h_scrollbar(TEXTDISPLAY td); +extern "C" void fl_text_display_update_v_scrollbar(TEXTDISPLAY td); -extern "C" void fl_text_display_redisplay_range(TEXTDISPLAY td, int s, int f); +extern "C" int fl_text_display_get_shortcut(TEXTDISPLAY td); +extern "C" void fl_text_display_set_shortcut(TEXTDISPLAY td, int s); +extern "C" void fl_text_display_resize(TEXTDISPLAY td, int x, int y, int w, int h); + + +extern "C" void fl_text_display_clear_rect(TEXTDISPLAY td, int s, int x, int y, int w, int h); +extern "C" void fl_text_display_display_insert(TEXTDISPLAY td); +extern "C" void fl_text_display_redisplay_range(TEXTDISPLAY td, int s, int f); extern "C" void fl_text_display_draw(TEXTDISPLAY td); +extern "C" void fl_text_display_draw_cursor(TEXTDISPLAY td, int x, int y); +extern "C" void fl_text_display_draw_line_numbers(TEXTDISPLAY td, int c); +extern "C" void fl_text_display_draw_range(TEXTDISPLAY td, int s, int f); +extern "C" void fl_text_display_draw_string(TEXTDISPLAY td, int s, int x, int y, int r, + const char * str, int n); +extern "C" void fl_text_display_draw_text(TEXTDISPLAY td, int x, int y, int w, int h); +extern "C" void fl_text_display_draw_vline(TEXTDISPLAY td, int line, int left, int right, + int lchar, int rchar); extern "C" int fl_text_display_handle(TEXTDISPLAY td, int e); diff --git a/body/fltk-widgets-groups-text_displays.adb b/body/fltk-widgets-groups-text_displays.adb index 011d841..1286f6a 100644 --- a/body/fltk-widgets-groups-text_displays.adb +++ b/body/fltk-widgets-groups-text_displays.adb @@ -6,17 +6,27 @@ with - Interfaces.C, + Ada.Assertions, + Ada.Characters.Latin_1, + Ada.Unchecked_Conversion, + Interfaces.C.Strings, FLTK.Text_Buffers; use type - Interfaces.C.int; + Interfaces.C.int, + Interfaces.C.Strings.chars_ptr; package body FLTK.Widgets.Groups.Text_Displays is + package Chk renames Ada.Assertions; + package Latin renames Ada.Characters.Latin_1; + + + + ------------------------ -- Functions From C -- ------------------------ @@ -47,6 +57,19 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_set_buffer, "fl_text_display_set_buffer"); pragma Inline (fl_text_display_set_buffer); + procedure fl_text_display_buffer_modified_cb + (P, I, D, R : in Interfaces.C.int; + T : in Interfaces.C.Strings.chars_ptr; + TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_buffer_modified_cb, "fl_text_display_buffer_modified_cb"); + pragma Inline (fl_text_display_buffer_modified_cb); + + procedure fl_text_display_buffer_predelete_cb + (P, D : in Interfaces.C.int; + TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_buffer_predelete_cb, "fl_text_display_buffer_predelete_cb"); + pragma Inline (fl_text_display_buffer_predelete_cb); + @@ -59,11 +82,18 @@ package body FLTK.Widgets.Groups.Text_Displays is procedure fl_text_display_highlight_data2 (TD, TB, ST : in Storage.Integer_Address; L : in Interfaces.C.int; - C : in Interfaces.C.unsigned; + C : in Interfaces.C.char; B, A : in Storage.Integer_Address); pragma Import (C, fl_text_display_highlight_data2, "fl_text_display_highlight_data2"); pragma Inline (fl_text_display_highlight_data2); + function fl_text_display_position_style + (TD : in Storage.Integer_Address; + S, L, I : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_position_style, "fl_text_display_position_style"); + pragma Inline (fl_text_display_position_style); + @@ -96,6 +126,52 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_position_to_xy, "fl_text_display_position_to_xy"); pragma Inline (fl_text_display_position_to_xy); + procedure fl_text_display_find_line_end + (TD : in Storage.Integer_Address; + SP, SPILS : in Interfaces.C.int; + LE, NLS : out Interfaces.C.int); + pragma Import (C, fl_text_display_find_line_end, "fl_text_display_find_line_end"); + pragma Inline (fl_text_display_find_line_end); + + function fl_text_display_find_x + (TD : in Storage.Integer_Address; + T : in Interfaces.C.char_array; + L, S, X : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_find_x, "fl_text_display_find_x"); + pragma Inline (fl_text_display_find_x); + + function fl_text_display_position_to_line + (TD : in Storage.Integer_Address; + P : in Interfaces.C.int; + LN : out Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_position_to_line, "fl_text_display_position_to_line"); + pragma Inline (fl_text_display_position_to_line); + + function fl_text_display_position_to_linecol + (TD : in Storage.Integer_Address; + P : in Interfaces.C.int; + LN, C : out Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_position_to_linecol, "fl_text_display_position_to_linecol"); + pragma Inline (fl_text_display_position_to_linecol); + + function fl_text_display_xy_to_position + (TD : in Storage.Integer_Address; + X, Y, K : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_xy_to_position, "fl_text_display_xy_to_position"); + pragma Inline (fl_text_display_xy_to_position); + + procedure fl_text_display_xy_to_rowcol + (TD : in Storage.Integer_Address; + X, Y : in Interfaces.C.int; + R, C : out Interfaces.C.int; + K : in Interfaces.C.int); + pragma Import (C, fl_text_display_xy_to_rowcol, "fl_text_display_xy_to_rowcol"); + pragma Inline (fl_text_display_xy_to_rowcol); + @@ -225,12 +301,44 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_previous_word, "fl_text_display_previous_word"); pragma Inline (fl_text_display_previous_word); + + + procedure fl_text_display_wrap_mode (TD : in Storage.Integer_Address; W, M : in Interfaces.C.int); pragma Import (C, fl_text_display_wrap_mode, "fl_text_display_wrap_mode"); pragma Inline (fl_text_display_wrap_mode); + function fl_text_display_wrapped_row + (TD : in Storage.Integer_Address; + R : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_wrapped_row, "fl_text_display_wrapped_row"); + pragma Inline (fl_text_display_wrapped_row); + + function fl_text_display_wrapped_column + (TD : in Storage.Integer_Address; + R, C : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_wrapped_column, "fl_text_display_wrapped_column"); + pragma Inline (fl_text_display_wrapped_column); + + function fl_text_display_wrap_uses_character + (TD : in Storage.Integer_Address; + L : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_wrap_uses_character, "fl_text_display_wrap_uses_character"); + pragma Inline (fl_text_display_wrap_uses_character); + + procedure fl_text_display_wrapped_line_counter + (TD, Buf : in Storage.Integer_Address; + SP, MP, ML, SPILS, SBO : in Interfaces.C.int; + RP, RL, RLS, RLE : out Interfaces.C.int; + CLLMNL : in Interfaces.C.int); + pragma Import (C, fl_text_display_wrapped_line_counter, "fl_text_display_wrapped_line_counter"); + pragma Inline (fl_text_display_wrapped_line_counter); + @@ -269,6 +377,82 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_rewind_lines, "fl_text_display_rewind_lines"); pragma Inline (fl_text_display_rewind_lines); + procedure fl_text_display_calc_last_char + (TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_calc_last_char, "fl_text_display_calc_last_char"); + pragma Inline (fl_text_display_calc_last_char); + + procedure fl_text_display_calc_line_starts + (TD : in Storage.Integer_Address; + S, F : in Interfaces.C.int); + pragma Import (C, fl_text_display_calc_line_starts, "fl_text_display_calc_line_starts"); + pragma Inline (fl_text_display_calc_line_starts); + + procedure fl_text_display_offset_line_starts + (TD : in Storage.Integer_Address; + T : in Interfaces.C.int); + pragma Import (C, fl_text_display_offset_line_starts, "fl_text_display_offset_line_starts"); + pragma Inline (fl_text_display_offset_line_starts); + + + + + procedure fl_text_display_absolute_top_line_number + (TD : in Storage.Integer_Address; + C : in Interfaces.C.int); + pragma Import (C, fl_text_display_absolute_top_line_number, + "fl_text_display_absolute_top_line_number"); + pragma Inline (fl_text_display_absolute_top_line_number); + + function fl_text_display_get_absolute_top_line_number + (TD : in Storage.Integer_Address) + return Interfaces.C.int; + pragma Import (C, fl_text_display_get_absolute_top_line_number, + "fl_text_display_get_absolute_top_line_number"); + pragma Inline (fl_text_display_get_absolute_top_line_number); + + procedure fl_text_display_maintain_absolute_top_line_number + (TD : in Storage.Integer_Address; + S : in Interfaces.C.int); + pragma Import (C, fl_text_display_maintain_absolute_top_line_number, + "fl_text_display_maintain_absolute_top_line_number"); + pragma Inline (fl_text_display_maintain_absolute_top_line_number); + + function fl_text_display_maintaining_absolute_top_line_number + (TD : in Storage.Integer_Address) + return Interfaces.C.int; + pragma Import (C, fl_text_display_maintaining_absolute_top_line_number, + "fl_text_display_maintaining_absolute_top_line_number"); + pragma Inline (fl_text_display_maintaining_absolute_top_line_number); + + procedure fl_text_display_reset_absolute_top_line_number + (TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_reset_absolute_top_line_number, + "fl_text_display_reset_absolute_top_line_number"); + pragma Inline (fl_text_display_reset_absolute_top_line_number); + + + + + function fl_text_display_empty_vlines + (TD : in Storage.Integer_Address) + return Interfaces.C.int; + pragma Import (C, fl_text_display_empty_vlines, "fl_text_display_empty_vlines"); + pragma Inline (fl_text_display_empty_vlines); + + function fl_text_display_longest_vline + (TD : in Storage.Integer_Address) + return Interfaces.C.int; + pragma Import (C, fl_text_display_longest_vline, "fl_text_display_longest_vline"); + pragma Inline (fl_text_display_longest_vline); + + function fl_text_display_vline_length + (TD : in Storage.Integer_Address; + L : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_vline_length, "fl_text_display_vline_length"); + pragma Inline (fl_text_display_vline_length); + @@ -356,6 +540,47 @@ package body FLTK.Widgets.Groups.Text_Displays is "fl_text_display_set_linenumber_width"); pragma Inline (fl_text_display_set_linenumber_width); + function fl_text_display_get_linenumber_format + (TD : in Storage.Integer_Address) + return Interfaces.C.Strings.chars_ptr; + pragma Import (C, fl_text_display_get_linenumber_format, + "fl_text_display_get_linenumber_format"); + pragma Inline (fl_text_display_get_linenumber_format); + + procedure fl_text_display_set_linenumber_format + (TD : in Storage.Integer_Address; + V : in Interfaces.C.char_array); + pragma Import (C, fl_text_display_set_linenumber_format, + "fl_text_display_set_linenumber_format"); + pragma Inline (fl_text_display_set_linenumber_format); + + + + + function fl_text_display_measure_proportional_character + (TD : in Storage.Integer_Address; + T : in Interfaces.C.char_array; + X, P : in Interfaces.C.int) + return Interfaces.C.double; + pragma Import (C, fl_text_display_measure_proportional_character, + "fl_text_display_measure_proportional_character"); + pragma Inline (fl_text_display_measure_proportional_character); + + function fl_text_display_measure_vline + (TD : in Storage.Integer_Address; + L : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_measure_vline, "fl_text_display_measure_vline"); + pragma Inline (fl_text_display_measure_vline); + + function fl_text_display_string_width + (TD : in Storage.Integer_Address; + T : in Interfaces.C.char_array; + L, S : in Interfaces.C.int) + return Interfaces.C.double; + pragma Import (C, fl_text_display_string_width, "fl_text_display_string_width"); + pragma Inline (fl_text_display_string_width); + @@ -387,11 +612,18 @@ package body FLTK.Widgets.Groups.Text_Displays is procedure fl_text_display_scroll - (TD : in Storage.Integer_Address; - L : in Interfaces.C.int); + (TD : in Storage.Integer_Address; + L, C : in Interfaces.C.int); pragma Import (C, fl_text_display_scroll, "fl_text_display_scroll"); pragma Inline (fl_text_display_scroll); + function fl_text_display_scroll2 + (TD : in Storage.Integer_Address; + L, P : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_text_display_scroll2, "fl_text_display_scroll2"); + pragma Inline (fl_text_display_scroll2); + function fl_text_display_get_scrollbar_align (TD : in Storage.Integer_Address) return Interfaces.C.unsigned; @@ -416,9 +648,54 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_set_scrollbar_width, "fl_text_display_set_scrollbar_width"); pragma Inline (fl_text_display_set_scrollbar_width); + procedure fl_text_display_update_h_scrollbar + (TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_update_h_scrollbar, "fl_text_display_update_h_scrollbar"); + pragma Inline (fl_text_display_update_h_scrollbar); + + procedure fl_text_display_update_v_scrollbar + (TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_update_v_scrollbar, "fl_text_display_update_v_scrollbar"); + pragma Inline (fl_text_display_update_v_scrollbar); + + function fl_text_display_get_shortcut + (TD : in Storage.Integer_Address) + return Interfaces.C.int; + pragma Import (C, fl_text_display_get_shortcut, "fl_text_display_get_shortcut"); + pragma Inline (fl_text_display_get_shortcut); + + procedure fl_text_display_set_shortcut + (TD : in Storage.Integer_Address; + V : in Interfaces.C.int); + pragma Import (C, fl_text_display_set_shortcut, "fl_text_display_set_shortcut"); + pragma Inline (fl_text_display_set_shortcut); + + + + + procedure fl_text_display_resize + (TD : in Storage.Integer_Address; + X, Y, W, H : in Interfaces.C.int); + pragma Import (C, fl_text_display_resize, "fl_text_display_resize"); + pragma Inline (fl_text_display_resize); + + + + + procedure fl_text_display_clear_rect + (TD : in Storage.Integer_Address; + S, X, Y, W, H : in Interfaces.C.int); + pragma Import (C, fl_text_display_clear_rect, "fl_text_display_clear_rect"); + pragma Inline (fl_text_display_clear_rect); + + procedure fl_text_display_display_insert + (TD : in Storage.Integer_Address); + pragma Import (C, fl_text_display_display_insert, "fl_text_display_display_insert"); + pragma Inline (fl_text_display_display_insert); + procedure fl_text_display_redisplay_range (TD : in Storage.Integer_Address; S, F : in Interfaces.C.int); @@ -430,6 +707,44 @@ package body FLTK.Widgets.Groups.Text_Displays is pragma Import (C, fl_text_display_draw, "fl_text_display_draw"); pragma Inline (fl_text_display_draw); + procedure fl_text_display_draw_cursor + (TD : in Storage.Integer_Address; + X, Y : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_cursor, "fl_text_display_draw_cursor"); + pragma Inline (fl_text_display_draw_cursor); + + procedure fl_text_display_draw_line_numbers + (TD : in Storage.Integer_Address; + C : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_line_numbers, "fl_text_display_draw_line_numbers"); + pragma Inline (fl_text_display_draw_line_numbers); + + procedure fl_text_display_draw_range + (TD : in Storage.Integer_Address; + S, F : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_range, "fl_text_display_draw_range"); + pragma Inline (fl_text_display_draw_range); + + procedure fl_text_display_draw_string + (TD : in Storage.Integer_Address; + S, X, Y, R : in Interfaces.C.int; + T : in Interfaces.C.char_array; + N : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_string, "fl_text_display_draw_string"); + pragma Inline (fl_text_display_draw_string); + + procedure fl_text_display_draw_text + (TD : in Storage.Integer_Address; + X, Y, W, H : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_text, "fl_text_display_draw_text"); + pragma Inline (fl_text_display_draw_text); + + procedure fl_text_display_draw_vline + (TD : in Storage.Integer_Address; + N, L, R, LC, RC : in Interfaces.C.int); + pragma Import (C, fl_text_display_draw_vline, "fl_text_display_draw_vline"); + pragma Inline (fl_text_display_draw_vline); + function fl_text_display_handle (W : in Storage.Integer_Address; E : in Interfaces.C.int) @@ -440,6 +755,37 @@ package body FLTK.Widgets.Groups.Text_Displays is + ------------------------ + -- Internal Utility -- + ------------------------ + + function UChar_To_Mask is new Ada.Unchecked_Conversion + (Interfaces.C.unsigned_char, Styles.Style_Mask); + + function Cint_To_Style_Info + (Value : in Interfaces.C.int) + return Styles.Style_Info is + begin + return + (Mask => UChar_To_Mask (Interfaces.C.unsigned_char ((Value / 256) mod 256)), + Index => Styles.Style_Index (Character'Val (Value mod 256))); + end Cint_To_Style_Info; + + + function Mask_To_UChar is new Ada.Unchecked_Conversion + (Styles.Style_Mask, Interfaces.C.unsigned_char); + + function Style_Info_To_Cint + (Value : in Styles.Style_Info) + return Interfaces.C.int is + begin + return Interfaces.C.int (Mask_To_UChar (Value.Mask)) * 256 + + Character'Pos (Character (Value.Index)); + end Style_Info_To_Cint; + + + + ---------------------- -- Callback Hooks -- ---------------------- @@ -545,33 +891,6 @@ package body FLTK.Widgets.Groups.Text_Displays is - ---------------------- - -- Child Packages -- - ---------------------- - - package body Styles is - - function Item - (Tint : in Color; - Font : in Font_Kind; - Size : in Font_Size) - return Style_Entry is - begin - return This : Style_Entry do - This.Attr := 0; - This.Col := Interfaces.C.unsigned (Tint); - This.Font := Font_Kind'Pos (Font); - This.Size := Interfaces.C.int (Size); - end return; - end Item; - - pragma Inline (Item); - - end Styles; - - - - ----------------------- -- API Subprograms -- ----------------------- @@ -598,6 +917,47 @@ package body FLTK.Widgets.Groups.Text_Displays is end Set_Buffer; + procedure Buffer_Modified_Callback + (This : in out Text_Display; + Action : in FLTK.Text_Buffers.Modification; + Place : in FLTK.Text_Buffers.Position; + Length : in Natural; + Deleted_Text : in String) + is + Bytes_Inserted, Bytes_Deleted, Bytes_Restyled : Interfaces.C.int := 0; + C_Text : aliased Interfaces.C.char_array := Interfaces.C.To_C (Deleted_Text); + use type FLTK.Text_Buffers.Modification; + begin + case Action is + when FLTK.Text_Buffers.Insert => Bytes_Inserted := Interfaces.C.int (Length); + when FLTK.Text_Buffers.Restyle => Bytes_Restyled := Interfaces.C.int (Length); + when FLTK.Text_Buffers.Delete => Bytes_Deleted := Interfaces.C.int (Length); + when FLTK.Text_Buffers.None => null; + end case; + fl_text_display_buffer_modified_cb + (Interfaces.C.int (Place), + Bytes_Inserted, + Bytes_Deleted, + Bytes_Restyled, + (if Action = FLTK.Text_Buffers.Delete + then Interfaces.C.Strings.To_Chars_Ptr (C_Text'Unchecked_Access) + else Interfaces.C.Strings.Null_Ptr), + This.Void_Ptr); + end Buffer_Modified_Callback; + + + procedure Buffer_Predelete_Callback + (This : in out Text_Display; + Place : in FLTK.Text_Buffers.Position; + Length : in Natural) is + begin + fl_text_display_buffer_predelete_cb + (Interfaces.C.int (Place), + Interfaces.C.int (Length), + This.Void_Ptr); + end Buffer_Predelete_Callback; + + procedure Highlight_Data @@ -608,7 +968,7 @@ package body FLTK.Widgets.Groups.Text_Displays is fl_text_display_highlight_data (This.Void_Ptr, Wrapper (Buff).Void_Ptr, - Storage.To_Integer (Table'Address), + Storage.To_Integer (Table (Table'First)'Address), Table'Length); end Highlight_Data; @@ -617,21 +977,42 @@ package body FLTK.Widgets.Groups.Text_Displays is (This : in out Text_Display; Buff : in out FLTK.Text_Buffers.Text_Buffer; Table : in Styles.Style_Array; - Unfinished : in Styles.Style_Index; + Unfinished : in Character; Callback : in Styles.Unfinished_Style_Callback) is begin This.Style_Callback := Callback; fl_text_display_highlight_data2 (This.Void_Ptr, Wrapper (Buff).Void_Ptr, - Storage.To_Integer (Table'Address), + Storage.To_Integer (Table (Table'First)'Address), Table'Length, - Character'Pos (Character (Unfinished)), + Interfaces.C.To_C (Unfinished), Storage.To_Integer (Style_Hook'Address), Storage.To_Integer (This'Address)); end Highlight_Data; + function Position_Style + (This : in Text_Display; + Line_Start : in Natural; + Line_Length : in Natural; + Line_Index : in Natural) + return Styles.Style_Info + is + Result : Interfaces.C.int := fl_text_display_position_style + (This.Void_Ptr, + Interfaces.C.int (Line_Start), + Interfaces.C.int (Line_Length), + Interfaces.C.int (Line_Index)); + begin + return Cint_To_Style_Info (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_style returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Position_Style; + + function Col_To_X @@ -678,6 +1059,198 @@ package body FLTK.Widgets.Groups.Text_Displays is end Position_To_XY; + procedure Find_Line_End + (This : in Text_Display; + Start : in Natural; + Start_Pos_Is_Line_Start : in Boolean; + Line_End : out Natural; + Next_Line_Start : out Natural) + is + C_Line_End, C_Next_Line_Start : Interfaces.C.int; + begin + fl_text_display_find_line_end + (This.Void_Ptr, + Interfaces.C.int (Start), + Boolean'Pos (Start_Pos_Is_Line_Start), + C_Line_End, C_Next_Line_Start); + Line_End := Natural (C_Line_End); + Next_Line_Start := Natural (C_Next_Line_Start); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::find_line_end returned unexpected int values of" & Latin.LF & + Latin.HT & "lineEnd = " & Interfaces.C.int'Image (C_Line_End) & Latin.LF & + Latin.HT & "nextLineStart = " & Interfaces.C.int'Image (C_Next_Line_Start); + end Find_Line_End; + + + function Find_Character + (This : in Text_Display; + Text : in String; + Style : in Styles.Style_Index; + X : in Integer) + return Natural + is + Result : Interfaces.C.int := fl_text_display_find_x + (This.Void_Ptr, + Interfaces.C.To_C (Text), + Text'Length, + Character'Pos (Character (Style)), + Interfaces.C.int (X)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::find_x returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Find_Character; + + + function Position_To_Line + (This : in Text_Display; + Position : in Natural) + return Natural + is + C_Line_Num : Interfaces.C.int; + Result : Interfaces.C.int := fl_text_display_position_to_line + (This.Void_Ptr, + Interfaces.C.int (Position), + C_Line_Num); + begin + pragma Assert (Result >= 0); + return Natural (C_Line_Num); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_line returned unexpected int value of" & Latin.LF & + Latin.HT & "lineNum = " & Interfaces.C.int'Image (C_Line_Num); + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_line returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Position_To_Line; + + + function Position_To_Line + (This : in Text_Display; + Position : in Natural; + Displayed : out Boolean) + return Natural + is + C_Line_Num : Interfaces.C.int; + Result : Interfaces.C.int := fl_text_display_position_to_line + (This.Void_Ptr, + Interfaces.C.int (Position), + C_Line_Num); + begin + pragma Assert (Result >= 0); + Displayed := Result /= 0; + return Natural (C_Line_Num); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_line returned unexpected int value of" & Latin.LF & + Latin.HT & "lineNum = " & Interfaces.C.int'Image (C_Line_Num); + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_line returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Position_To_Line; + + + procedure Position_To_Line_Column + (This : in Text_Display; + Position : in Natural; + Line : out Natural; + Column : out Natural) + is + C_Line_Num, C_Column : Interfaces.C.int; + Result : Interfaces.C.int := fl_text_display_position_to_linecol + (This.Void_Ptr, + Interfaces.C.int (Position), + C_Line_Num, C_Column); + begin + Line := Natural (C_Line_Num); + Column := Natural (C_Column); + pragma Assert (Result >= 0); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_linecol returned unexpected int values of" & Latin.LF & + Latin.HT & "lineNum = " & Interfaces.C.int'Image (C_Line_Num) & Latin.LF & + Latin.HT & "column = " & Interfaces.C.int'Image (C_Column); + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_linecol returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Position_To_Line_Column; + + + procedure Position_To_Line_Column + (This : in Text_Display; + Position : in Natural; + Line : out Natural; + Column : out Natural; + Displayed : out Boolean) + is + C_Line_Num, C_Column : Interfaces.C.int; + Result : Interfaces.C.int := fl_text_display_position_to_linecol + (This.Void_Ptr, + Interfaces.C.int (Position), + C_Line_Num, C_Column); + begin + Line := Natural (C_Line_Num); + Column := Natural (C_Column); + pragma Assert (Result >= 0); + Displayed := Result /= 0; + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_linecol returned unexpected int values of" & Latin.LF & + Latin.HT & "lineNum = " & Interfaces.C.int'Image (C_Line_Num) & Latin.LF & + Latin.HT & "column = " & Interfaces.C.int'Image (C_Column); + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::position_to_linecol returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Position_To_Line_Column; + + + function XY_To_Position + (This : in Text_Display; + X, Y : in Integer; + Kind : in Position_Kind := Character_Position) + return Natural + is + Result : Interfaces.C.int := fl_text_display_xy_to_position + (This.Void_Ptr, + Interfaces.C.int (X), + Interfaces.C.int (Y), + Position_Kind'Pos (Kind)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::xy_to_position returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end XY_To_Position; + + + procedure XY_To_Row_Column + (This : in Text_Display; + X, Y : in Integer; + Row, Column : out Natural; + Kind : in Position_Kind := Character_Position) + is + C_Row, C_Column : Interfaces.C.int; + begin + fl_text_display_xy_to_rowcol + (This.Void_Ptr, + Interfaces.C.int (X), + Interfaces.C.int (Y), + C_Row, C_Column, + Position_Kind'Pos (Kind)); + Row := Natural (C_Row); + Column := Natural (C_Column); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::xy_to_rowcol returned unexpected int values of" & Latin.LF & + Latin.HT & "row = " & Interfaces.C.int'Image (C_Row) & Latin.LF & + Latin.HT & "column = " & Interfaces.C.int'Image (C_Column); + end XY_To_Row_Column; + + function Get_Cursor_Color @@ -847,6 +1420,8 @@ package body FLTK.Widgets.Groups.Text_Displays is end Previous_Word; + + procedure Set_Wrap_Mode (This : in out Text_Display; Mode : in Wrap_Mode; @@ -859,6 +1434,99 @@ package body FLTK.Widgets.Groups.Text_Displays is end Set_Wrap_Mode; + function Wrapped_Row + (This : in Text_Display; + Row : in Natural) + return Natural + is + Result : Interfaces.C.int := fl_text_display_wrapped_row + (This.Void_Ptr, + Interfaces.C.int (Row)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::wrapped_row returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Wrapped_Row; + + + function Wrapped_Column + (This : in Text_Display; + Row, Column : in Natural) + return Natural + is + Result : Interfaces.C.int := fl_text_display_wrapped_column + (This.Void_Ptr, + Interfaces.C.int (Row), + Interfaces.C.int (Column)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::wrapped_column returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Wrapped_Column; + + + function Wrap_Uses_Character + (This : in Text_Display; + Line_End : in Natural) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_wrap_uses_character + (This.Void_Ptr, + Interfaces.C.int (Line_End)); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::wrap_uses_character returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Wrap_Uses_Character; + + + procedure Count_Wrapped_Lines + (This : in Text_Display; + Buffer : in FLTK.Text_Buffers.Text_Buffer; + Start : in Natural; + Max_Position, Max_Lines : in Natural; + Start_Pos_Is_Line_Start : in Boolean; + Style_Offset : in Natural; + Finish, Line_Count : out Natural; + End_Count_Line_Start : out Natural; + Last_Line_End : out Natural; + Count_Last_Missing_Newline : in Boolean := True) + is + C_Finish, C_Line_Count, C_End_Count_Line_Start, C_Last_Line_End : Interfaces.C.int; + begin + fl_text_display_wrapped_line_counter + (This.Void_Ptr, + Wrapper (Buffer).Void_Ptr, + Interfaces.C.int (Start), + Interfaces.C.int (Max_Position), + Interfaces.C.int (Max_Lines), + Boolean'Pos (Start_Pos_Is_Line_Start), + Interfaces.C.int (Style_Offset), + C_Finish, + C_Line_Count, + C_End_Count_Line_Start, + C_Last_Line_End, + Boolean'Pos (Count_Last_Missing_Newline)); + Finish := Natural (C_Finish); + Line_Count := Natural (C_Line_Count); + End_Count_Line_Start := Natural (C_End_Count_Line_Start); + Last_Line_End := Natural (C_Last_Line_End); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::wrapped_line_counter returned unexpected int values of" & Latin.LF & + Latin.HT & "retPos = " & Interfaces.C.int'Image (C_Finish) & Latin.LF & + Latin.HT & "retLines = " & Interfaces.C.int'Image (C_Line_Count) & Latin.LF & + Latin.HT & "retLineStart = " & Interfaces.C.int'Image (C_End_Count_Line_Start) & Latin.LF & + Latin.HT & "retLineEnd = " & Interfaces.C.int'Image (C_Last_Line_End); + end Count_Wrapped_Lines; + + function Line_Start @@ -925,6 +1593,135 @@ package body FLTK.Widgets.Groups.Text_Displays is end Rewind_Lines; + procedure Calculate_Last_Character + (This : in out Text_Display) is + begin + fl_text_display_calc_last_char (This.Void_Ptr); + end Calculate_Last_Character; + + + procedure Calculate_Line_Starts + (This : in out Text_Display; + Start, Finish : in Natural) is + begin + fl_text_display_calc_line_starts + (This.Void_Ptr, + Interfaces.C.int (Start), + Interfaces.C.int (Finish)); + end Calculate_Line_Starts; + + + procedure Offset_Line_Starts + (This : in out Text_Display; + New_Top : in Natural) is + begin + fl_text_display_offset_line_starts + (This.Void_Ptr, + Interfaces.C.int (New_Top)); + end Offset_Line_Starts; + + + + + procedure Redo_Absolute_Top_Line + (This : in out Text_Display; + Old_First : in Natural) is + begin + fl_text_display_absolute_top_line_number (This.Void_Ptr, Interfaces.C.int (Old_First)); + end Redo_Absolute_Top_Line; + + + function Get_Absolute_Top_Line + (This : in Text_Display) + return Natural + is + Result : Interfaces.C.int := fl_text_display_get_absolute_top_line_number (This.Void_Ptr); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::get_absolute_top_line_number returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Get_Absolute_Top_Line; + + + procedure Maintain_Absolute_Top_Line + (This : in out Text_Display; + State : in Boolean := True) is + begin + fl_text_display_maintain_absolute_top_line_number (This.Void_Ptr, Boolean'Pos (State)); + end Maintain_Absolute_Top_Line; + + + function Maintaining_Absolute_Top_Line + (This : in Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_maintaining_absolute_top_line_number + (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::maintaining_absolute_top_line_number returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Maintaining_Absolute_Top_Line; + + + procedure Reset_Absolute_Top_Line + (This : in out Text_Display) is + begin + fl_text_display_reset_absolute_top_line_number (This.Void_Ptr); + end Reset_Absolute_Top_Line; + + + + + function Has_Empty_Visible_Lines + (This : in Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_empty_vlines (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::empty_vlines returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Has_Empty_Visible_Lines; + + + function Get_Longest_Visible_Line + (This : in Text_Display) + return Natural + is + Result : Interfaces.C.int := fl_text_display_longest_vline (This.Void_Ptr); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::longest_vline returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Get_Longest_Visible_Line; + + + function Visible_Line_Length + (This : in Text_Display; + Line : in Natural) + return Natural + is + Result : Interfaces.C.int := fl_text_display_vline_length + (This.Void_Ptr, + Interfaces.C.int (Line)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::vline_length returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Visible_Line_Length; + + function Get_Linenumber_Alignment @@ -1035,51 +1832,217 @@ package body FLTK.Widgets.Groups.Text_Displays is end Set_Linenumber_Width; + function Get_Linenumber_Format + (This : in Text_Display) + return String + is + Result : Interfaces.C.Strings.chars_ptr := + fl_text_display_get_linenumber_format (This.Void_Ptr); + begin + if Result = Interfaces.C.Strings.Null_Ptr then + return ""; + else + return Interfaces.C.Strings.Value (Result); + end if; + end Get_Linenumber_Format; + + + procedure Set_Linenumber_Format + (This : in out Text_Display; + Value : in String) is + begin + fl_text_display_set_linenumber_format (This.Void_Ptr, Interfaces.C.To_C (Value)); + end Set_Linenumber_Format; + + + + + function Measure_Character + (This : in Text_Display; + Text : in String; + X : in Integer; + Index : in Positive) + return Long_Float is + begin + return Long_Float (fl_text_display_measure_proportional_character + (This.Void_Ptr, + Interfaces.C.To_C (Text), + Interfaces.C.int (X), + Interfaces.C.int (Index) - 1)); + end Measure_Character; + + + function Measure_Visible_Line + (This : in Text_Display; + Line : in Natural) + return Natural + is + Result : Interfaces.C.int := fl_text_display_measure_vline + (This.Void_Ptr, + Interfaces.C.int (Line)); + begin + return Natural (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::measure_vline returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Measure_Visible_Line; + + + function Measure_String + (This : in Text_Display; + Text : in String; + Style : in Styles.Style_Index) + return Long_Float is + begin + return Long_Float (fl_text_display_string_width + (This.Void_Ptr, + Interfaces.C.To_C (Text), + Text'Length, + Character'Pos (Character (Style)))); + end Measure_String; + + procedure Move_Down - (This : in out Text_Display) is + (This : in out Text_Display) + is + Result : Interfaces.C.int := fl_text_display_move_down (This.Void_Ptr); begin - if fl_text_display_move_down (This.Void_Ptr) = 0 then - raise Bounds_Error; - end if; + pragma Assert (Result in 0 .. 1); + exception + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_down returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Move_Down; + + + function Move_Down + (This : in out Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_move_down (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_down returned unexpected int value of " & + Interfaces.C.int'Image (Result); end Move_Down; procedure Move_Left - (This : in out Text_Display) is + (This : in out Text_Display) + is + Result : Interfaces.C.int := fl_text_display_move_left (This.Void_Ptr); begin - if fl_text_display_move_left (This.Void_Ptr) = 0 then - raise Bounds_Error; - end if; + pragma Assert (Result in 0 .. 1); + exception + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_left returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Move_Left; + + + function Move_Left + (This : in out Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_move_left (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_left returned unexpected int value of " & + Interfaces.C.int'Image (Result); end Move_Left; procedure Move_Right - (This : in out Text_Display) is + (This : in out Text_Display) + is + Result : Interfaces.C.int := fl_text_display_move_right (This.Void_Ptr); begin - if fl_text_display_move_right (This.Void_Ptr) = 0 then - raise Bounds_Error; - end if; + pragma Assert (Result in 0 .. 1); + exception + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_right returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Move_Right; + + + function Move_Right + (This : in out Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_move_right (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_right returned unexpected int value of " & + Interfaces.C.int'Image (Result); end Move_Right; procedure Move_Up - (This : in out Text_Display) is + (This : in out Text_Display) + is + Result : Interfaces.C.int := fl_text_display_move_up (This.Void_Ptr); begin - if fl_text_display_move_up (This.Void_Ptr) = 0 then - raise Bounds_Error; - end if; + pragma Assert (Result in 0 .. 1); + exception + when Chk.Assertion_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_up returned unexpected int value of " & + Interfaces.C.int'Image (Result); + end Move_Up; + + + function Move_Up + (This : in out Text_Display) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_move_up (This.Void_Ptr); + begin + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::move_up returned unexpected int value of " & + Interfaces.C.int'Image (Result); end Move_Up; procedure Scroll_To - (This : in out Text_Display; - Line : in Natural) is + (This : in out Text_Display; + Line : in Natural; + Column : in Natural := 0) is + begin + fl_text_display_scroll + (This.Void_Ptr, + Interfaces.C.int (Line), + Interfaces.C.int (Column)); + end Scroll_To; + + + function Scroll_To + (This : in out Text_Display; + Line : in Natural; + Pixel : in Natural := 0) + return Boolean + is + Result : Interfaces.C.int := fl_text_display_scroll2 + (This.Void_Ptr, + Interfaces.C.int (Line), + Interfaces.C.int (Pixel)); begin - fl_text_display_scroll (This.Void_Ptr, Interfaces.C.int (Line)); + return Boolean'Val (Result); + exception + when Constraint_Error => raise Internal_FLTK_Error with + "Fl_Text_Display::scroll_ returned unexpected int value of " & + Interfaces.C.int'Image (Result); end Scroll_To; @@ -1119,6 +2082,75 @@ package body FLTK.Widgets.Groups.Text_Displays is end Set_Scrollbar_Width; + procedure Update_Horizontal_Scrollbar + (This : in out Text_Display) is + begin + fl_text_display_update_h_scrollbar (This.Void_Ptr); + end Update_Horizontal_Scrollbar; + + + procedure Update_Vertical_Scrollbar + (This : in out Text_Display) is + begin + fl_text_display_update_v_scrollbar (This.Void_Ptr); + end Update_Vertical_Scrollbar; + + + + + function Get_Shortcut + (This : in Text_Display) + return Key_Combo is + begin + return To_Ada (fl_text_display_get_shortcut (This.Void_Ptr)); + end Get_Shortcut; + + + procedure Set_Shortcut + (This : in out Text_Display; + Value : in Key_Combo) is + begin + fl_text_display_set_shortcut (This.Void_Ptr, To_C (Value)); + end Set_Shortcut; + + + + + procedure Resize + (This : in out Text_Display; + X, Y, W, H : in Integer) is + begin + fl_text_display_resize + (This.Void_Ptr, + Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H)); + end Resize; + + + + + procedure Clear_Rect + (This : in out Text_Display; + Style : in Styles.Style_Info; + X, Y, W, H : in Integer) is + begin + fl_text_display_clear_rect + (This.Void_Ptr, + Style_Info_To_Cint (Style), + Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H)); + end Clear_Rect; + + + procedure Display_Insert + (This : in out Text_Display) is + begin + fl_text_display_display_insert (This.Void_Ptr); + end Display_Insert; procedure Redisplay_Range @@ -1139,6 +2171,84 @@ package body FLTK.Widgets.Groups.Text_Displays is end Draw; + procedure Draw_Cursor + (This : in out Text_Display; + X, Y : in Integer) is + begin + fl_text_display_draw_cursor + (This.Void_Ptr, + Interfaces.C.int (X), + Interfaces.C.int (Y)); + end Draw_Cursor; + + + procedure Draw_Line_Numbers + (This : in out Text_Display; + Clear : in Boolean := False) is + begin + fl_text_display_draw_line_numbers (This.Void_Ptr, Boolean'Pos (Clear)); + end Draw_Line_Numbers; + + + procedure Draw_Range + (This : in out Text_Display; + Start, Finish : in Natural) is + begin + fl_text_display_draw_range + (This.Void_Ptr, + Interfaces.C.int (Start), + Interfaces.C.int (Finish)); + end Draw_Range; + + + procedure Draw_String + (This : in out Text_Display; + Style : in Styles.Style_Info; + X, Y : in Integer; + Right : in Integer; + Text : in String; + Num_Chars : in Natural) is + begin + fl_text_display_draw_string + (This.Void_Ptr, + Style_Info_To_Cint (Style), + Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (Right), + Interfaces.C.To_C (Text), + Interfaces.C.int (Num_Chars)); + end Draw_String; + + + procedure Draw_Text + (This : in out Text_Display; + X, Y, W, H : in Integer) is + begin + fl_text_display_draw_text + (This.Void_Ptr, + Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H)); + end Draw_Text; + + + procedure Draw_Visible_Line + (This : in out Text_Display; + Line : in Natural; + Left_Clip, Right_Clip : in Integer; + Left_Char, Right_Char : in Natural) is + begin + fl_text_display_draw_vline + (This.Void_Ptr, + Interfaces.C.int (Line), + Interfaces.C.int (Left_Clip), + Interfaces.C.int (Right_Clip), + Interfaces.C.int (Left_Char), + Interfaces.C.int (Right_Char)); + end Draw_Visible_Line; + + function Handle (This : in out Text_Display; Event : in Event_Kind) diff --git a/body/fltk-widgets-inputs.adb b/body/fltk-widgets-inputs.adb index ab83121..6863110 100644 --- a/body/fltk-widgets-inputs.adb +++ b/body/fltk-widgets-inputs.adb @@ -605,20 +605,20 @@ package body FLTK.Widgets.Inputs is end Get_Kind; - function Get_Shortcut_Key + function Get_Shortcut (This : in Input) return Key_Combo is begin return To_Ada (fl_input_get_shortcut (This.Void_Ptr)); - end Get_Shortcut_Key; + end Get_Shortcut; - procedure Set_Shortcut_Key + procedure Set_Shortcut (This : in out Input; To : in Key_Combo) is begin fl_input_set_shortcut (This.Void_Ptr, To_C (To)); - end Set_Shortcut_Key; + end Set_Shortcut; function Get_Mark diff --git a/doc/fl_button.html b/doc/fl_button.html index cc7b94d..05838b5 100644 --- a/doc/fl_button.html +++ b/doc/fl_button.html @@ -176,7 +176,7 @@ int shortcut() const; 
 function Get_Shortcut
        (This : in Button)
-    return Shortcut_Key;
+    return Key_Combo;
@@ -187,7 +187,7 @@ void shortcut(int s); 
 procedure Set_Shortcut
        (This : in out Button;
-        Key  : in     Shortcut_Key);
+        Key  : in     Key_Combo);
diff --git a/doc/fl_input_.html b/doc/fl_input_.html index 071ec66..e9edf37 100644 --- a/doc/fl_input_.html +++ b/doc/fl_input_.html @@ -392,9 +392,9 @@ procedure Resize int shortcut() const; 
-function Get_Shortcut_Key
+function Get_Shortcut
        (This : in Input)
-    return Shortcut_Key;
+    return Key_Combo;
@@ -403,9 +403,9 @@ function Get_Shortcut_Key void shortcut(int s); 
-procedure Set_Shortcut_Key
+procedure Set_Shortcut
        (This : in out Input;
-        To   : in     Shortcut_Key);
+        To   : in     Key_Combo);
diff --git a/doc/fl_text_display.html b/doc/fl_text_display.html index e37622c..8d0d20a 100644 --- a/doc/fl_text_display.html +++ b/doc/fl_text_display.html @@ -48,7 +48,7 @@ enum { CURSOR_POS, CHARACTER_POS } -   + Position_Kind @@ -72,15 +72,25 @@ -   + uchar Style_Index -   + Style_Table_Entry * Style_Array + + int + Style_Mask + + + + int + Style_Info + + @@ -135,6 +145,7 @@ function Create 
 void buffer(Fl_Text_Buffer *buf);
+
 void buffer(Fl_Text_Buffer &buf);
 
@@ -169,7 +180,8 @@ function Col_To_X
 
   
 
-int count_lines(int start, int end, bool start_pos_is_line_start) const;
+int count_lines(int start, int end,
+    bool start_pos_is_line_start) const;
 

 
 function Count_Lines
@@ -305,20 +317,10 @@ function Get_Insert_Position
 

   
 
-  
- 
-
-function Item
-       (Tint : in Color;
-        Font : in Font_Kind;
-        Size : in Font_Size)
-    return Style_Entry;
-

-  
-
   
 
-int line_end(int startPos, bool startPosIsLineStart) const;
+int line_end(int startPos,
+    bool startPosIsLineStart) const;
 

 
 function Line_End
@@ -431,16 +433,24 @@ function Get_Linenumber_Font
 
   
 
-void linenumber_format(const char *val);
+const char * linenumber_format() const;
+

+
+function Get_Linenumber_Format
+       (This : in Text_Display)
+    return String;
 

- 
   
 
   
 
-const char * linenumber_format() const;
+void linenumber_format(const char *val);
+

+
+procedure Set_Linenumber_Format
+       (This  : in out Text_Display;
+        Value : in     String);
 

- 
   
 
   
@@ -494,6 +504,10 @@ int move_down();
 
 procedure Move_Down
        (This : in out Text_Display);
+
+function Move_Down
+       (This : in out Text_Display)
+    return Boolean;
 

   
 
@@ -504,6 +518,10 @@ int move_left();
 
 procedure Move_Left
        (This : in out Text_Display);
+
+function Move_Left
+       (This : in out Text_Display)
+    return Boolean;
 

   
 
@@ -514,6 +532,10 @@ int move_right();
 
 procedure Move_Right
        (This : in out Text_Display);
+
+function Move_Right
+       (This : in out Text_Display)
+    return Boolean;
 

   
 
@@ -524,6 +546,10 @@ int move_up();
 
 procedure Move_Up
        (This : in out Text_Display);
+
+function Move_Up
+       (This : in out Text_Display)
+    return Boolean;
 

   
 
@@ -550,9 +576,17 @@ procedure Overstrike
 
   
 
-int position_style(int lineStartPos, int lineLen, int lineIndex) const;
+int position_style(int lineStartPos, int lineLen,
+    int lineIndex) const;
+

+
+function Position_Style
+       (This        : in Text_Display;
+        Line_Start  : in Natural;
+        Line_Length : in Natural;
+        Line_Index  : in Natural)
+    return Styles.Style_Info;
 

- 
   
 
   
@@ -593,7 +627,11 @@ procedure Redisplay_Range
 
 virtual void resize(int X, int Y, int W, int H);
 

- 
+
+procedure Resize
+       (This       : in out Text_Display;
+        X, Y, W, H : in     Integer);
+

   
 
   
@@ -614,8 +652,9 @@ void scroll(int topLineNum, int horizOffset);
 

 
 procedure Scroll_To
-       (This : in out Text_Display;
-        Line : in     Natural);
+       (This   : in out Text_Display;
+        Line   : in     Natural;
+        Column : in     Natural := 0);
 

   
 
@@ -667,14 +706,22 @@ procedure Set_Scrollbar_Width
 
 int shortcut() const;
 

- 
+
+function Get_Shortcut
+       (This : in Text_Display)
+    return Key_Combo;
+

   
 
   
 
 void shortcut(int s);
 

- 
+
+procedure Set_Shortcut
+       (This  : in out Text_Display;
+        Value : in     Key_Combo);
+

   
 
   
@@ -699,7 +746,8 @@ procedure Show_Insert_Position
 
   
 
-int skip_lines(int startPos, int nLines, bool startPosIsLineStart);
+int skip_lines(int startPos, int nLines,
+    bool startPosIsLineStart);
 

 
 function Skip_Lines
@@ -816,14 +864,24 @@ procedure Set_Wrap_Mode
 
 int wrapped_column(int row, int column) const;
 

- 
+
+function Wrapped_Column
+       (This        : in Text_Display;
+        Row, Column : in Natural)
+    return Natural;
+

   
 
   
 
 int wrapped_row(int row) const;
 

- 
+
+function Wrapped_Row
+       (This : in Text_Display;
+        Row  : in Natural)
+    return Natural;
+

   
 
   
@@ -845,6 +903,54 @@ function X_To_Col
 
 
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
 

   
Static Protected Functions and Procedures
+static void buffer_modified_cb(int pos, int nInserted, int nDeleted,
+    int nRestyled, const char *deletedText, void *cbArg);
+
+procedure Buffer_Modified_Callback
+       (This         : in out Text_Display;
+        Action       : in     FLTK.Text_Buffers.Modification;
+        Place        : in     FLTK.Text_Buffers.Position;
+        Length       : in     Natural;
+        Deleted_Text : in     String);
+
+static void buffer_predelete_cb(int pos, int nDeleted, void *cbArg);
+
+procedure Buffer_Predelete_Callback
+       (This   : in out Text_Display;
+        Place  : in     FLTK.Text_Buffers.Position;
+        Length : in     Natural);
+
+static void h_scrollbar_cb(Fl_Scrollbar *w, Fl_Text_Display *d);
+
Intentionally left unbound.
+static void scroll_timer_cb(void *);
+
Intentionally left unbound.
+static void v_scrollbar_cb(Fl_Scrollbar *w, Fl_Text_Display *d);
+
Intentionally left unbound.

 
 
@@ -854,6 +960,61 @@ function X_To_Col
 
   
 
+void absolute_top_line_number(int oldFirstChar);
+

+
+procedure Redo_Absolute_Top_Line
+       (This      : in out Text_Display;
+        Old_First : in     Natural);
+

+  
+
+  
+
+void calc_last_char();
+

+
+procedure Calculate_Last_Character
+       (This : in out Text_Display);
+

+  
+
+  
+
+void calc_line_starts(int startLine, int endLine);
+

+
+procedure Calculate_Line_Starts
+       (This          : in out Text_Display;
+        Start, Finish : in     Natural);
+

+  
+
+  
+
+void clear_rect(int style, int x, int y, int width,
+    int height) const;
+

+
+procedure Clear_Rect
+       (This       : in out Text_Display;
+        Style      : in     Styles.Style_Info;
+        X, Y, W, H : in     Integer);
+

+  
+
+  
+
+void display_insert();
+

+
+procedure Display_Insert
+       (This : in out Text_Display);
+

+  
+
+  
+
 virtual void draw();
 

 
@@ -862,6 +1023,412 @@ procedure Draw
 

   
 
+  
+
+void draw_cursor(int, int);
+

+
+procedure Draw_Cursor
+       (This : in out Text_Display;
+        X, Y : in     Integer);
+

+  
+
+  
+
+void draw_line_numbers(bool clearAll);
+

+
+procedure Draw_Line_Numbers
+       (This  : in out Text_Display;
+        Clear : in     Boolean :=  False);
+

+  
+
+  
+
+void draw_range(int start, int end);
+

+
+procedure Draw_Range
+       (This          : in out Text_Display;
+        Start, Finish : in     Natural);
+

+  
+
+  
+
+void draw_string(int style, int x, int y, int toX,
+    const char *string, int nChars) const;
+

+
+procedure Draw_String
+       (This      : in out Text_Display;
+        Style     : in     Styles.Style_Info;
+        X, Y      : in     Integer;
+        Right     : in     Integer;
+        Text      : in     String;
+        Num_Chars : in     Natural);
+

+  
+
+  
+
+void draw_text(int x, int y, int w, int h);
+

+
+procedure Draw_Text
+       (This       : in out Text_Display;
+        X, Y, W, H : in     Integer);
+

+  
+
+  
+
+void draw_vline(int visLineNum, int leftClip, int rightClip,
+    int leftCharIndex, int rightCharIndex);
+

+
+procedure Draw_Visible_Line
+       (This                  : in out Text_Display;
+        Line                  : in     Natural;
+        Left_Clip, Right_Clip : in     Integer;
+        Left_Char, Right_Char : in     Natural);
+

+  
+
+  
+
+int empty_vlines() const;
+

+
+function Has_Empty_Visible_Lines
+       (This : in Text_Display)
+    return Boolean;
+

+  
+
+  
+
+void extend_range_for_styles(int *start, int *end);
+

+Intentionally left unbound.
+  
+
+  
+
+void find_line_end(int pos, bool start_pos_is_line_start,
+    int *lineEnd, int *nextLineStart) const;
+

+
+procedure Find_Line_End
+       (This                    : in     Text_Display;
+        Start                   : in     Natural;
+        Start_Pos_Is_Line_Start : in     Boolean;
+        Line_End                :    out Natural;
+        Next_Line_Start         :    out Natural);
+

+  
+
+  
+
+void find_wrap_range(const char *deletedText, int pos,
+    int nInserted, int nDeleted, int *modRangeStart,
+    int *modRangeEnd, int *linesInserted, int *linesDeleted);
+

+Intentionally left unbound.
+  
+
+  
+
+int find_x(const char *s, int len, int style, int x) const;
+

+
+function Find_Character
+       (This  : in Text_Display;
+        Text  : in String;
+        Style : in Styles.Style_Index;
+        X     : in Integer)
+    return Natural;
+

+  
+
+  
+
+int get_absolute_top_line_number() const;
+

+
+function Get_Absolute_Top_Line
+       (This : in Text_Display)
+    return Natural;
+

+  
+
+  
+
+int handle_vline(int mode, int lineStart, int lineLen,
+    int leftChar, int rightChar, int topClip, int bottomClip,
+    int leftClip, int rightClip) const;
+

+Intentionally left unbound.
+  
+
+  
+
+int longest_vline() const;
+

+
+function Get_Longest_Visible_Line
+       (This : in Text_Display)
+    return Natural;
+

+  
+
+  
+
+void maintain_absolute_top_line_number(int state);
+

+
+procedure Maintain_Absolute_Top_Line
+       (This  : in out Text_Display;
+        State : in     Boolean := True);
+

+  
+
+  
+
+int maintaining_absolute_top_line_number() const;
+

+
+function Maintaining_Absolute_Top_Line
+       (This : in Text_Display)
+    return Boolean;
+

+  
+
+  
+
+void measure_deleted_lines(int pos, int nDeleted);
+

+Intentionally left unbound.
+  
+
+  
+
+double measure_proportional_character(const char *s, int colNum,
+    int pos) const;
+

+
+function Measure_Character
+       (This  : in Text_Display;
+        Text  : in String;
+        X     : in Integer;
+        Index : in Positive)
+    return Long_Float;
+

+  
+
+  
+
+int measure_vline(int visLineNum) const;
+

+
+function Measure_Visible_Line
+       (This : in Text_Display;
+        Line : in Natural)
+    return Natural;
+

+  
+
+  
+
+void offset_line_starts(int newTopLineNum);
+

+
+procedure Offset_Line_Starts
+       (This    : in out Text_Display;
+        New_Top : in     Natural);
+

+  
+
+  
+
+int position_to_line(int pos, int *lineNum) const;
+

+
+function Position_To_Line
+       (This     : in Text_Display;
+        Position : in Natural)
+    return Natural;
+
+function Position_To_Line
+       (This      : in     Text_Display;
+        Position  : in     Natural;
+        Displayed :    out Boolean)
+    return Natural;
+

+  
+
+  
+
+int position_to_linecol(int pos, int *lineNum, int *column) const;
+

+
+procedure Position_To_Line_Column
+       (This     : in     Text_Display;
+        Position : in     Natural;
+        Line     :    out Natural;
+        Column   :    out Natural);
+
+procedure Position_To_Line_Column
+       (This      : in     Text_Display;
+        Position  : in     Natural;
+        Line      :    out Natural;
+        Column    :    out Natural;
+        Displayed :    out Boolean);
+

+  
+
+  
+
+void reset_absolute_top_line_number();
+

+
+procedure Reset_Absolute_Top_Line
+       (This : in out Text_Display);
+

+  
+
+  
+
+int scroll_(int topLineNum, int horizOffset);
+

+
+function Scroll_To
+       (This  : in out Text_Display;
+        Line  : in     Natural;
+        Pixel : in     Natural := 0)
+    return Boolean;
+

+  
+
+  
+
+double string_width(const char *string, int length,
+    int style) const;
+

+
+function Measure_String
+       (This  : in Text_Display;
+        Text  : in String;
+        Style : in Styles.Style_Index)
+    return Long_Float;
+

+  
+
+  
+
+void update_h_scrollbar();
+

+
+procedure Update_Horizontal_Scrollbar
+       (This : in out Text_Display);
+

+  
+
+  
+
+void update_line_starts(int pos, int charsInserted,
+    int charsDeleted, int linesInserted, int linesDeleted,
+    int *scrolled);
+

+Intentionally left unbound.
+  
+
+  
+
+void update_v_scrollbar();
+

+
+procedure Update_Vertical_Scrollbar
+       (This : in out Text_Display);
+

+  
+
+  
+
+int vline_length(int visLineNum) const;
+

+
+function Visible_Line_Length
+       (This : in Text_Display;
+        Line : in Natural)
+    return Natural;
+

+  
+
+  
+
+int wrap_uses_character(int lineEndPos) const;
+

+
+function Wrap_Uses_Character
+       (This     : in Text_Display;
+        Line_End : in Natural)
+    return Boolean;
+

+  
+
+  
+
+void wrapped_line_counter(Fl_Text_Buffer *buf, int startPos,
+    int maxPos, int maxLines, bool startPosIsLineStart,
+    int styleBufOffset, int *retPos, int *retLines,
+    int *retLineStart, int *retLineEnd,
+    bool countLastLineMissingNewLine=true) const;
+

+
+procedure Count_Wrapped_Lines
+       (This                       : in     Text_Display;
+        Buffer                     : in     FLTK.Text_Buffers.Text_Buffer;
+        Start                      : in     Natural;
+        Max_Position, Max_Lines    : in     Natural;
+        Start_Pos_Is_Line_Start    : in     Boolean;
+        Style_Offset               : in     Natural;
+        Finish, Line_Count         :    out Natural;
+        End_Count_Line_Start       :    out Natural;
+        Last_Line_End              :    out Natural;
+        Count_Last_Missing_Newline : in     Boolean := True);
+

+  
+
+  
+
+int xy_to_position(int x, int y, int PosType=CHARACTER_POS) const;
+

+
+function XY_To_Position
+       (This : in Text_Display;
+        X, Y : in Integer;
+        Kind : in Position_Kind := Character_Position)
+    return Natural;
+

+  
+
+  
+
+void xy_to_rowcol(int x, int y, int *row, int *column,
+    int PosType=CHARACTER_POS) const;
+

+
+procedure XY_To_Row_Column
+       (This        : in     Text_Display;
+        X, Y        : in     Integer;
+        Row, Column :    out Natural;
+        Kind        : in     Position_Kind := Character_Position);
+

+  
+
 
 
 
diff --git a/spec/fltk-widgets-groups-text_displays.ads b/spec/fltk-widgets-groups-text_displays.ads
index c56708a..7892277 100644
--- a/spec/fltk-widgets-groups-text_displays.ads
+++ b/spec/fltk-widgets-groups-text_displays.ads
@@ -26,8 +26,7 @@ package FLTK.Widgets.Groups.Text_Displays is
 
     type Cursor_Style is (Normal, Caret, Dim, Block, Heavy, Simple);
 
-
-    Bounds_Error : exception;
+    type Position_Kind is (Cursor_Position, Character_Position);
 
 
 
@@ -52,29 +51,62 @@ package FLTK.Widgets.Groups.Text_Displays is
 
     package Styles is
 
-        type Style_Entry is private;
+        type Style_Entry is record
+            Hue  : Color;
+            Font : Font_Kind;
+            Size : Font_Size;
+        end record;
+
         type Style_Index is new Character range 'A' .. '~';
+
         type Style_Array is array (Style_Index range <>) of Style_Entry;
 
         type Unfinished_Style_Callback is access procedure
                (Char    : in     Character;
                 Display : in out Text_Display);
 
-        function Item
-               (Tint : in Color;
-                Font : in Font_Kind;
-                Size : in Font_Size)
-            return Style_Entry;
+        type Style_Mask is record
+            Fill       : Boolean := False;
+            Secondary  : Boolean := False;
+            Primary    : Boolean := False;
+            Highlight  : Boolean := False;
+            Background : Boolean := False;
+            Text_Only  : Boolean := False;
+        end record;
+
+        Empty_Mask : constant Style_Mask;
+
+        type Style_Info is record
+            Mask  : Style_Mask;
+            Index : Style_Index;
+        end record;
 
     private
 
-        type Style_Entry is record
-            Attr : Interfaces.C.unsigned;
-            Col  : Interfaces.C.unsigned;
-            Font : Interfaces.C.int;
-            Size : Interfaces.C.int;
+        for Style_Entry use record
+            Hue  at 1 * Interfaces.C.unsigned'Size / System.Storage_Unit
+                range 0 .. Interfaces.C.unsigned'Size - 1;
+            Font at 2 * Interfaces.C.unsigned'Size / System.Storage_Unit
+                range 0 .. Interfaces.C.int'Size - 1;
+            Size at 3 * Interfaces.C.unsigned'Size / System.Storage_Unit
+                range 0 .. Interfaces.C.int'Size - 1;
         end record;
 
+        for Style_Entry'Size use Interfaces.C.unsigned'Size * 3 + Interfaces.C.int'Size;
+
+        for Style_Mask use record
+            Fill       at 0 range 0 .. 0;
+            Secondary  at 0 range 1 .. 1;
+            Primary    at 0 range 2 .. 2;
+            Highlight  at 0 range 3 .. 3;
+            Background at 0 range 4 .. 4;
+            Text_Only  at 0 range 5 .. 5;
+        end record;
+
+        for Style_Mask'Size use Interfaces.C.unsigned_char'Size;
+
+        Empty_Mask : constant Style_Mask := (others => False);
+
         pragma Convention (C, Style_Entry);
         pragma Convention (C, Style_Array);
 
@@ -91,6 +123,18 @@ package FLTK.Widgets.Groups.Text_Displays is
            (This : in out Text_Display;
             Buff : in out FLTK.Text_Buffers.Text_Buffer);
 
+    procedure Buffer_Modified_Callback
+           (This         : in out Text_Display;
+            Action       : in     FLTK.Text_Buffers.Modification;
+            Place        : in     FLTK.Text_Buffers.Position;
+            Length       : in     Natural;
+            Deleted_Text : in     String);
+
+    procedure Buffer_Predelete_Callback
+           (This   : in out Text_Display;
+            Place  : in     FLTK.Text_Buffers.Position;
+            Length : in     Natural);
+
 
 
 
@@ -103,9 +147,16 @@ package FLTK.Widgets.Groups.Text_Displays is
            (This       : in out Text_Display;
             Buff       : in out FLTK.Text_Buffers.Text_Buffer;
             Table      : in     Styles.Style_Array;
-            Unfinished : in     Styles.Style_Index;
+            Unfinished : in     Character;
             Callback   : in     Styles.Unfinished_Style_Callback);
 
+    function Position_Style
+           (This        : in Text_Display;
+            Line_Start  : in Natural;
+            Line_Length : in Natural;
+            Line_Index  : in Natural)
+        return Styles.Style_Info;
+
 
 
 
@@ -130,6 +181,56 @@ package FLTK.Widgets.Groups.Text_Displays is
             X, Y     :    out Integer;
             Vert_Out :    out Boolean);
 
+    procedure Find_Line_End
+           (This                    : in     Text_Display;
+            Start                   : in     Natural;
+            Start_Pos_Is_Line_Start : in     Boolean;
+            Line_End                :    out Natural;
+            Next_Line_Start         :    out Natural);
+
+    function Find_Character
+           (This  : in Text_Display;
+            Text  : in String;
+            Style : in Styles.Style_Index;
+            X     : in Integer)
+        return Natural;
+
+    function Position_To_Line
+           (This     : in Text_Display;
+            Position : in Natural)
+        return Natural;
+
+    function Position_To_Line
+           (This      : in     Text_Display;
+            Position  : in     Natural;
+            Displayed :    out Boolean)
+        return Natural;
+
+    procedure Position_To_Line_Column
+           (This     : in     Text_Display;
+            Position : in     Natural;
+            Line     :    out Natural;
+            Column   :    out Natural);
+
+    procedure Position_To_Line_Column
+           (This      : in     Text_Display;
+            Position  : in     Natural;
+            Line      :    out Natural;
+            Column    :    out Natural;
+            Displayed :    out Boolean);
+
+    function XY_To_Position
+           (This : in Text_Display;
+            X, Y : in Integer;
+            Kind : in Position_Kind := Character_Position)
+        return Natural;
+
+    procedure XY_To_Row_Column
+           (This        : in     Text_Display;
+            X, Y        : in     Integer;
+            Row, Column :    out Natural;
+            Kind        : in     Position_Kind := Character_Position);
+
 
 
 
@@ -219,11 +320,41 @@ package FLTK.Widgets.Groups.Text_Displays is
     procedure Previous_Word
            (This : in out Text_Display);
 
+
+
+
     procedure Set_Wrap_Mode
            (This   : in out Text_Display;
             Mode   : in     Wrap_Mode;
             Margin : in     Natural := 0);
 
+    function Wrapped_Row
+           (This : in Text_Display;
+            Row  : in Natural)
+        return Natural;
+
+    function Wrapped_Column
+           (This        : in Text_Display;
+            Row, Column : in Natural)
+        return Natural;
+
+    function Wrap_Uses_Character
+           (This     : in Text_Display;
+            Line_End : in Natural)
+        return Boolean;
+
+    procedure Count_Wrapped_Lines
+           (This                       : in     Text_Display;
+            Buffer                     : in     FLTK.Text_Buffers.Text_Buffer;
+            Start                      : in     Natural;
+            Max_Position, Max_Lines    : in     Natural;
+            Start_Pos_Is_Line_Start    : in     Boolean;
+            Style_Offset               : in     Natural;
+            Finish, Line_Count         :    out Natural;
+            End_Count_Line_Start       :    out Natural;
+            Last_Line_End              :    out Natural;
+            Count_Last_Missing_Newline : in     Boolean := True);
+
 
 
 
@@ -259,6 +390,55 @@ package FLTK.Widgets.Groups.Text_Displays is
             Start, Lines : in Natural)
         return Natural;
 
+    procedure Calculate_Last_Character
+           (This : in out Text_Display);
+
+    procedure Calculate_Line_Starts
+           (This          : in out Text_Display;
+            Start, Finish : in     Natural);
+
+    procedure Offset_Line_Starts
+           (This    : in out Text_Display;
+            New_Top : in     Natural);
+
+
+
+
+    procedure Redo_Absolute_Top_Line
+           (This      : in out Text_Display;
+            Old_First : in     Natural);
+
+    function Get_Absolute_Top_Line
+           (This : in Text_Display)
+        return Natural;
+
+    procedure Maintain_Absolute_Top_Line
+           (This  : in out Text_Display;
+            State : in     Boolean := True);
+
+    function Maintaining_Absolute_Top_Line
+           (This : in Text_Display)
+        return Boolean;
+
+    procedure Reset_Absolute_Top_Line
+           (This : in out Text_Display);
+
+
+
+
+    function Has_Empty_Visible_Lines
+           (This : in Text_Display)
+        return Boolean;
+
+    function Get_Longest_Visible_Line
+           (This : in Text_Display)
+        return Natural;
+
+    function Visible_Line_Length
+           (This : in Text_Display;
+            Line : in Natural)
+        return Natural;
+
 
 
 
@@ -310,27 +490,79 @@ package FLTK.Widgets.Groups.Text_Displays is
            (This  : in out Text_Display;
             Width : in     Natural);
 
+    function Get_Linenumber_Format
+           (This : in Text_Display)
+        return String;
+
+    procedure Set_Linenumber_Format
+           (This  : in out Text_Display;
+            Value : in     String);
+
+
+
+
+    function Measure_Character
+           (This  : in Text_Display;
+            Text  : in String;
+            X     : in Integer;
+            Index : in Positive)
+        return Long_Float;
+
+    function Measure_Visible_Line
+           (This : in Text_Display;
+            Line : in Natural)
+        return Natural;
+
+    function Measure_String
+           (This  : in Text_Display;
+            Text  : in String;
+            Style : in Styles.Style_Index)
+        return Long_Float;
+
 
 
 
     procedure Move_Down
            (This : in out Text_Display);
 
+    function Move_Down
+           (This : in out Text_Display)
+        return Boolean;
+
     procedure Move_Left
            (This : in out Text_Display);
 
+    function Move_Left
+           (This : in out Text_Display)
+        return Boolean;
+
     procedure Move_Right
            (This : in out Text_Display);
 
+    function Move_Right
+           (This : in out Text_Display)
+        return Boolean;
+
     procedure Move_Up
            (This : in out Text_Display);
 
+    function Move_Up
+           (This : in out Text_Display)
+        return Boolean;
+
 
 
 
     procedure Scroll_To
-           (This : in out Text_Display;
-            Line : in     Natural);
+           (This   : in out Text_Display;
+            Line   : in     Natural;
+            Column : in     Natural := 0);
+
+    function Scroll_To
+           (This  : in out Text_Display;
+            Line  : in     Natural;
+            Pixel : in     Natural := 0)
+        return Boolean;
 
     function Get_Scrollbar_Alignment
            (This : in Text_Display)
@@ -348,9 +580,41 @@ package FLTK.Widgets.Groups.Text_Displays is
            (This  : in out Text_Display;
             Width : in     Natural);
 
+    procedure Update_Horizontal_Scrollbar
+           (This : in out Text_Display);
 
+    procedure Update_Vertical_Scrollbar
+           (This : in out Text_Display);
 
 
+
+
+    function Get_Shortcut
+           (This : in Text_Display)
+        return Key_Combo;
+
+    procedure Set_Shortcut
+           (This  : in out Text_Display;
+            Value : in     Key_Combo);
+
+
+
+
+    procedure Resize
+           (This       : in out Text_Display;
+            X, Y, W, H : in     Integer);
+
+
+
+
+    procedure Clear_Rect
+           (This       : in out Text_Display;
+            Style      : in     Styles.Style_Info;
+            X, Y, W, H : in     Integer);
+
+    procedure Display_Insert
+           (This : in out Text_Display);
+
     procedure Redisplay_Range
            (This          : in out Text_Display;
             Start, Finish : in     Natural);
@@ -358,6 +622,36 @@ package FLTK.Widgets.Groups.Text_Displays is
     procedure Draw
            (This : in out Text_Display);
 
+    procedure Draw_Cursor
+           (This : in out Text_Display;
+            X, Y : in     Integer);
+
+    procedure Draw_Line_Numbers
+           (This  : in out Text_Display;
+            Clear : in     Boolean :=  False);
+
+    procedure Draw_Range
+           (This          : in out Text_Display;
+            Start, Finish : in     Natural);
+
+    procedure Draw_String
+           (This      : in out Text_Display;
+            Style     : in     Styles.Style_Info;
+            X, Y      : in     Integer;
+            Right     : in     Integer;
+            Text      : in     String;
+            Num_Chars : in     Natural);
+
+    procedure Draw_Text
+           (This       : in out Text_Display;
+            X, Y, W, H : in     Integer);
+
+    procedure Draw_Visible_Line
+           (This                  : in out Text_Display;
+            Line                  : in     Natural;
+            Left_Clip, Right_Clip : in     Integer;
+            Left_Char, Right_Char : in     Natural);
+
     function Handle
            (This  : in out Text_Display;
             Event : in     Event_Kind)
@@ -409,6 +703,7 @@ private
 
     pragma Inline (Get_Buffer);
     pragma Inline (Set_Buffer);
+    pragma Inline (Buffer_Predelete_Callback);
 
     pragma Inline (Highlight_Data);
 
@@ -416,6 +711,12 @@ private
     pragma Inline (X_To_Col);
     pragma Inline (In_Selection);
     pragma Inline (Position_To_XY);
+    pragma Inline (Find_Line_End);
+    pragma Inline (Find_Character);
+    pragma Inline (Position_To_Line);
+    pragma Inline (Position_To_Line_Column);
+    pragma Inline (XY_To_Position);
+    pragma Inline (XY_To_Row_Column);
 
     pragma Inline (Get_Cursor_Color);
     pragma Inline (Set_Cursor_Color);
@@ -440,13 +741,31 @@ private
     pragma Inline (Word_End);
     pragma Inline (Next_Word);
     pragma Inline (Previous_Word);
+
     pragma Inline (Set_Wrap_Mode);
+    pragma Inline (Wrapped_Row);
+    pragma Inline (Wrapped_Column);
+    pragma Inline (Wrap_Uses_Character);
+    pragma Inline (Count_Wrapped_Lines);
 
     pragma Inline (Line_Start);
     pragma Inline (Line_End);
     pragma Inline (Count_Lines);
     pragma Inline (Skip_Lines);
     pragma Inline (Rewind_Lines);
+    pragma Inline (Calculate_Last_Character);
+    pragma Inline (Calculate_Line_Starts);
+    pragma Inline (Offset_Line_Starts);
+
+    pragma Inline (Redo_Absolute_Top_Line);
+    pragma Inline (Get_Absolute_Top_Line);
+    pragma Inline (Maintain_Absolute_Top_Line);
+    pragma Inline (Maintaining_Absolute_Top_Line);
+    pragma Inline (Reset_Absolute_Top_Line);
+
+    pragma Inline (Has_Empty_Visible_Lines);
+    pragma Inline (Get_Longest_Visible_Line);
+    pragma Inline (Visible_Line_Length);
 
     pragma Inline (Get_Linenumber_Alignment);
     pragma Inline (Set_Linenumber_Alignment);
@@ -460,6 +779,12 @@ private
     pragma Inline (Set_Linenumber_Size);
     pragma Inline (Get_Linenumber_Width);
     pragma Inline (Set_Linenumber_Width);
+    pragma Inline (Get_Linenumber_Format);
+    pragma Inline (Set_Linenumber_Format);
+
+    pragma Inline (Measure_Character);
+    pragma Inline (Measure_Visible_Line);
+    pragma Inline (Measure_String);
 
     pragma Inline (Move_Down);
     pragma Inline (Move_Left);
@@ -471,9 +796,24 @@ private
     pragma Inline (Set_Scrollbar_Alignment);
     pragma Inline (Get_Scrollbar_Width);
     pragma Inline (Set_Scrollbar_Width);
+    pragma Inline (Update_Horizontal_Scrollbar);
+    pragma Inline (Update_Vertical_Scrollbar);
+
+    pragma Inline (Get_Shortcut);
+    pragma Inline (Set_Shortcut);
+
+    pragma Inline (Resize);
 
+    pragma Inline (Clear_Rect);
+    pragma Inline (Display_Insert);
     pragma Inline (Redisplay_Range);
     pragma Inline (Draw);
+    pragma Inline (Draw_Cursor);
+    pragma Inline (Draw_Line_Numbers);
+    pragma Inline (Draw_Range);
+    pragma Inline (Draw_String);
+    pragma Inline (Draw_Text);
+    pragma Inline (Draw_Visible_Line);
     pragma Inline (Handle);
 
 
diff --git a/spec/fltk-widgets-inputs.ads b/spec/fltk-widgets-inputs.ads
index c7f9c17..2518fbb 100644
--- a/spec/fltk-widgets-inputs.ads
+++ b/spec/fltk-widgets-inputs.ads
@@ -132,11 +132,11 @@ package FLTK.Widgets.Inputs is
            (This : in Input)
         return Input_Kind;
 
-    function Get_Shortcut_Key
+    function Get_Shortcut
            (This : in Input)
         return Key_Combo;
 
-    procedure Set_Shortcut_Key
+    procedure Set_Shortcut
            (This : in out Input;
             To   : in     Key_Combo);
 
@@ -326,8 +326,8 @@ private
     pragma Inline (Set_Wrap);
 
     pragma Inline (Get_Kind);
-    pragma Inline (Get_Shortcut_Key);
-    pragma Inline (Set_Shortcut_Key);
+    pragma Inline (Get_Shortcut);
+    pragma Inline (Set_Shortcut);
     pragma Inline (Get_Mark);
     pragma Inline (Set_Mark);
     pragma Inline (Get_Position);
-- 
cgit