summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--progress.txt2
-rw-r--r--src/c_fl_color_chooser.cpp119
-rw-r--r--src/c_fl_color_chooser.h45
-rw-r--r--src/fltk-widgets-groups-color_choosers.adb281
-rw-r--r--src/fltk-widgets-groups-color_choosers.ads102
5 files changed, 548 insertions, 1 deletions
diff --git a/progress.txt b/progress.txt
index ddf56f0..ea35729 100644
--- a/progress.txt
+++ b/progress.txt
@@ -33,6 +33,7 @@ FLTK.Widgets.Buttons.Toggle
FLTK.Widgets.Clocks
FLTK.Widgets.Clocks.Updated
FLTK.Widgets.Clocks.Updated.Round
+FLTK.Widgets.Groups.Color_Choosers
FLTK.Widgets.Groups.Input_Choices
FLTK.Widgets.Groups.Scrolls
FLTK.Widgets.Groups.Spinners
@@ -104,7 +105,6 @@ FL_File_Browser
FL_Hold_Browser
FL_Multi_Browser
FL_Select_Browser
-FL_Color_Chooser
FL_Help_View (several methods have ABI_VERSION bugs)
FL_Pack
FL_Table
diff --git a/src/c_fl_color_chooser.cpp b/src/c_fl_color_chooser.cpp
new file mode 100644
index 0000000..fa34171
--- /dev/null
+++ b/src/c_fl_color_chooser.cpp
@@ -0,0 +1,119 @@
+
+
+#include <FL/Fl_Color_Chooser.H>
+#include "c_fl_color_chooser.h"
+#include "c_fl_type.h"
+
+
+
+
+class My_Color_Chooser : public Fl_Color_Chooser {
+ public:
+ using Fl_Color_Chooser::Fl_Color_Chooser;
+ friend void color_chooser_set_draw_hook(COLOR_CHOOSER n, void * d);
+ friend void fl_color_chooser_draw(COLOR_CHOOSER n);
+ friend void color_chooser_set_handle_hook(COLOR_CHOOSER n, void * h);
+ friend int fl_color_chooser_handle(COLOR_CHOOSER n, 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_Color_Chooser::draw() {
+ (*draw_hook)(this->user_data());
+}
+
+void My_Color_Chooser::real_draw() {
+ Fl_Color_Chooser::draw();
+}
+
+int My_Color_Chooser::handle(int e) {
+ return (*handle_hook)(this->user_data(), e);
+}
+
+int My_Color_Chooser::real_handle(int e) {
+ return Fl_Color_Chooser::handle(e);
+}
+
+void color_chooser_set_draw_hook(COLOR_CHOOSER n, void * d) {
+ reinterpret_cast<My_Color_Chooser*>(n)->draw_hook = reinterpret_cast<d_hook_p>(d);
+}
+
+void fl_color_chooser_draw(COLOR_CHOOSER n) {
+ reinterpret_cast<My_Color_Chooser*>(n)->real_draw();
+}
+
+void color_chooser_set_handle_hook(COLOR_CHOOSER n, void * h) {
+ reinterpret_cast<My_Color_Chooser*>(n)->handle_hook = reinterpret_cast<h_hook_p>(h);
+}
+
+int fl_color_chooser_handle(COLOR_CHOOSER n, int e) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->real_handle(e);
+}
+
+
+
+
+COLOR_CHOOSER new_fl_color_chooser(int x, int y, int w, int h, char* label) {
+ My_Color_Chooser *n = new My_Color_Chooser(x, y, w, h, label);
+ return n;
+}
+
+void free_fl_color_chooser(COLOR_CHOOSER n) {
+ delete reinterpret_cast<My_Color_Chooser*>(n);
+}
+
+
+
+
+double fl_color_chooser_r(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->r();
+}
+
+double fl_color_chooser_g(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->g();
+}
+
+double fl_color_chooser_b(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->b();
+}
+
+int fl_color_chooser_rgb(COLOR_CHOOSER n, int r, int g, int b) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->rgb(r,g,b);
+}
+
+
+
+
+double fl_color_chooser_hue(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->hue();
+}
+
+double fl_color_chooser_saturation(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->saturation();
+}
+
+double fl_color_chooser_value(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->value();
+}
+
+int fl_color_chooser_hsv(COLOR_CHOOSER n, int h, int s, int v) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->hsv(h,s,v);
+}
+
+
+
+
+int fl_color_chooser_get_mode(COLOR_CHOOSER n) {
+ return reinterpret_cast<My_Color_Chooser*>(n)->mode();
+}
+
+void fl_color_chooser_set_mode(COLOR_CHOOSER n, int m) {
+ reinterpret_cast<My_Color_Chooser*>(n)->mode(m);
+}
+
+
diff --git a/src/c_fl_color_chooser.h b/src/c_fl_color_chooser.h
new file mode 100644
index 0000000..2948285
--- /dev/null
+++ b/src/c_fl_color_chooser.h
@@ -0,0 +1,45 @@
+
+
+#ifndef FL_COLOR_CHOOSER_GUARD
+#define FL_COLOR_CHOOSER_GUARD
+
+
+
+
+typedef void* COLOR_CHOOSER;
+
+
+
+
+extern "C" void color_chooser_set_draw_hook(COLOR_CHOOSER n, void * d);
+extern "C" void fl_color_chooser_draw(COLOR_CHOOSER n);
+extern "C" void color_chooser_set_handle_hook(COLOR_CHOOSER n, void * h);
+extern "C" int fl_color_chooser_handle(COLOR_CHOOSER n, int e);
+
+
+
+
+extern "C" COLOR_CHOOSER new_fl_color_chooser(int x, int y, int w, int h, char* label);
+extern "C" void free_fl_color_chooser(COLOR_CHOOSER n);
+
+
+
+
+extern "C" double fl_color_chooser_r(COLOR_CHOOSER n);
+extern "C" double fl_color_chooser_g(COLOR_CHOOSER n);
+extern "C" double fl_color_chooser_b(COLOR_CHOOSER n);
+extern "C" int fl_color_chooser_rgb(COLOR_CHOOSER n, int r, int g, int b);
+
+
+extern "C" double fl_color_chooser_hue(COLOR_CHOOSER n);
+extern "C" double fl_color_chooser_saturation(COLOR_CHOOSER n);
+extern "C" double fl_color_chooser_value(COLOR_CHOOSER n);
+extern "C" int fl_color_chooser_hsv(COLOR_CHOOSER n, int h, int s, int v);
+
+
+extern "C" int fl_color_chooser_get_mode(COLOR_CHOOSER n);
+extern "C" void fl_color_chooser_set_mode(COLOR_CHOOSER n, int m);
+
+
+#endif
+
diff --git a/src/fltk-widgets-groups-color_choosers.adb b/src/fltk-widgets-groups-color_choosers.adb
new file mode 100644
index 0000000..c47533a
--- /dev/null
+++ b/src/fltk-widgets-groups-color_choosers.adb
@@ -0,0 +1,281 @@
+
+
+with
+
+ Interfaces.C,
+ System;
+
+use type
+
+ Interfaces.C.int,
+ System.Address;
+
+
+package body FLTK.Widgets.Groups.Color_Choosers is
+
+
+ procedure color_chooser_set_draw_hook
+ (W, D : in System.Address);
+ pragma Import (C, color_chooser_set_draw_hook, "color_chooser_set_draw_hook");
+
+ procedure color_chooser_set_handle_hook
+ (W, H : in System.Address);
+ pragma Import (C, color_chooser_set_handle_hook, "color_chooser_set_handle_hook");
+
+
+
+
+ function new_fl_color_chooser
+ (X, Y, W, H : in Interfaces.C.int;
+ Text : in Interfaces.C.char_array)
+ return System.Address;
+ pragma Import (C, new_fl_color_chooser, "new_fl_color_chooser");
+
+ procedure free_fl_color_chooser
+ (W : in System.Address);
+ pragma Import (C, free_fl_color_chooser, "free_fl_color_chooser");
+
+
+
+
+ function fl_color_chooser_r
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_r, "fl_color_chooser_r");
+
+ function fl_color_chooser_g
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_g, "fl_color_chooser_g");
+
+ function fl_color_chooser_b
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_b, "fl_color_chooser_b");
+
+ function fl_color_chooser_rgb
+ (N : in System.Address;
+ R, G, B : in Interfaces.C.double)
+ return Interfaces.C.int;
+ pragma Import (C, fl_color_chooser_rgb, "fl_color_chooser_rgb");
+
+
+
+
+ function fl_color_chooser_hue
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_hue, "fl_color_chooser_hue");
+
+ function fl_color_chooser_saturation
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_saturation, "fl_color_chooser_saturation");
+
+ function fl_color_chooser_value
+ (N : in System.Address)
+ return Interfaces.C.double;
+ pragma Import (C, fl_color_chooser_value, "fl_color_chooser_value");
+
+ function fl_color_chooser_hsv
+ (N : in System.Address;
+ H, S, V : in Interfaces.C.double)
+ return Interfaces.C.int;
+ pragma Import (C, fl_color_chooser_hsv, "fl_color_chooser_hsv");
+
+
+
+
+ function fl_color_chooser_get_mode
+ (N : in System.Address)
+ return Interfaces.C.int;
+ pragma Import (C, fl_color_chooser_get_mode, "fl_color_chooser_get_mode");
+
+ procedure fl_color_chooser_set_mode
+ (N : in System.Address;
+ M : in Interfaces.C.int);
+ pragma Import (C, fl_color_chooser_set_mode, "fl_color_chooser_set_mode");
+
+
+
+
+ procedure fl_color_chooser_draw
+ (W : in System.Address);
+ pragma Import (C, fl_color_chooser_draw, "fl_color_chooser_draw");
+
+ function fl_color_chooser_handle
+ (W : in System.Address;
+ E : in Interfaces.C.int)
+ return Interfaces.C.int;
+ pragma Import (C, fl_color_chooser_handle, "fl_color_chooser_handle");
+
+
+
+
+ procedure Finalize
+ (This : in out Color_Chooser) is
+ begin
+ if This.Void_Ptr /= System.Null_Address and then
+ This in Color_Chooser'Class
+ then
+ This.Clear;
+ free_fl_color_chooser (This.Void_Ptr);
+ This.Void_Ptr := System.Null_Address;
+ end if;
+ Finalize (Group (This));
+ end Finalize;
+
+
+
+
+ package body Forge is
+
+ function Create
+ (X, Y, W, H : in Integer;
+ Text : in String)
+ return Color_Chooser is
+ begin
+ return This : Color_Chooser do
+ This.Void_Ptr := new_fl_color_chooser
+ (Interfaces.C.int (X),
+ Interfaces.C.int (Y),
+ Interfaces.C.int (W),
+ Interfaces.C.int (H),
+ Interfaces.C.To_C (Text));
+ fl_group_end (This.Void_Ptr);
+ fl_widget_set_user_data
+ (This.Void_Ptr,
+ Widget_Convert.To_Address (This'Unchecked_Access));
+ color_chooser_set_draw_hook (This.Void_Ptr, Draw_Hook'Address);
+ color_chooser_set_handle_hook (This.Void_Ptr, Handle_Hook'Address);
+ end return;
+ end Create;
+
+ end Forge;
+
+
+
+
+ function Get_Red
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_r (This.Void_Ptr));
+ end Get_Red;
+
+
+ function Get_Green
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_g (This.Void_Ptr));
+ end Get_Green;
+
+
+ function Get_Blue
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_b (This.Void_Ptr));
+ end Get_Blue;
+
+
+ procedure Set_RGB
+ (This : in out Color_Chooser;
+ R, G, B : in Long_Float) is
+ begin
+ This.Was_Changed := fl_color_chooser_rgb
+ (This.Void_Ptr,
+ Interfaces.C.double (R),
+ Interfaces.C.double (G),
+ Interfaces.C.double (B)) /= 0;
+ end Set_RGB;
+
+
+
+
+ function Get_Hue
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_hue (This.Void_Ptr));
+ end Get_Hue;
+
+
+ function Get_Saturation
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_saturation (This.Void_Ptr));
+ end Get_Saturation;
+
+
+ function Get_Value
+ (This : in Color_Chooser)
+ return Long_Float is
+ begin
+ return Long_Float (fl_color_chooser_value (This.Void_Ptr));
+ end Get_Value;
+
+
+ procedure Set_HSV
+ (This : in out Color_Chooser;
+ H, S, V : in Long_Float) is
+ begin
+ This.Was_Changed := fl_color_chooser_hsv
+ (This.Void_Ptr,
+ Interfaces.C.double (H),
+ Interfaces.C.double (S),
+ Interfaces.C.double (V)) /= 0;
+ end Set_HSV;
+
+
+
+
+ function Color_Was_Changed
+ (This : in Color_Chooser)
+ return Boolean is
+ begin
+ return This.Was_Changed;
+ end Color_Was_Changed;
+
+
+
+
+ function Get_Mode
+ (This : in Color_Chooser)
+ return Color_Mode is
+ begin
+ return Color_Mode'Val (fl_color_chooser_get_mode (This.Void_Ptr));
+ end Get_Mode;
+
+
+ procedure Set_Mode
+ (This : in out Color_Chooser;
+ To : in Color_Mode) is
+ begin
+ fl_color_chooser_set_mode (This.Void_Ptr, Color_Mode'Pos (To));
+ end Set_Mode;
+
+
+
+
+ procedure Draw
+ (This : in out Color_Chooser) is
+ begin
+ fl_color_chooser_draw (This.Void_Ptr);
+ end Draw;
+
+
+ function Handle
+ (This : in out Color_Chooser;
+ Event : in Event_Kind)
+ return Event_Outcome is
+ begin
+ return Event_Outcome'Val
+ (fl_color_chooser_handle (This.Void_Ptr, Event_Kind'Pos (Event)));
+ end Handle;
+
+
+end FLTK.Widgets.Groups.Color_Choosers;
+
diff --git a/src/fltk-widgets-groups-color_choosers.ads b/src/fltk-widgets-groups-color_choosers.ads
new file mode 100644
index 0000000..3cf4386
--- /dev/null
+++ b/src/fltk-widgets-groups-color_choosers.ads
@@ -0,0 +1,102 @@
+
+
+package FLTK.Widgets.Groups.Color_Choosers is
+
+
+ type Color_Chooser is new Group with private;
+
+ type Color_Mode is (RGB, Byte, Hex, HSV);
+
+
+
+
+ package Forge is
+
+ function Create
+ (X, Y, W, H : in Integer;
+ Text : in String)
+ return Color_Chooser;
+
+ end Forge;
+
+
+
+
+ function Get_Red
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ function Get_Green
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ function Get_Blue
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ procedure Set_RGB
+ (This : in out Color_Chooser;
+ R, G, B : in Long_Float);
+
+
+
+
+ function Get_Hue
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ function Get_Saturation
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ function Get_Value
+ (This : in Color_Chooser)
+ return Long_Float;
+
+ procedure Set_HSV
+ (This : in out Color_Chooser;
+ H, S, V : in Long_Float);
+
+
+
+
+ function Color_Was_Changed
+ (This : in Color_Chooser)
+ return Boolean;
+
+
+
+
+ function Get_Mode
+ (This : in Color_Chooser)
+ return Color_Mode;
+
+ procedure Set_Mode
+ (This : in out Color_Chooser;
+ To : in Color_Mode);
+
+
+
+
+ procedure Draw
+ (This : in out Color_Chooser);
+
+ function Handle
+ (This : in out Color_Chooser;
+ Event : in Event_Kind)
+ return Event_Outcome;
+
+
+private
+
+
+ type Color_Chooser is new Group with record
+ Was_Changed : Boolean := False;
+ end record;
+
+ overriding procedure Finalize
+ (This : in out Color_Chooser);
+
+
+end FLTK.Widgets.Groups.Color_Choosers;
+