diff options
| -rw-r--r-- | progress.txt | 2 | ||||
| -rw-r--r-- | src/c_fl_hor_value_slider.cpp | 96 | ||||
| -rw-r--r-- | src/c_fl_hor_value_slider.h | 27 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators-sliders-value-horizontal.adb | 113 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators-sliders-value-horizontal.ads | 42 |
5 files changed, 279 insertions, 1 deletions
diff --git a/progress.txt b/progress.txt index fcdbb33..9a5d114 100644 --- a/progress.txt +++ b/progress.txt @@ -62,6 +62,7 @@ FLTK.Widgets.Valuators.Sliders.Horizontal FLTK.Widgets.Valuators.Sliders.Nice FLTK.Widgets.Valuators.Sliders.Scrollbars FLTK.Widgets.Valuators.Sliders.Value +FLTK.Widgets.Valuators.Sliders.Value.Horizontal @@ -110,7 +111,6 @@ FL_Table FL_Table_Row FL_Tile FL_Tree -FL_Hor_Value_Slider diff --git a/src/c_fl_hor_value_slider.cpp b/src/c_fl_hor_value_slider.cpp new file mode 100644 index 0000000..fe29ef8 --- /dev/null +++ b/src/c_fl_hor_value_slider.cpp @@ -0,0 +1,96 @@ + + +#include <FL/Fl_Hor_Value_Slider.H> +#include "c_fl_hor_value_slider.h" +#include "c_fl_type.h" + + + + +class My_Hor_Value_Slider : public Fl_Hor_Value_Slider { + public: + using Fl_Hor_Value_Slider::Fl_Hor_Value_Slider; + friend void hor_value_slider_set_draw_hook(HOR_VALUE_SLIDER s, void * d); + friend void fl_hor_value_slider_draw(HOR_VALUE_SLIDER s); + friend void hor_value_slider_set_handle_hook(HOR_VALUE_SLIDER s, void * h); + friend int fl_hor_value_slider_handle(HOR_VALUE_SLIDER s, int e); + protected: + void draw(); + void real_draw(); + int handle(int e); + int real_handle(int e); + d_hook_p draw_hook; + h_hook_p handle_hook; +}; + +void My_Hor_Value_Slider::draw() { + (*draw_hook)(this->user_data()); +} + +void My_Hor_Value_Slider::real_draw() { + Fl_Hor_Value_Slider::draw(); +} + +int My_Hor_Value_Slider::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + +int My_Hor_Value_Slider::real_handle(int e) { + return Fl_Hor_Value_Slider::handle(e); +} + +void hor_value_slider_set_draw_hook(HOR_VALUE_SLIDER s, void * d) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->draw_hook = reinterpret_cast<d_hook_p>(d); +} + +void fl_hor_value_slider_draw(HOR_VALUE_SLIDER s) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->real_draw(); +} + +void hor_value_slider_set_handle_hook(HOR_VALUE_SLIDER s, void * h) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->handle_hook = reinterpret_cast<h_hook_p>(h); +} + +int fl_hor_value_slider_handle(HOR_VALUE_SLIDER s, int e) { + return reinterpret_cast<My_Hor_Value_Slider*>(s)->real_handle(e); +} + + + + +HOR_VALUE_SLIDER new_fl_hor_value_slider(int x, int y, int w, int h, char* label) { + My_Hor_Value_Slider *s = new My_Hor_Value_Slider(x, y, w, h, label); + return s; +} + +void free_fl_hor_value_slider(HOR_VALUE_SLIDER s) { + delete reinterpret_cast<My_Hor_Value_Slider*>(s); +} + + + + +unsigned int fl_hor_value_slider_get_textcolor(HOR_VALUE_SLIDER s) { + return reinterpret_cast<My_Hor_Value_Slider*>(s)->textcolor(); +} + +void fl_hor_value_slider_set_textcolor(HOR_VALUE_SLIDER s, unsigned int t) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->textcolor(t); +} + +int fl_hor_value_slider_get_textfont(HOR_VALUE_SLIDER s) { + return reinterpret_cast<My_Hor_Value_Slider*>(s)->textfont(); +} + +void fl_hor_value_slider_set_textfont(HOR_VALUE_SLIDER s, int t) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->textfont(t); +} + +int fl_hor_value_slider_get_textsize(HOR_VALUE_SLIDER s) { + return reinterpret_cast<My_Hor_Value_Slider*>(s)->textsize(); +} + +void fl_hor_value_slider_set_textsize(HOR_VALUE_SLIDER s, int t) { + reinterpret_cast<My_Hor_Value_Slider*>(s)->textsize(t); +} + diff --git a/src/c_fl_hor_value_slider.h b/src/c_fl_hor_value_slider.h new file mode 100644 index 0000000..7e682f5 --- /dev/null +++ b/src/c_fl_hor_value_slider.h @@ -0,0 +1,27 @@ + + +#ifndef FL_HOR_VALUE_SLIDER_GUARD +#define FL_HOR_VALUE_SLIDER_GUARD + + + + +typedef void* HOR_VALUE_SLIDER; + + + + +extern "C" void hor_value_slider_set_draw_hook(HOR_VALUE_SLIDER s, void * d); +extern "C" void fl_hor_value_slider_draw(HOR_VALUE_SLIDER s); +extern "C" void hor_value_slider_set_handle_hook(HOR_VALUE_SLIDER s, void * h); +extern "C" int fl_hor_value_slider_handle(HOR_VALUE_SLIDER s, int e); + + + + +extern "C" HOR_VALUE_SLIDER new_fl_hor_value_slider(int x, int y, int w, int h, char* label); +extern "C" void free_fl_hor_value_slider(HOR_VALUE_SLIDER s); + + +#endif + diff --git a/src/fltk-widgets-valuators-sliders-value-horizontal.adb b/src/fltk-widgets-valuators-sliders-value-horizontal.adb new file mode 100644 index 0000000..77b9fd6 --- /dev/null +++ b/src/fltk-widgets-valuators-sliders-value-horizontal.adb @@ -0,0 +1,113 @@ + + +with + + Interfaces.C.Strings, + System; + +use type + + System.Address; + + +package body FLTK.Widgets.Valuators.Sliders.Value.Horizontal is + + + procedure hor_value_slider_set_draw_hook + (W, D : in System.Address); + pragma Import (C, hor_value_slider_set_draw_hook, "hor_value_slider_set_draw_hook"); + + procedure hor_value_slider_set_handle_hook + (W, H : in System.Address); + pragma Import (C, hor_value_slider_set_handle_hook, "hor_value_slider_set_handle_hook"); + + + + + function new_fl_hor_value_slider + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_hor_value_slider, "new_fl_hor_value_slider"); + + procedure free_fl_hor_value_slider + (D : in System.Address); + pragma Import (C, free_fl_hor_value_slider, "free_fl_hor_value_slider"); + + + + + procedure fl_hor_value_slider_draw + (W : in System.Address); + pragma Import (C, fl_hor_value_slider_draw, "fl_hor_value_slider_draw"); + + function fl_hor_value_slider_handle + (W : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_hor_value_slider_handle, "fl_hor_value_slider_handle"); + + + + + procedure Finalize + (This : in out Hor_Value_Slider) is + begin + if This.Void_Ptr /= System.Null_Address and then + This in Hor_Value_Slider'Class + then + free_fl_hor_value_slider (This.Void_Ptr); + This.Void_Ptr := System.Null_Address; + end if; + Finalize (Value_Slider (This)); + end Finalize; + + + + + package body Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Value_Slider is + begin + return This : Hor_Value_Slider do + This.Void_Ptr := new_fl_hor_value_slider + (Interfaces.C.int (X), + Interfaces.C.int (Y), + Interfaces.C.int (W), + Interfaces.C.int (H), + Interfaces.C.To_C (Text)); + fl_widget_set_user_data + (This.Void_Ptr, + Widget_Convert.To_Address (This'Unchecked_Access)); + hor_value_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + hor_value_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + end Forge; + + + + + procedure Draw + (This : in out Hor_Value_Slider) is + begin + fl_hor_value_slider_draw (This.Void_Ptr); + end Draw; + + + function Handle + (This : in out Hor_Value_Slider; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_hor_value_slider_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + +end FLTK.Widgets.Valuators.Sliders.Value.Horizontal; + diff --git a/src/fltk-widgets-valuators-sliders-value-horizontal.ads b/src/fltk-widgets-valuators-sliders-value-horizontal.ads new file mode 100644 index 0000000..3b05627 --- /dev/null +++ b/src/fltk-widgets-valuators-sliders-value-horizontal.ads @@ -0,0 +1,42 @@ + + +package FLTK.Widgets.Valuators.Sliders.Value.Horizontal is + + + type Hor_Value_Slider is new Value_Slider with private; + + + + + package Forge is + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Hor_Value_Slider; + + end Forge; + + + + + procedure Draw + (This : in out Hor_Value_Slider); + + function Handle + (This : in out Hor_Value_Slider; + Event : in Event_Kind) + return Event_Outcome; + + +private + + + type Hor_Value_Slider is new Value_Slider with null record; + + overriding procedure Finalize + (This : in out Hor_Value_Slider); + + +end FLTK.Widgets.Valuators.Sliders.Value.Horizontal; + |