From 2354ea851677fbd66fb2a9fb2074a6122fc04e03 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Tue, 9 May 2017 14:11:42 +1000 Subject: Added Float_Input widgets --- src/c_fl_float_input.cpp | 63 ++++++++++++++++++++++ src/c_fl_float_input.h | 21 ++++++++ src/fltk-widgets-inputs-float.adb | 111 ++++++++++++++++++++++++++++++++++++++ src/fltk-widgets-inputs-float.ads | 35 ++++++++++++ 4 files changed, 230 insertions(+) create mode 100644 src/c_fl_float_input.cpp create mode 100644 src/c_fl_float_input.h create mode 100644 src/fltk-widgets-inputs-float.adb create mode 100644 src/fltk-widgets-inputs-float.ads diff --git a/src/c_fl_float_input.cpp b/src/c_fl_float_input.cpp new file mode 100644 index 0000000..d8812c7 --- /dev/null +++ b/src/c_fl_float_input.cpp @@ -0,0 +1,63 @@ + + +#include +#include "c_fl_float_input.h" + + +typedef void (hook)(void*); +typedef hook* hook_p; + + + + +class My_Float_Input : public Fl_Float_Input { + public: + using Fl_Float_Input::Fl_Float_Input; + friend void float_input_set_draw_hook(FLOAT_INPUT n, void * d); + friend void fl_float_input_draw(FLOAT_INPUT n); + protected: + void draw(); + void real_draw(); + hook_p draw_hook; +}; + + +void My_Float_Input::draw() { + (*draw_hook)(this->user_data()); +} + + +void My_Float_Input::real_draw() { + Fl_Float_Input::draw(); +} + + +void float_input_set_draw_hook(FLOAT_INPUT n, void * d) { + reinterpret_cast(n)->draw_hook = reinterpret_cast(d); +} + + +void fl_float_input_draw(FLOAT_INPUT n) { + reinterpret_cast(n)->real_draw(); +} + + + + +FLOAT_INPUT new_fl_float_input(int x, int y, int w, int h, char* label) { + My_Float_Input *i = new My_Float_Input(x, y, w, h, label); + return i; +} + + +void free_fl_float_input(FLOAT_INPUT i) { + delete reinterpret_cast(i); +} + + + + +const char * fl_float_input_get_value(FLOAT_INPUT i) { + return reinterpret_cast(i)->value(); +} + diff --git a/src/c_fl_float_input.h b/src/c_fl_float_input.h new file mode 100644 index 0000000..187a176 --- /dev/null +++ b/src/c_fl_float_input.h @@ -0,0 +1,21 @@ + + +#ifndef FL_FLOAT_INPUT_GUARD +#define FL_FLOAT_INPUT_GUARD + + +typedef void* FLOAT_INPUT; + + +extern "C" void float_input_set_draw_hook(FLOAT_INPUT n, void * d); +extern "C" void fl_float_input_draw(FLOAT_INPUT n); + +extern "C" FLOAT_INPUT new_fl_float_input(int x, int y, int w, int h, char* label); +extern "C" void free_fl_float_input(FLOAT_INPUT i); + + +extern "C" const char * fl_float_input_get_value(FLOAT_INPUT i); + + +#endif + diff --git a/src/fltk-widgets-inputs-float.adb b/src/fltk-widgets-inputs-float.adb new file mode 100644 index 0000000..2287140 --- /dev/null +++ b/src/fltk-widgets-inputs-float.adb @@ -0,0 +1,111 @@ + + +with Interfaces.C.Strings; +with System; +use type System.Address; + + +package body FLTK.Widgets.Inputs.Float is + + + procedure float_input_set_draw_hook + (W, D : in System.Address); + pragma Import (C, float_input_set_draw_hook, "float_input_set_draw_hook"); + + procedure fl_float_input_draw + (W : in System.Address); + pragma Import (C, fl_float_input_draw, "fl_float_input_draw"); + + function new_fl_float_input + (X, Y, W, H : in Interfaces.C.int; + Text : in Interfaces.C.char_array) + return System.Address; + pragma Import (C, new_fl_float_input, "new_fl_float_input"); + + procedure free_fl_float_input + (F : in System.Address); + pragma Import (C, free_fl_float_input, "free_fl_float_input"); + + function fl_float_input_get_value + (F : in System.Address) + return Interfaces.C.Strings.chars_ptr; + pragma Import (C, fl_float_input_get_value, "fl_float_input_get_value"); + + + + + procedure Draw_Hook (U : in System.Address); + pragma Convention (C, Draw_Hook); + + procedure Draw_Hook + (U : in System.Address) + is + package Float_Input_Convert is new + System.Address_To_Access_Conversions (Float_Input'Class); + + Ada_Input : access Float_Input'Class := + Float_Input_Convert.To_Pointer (U); + begin + Ada_Input.Draw; + end Draw_Hook; + + + + + procedure Draw + (This : in out Float_Input) is + begin + fl_float_input_draw (This.Void_Ptr); + end Draw; + + + + + procedure Finalize + (This : in out Float_Input) is + begin + if This in Float_Input and then + This.Void_Ptr /= System.Null_Address + then + free_fl_float_input (This.Void_Ptr); + end if; + Finalize (Input (This)); + end Finalize; + + + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Float_Input is + begin + return This : Float_Input do + This.Void_Ptr := new_fl_float_input + (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)); + float_input_set_draw_hook (This.Void_Ptr, Draw_Hook'Address); + end return; + end Create; + + + + + function Get_Value + (This : in Float_Input) + return Standard.Float is + begin + return Standard.Float'Value + (Interfaces.C.Strings.Value + (fl_float_input_get_value (This.Void_Ptr))); + end Get_Value; + + +end FLTK.Widgets.Inputs.Float; + diff --git a/src/fltk-widgets-inputs-float.ads b/src/fltk-widgets-inputs-float.ads new file mode 100644 index 0000000..8d6abaa --- /dev/null +++ b/src/fltk-widgets-inputs-float.ads @@ -0,0 +1,35 @@ + + +package FLTK.Widgets.Inputs.Float is + + + type Float_Input is new Input with private; + + + function Create + (X, Y, W, H : in Integer; + Text : in String) + return Float_Input; + + + function Get_Value + (This : in Float_Input) + return Standard.Float; + + + procedure Draw + (This : in out Float_Input); + + +private + + + type Float_Input is new Input with null record; + + + overriding procedure Finalize + (This : in out Float_Input); + + +end FLTK.Widgets.Inputs.Float; + -- cgit