Revised Input subhierarchy, separated bindings for Fl_Input and Fl_Input_ widgets

1 files changed, 31 insertions, 38 deletions

diff --git a/src/c_fl_secret_input.cpp b/src/c_fl_secret_input.cpp
index ddff53d..9bf1753 100644
--- a/src/c_fl_secret_input.cpp
+++ b/src/c_fl_secret_input.cpp
@@ -6,69 +6,62 @@
 
 #include <FL/Fl_Secret_Input.H>
 #include "c_fl_secret_input.h"
-#include "c_fl_type.h"
 
 
 
 
+//  Exports from Ada
+
+extern "C" void widget_draw_hook(void * ud);
+extern "C" int widget_handle_hook(void * ud, int e);
+
+
+
+
+//  Attaching all relevant hooks and friends
+
 class My_Secret_Input : public Fl_Secret_Input {
-    public:
-        using Fl_Secret_Input::Fl_Secret_Input;
-        friend void secret_input_set_draw_hook(SECRET_INPUT i, void * d);
-        friend void fl_secret_input_draw(SECRET_INPUT i);
-        friend void secret_input_set_handle_hook(SECRET_INPUT i, void * h);
-        friend int fl_secret_input_handle(SECRET_INPUT i, 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;
+public:
+    using Fl_Secret_Input::Fl_Secret_Input;
+
+    friend void fl_secret_input_draw(SECRETINPUT i);
+    friend int fl_secret_input_handle(SECRETINPUT i, int e);
+
+    void draw();
+    int handle(int e);
 };
 
 void My_Secret_Input::draw() {
-    (*draw_hook)(this->user_data());
-}
-
-void My_Secret_Input::real_draw() {
-    Fl_Secret_Input::draw();
+    widget_draw_hook(this->user_data());
 }
 
 int My_Secret_Input::handle(int e) {
-    return (*handle_hook)(this->user_data(), e);
+    return widget_handle_hook(this->user_data(), e);
 }
 
-int My_Secret_Input::real_handle(int e) {
-    return Fl_Secret_Input::handle(e);
-}
 
-void secret_input_set_draw_hook(SECRET_INPUT i, void * d) {
-    reinterpret_cast<My_Secret_Input*>(i)->draw_hook = reinterpret_cast<d_hook_p>(d);
-}
 
-void fl_secret_input_draw(SECRET_INPUT i) {
-    reinterpret_cast<My_Secret_Input*>(i)->real_draw();
-}
 
-void secret_input_set_handle_hook(SECRET_INPUT i, void * h) {
-    reinterpret_cast<My_Secret_Input*>(i)->handle_hook = reinterpret_cast<h_hook_p>(h);
+//  Flattened C API
+
+SECRETINPUT new_fl_secret_input(int x, int y, int w, int h, char* label) {
+    My_Secret_Input *i = new My_Secret_Input(x, y, w, h, label);
+    return i;
 }
 
-int fl_secret_input_handle(SECRET_INPUT i, int e) {
-    return reinterpret_cast<My_Secret_Input*>(i)->real_handle(e);
+void free_fl_secret_input(SECRETINPUT i) {
+    delete reinterpret_cast<My_Secret_Input*>(i);
 }
 
 
 
 
-SECRET_INPUT new_fl_secret_input(int x, int y, int w, int h, char* label) {
-    My_Secret_Input *i = new My_Secret_Input(x, y, w, h, label);
-    return i;
+void fl_secret_input_draw(SECRETINPUT i) {
+    reinterpret_cast<My_Secret_Input*>(i)->Fl_Secret_Input::draw();
 }
 
-void free_fl_secret_input(SECRET_INPUT i) {
-    delete reinterpret_cast<My_Secret_Input*>(i);
+int fl_secret_input_handle(SECRETINPUT i, int e) {
+    return reinterpret_cast<My_Secret_Input*>(i)->Fl_Secret_Input::handle(e);
 }