X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.h;h=0ae021edc6a31696785a5cfc88a2876c70769b24;hb=0d3917a4eda0344055badf0bd6e235c15c3b6cb8;hp=a63069324050b12ecac6d3b6f6488f2edb86a09f;hpb=72a6abf751403bd91464e77ff2cece01c9756a6b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/colorpicker.h b/cinelerra-5.1/cinelerra/colorpicker.h
index a6306932..0ae021ed 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.h
+++ b/cinelerra-5.1/cinelerra/colorpicker.h
@@ -58,11 +58,11 @@ class PaletteHex;
 class PaletteGrabButton;
 class PaletteHistory;
 
-class ColorThread : public BC_DialogThread
+class ColorPicker : public BC_DialogThread
 {
 public:
-	ColorThread(int do_alpha = 0, const char *title = 0);
-	~ColorThread();
+	ColorPicker(int do_alpha = 0, const char *title = 0);
+	~ColorPicker();
 
 	void start_window(int output, int alpha, int do_okcancel=0);
 	virtual int handle_new_color(int output, int alpha);
@@ -77,7 +77,7 @@ public:
 class ColorWindow : public BC_Window
 {
 public:
-	ColorWindow(ColorThread *thread, int x, int y, int w, int h, const char *title);
+	ColorWindow(ColorPicker *thread, int x, int y, int w, int h, const char *title);
 	~ColorWindow();
 
 	void create_objects();
@@ -88,6 +88,8 @@ public:
 	void update_hsv();
 	void update_yuv();
 	int handle_event();
+	void get_screen_sample();
+	int cursor_motion_event();
 	int button_press_event();
 	int button_release_event();
 
@@ -98,9 +100,10 @@ public:
 	void update_rgb(float r, float g, float b);
 	void update_hsv(float h, float s, float v);
 	void update_yuv(float y, float u, float v);
+	void update_rgb_hex(const char *hex);
 	int rgb888();
 
-	ColorThread *thread;
+	ColorPicker *thread;
 	PaletteWheel *wheel;
 	PaletteWheelValue *wheel_value;
 	PaletteOutput *output;
@@ -335,7 +338,7 @@ class PaletteHex : public BC_TextBox
 public:
 	PaletteHex(ColorWindow *window, int x, int y, const char *hex);
 	~PaletteHex();
-	int handle_event();
+	int keypress_event();
 	void update();
 	ColorWindow *window;
 };
@@ -360,7 +363,6 @@ public:
 	int button_press_event();
 	int button_release_event();
 	int cursor_motion_event();
-	int cursor_enter_event();
 	int cursor_leave_event();
 	int repeat_event(int64_t duration);