X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=c7a2657005426ecc0f20eff1de7c9f8cb18a0e86;hb=a87d05583cb7dffaf0e0f5eb9f9b2fc0bcf656e1;hp=0cd7e0f35d20ddb40a713e3d87beee7253bf0433;hpb=1e06dc208a02e68cf1bb127927e3ad5af3657c58;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index 0cd7e0f..c7a2657 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -37,55 +37,73 @@ void Root::tick()
 {
 	if(tooltip_timeout && Time::now()>tooltip_timeout)
 	{
+		std::string tip;
 		if(Widget *wdg=get_descendant_at(pointer_x, pointer_y))
 		{
-			const std::string &tip=wdg->get_tooltip();
-			if(!tip.empty())
+			tip=wdg->get_tooltip();
+			tooltip_target=wdg;
+		}
+		else
+		{
+			tip=signal_tooltip.emit(pointer_x, pointer_y);
+			tooltip_target=this;
+		}
+
+		if(!tip.empty())
+		{
+			if(!lbl_tooltip)
+			{
+				lbl_tooltip=new Label(res);
+				add(*lbl_tooltip);
+				lbl_tooltip->set_style("tooltip");
+			}
+
+			lbl_tooltip->set_text(tip);
+			lbl_tooltip->autosize();
+			const Geometry &tip_geom=lbl_tooltip->get_geometry();
+			unsigned x=pointer_x+10;
+			unsigned y=pointer_y-10-lbl_tooltip->get_geometry().h;
+			if(x+tip_geom.w>geom.w)
 			{
-				if(!lbl_tooltip)
-				{
-					lbl_tooltip=new Label(res);
-					add(*lbl_tooltip);
-					lbl_tooltip->set_style("tooltip");
-				}
-
-				lbl_tooltip->set_text(tip);
-				lbl_tooltip->autosize();
-				const Geometry &tip_geom=lbl_tooltip->get_geometry();
-				unsigned x=pointer_x+10;
-				unsigned y=pointer_y-10-lbl_tooltip->get_geometry().h;
-				if(x+tip_geom.w>geom.w)
-				{
-					if(pointer_x>static_cast<int>(tip_geom.w+2))
-						x=pointer_x-2-tip_geom.w;
-					else
-						x=geom.w-tip_geom.w;
-				}
-				lbl_tooltip->set_position(x, y);
-				raise(*lbl_tooltip);
-				lbl_tooltip->set_visible(true);
-				tooltip_timeout=Time::TimeStamp();
-				tooltip_target=wdg;
+				if(pointer_x>static_cast<int>(tip_geom.w+2))
+					x=pointer_x-2-tip_geom.w;
+				else
+					x=geom.w-tip_geom.w;
 			}
+			lbl_tooltip->set_position(x, y);
+			raise(*lbl_tooltip);
+			lbl_tooltip->set_visible(true);
 		}
+
+		tooltip_timeout=Time::TimeStamp();
 	}
 }
 
-void Root::button_press_event(int x, int y, unsigned btn, unsigned)
+void Root::button_press_event(int x, int y, unsigned btn, unsigned mod)
 {
 	if(visible)
 	{
+		Widget *old_focus=pointer_focus;
+
 		translate_coords(x, y);
 		button_press(x, y, btn);
+
+		if(!pointer_focus && !old_focus)
+			signal_button_press.emit(x, geom.h-1-y, btn, mod);
 	}
 }
 
-void Root::button_release_event(int x, int y, unsigned btn, unsigned)
+void Root::button_release_event(int x, int y, unsigned btn, unsigned mod)
 {
 	if(visible)
 	{
+		Widget *old_focus=pointer_focus;
+
 		translate_coords(x, y);
 		button_release(x, y, btn);
+
+		if(!pointer_focus && !old_focus)
+			signal_button_release.emit(x, geom.h-1-y, btn, mod);
 	}
 }
 
@@ -98,33 +116,46 @@ void Root::pointer_motion_event(int x, int y)
 
 		if(!tooltip_target)
 		{
-			if(pointer_focus)
-			{
-				pointer_x=x;
-				pointer_y=y;
-				tooltip_timeout=Time::now()+700*Time::msec;
-			}
-			else
-				tooltip_timeout=Time::TimeStamp();
+			pointer_x=x;
+			pointer_y=y;
+			tooltip_timeout=Time::now()+700*Time::msec;
 		}
 		else if(get_descendant_at(x, y)!=tooltip_target)
 		{
-			lbl_tooltip->set_visible(false);
+			if(lbl_tooltip)
+				lbl_tooltip->set_visible(false);
 			tooltip_target=0;
 		}
+
+		if(!pointer_focus)
+			signal_pointer_motion.emit(x, geom.h-1-y);
 	}
 }
 
 void Root::key_press_event(unsigned key, unsigned mod, wchar_t ch)
 {
 	if(visible)
+	{
+		Widget *old_focus=input_focus;
+
 		key_press(Input::key_from_sys(key), mod, ch);
+
+		if(!input_focus && !old_focus)
+			signal_key_press.emit(key, mod, ch);
+	}
 }
 
 void Root::key_release_event(unsigned key, unsigned mod)
 {
 	if(visible)
+	{
+		Widget *old_focus=input_focus;
+
 		key_release(Input::key_from_sys(key), mod);
+
+		if(!input_focus && !old_focus)
+			signal_key_release.emit(key, mod);
+	}
 }
 
 void Root::translate_coords(int &x, int &y)