diff options
| -rw-r--r-- | progress.txt | 2 | ||||
| -rw-r--r-- | src/c_fl_horizontal_slider.cpp | 70 | ||||
| -rw-r--r-- | src/c_fl_horizontal_slider.h | 27 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators-sliders-horizontal.adb | 109 | ||||
| -rw-r--r-- | src/fltk-widgets-valuators-sliders-horizontal.ads | 38 |
5 files changed, 245 insertions, 1 deletions
diff --git a/progress.txt b/progress.txt index 0837214..e09fd22 100644 --- a/progress.txt +++ b/progress.txt @@ -56,6 +56,7 @@ FLTK.Widgets.Valuators.Rollers FLTK.Widgets.Valuators.Sliders.Fill FLTK.Widgets.Valuators.Sliders.Hor_Fill FLTK.Widgets.Valuators.Sliders.Hor_Nice +FLTK.Widgets.Valuators.Sliders.Horizontal @@ -106,7 +107,6 @@ FL_Tabs FL_Tile FL_Tree FL_Wizard -FL_Hor_Slider FL_Nice_Slider FL_Scrollbar FL_Value_Slider diff --git a/src/c_fl_horizontal_slider.cpp b/src/c_fl_horizontal_slider.cpp new file mode 100644 index 0000000..e690b17 --- /dev/null +++ b/src/c_fl_horizontal_slider.cpp @@ -0,0 +1,70 @@ + + +#include <FL/Fl_Hor_Slider.H> +#include "c_fl_horizontal_slider.h" +#include "c_fl_type.h" + + + + +class My_Horizontal_Slider : public Fl_Hor_Slider { + public: + using Fl_Hor_Slider::Fl_Hor_Slider; + friend void horizontal_slider_set_draw_hook(HORIZONTAL_SLIDER s, void * d); + friend void fl_horizontal_slider_draw(HORIZONTAL_SLIDER s); + friend void horizontal_slider_set_handle_hook(HORIZONTAL_SLIDER s, void * h); + friend int fl_horizontal_slider_handle(HORIZONTAL_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_Horizontal_Slider::draw() { + (*draw_hook)(this->user_data()); +} + +void My_Horizontal_Slider::real_draw() { + Fl_Hor_Slider::draw(); +} + +int My_Horizontal_Slider::handle(int e) { + return (*handle_hook)(this->user_data(), e); +} + +int My_Horizontal_Slider::real_handle(int e) { + return Fl_Hor_Slider::handle(e); +} + +void horizontal_slider_set_draw_hook(HORIZONTAL_SLIDER s, void * d) { + reinterpret_cast<My_Horizontal_Slider*>(s)->draw_hook = reinterpret_cast<d_hook_p>(d); +} + +void fl_horizontal_slider_draw(HORIZONTAL_SLIDER s) { + reinterpret_cast<My_Horizontal_Slider*>(s)->real_draw(); +} + +void horizontal_slider_set_handle_hook(HORIZONTAL_SLIDER s, void * h) { + reinterpret_cast<My_Horizontal_Slider*>(s)->handle_hook = reinterpret_cast<h_hook_p>(h); +} + +int fl_horizontal_slider_handle(HORIZONTAL_SLIDER s, int e) { + return reinterpret_cast<My_Horizontal_Slider*>(s)->real_handle(e); +} + + + + +HORIZONTAL_SLIDER new_fl_horizontal_slider(int x, int y, int w, int h, char* label) { + My_Horizontal_Slider *s = new My_Horizontal_Slider(x, y, w, h, label); + return s; +} + +void free_fl_horizontal_slider(HORIZONTAL_SLIDER s) { + delete reinterpret_cast<My_Horizontal_Slider*>(s); +} + + diff --git a/src/c_fl_horizontal_slider.h b/src/c_fl_horizontal_slider.h new file mode 100644 index 0000000..13ba6e2 --- /dev/null +++ b/src/c_fl_horizontal_slider.h @@ -0,0 +1,27 @@ + + +#ifndef FL_HORIZONTAL_SLIDER_GUARD +#define FL_HORIZONTAL_SLIDER_GUARD + + + + +typedef void* HORIZONTAL_SLIDER; + + + + +extern "C" void horizontal_slider_set_draw_hook(HORIZONTAL_SLIDER s, void * d); +extern "C" void fl_horizontal_slider_draw(HORIZONTAL_SLIDER s); +extern "C" void horizontal_slider_set_handle_hook(HORIZONTAL_SLIDER s, void * h); +extern "C" int fl_horizontal_slider_handle(HORIZONTAL_SLIDER s, int e); + + + + +extern "C" HORIZONTAL_SLIDER new_fl_horizontal_slider(int x, int y, int w, int h, char* label); +extern "C" void free_fl_horizontal_slider(HORIZONTAL_SLIDER s); + + +#endif + diff --git a/src/fltk-widgets-valuators-sliders-horizontal.adb b/src/fltk-widgets-valuators-sliders-horizontal.adb new file mode 100644 index 0000000..6091fda --- /dev/null +++ b/src/fltk-widgets-valuators-sliders-horizontal.adb @@ -0,0 +1,109 @@ + + +with + + Interfaces.C.Strings, + System; + +use type + + System.Address; + + +package body FLTK.Widgets.Valuators.Sliders.Horizontal is + + + procedure horizontal_slider_set_draw_hook + (W, D : in System.Address); + pragma Import (C, horizontal_slider_set_draw_hook, "horizontal_slider_set_draw_hook"); + + procedure horizontal_slider_set_handle_hook + (W, H : in System.Address); + pragma Import (C, horizontal_slider_set_handle_hook, "horizontal_slider_set_handle_hook"); + + + + + function new_fl_horizontal_slider + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_horizontal_slider, "new_fl_horizontal_slider"); + + procedure free_fl_horizontal_slider + (D : in System.Address); + pragma Import (C, free_fl_horizontal_slider, "free_fl_horizontal_slider"); + + + + + procedure fl_horizontal_slider_draw + (W : in System.Address); + pragma Import (C, fl_horizontal_slider_draw, "fl_horizontal_slider_draw"); + + function fl_horizontal_slider_handle + (W : in System.Address; + E : in Interfaces.C.int) + return Interfaces.C.int; + pragma Import (C, fl_horizontal_slider_handle, "fl_horizontal_slider_handle"); + + + + + procedure Finalize + (This : in out Horizontal_Slider) is + begin + if This.Void_Ptr /= System.Null_Address and then + This in Horizontal_Slider'Class + then + free_fl_horizontal_slider (This.Void_Ptr); + This.Void_Ptr := System.Null_Address; + end if; + Finalize (Valuator (This)); + end Finalize; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Horizontal_Slider is + begin + return This : Horizontal_Slider do + This.Void_Ptr := new_fl_horizontal_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)); + horizontal_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + horizontal_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address); + end return; + end Create; + + + + + procedure Draw + (This : in out Horizontal_Slider) is + begin + fl_horizontal_slider_draw (This.Void_Ptr); + end Draw; + + + function Handle + (This : in out Horizontal_Slider; + Event : in Event_Kind) + return Event_Outcome is + begin + return Event_Outcome'Val + (fl_horizontal_slider_handle (This.Void_Ptr, Event_Kind'Pos (Event))); + end Handle; + + +end FLTK.Widgets.Valuators.Sliders.Horizontal; + diff --git a/src/fltk-widgets-valuators-sliders-horizontal.ads b/src/fltk-widgets-valuators-sliders-horizontal.ads new file mode 100644 index 0000000..5804a59 --- /dev/null +++ b/src/fltk-widgets-valuators-sliders-horizontal.ads @@ -0,0 +1,38 @@ + + +package FLTK.Widgets.Valuators.Sliders.Horizontal is + + + type Horizontal_Slider is new Slider with private; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Horizontal_Slider; + + + + + procedure Draw + (This : in out Horizontal_Slider); + + function Handle + (This : in out Horizontal_Slider; + Event : in Event_Kind) + return Event_Outcome; + + +private + + + type Horizontal_Slider is new Slider with null record; + + overriding procedure Finalize + (This : in out Horizontal_Slider); + + +end FLTK.Widgets.Valuators.Sliders.Horizontal; + |