summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--progress.txt2
-rw-r--r--src/c_fl_nice_slider.cpp70
-rw-r--r--src/c_fl_nice_slider.h27
-rw-r--r--src/fltk-widgets-valuators-sliders-nice.adb109
-rw-r--r--src/fltk-widgets-valuators-sliders-nice.ads38
5 files changed, 245 insertions, 1 deletions
diff --git a/progress.txt b/progress.txt
index e09fd22..8611c9b 100644
--- a/progress.txt
+++ b/progress.txt
@@ -57,6 +57,7 @@ FLTK.Widgets.Valuators.Sliders.Fill
FLTK.Widgets.Valuators.Sliders.Hor_Fill
FLTK.Widgets.Valuators.Sliders.Hor_Nice
FLTK.Widgets.Valuators.Sliders.Horizontal
+FLTK.Widgets.Valuators.Sliders.Nice
@@ -107,7 +108,6 @@ FL_Tabs
FL_Tile
FL_Tree
FL_Wizard
-FL_Nice_Slider
FL_Scrollbar
FL_Value_Slider
FL_Hor_Value_Slider
diff --git a/src/c_fl_nice_slider.cpp b/src/c_fl_nice_slider.cpp
new file mode 100644
index 0000000..804f0f0
--- /dev/null
+++ b/src/c_fl_nice_slider.cpp
@@ -0,0 +1,70 @@
+
+
+#include <FL/Fl_Nice_Slider.H>
+#include "c_fl_nice_slider.h"
+#include "c_fl_type.h"
+
+
+
+
+class My_Nice_Slider : public Fl_Nice_Slider {
+ public:
+ using Fl_Nice_Slider::Fl_Nice_Slider;
+ friend void nice_slider_set_draw_hook(NICE_SLIDER s, void * d);
+ friend void fl_nice_slider_draw(NICE_SLIDER s);
+ friend void nice_slider_set_handle_hook(NICE_SLIDER s, void * h);
+ friend int fl_nice_slider_handle(NICE_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_Nice_Slider::draw() {
+ (*draw_hook)(this->user_data());
+}
+
+void My_Nice_Slider::real_draw() {
+ Fl_Nice_Slider::draw();
+}
+
+int My_Nice_Slider::handle(int e) {
+ return (*handle_hook)(this->user_data(), e);
+}
+
+int My_Nice_Slider::real_handle(int e) {
+ return Fl_Nice_Slider::handle(e);
+}
+
+void nice_slider_set_draw_hook(NICE_SLIDER s, void * d) {
+ reinterpret_cast<My_Nice_Slider*>(s)->draw_hook = reinterpret_cast<d_hook_p>(d);
+}
+
+void fl_nice_slider_draw(NICE_SLIDER s) {
+ reinterpret_cast<My_Nice_Slider*>(s)->real_draw();
+}
+
+void nice_slider_set_handle_hook(NICE_SLIDER s, void * h) {
+ reinterpret_cast<My_Nice_Slider*>(s)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+int fl_nice_slider_handle(NICE_SLIDER s, int e) {
+ return reinterpret_cast<My_Nice_Slider*>(s)->real_handle(e);
+}
+
+
+
+
+NICE_SLIDER new_fl_nice_slider(int x, int y, int w, int h, char* label) {
+ My_Nice_Slider *s = new My_Nice_Slider(x, y, w, h, label);
+ return s;
+}
+
+void free_fl_nice_slider(NICE_SLIDER s) {
+ delete reinterpret_cast<My_Nice_Slider*>(s);
+}
+
+
diff --git a/src/c_fl_nice_slider.h b/src/c_fl_nice_slider.h
new file mode 100644
index 0000000..d07b47e
--- /dev/null
+++ b/src/c_fl_nice_slider.h
@@ -0,0 +1,27 @@
+
+
+#ifndef FL_NICE_SLIDER_GUARD
+#define FL_NICE_SLIDER_GUARD
+
+
+
+
+typedef void* NICE_SLIDER;
+
+
+
+
+extern "C" void nice_slider_set_draw_hook(NICE_SLIDER s, void * d);
+extern "C" void fl_nice_slider_draw(NICE_SLIDER s);
+extern "C" void nice_slider_set_handle_hook(NICE_SLIDER s, void * h);
+extern "C" int fl_nice_slider_handle(NICE_SLIDER s, int e);
+
+
+
+
+extern "C" NICE_SLIDER new_fl_nice_slider(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_nice_slider(NICE_SLIDER s);
+
+
+#endif
+
diff --git a/src/fltk-widgets-valuators-sliders-nice.adb b/src/fltk-widgets-valuators-sliders-nice.adb
new file mode 100644
index 0000000..fc529d4
--- /dev/null
+++ b/src/fltk-widgets-valuators-sliders-nice.adb
@@ -0,0 +1,109 @@
+
+
+with
+
+ Interfaces.C.Strings,
+ System;
+
+use type
+
+ System.Address;
+
+
+package body FLTK.Widgets.Valuators.Sliders.Nice is
+
+
+ procedure nice_slider_set_draw_hook
+ (W, D : in System.Address);
+ pragma Import (C, nice_slider_set_draw_hook, "nice_slider_set_draw_hook");
+
+ procedure nice_slider_set_handle_hook
+ (W, H : in System.Address);
+ pragma Import (C, nice_slider_set_handle_hook, "nice_slider_set_handle_hook");
+
+
+
+
+ function new_fl_nice_slider
+ (X, Y, W, H : in Interfaces.C.int;
+ Text : in Interfaces.C.char_array)
+ return System.Address;
+ pragma Import (C, new_fl_nice_slider, "new_fl_nice_slider");
+
+ procedure free_fl_nice_slider
+ (D : in System.Address);
+ pragma Import (C, free_fl_nice_slider, "free_fl_nice_slider");
+
+
+
+
+ procedure fl_nice_slider_draw
+ (W : in System.Address);
+ pragma Import (C, fl_nice_slider_draw, "fl_nice_slider_draw");
+
+ function fl_nice_slider_handle
+ (W : in System.Address;
+ E : in Interfaces.C.int)
+ return Interfaces.C.int;
+ pragma Import (C, fl_nice_slider_handle, "fl_nice_slider_handle");
+
+
+
+
+ procedure Finalize
+ (This : in out Nice_Slider) is
+ begin
+ if This.Void_Ptr /= System.Null_Address and then
+ This in Nice_Slider'Class
+ then
+ free_fl_nice_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 Nice_Slider is
+ begin
+ return This : Nice_Slider do
+ This.Void_Ptr := new_fl_nice_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));
+ nice_slider_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
+ nice_slider_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+ end return;
+ end Create;
+
+
+
+
+ procedure Draw
+ (This : in out Nice_Slider) is
+ begin
+ fl_nice_slider_draw (This.Void_Ptr);
+ end Draw;
+
+
+ function Handle
+ (This : in out Nice_Slider;
+ Event : in Event_Kind)
+ return Event_Outcome is
+ begin
+ return Event_Outcome'Val
+ (fl_nice_slider_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+ end Handle;
+
+
+end FLTK.Widgets.Valuators.Sliders.Nice;
+
diff --git a/src/fltk-widgets-valuators-sliders-nice.ads b/src/fltk-widgets-valuators-sliders-nice.ads
new file mode 100644
index 0000000..3005f88
--- /dev/null
+++ b/src/fltk-widgets-valuators-sliders-nice.ads
@@ -0,0 +1,38 @@
+
+
+package FLTK.Widgets.Valuators.Sliders.Nice is
+
+
+ type Nice_Slider is new Slider with private;
+
+
+
+
+ function Create
+ (X, Y, W, H : in Integer;
+ Text : in String)
+ return Nice_Slider;
+
+
+
+
+ procedure Draw
+ (This : in out Nice_Slider);
+
+ function Handle
+ (This : in out Nice_Slider;
+ Event : in Event_Kind)
+ return Event_Outcome;
+
+
+private
+
+
+ type Nice_Slider is new Slider with null record;
+
+ overriding procedure Finalize
+ (This : in out Nice_Slider);
+
+
+end FLTK.Widgets.Valuators.Sliders.Nice;
+