diff options
| -rw-r--r-- | progress.txt | 2 | ||||
| -rw-r--r-- | src/c_fl_valuator.cpp | 99 | ||||
| -rw-r--r-- | src/c_fl_valuator.h | 46 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators.adb | 281 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators.ads | 93 |
5 files changed, 520 insertions, 1 deletions
diff --git a/progress.txt b/progress.txt index 3df776b..3c2015a 100644 --- a/progress.txt +++ b/progress.txt @@ -65,6 +65,7 @@ FLTK.Widgets.Inputs FLTK.Widgets.Inputs.File FLTK.Widgets.Menus FLTK.Widgets.Menus.Menu_Buttons +FLTK.Widgets.Valuators @@ -94,7 +95,6 @@ FL_Tabs FL_Tile FL_Tree FL_Wizard -FL_Valuator FL_Adjuster FL_Counter FL_Simple_Counter diff --git a/src/c_fl_valuator.cpp b/src/c_fl_valuator.cpp new file mode 100644 index 0000000..c13669c --- /dev/null +++ b/src/c_fl_valuator.cpp @@ -0,0 +1,99 @@ + + +#include <FL/Fl_Valuator.H> +#include "c_fl_valuator.h" +#include "c_fl_type.h" + + + + +class My_Valuator : public Fl_Valuator { + public: + using Fl_Valuator::Fl_Valuator; + friend void valuator_set_draw_hook(VALUATOR v, void * d); + friend void valuator_set_handle_hook(VALUATOR v, void * h); + friend int fl_valuator_handle(VALUATOR v, int e); + friend VALUATOR new_fl_valuator(int x, int y, int w, int h, char* label); + protected: + void draw(); + int handle(int e); + int real_handle(int e); + d_hook_p draw_hook; + h_hook_p handle_hook; +}; + +void My_Valuator::draw() { + (*draw_hook)(this->user_data()); +} + +int My_Valuator::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + +int My_Valuator::real_handle(int e) { + return Fl_Valuator::handle(e); +} + +void valuator_set_draw_hook(VALUATOR v, void * d) { + reinterpret_cast<My_Valuator*>(v)->draw_hook = reinterpret_cast<d_hook_p>(d); +} + +void valuator_set_handle_hook(VALUATOR v, void * h) { + reinterpret_cast<My_Valuator*>(v)->handle_hook = reinterpret_cast<h_hook_p>(h); +} + +int fl_valuator_handle(VALUATOR v, int e) { + return reinterpret_cast<My_Valuator*>(v)->real_handle(e); +} + + + + +VALUATOR new_fl_valuator(int x, int y, int w, int h, char* label) { + My_Valuator *v = new My_Valuator(x, y, w, h, label); + return v; +} + +void free_fl_valuator(VALUATOR v) { + delete reinterpret_cast<My_Valuator*>(v); +} + + + + +double fl_valuator_get_minimum(VALUATOR v) { + return reinterpret_cast<My_Valuator*>(v)->minimum(); +} + +void fl_valuator_set_minimum(VALUATOR v, double t) { + reinterpret_cast<My_Valuator*>(v)->minimum(t); +} + +double fl_valuator_get_maximum(VALUATOR v) { + return reinterpret_cast<My_Valuator*>(v)->maximum(); +} + +void fl_valuator_set_maximum(VALUATOR v, double t) { + reinterpret_cast<My_Valuator*>(v)->maximum(t); +} + +double fl_valuator_get_value(VALUATOR v) { + return reinterpret_cast<My_Valuator*>(v)->value(); +} + +void fl_valuator_set_value(VALUATOR v, double t) { + reinterpret_cast<My_Valuator*>(v)->value(t); +} + +void fl_valuator_bounds(VALUATOR v, double a, double b) { + reinterpret_cast<My_Valuator*>(v)->bounds(a,b); +} + +void fl_valuator_precision(VALUATOR v, int s) { + reinterpret_cast<My_Valuator*>(v)->precision(s); +} + +void fl_valuator_range(VALUATOR v, double a, double b) { + reinterpret_cast<My_Valuator*>(v)->range(a,b); +} + diff --git a/src/c_fl_valuator.h b/src/c_fl_valuator.h new file mode 100644 index 0000000..867e030 --- /dev/null +++ b/src/c_fl_valuator.h @@ -0,0 +1,46 @@ + + +#ifndef FL_VALUATOR_GUARD +#define FL_VALUATOR_GUARD + + + + +typedef void* VALUATOR; + + + + +extern "C" void valuator_set_draw_hook(VALUATOR v, void * d); +extern "C" void valuator_set_handle_hook(VALUATOR v, void * h); +extern "C" int fl_valuator_handle(VALUATOR v, int e); + + + + +extern "C" VALUATOR new_fl_valuator(int x, int y, int w, int h, char* label); +extern "C" void free_fl_valuator(VALUATOR v); + + + + +extern "C" double fl_valuator_clamp(VALUATOR v, double a); +extern "C" double fl_valuator_round(VALUATOR v, double a); +extern "C" double fl_valuator_increment(VALUATOR v, double a, int s); + + + + +extern "C" double fl_valuator_get_minimum(VALUATOR v); +extern "C" void fl_valuator_set_minimum(VALUATOR v, double t); +extern "C" double fl_valuator_get_maximum(VALUATOR v); +extern "C" void fl_valuator_set_maximum(VALUATOR v, double t); +extern "C" double fl_valuator_get_value(VALUATOR v); +extern "C" void fl_valuator_set_value(VALUATOR v, double t); +extern "C" void fl_valuator_bounds(VALUATOR v, double a, double b); +extern "C" void fl_valuator_precision(VALUATOR v, int s); +extern "C" void fl_valuator_range(VALUATOR v, double a, double b); + + +#endif + diff --git a/src/fltk-widgets-valuators.adb b/src/fltk-widgets-valuators.adb new file mode 100644 index 0000000..4ef7edb --- /dev/null +++ b/src/fltk-widgets-valuators.adb @@ -0,0 +1,281 @@ + + +with + + Interfaces.C.Strings, + System; + +use type + + System.Address; + + +package body FLTK.Widgets.Valuators is + + + procedure valuator_set_draw_hook + (W, D : in System.Address); + pragma Import (C, valuator_set_draw_hook, "valuator_set_draw_hook"); + + procedure valuator_set_handle_hook + (W, H : in System.Address); + pragma Import (C, valuator_set_handle_hook, "valuator_set_handle_hook"); + + + + + function new_fl_valuator + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_valuator, "new_fl_valuator"); + + procedure free_fl_valuator + (V : in System.Address); + pragma Import (C, free_fl_valuator, "free_fl_valuator"); + + + + + function fl_valuator_clamp + (V : in System.Address; + D : in Interfaces.C.double) + return Interfaces.C.double; + pragma Import (C, fl_valuator_clamp, "fl_valuator_clamp"); + + function fl_valuator_round + (V : in System.Address; + D : in Interfaces.C.double) + return Interfaces.C.double; + pragma Import (C, fl_valuator_round, "fl_valuator_round"); + + function fl_valuator_increment + (V : in System.Address; + D : in Interfaces.C.double; + S : in Interfaces.C.int) + return Interfaces.C.double; + pragma Import (C, fl_valuator_increment, "fl_valuator_increment"); + + + + + function fl_valuator_get_minimum + (V : in System.Address) + return Interfaces.C.double; + pragma Import (C, fl_valuator_get_minimum, "fl_valuator_get_minimum"); + + procedure fl_valuator_set_minimum + (V : in System.Address; + D : in Interfaces.C.double); + pragma Import (C, fl_valuator_set_minimum, "fl_valuator_set_minimum"); + + function fl_valuator_get_maximum + (V : in System.Address) + return Interfaces.C.double; + pragma Import (C, fl_valuator_get_maximum, "fl_valuator_get_maximum"); + + procedure fl_valuator_set_maximum + (V : in System.Address; + D : in Interfaces.C.double); + pragma Import (C, fl_valuator_set_maximum, "fl_valuator_set_maximum"); + + function fl_valuator_get_value + (V : in System.Address) + return Interfaces.C.double; + pragma Import (C, fl_valuator_get_value, "fl_valuator_get_value"); + + procedure fl_valuator_set_value + (V : in System.Address; + D : in Interfaces.C.double); + pragma Import (C, fl_valuator_set_value, "fl_valuator_set_value"); + + procedure fl_valuator_bounds + (V : in System.Address; + A, B : in Interfaces.C.double); + pragma Import (C, fl_valuator_bounds, "fl_valuator_bounds"); + + procedure fl_valuator_precision + (V : in System.Address; + D : in Interfaces.C.int); + pragma Import (C, fl_valuator_precision, "fl_valuator_precision"); + + procedure fl_valuator_range + (V : in System.Address; + A, B : in Interfaces.C.double); + pragma Import (C, fl_valuator_range, "fl_valuator_range"); + + + + + function fl_valuator_handle + (V : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_valuator_handle, "fl_valuator_handle"); + + + + + procedure Finalize + (This : in out Valuator) is + begin + if This.Void_Ptr /= System.Null_Address and then + This in Valuator'Class + then + free_fl_valuator (This.Void_Ptr); + This.Void_Ptr := System.Null_Address; + end if; + Finalize (Widget (This)); + end Finalize; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Valuator is + begin + return This : Valuator do + This.Void_Ptr := new_fl_valuator + (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)); + valuator_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + valuator_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + + + function Clamp + (This : in Valuator; + Input : in Long_Float) + return Long_Float is + begin + return Long_Float (fl_valuator_clamp (This.Void_Ptr, Interfaces.C.double (Input))); + end Clamp; + + + function Round + (This : in Valuator; + Input : in Long_Float) + return Long_Float is + begin + return Long_Float (fl_valuator_round (This.Void_Ptr, Interfaces.C.double (Input))); + end Round; + + + function Increment + (This : in Valuator; + Input : in Long_Float; + Step : in Integer) + return Long_Float is + begin + return Long_Float (fl_valuator_increment + (This.Void_Ptr, + Interfaces.C.double (Input), + Interfaces.C.int (Step))); + end Increment; + + + + + function Get_Minimum + (This : in Valuator) + return Long_Float is + begin + return Long_Float (fl_valuator_get_minimum (This.Void_Ptr)); + end Get_Minimum; + + + procedure Set_Minimum + (This : in out Valuator; + To : in Long_Float) is + begin + fl_valuator_set_minimum (This.Void_Ptr, Interfaces.C.double (To)); + end Set_Minimum; + + + function Get_Maximum + (This : in Valuator) + return Long_Float is + begin + return Long_Float (fl_valuator_get_maximum (This.Void_Ptr)); + end Get_Maximum; + + + procedure Set_Maximum + (This : in out Valuator; + To : in Long_Float) is + begin + fl_valuator_set_maximum (This.Void_Ptr, Interfaces.C.double (To)); + end Set_Maximum; + + + function Get_Value + (This : in Valuator) + return Long_Float is + begin + return Long_Float (fl_valuator_get_value (This.Void_Ptr)); + end Get_Value; + + + procedure Set_Value + (This : in out Valuator; + To : in Long_Float) is + begin + fl_valuator_set_value (This.Void_Ptr, Interfaces.C.double (To)); + end Set_Value; + + + procedure Set_Bounds + (This : in out Valuator; + Min, Max : in Long_Float) is + begin + fl_valuator_bounds + (This.Void_Ptr, + Interfaces.C.double (Min), + Interfaces.C.double (Max)); + end Set_Bounds; + + + procedure Set_Precision + (This : in out Valuator; + To : in Integer) is + begin + fl_valuator_precision (This.Void_Ptr, Interfaces.C.int (To)); + end Set_Precision; + + + procedure Set_Range + (This : in out Valuator; + Min, Max : in Long_Float) is + begin + fl_valuator_range + (This.Void_Ptr, + Interfaces.C.double (Min), + Interfaces.C.double (Max)); + end Set_Range; + + + + + function Handle + (This : in out Valuator; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_valuator_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + +end FLTK.Widgets.Valuators; + diff --git a/src/fltk-widgets-valuators.ads b/src/fltk-widgets-valuators.ads new file mode 100644 index 0000000..ede5281 --- /dev/null +++ b/src/fltk-widgets-valuators.ads @@ -0,0 +1,93 @@ + + +package FLTK.Widgets.Valuators is + + + type Valuator is new Widget with private; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Valuator; + + + + + function Clamp + (This : in Valuator; + Input : in Long_Float) + return Long_Float; + + function Round + (This : in Valuator; + Input : in Long_Float) + return Long_Float; + + function Increment + (This : in Valuator; + Input : in Long_Float; + Step : in Integer) + return Long_Float; + + + + + function Get_Minimum + (This : in Valuator) + return Long_Float; + + procedure Set_Minimum + (This : in out Valuator; + To : in Long_Float); + + function Get_Maximum + (This : in Valuator) + return Long_Float; + + procedure Set_Maximum + (This : in out Valuator; + To : in Long_Float); + + function Get_Value + (This : in Valuator) + return Long_Float; + + procedure Set_Value + (This : in out Valuator; + To : in Long_Float); + + procedure Set_Bounds + (This : in out Valuator; + Min, Max : in Long_Float); + + procedure Set_Precision + (This : in out Valuator; + To : in Integer); + + procedure Set_Range + (This : in out Valuator; + Min, Max : in Long_Float); + + + + + function Handle + (This : in out Valuator; + Event : in Event_Kind) + return Event_Outcome; + + +private + + + type Valuator is new Widget with null record; + + overriding procedure Finalize + (This : in out Valuator); + + +end FLTK.Widgets.Valuators; + |