From 6006fb5bba0419f5227e46ac64183a59f6e99505 Mon Sep 17 00:00:00 2001
From: Grigori Goronzy <greg@blackbox>
Date: Tue, 12 Jan 2010 03:19:49 +0000
Subject: [PATCH] Redirect mouse events from the color picker dialog to the
 dropper icon to make the color dropper work on Unix/GTK. OS X still needs
 fixes.

Originally committed to SVN as r3975.
---
 aegisub/src/dialog_colorpicker.cpp | 32 ++++++++++++++++++++----------
 aegisub/src/dialog_colorpicker.h   |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp
index 57728c0d5..fb9b656f5 100644
--- a/aegisub/src/dialog_colorpicker.cpp
+++ b/aegisub/src/dialog_colorpicker.cpp
@@ -660,12 +660,10 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
 
 	recent_box = new ColorPickerRecent(this, SELECTOR_RECENT, 8, 4, 16);
 
-#ifdef __WXMSW__
 	eyedropper_bitmap = GETIMAGE(eyedropper_tool_24);
 	eyedropper_bitmap.SetMask(new wxMask(eyedropper_bitmap, wxColour(255, 0, 255)));
 	screen_dropper_icon = new wxStaticBitmap(this, SELECTOR_DROPPER, eyedropper_bitmap, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER);
 	screen_dropper = new ColorPickerScreenDropper(this, SELECTOR_DROPPER_PICK, 7, 7, 8, false);
-#endif
 
 	// Arrange the controls in a nice way
 	wxSizer *spectop_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -728,11 +726,9 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
 	if (Options.AsBool(_T("RGBAdjust Tool"))) recent_sizer->Add(new wxButton(this,BUTTON_RGBADJUST,_T("rgbadjust()")), 0, wxEXPAND);
 
 	wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL);
-#ifdef __WXMSW__
 	picker_sizer->AddStretchSpacer();
 	picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5);
 	picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER);
-#endif
 	picker_sizer->AddStretchSpacer();
 	picker_sizer->Add(recent_sizer, 0, wxALIGN_CENTER);
 	picker_sizer->AddStretchSpacer();
@@ -774,13 +770,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
 	SetColor(initial_color);
 	recent_box->LoadFromString(Options.AsText(_T("Color Picker Recent")));
 
-#ifdef __WXMSW__
 	// The mouse event handler for the Dropper control must be manually assigned
 	// The EVT_MOUSE_EVENTS macro can't take a control id
 	screen_dropper_icon->Connect(wxEVT_MOTION, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
 	screen_dropper_icon->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
 	screen_dropper_icon->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(DialogColorPicker::OnDropperMouse), 0, this);
-#endif
 }
 
 
@@ -802,9 +796,7 @@ DialogColorPicker::~DialogColorPicker()
 	delete hsl_slider;
 	delete hsv_slider;
 
-#ifdef __WXMSW__
 	if (screen_dropper_icon->HasCapture()) screen_dropper_icon->ReleaseMouse();
-#endif
 }
 
 
@@ -1226,6 +1218,7 @@ BEGIN_EVENT_TABLE(DialogColorPicker, wxDialog)
 	EVT_COMMAND(SELECTOR_RECENT, wxRECENT_SELECT, DialogColorPicker::OnRecentSelect)
 	EVT_COMMAND(SELECTOR_DROPPER_PICK, wxDROPPER_SELECT, DialogColorPicker::OnRecentSelect)
 	EVT_BUTTON(BUTTON_RGBADJUST, DialogColorPicker::OnRGBAdjust)
+	EVT_MOUSE_EVENTS(DialogColorPicker::OnMouse)
 END_EVENT_TABLE()
 
 
@@ -1442,15 +1435,15 @@ void DialogColorPicker::OnRecentSelect(wxCommandEvent &evt)
 void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt)
 {
 	if (evt.LeftDown() && !screen_dropper_icon->HasCapture()) {
-		screen_dropper_icon->CaptureMouse();
-		eyedropper_grab_point = evt.GetPosition();
-		eyedropper_is_grabbed = false;
 #ifdef WIN32
 		screen_dropper_icon->SetCursor(wxCursor(_T("eyedropper_cursor")));
 #else
 		screen_dropper_icon->SetCursor(*wxCROSS_CURSOR);
 #endif
 		screen_dropper_icon->SetBitmap(wxNullBitmap);
+		screen_dropper_icon->CaptureMouse();
+		eyedropper_grab_point = evt.GetPosition();
+		eyedropper_is_grabbed = false;
 	}
 
 	if (evt.LeftUp()) {
@@ -1477,6 +1470,23 @@ void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt)
 
 
 
+/// @brief Hack to redirect events to the screen dropper icon
+/// @param evt 
+///
+void DialogColorPicker::OnMouse(wxMouseEvent &evt)
+{
+	if (screen_dropper_icon->HasCapture()) {
+		wxPoint dropper_pos = screen_dropper_icon->ScreenToClient(ClientToScreen(evt.GetPosition()));
+		evt.m_x = dropper_pos.x;
+		evt.m_y = dropper_pos.y;
+		screen_dropper_icon->GetEventHandler()->ProcessEvent(evt);
+	}
+	else
+		evt.Skip();
+}
+
+
+
 /// @brief rgbadjust() tool
 /// @param evt 
 ///
diff --git a/aegisub/src/dialog_colorpicker.h b/aegisub/src/dialog_colorpicker.h
index 387d7f5f9..9f4ecad6f 100644
--- a/aegisub/src/dialog_colorpicker.h
+++ b/aegisub/src/dialog_colorpicker.h
@@ -314,6 +314,7 @@ private:
 	void OnRecentSelect(wxCommandEvent &evt); // also handles dropper pick
 	void OnRGBAdjust(wxCommandEvent &evt);
 	void OnDropperMouse(wxMouseEvent &evt);
+	void OnMouse(wxMouseEvent &evt);
 
 
 	/// DOCME