X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Froot.cpp;h=9023b7cb5c0f0f89578dbd864f12228dab9d5f88;hb=0af3c2393bd00f39db3bfaf5b78a7a44f0fd5ff1;hp=9fc48e00aac234aecca5f3e6e1ac1e5b0b7c09db;hpb=3f301f9b6f73e886bdbb61565edb2c02667039d0;p=libs%2Fgltk.git

diff --git a/source/root.cpp b/source/root.cpp
index 9fc48e0..9023b7c 100644
--- a/source/root.cpp
+++ b/source/root.cpp
@@ -38,62 +38,72 @@ void Root::tick()
 	if(tooltip_timeout && Time::now()>tooltip_timeout)
 	{
 		std::string tip;
-		if(Widget *wdg=get_descendant_at(pointer_x, pointer_y))
+		if(Widget *wdg = get_descendant_at(pointer_x, pointer_y))
 		{
-			tip=wdg->get_tooltip();
-			tooltip_target=wdg;
+			tip = wdg->get_tooltip();
+			tooltip_target = wdg;
 		}
 		else
 		{
-			tip=signal_tooltip.emit(pointer_x, pointer_y);
-			tooltip_target=this;
+			tip = signal_tooltip.emit(pointer_x, pointer_y);
+			tooltip_target = this;
 		}
 
 		if(!tip.empty())
 		{
 			if(!lbl_tooltip)
 			{
-				lbl_tooltip=new Label(res);
+				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;
+			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;
+					x = pointer_x-2-tip_geom.w;
 				else
-					x=geom.w-tip_geom.w;
+					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_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);
 	}
 }
 
@@ -106,35 +116,52 @@ void Root::pointer_motion_event(int x, int y)
 
 		if(!tooltip_target)
 		{
-			pointer_x=x;
-			pointer_y=y;
-			tooltip_timeout=Time::now()+700*Time::msec;
+			pointer_x = x;
+			pointer_y = y;
+			tooltip_timeout = Time::now()+700*Time::msec;
 		}
 		else if(get_descendant_at(x, y)!=tooltip_target)
 		{
 			if(lbl_tooltip)
 				lbl_tooltip->set_visible(false);
-			tooltip_target=0;
+			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)
 {
-	x=x*geom.w/window.get_width();
-	y=geom.h-1-y*geom.h/window.get_height();
+	x = x*geom.w/window.get_width();
+	y = geom.h-1-y*geom.h/window.get_height();
 }
 
 } // namespace GLtk