Added FLTK.Widgets.Valuators.Counters

5 files changed, 487 insertions, 1 deletions

diff --git a/progress.txt b/progress.txt
index 11468e0..7d1c436 100644
--- a/progress.txt
+++ b/progress.txt
@@ -47,6 +47,7 @@ FLTK.Widgets.Inputs.Secret
 FLTK.Widgets.Menus.Menu_Bars
 FLTK.Widgets.Progress_Bars
 FLTK.Widgets.Valuators.Adjusters
+FLTK.Widgets.Valuators.Counters
 
 
 
@@ -96,7 +97,6 @@ FL_Tabs
 FL_Tile
 FL_Tree
 FL_Wizard
-FL_Counter
 FL_Simple_Counter
 FL_Dial
 FL_Fill_Dial
diff --git a/src/c_fl_counter.cpp b/src/c_fl_counter.cpp
new file mode 100644
index 0000000..1b18374
--- /dev/null
+++ b/src/c_fl_counter.cpp
@@ -0,0 +1,111 @@
+
+
+#include <FL/Fl_Counter.H>
+#include "c_fl_counter.h"
+#include "c_fl_type.h"
+
+
+
+
+class My_Counter : public Fl_Counter {
+    public:
+        using Fl_Counter::Fl_Counter;
+        friend void counter_set_draw_hook(COUNTER c, void * d);
+        friend void fl_counter_draw(COUNTER c);
+        friend void counter_set_handle_hook(COUNTER c, void * h);
+        friend int fl_counter_handle(COUNTER c, 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_Counter::draw() {
+    (*draw_hook)(this->user_data());
+}
+
+void My_Counter::real_draw() {
+    Fl_Counter::draw();
+}
+
+int My_Counter::handle(int e) {
+    return (*handle_hook)(this->user_data(), e);
+}
+
+int My_Counter::real_handle(int e) {
+    return Fl_Counter::handle(e);
+}
+
+void counter_set_draw_hook(COUNTER c, void * d) {
+    reinterpret_cast<My_Counter*>(c)->draw_hook = reinterpret_cast<d_hook_p>(d);
+}
+
+void fl_counter_draw(COUNTER c) {
+    reinterpret_cast<My_Counter*>(c)->real_draw();
+}
+
+void counter_set_handle_hook(COUNTER c, void * h) {
+    reinterpret_cast<My_Counter*>(c)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+int fl_counter_handle(COUNTER c, int e) {
+    return reinterpret_cast<My_Counter*>(c)->real_handle(e);
+}
+
+
+
+
+COUNTER new_fl_counter(int x, int y, int w, int h, char* label) {
+    My_Counter *c = new My_Counter(x, y, w, h, label);
+    return c;
+}
+
+void free_fl_counter(COUNTER c) {
+    delete reinterpret_cast<My_Counter*>(c);
+}
+
+
+
+
+double fl_counter_get_step(COUNTER c) {
+    return reinterpret_cast<My_Counter*>(c)->step();
+}
+
+void fl_counter_set_step(COUNTER c, double t) {
+    reinterpret_cast<My_Counter*>(c)->step(t);
+}
+
+void fl_counter_set_lstep(COUNTER c, double t) {
+    reinterpret_cast<My_Counter*>(c)->lstep(t);
+}
+
+
+
+
+unsigned int fl_counter_get_textcolor(COUNTER c) {
+    return reinterpret_cast<My_Counter*>(c)->textcolor();
+}
+
+void fl_counter_set_textcolor(COUNTER c, unsigned int t) {
+    reinterpret_cast<My_Counter*>(c)->textcolor(t);
+}
+
+int fl_counter_get_textfont(COUNTER c) {
+    return reinterpret_cast<My_Counter*>(c)->textfont();
+}
+
+void fl_counter_set_textfont(COUNTER c, int t) {
+    reinterpret_cast<My_Counter*>(c)->textfont(t);
+}
+
+int fl_counter_get_textsize(COUNTER c) {
+    return reinterpret_cast<My_Counter*>(c)->textsize();
+}
+
+void fl_counter_set_textsize(COUNTER c, int t) {
+    reinterpret_cast<My_Counter*>(c)->textsize(t);
+}
+
diff --git a/src/c_fl_counter.h b/src/c_fl_counter.h
new file mode 100644
index 0000000..97e7a50
--- /dev/null
+++ b/src/c_fl_counter.h
@@ -0,0 +1,42 @@
+
+
+#ifndef FL_COUNTER_GUARD
+#define FL_COUNTER_GUARD
+
+
+
+
+typedef void* COUNTER;
+
+
+
+
+extern "C" void counter_set_draw_hook(COUNTER c, void * d);
+extern "C" void fl_counter_draw(COUNTER c);
+extern "C" void counter_set_handle_hook(COUNTER c, void * h);
+extern "C" int fl_counter_handle(COUNTER c, int e);
+
+
+
+
+extern "C" COUNTER new_fl_counter(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_counter(COUNTER c);
+
+
+
+
+extern "C" double fl_counter_get_step(COUNTER c);
+extern "C" void fl_counter_set_step(COUNTER c, double t);
+extern "C" void fl_counter_set_lstep(COUNTER c, double t);
+
+
+extern "C" unsigned int fl_counter_get_textcolor(COUNTER c);
+extern "C" void fl_counter_set_textcolor(COUNTER c, unsigned int t);
+extern "C" int fl_counter_get_textfont(COUNTER c);
+extern "C" void fl_counter_set_textfont(COUNTER c, int t);
+extern "C" int fl_counter_get_textsize(COUNTER c);
+extern "C" void fl_counter_set_textsize(COUNTER c, int t);
+
+
+#endif
+
diff --git a/src/fltk-widgets-valuators-counters.adb b/src/fltk-widgets-valuators-counters.adb
new file mode 100644
index 0000000..811d2c0
--- /dev/null
+++ b/src/fltk-widgets-valuators-counters.adb
@@ -0,0 +1,245 @@
+
+
+with
+
+    Interfaces.C.Strings,
+    System;
+
+use type
+
+    System.Address;
+
+
+package body FLTK.Widgets.Valuators.Counters is
+
+
+    procedure counter_set_draw_hook
+           (W, D : in System.Address);
+    pragma Import (C, counter_set_draw_hook, "counter_set_draw_hook");
+
+    procedure counter_set_handle_hook
+           (W, H : in System.Address);
+    pragma Import (C, counter_set_handle_hook, "counter_set_handle_hook");
+
+
+
+
+    function new_fl_counter
+           (X, Y, W, H : in Interfaces.C.int;
+            Text       : in Interfaces.C.char_array)
+        return System.Address;
+    pragma Import (C, new_fl_counter, "new_fl_counter");
+
+    procedure free_fl_counter
+           (A : in System.Address);
+    pragma Import (C, free_fl_counter, "free_fl_counter");
+
+
+
+
+    function fl_counter_get_step
+           (C : in System.Address)
+        return Interfaces.C.double;
+    pragma Import (C, fl_counter_get_step, "fl_counter_get_step");
+
+    procedure fl_counter_set_step
+           (C : in System.Address;
+            T : in Interfaces.C.double);
+    pragma Import (C, fl_counter_set_step, "fl_counter_set_step");
+
+    procedure fl_counter_set_lstep
+           (C : in System.Address;
+            T : in Interfaces.C.double);
+    pragma Import (C, fl_counter_set_lstep, "fl_counter_set_lstep");
+
+
+
+
+    function fl_counter_get_textcolor
+           (C : in System.Address)
+        return Interfaces.C.unsigned;
+    pragma Import (C, fl_counter_get_textcolor, "fl_counter_get_textcolor");
+
+    procedure fl_counter_set_textcolor
+           (C : in System.Address;
+            T : in Interfaces.C.unsigned);
+    pragma Import (C, fl_counter_set_textcolor, "fl_counter_set_textcolor");
+
+    function fl_counter_get_textfont
+           (C : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_counter_get_textfont, "fl_counter_get_textfont");
+
+    procedure fl_counter_set_textfont
+           (C : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_counter_set_textfont, "fl_counter_set_textfont");
+
+    function fl_counter_get_textsize
+           (C : in System.Address)
+        return Interfaces.C.int;
+    pragma Import (C, fl_counter_get_textsize, "fl_counter_get_textsize");
+
+    procedure fl_counter_set_textsize
+           (C : in System.Address;
+            T : in Interfaces.C.int);
+    pragma Import (C, fl_counter_set_textsize, "fl_counter_set_textsize");
+
+
+
+
+    procedure fl_counter_draw
+           (W : in System.Address);
+    pragma Import (C, fl_counter_draw, "fl_counter_draw");
+
+    function fl_counter_handle
+           (W : in System.Address;
+            E : in Interfaces.C.int)
+        return Interfaces.C.int;
+    pragma Import (C, fl_counter_handle, "fl_counter_handle");
+
+
+
+
+    procedure Finalize
+           (This : in out Counter) is
+    begin
+        if  This.Void_Ptr /= System.Null_Address and then
+            This in Counter'Class
+        then
+            free_fl_counter (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 Counter is
+    begin
+        return This : Counter do
+            This.Void_Ptr := new_fl_counter
+                   (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));
+            counter_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
+            counter_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+        end return;
+    end Create;
+
+
+
+
+    function Get_Step
+           (This : in Counter)
+        return Long_Float is
+    begin
+        return Long_Float (fl_counter_get_step (This.Void_Ptr));
+    end Get_Step;
+
+
+    procedure Set_Step
+           (This : in out Counter;
+            To   : in     Long_Float) is
+    begin
+        fl_counter_set_step (This.Void_Ptr, Interfaces.C.double (To));
+    end Set_Step;
+
+
+    function Get_Long_Step
+           (This : in Counter)
+        return Long_Float is
+    begin
+        return This.Long_Step;
+    end Get_Long_Step;
+
+
+    procedure Set_Long_Step
+           (This : in out Counter;
+            To   : in     Long_Float) is
+    begin
+        This.Long_Step := To;
+        fl_counter_set_lstep (This.Void_Ptr, Interfaces.C.double (To));
+    end Set_Long_Step;
+
+
+
+
+    function Get_Text_Color
+           (This : in Counter)
+        return Color is
+    begin
+        return Color (fl_counter_get_textcolor (This.Void_Ptr));
+    end Get_Text_Color;
+
+
+    procedure Set_Text_Color
+           (This : in out Counter;
+            To   : in     Color) is
+    begin
+        fl_counter_set_textcolor (This.Void_Ptr, Interfaces.C.unsigned (To));
+    end Set_Text_Color;
+
+
+    function Get_Text_Font
+           (This : in Counter)
+        return Font_Kind is
+    begin
+        return Font_Kind'Val (fl_counter_get_textfont (This.Void_Ptr));
+    end Get_Text_Font;
+
+
+    procedure Set_Text_Font
+           (This : in out Counter;
+            To   : in     Font_Kind) is
+    begin
+        fl_counter_set_textfont (This.Void_Ptr, Font_Kind'Pos (To));
+    end Set_Text_Font;
+
+
+    function Get_Text_Size
+           (This : in Counter)
+        return Font_Size is
+    begin
+        return Font_Size (fl_counter_get_textsize (This.Void_Ptr));
+    end Get_Text_Size;
+
+
+    procedure Set_Text_Size
+           (This : in out Counter;
+            To   : in     Font_Size) is
+    begin
+        fl_counter_set_textsize (This.Void_Ptr, Interfaces.C.int (To));
+    end Set_Text_Size;
+
+
+
+
+    procedure Draw
+           (This : in out Counter) is
+    begin
+        fl_counter_draw (This.Void_Ptr);
+    end Draw;
+
+
+    function Handle
+           (This  : in out Counter;
+            Event : in     Event_Kind)
+        return Event_Outcome is
+    begin
+        return Event_Outcome'Val
+               (fl_counter_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+    end Handle;
+
+
+end FLTK.Widgets.Valuators.Counters;
+
diff --git a/src/fltk-widgets-valuators-counters.ads b/src/fltk-widgets-valuators-counters.ads
new file mode 100644
index 0000000..b69d380
--- /dev/null
+++ b/src/fltk-widgets-valuators-counters.ads
@@ -0,0 +1,88 @@
+
+
+package FLTK.Widgets.Valuators.Counters is
+
+
+    type Counter is new Valuator with private;
+
+
+
+
+    function Create
+           (X, Y, W, H : in Integer;
+            Text       : in String)
+        return Counter;
+
+
+
+
+    function Get_Step
+           (This : in Counter)
+        return Long_Float;
+
+    procedure Set_Step
+           (This : in out Counter;
+            To   : in     Long_Float);
+
+    function Get_Long_Step
+           (This : in Counter)
+        return Long_Float;
+
+    procedure Set_Long_Step
+           (This : in out Counter;
+            To   : in     Long_Float);
+
+
+
+
+    function Get_Text_Color
+           (This : in Counter)
+        return Color;
+
+    procedure Set_Text_Color
+           (This : in out Counter;
+            To   : in     Color);
+
+    function Get_Text_Font
+           (This : in Counter)
+        return Font_Kind;
+
+    procedure Set_Text_Font
+           (This : in out Counter;
+            To   : in     Font_Kind);
+
+    function Get_Text_Size
+           (This : in Counter)
+        return Font_Size;
+
+    procedure Set_Text_Size
+           (This : in out Counter;
+            To   : in     Font_Size);
+
+
+
+
+    procedure Draw
+           (This : in out Counter);
+
+    function Handle
+           (This  : in out Counter;
+            Event : in     Event_Kind)
+        return Event_Outcome;
+
+
+private
+
+
+    type Counter is new Valuator with record
+        --  Needed because Fl_Counter doesn't have
+        --  a way to retrieve this value otherwise.
+        Long_Step : Long_Float;
+    end record;
+
+    overriding procedure Finalize
+           (This : in out Counter);
+
+
+end FLTK.Widgets.Valuators.Counters;
+