X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=21d31fb0e2af7a988159a74895cfddc863e8c536;hb=79af58bcfa941e0f2c33b172c9e924522ebcdfea;hp=7c2e3fb4e8c8afb87b1aa41b49972575a27ffa62;hpb=1afb4f8d6379ad1bf832692fbfedef9714ee3ff5;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index 7c2e3fb..21d31fb 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -16,7 +16,8 @@ Container::Container():
 	click_button(0),
 	pointer_focus(0),
 	pointer_grabbed(false),
-	input_focus(0)
+	input_focus(0),
+	touch_focus(0)
 { }
 
 Container::~Container()
@@ -90,16 +91,16 @@ list<Widget *> Container::get_children() const
 	return result;
 }
 
-Widget *Container::get_child_at(int x, int y)
+Widget *Container::get_child_at(int x, int y) const
 {
-	for(list<Child *>::iterator i=children.end(); i!=children.begin();)
+	for(list<Child *>::const_iterator i=children.end(); i!=children.begin();)
 		if((*--i)->widget->is_visible() && (*i)->widget->get_geometry().is_inside(x, y))
 			return (*i)->widget;
 
 	return 0;
 }
 
-Widget *Container::get_descendant_at(int x, int y)
+Widget *Container::get_descendant_at(int x, int y) const
 {
 	Widget *wdg = get_child_at(x, y);
 	if(Container *cont = dynamic_cast<Container *>(wdg))
@@ -166,7 +167,7 @@ Widget *Container::get_final_input_focus() const
 
 void Container::button_press(int x, int y, unsigned btn)
 {
-	if(Widget *child = get_pointer_target(x, y))
+	if(Widget *child = get_pointer_target(x, y, false))
 	{
 		if(!click_focus)
 		{
@@ -185,7 +186,7 @@ void Container::button_press(int x, int y, unsigned btn)
 
 void Container::button_release(int x, int y, unsigned btn)
 {
-	if(Widget *child = get_pointer_target(x, y))
+	if(Widget *child = get_pointer_target(x, y, false))
 	{
 		if(child==click_focus && btn==click_button)
 		{
@@ -201,7 +202,7 @@ void Container::button_release(int x, int y, unsigned btn)
 
 void Container::pointer_motion(int x, int y)
 {
-	Widget *child = get_pointer_target(x, y);
+	Widget *child = get_pointer_target(x, y, false);
 	if(!pointer_grabbed)
 		set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0);
 
@@ -212,12 +213,14 @@ void Container::pointer_motion(int x, int y)
 	}
 }
 
-Widget *Container::get_pointer_target(int x, int y)
+Widget *Container::get_pointer_target(int x, int y, bool touch) const
 {
 	if(pointer_grabbed)
 		return pointer_focus;
-	else if(click_focus)
+	else if(!touch && click_focus)
 		return click_focus;
+	else if(touch && touch_focus)
+		return touch_focus;
 	else
 	{
 		Widget *child = get_child_at(x, y);
@@ -252,6 +255,41 @@ void Container::character(wchar_t ch)
 		input_focus->character(ch);
 }
 
+void Container::touch_press(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		// TODO track focus for each finger separately
+		if(!touch_focus)
+			touch_focus = child;
+
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_press(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
+void Container::touch_release(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		// TODO track focus for each finger separately
+		if(child==touch_focus)
+			touch_focus = 0;
+
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_release(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
+void Container::touch_motion(int x, int y, unsigned finger)
+{
+	if(Widget *child = get_pointer_target(x, y, true))
+	{
+		const Geometry &cgeom = child->get_geometry();
+		child->touch_motion(x-cgeom.x, y-cgeom.y, finger);
+	}
+}
+
 void Container::focus_out()
 {
 	set_input_focus(0);