X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=fade54edbb00e58eb87283bb42f460bf99052dfe;hb=1b29f1987b8891852a606afbb03e5e08b16c8c3e;hp=bec206602a95248c72f53ad4de28f41444b71659;hpb=9fdbf99cdb3c5620e665c3ecb34e83d778cb311a;p=libs%2Fgltk.git

diff --git a/source/container.cpp b/source/container.cpp
index bec2066..fade54e 100644
--- a/source/container.cpp
+++ b/source/container.cpp
@@ -12,7 +12,10 @@ hierarchy_error::hierarchy_error(const string &w):
 
 Container::Container():
 	click_focus(0),
-	click_button(0)
+	click_button(0),
+	pointer_focus(0),
+	pointer_grabbed(false),
+	input_focus(0)
 { }
 
 Container::~Container()
@@ -78,29 +81,100 @@ Widget *Container::get_descendant_at(int x, int y)
 	return wdg;
 }
 
+void Container::raise(Widget &wdg)
+{
+	for(list<Child *>::iterator i=children.begin(); i!=children.end(); ++i)
+		if((*i)->widget==&wdg)
+		{
+			children.splice(children.end(), children, i);
+			return;
+		}
+
+	throw hierarchy_error("widget not in container");
+}
+
+void Container::set_pointer_focus(Widget *wdg)
+{
+	if(wdg!=pointer_focus)
+	{
+		if(pointer_focus)
+			pointer_focus->pointer_leave();
+
+		pointer_focus = wdg;
+
+		if(pointer_focus)
+			pointer_focus->pointer_enter();
+	}
+}
+
+void Container::set_input_focus(Widget *wdg)
+{
+	if(wdg!=input_focus)
+	{
+		if(input_focus)
+			input_focus->focus_out();
+
+		input_focus = wdg;
+
+		if(input_focus)
+		{
+			raise(*wdg);
+			input_focus->focus_in();
+		}
+	}
+}
+
+Widget *Container::get_final_input_focus() const
+{
+	if(Container *container = dynamic_cast<Container *>(input_focus))
+		if(Widget *focus = container->get_final_input_focus())
+			return focus;
+
+	return input_focus;
+}
+
 void Container::button_press(int x, int y, unsigned btn)
 {
-	if(click_focus)
+	if(pointer_grabbed)
 	{
-		const Geometry &cgeom = click_focus->get_geometry();
-		click_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
+		const Geometry &cgeom = pointer_focus->get_geometry();
+		pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
 	}
 	else
 	{
 		if(Widget *wdg = get_child_at(x, y))
 		{
-			click_focus = wdg;
-			click_button = btn;
+			set_pointer_focus(wdg);
+			if(wdg->is_focusable())
+				set_input_focus(wdg);
+		}
+		if(click_focus)
+		{
+			const Geometry &cgeom = click_focus->get_geometry();
+			click_focus->button_press(x-cgeom.x, y-cgeom.y, btn);
+		}
+		else
+		{
+			if(Widget *wdg = get_child_at(x, y))
+			{
+				click_focus = wdg;
+				click_button = btn;
 
-			const Geometry &cgeom = wdg->get_geometry();
-			wdg->button_press(x-cgeom.x, y-cgeom.y, btn);
+				const Geometry &cgeom = wdg->get_geometry();
+				wdg->button_press(x-cgeom.x, y-cgeom.y, btn);
+			}
 		}
 	}
 }
 
 void Container::button_release(int x, int y, unsigned btn)
 {
-	if(click_focus)
+	if(pointer_grabbed)
+	{
+		const Geometry &cgeom = pointer_focus->get_geometry();
+		pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn);
+	}
+	else if(click_focus)
 	{
 		Widget *wdg = click_focus;
 
@@ -122,18 +196,27 @@ void Container::button_release(int x, int y, unsigned btn)
 
 void Container::pointer_motion(int x, int y)
 {
-	if(click_focus)
+	if(pointer_grabbed)
 	{
-		const Geometry &cgeom = click_focus->get_geometry();
-		click_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
+		const Geometry &cgeom = pointer_focus->get_geometry();
+		pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
 	}
 	else
 	{
-		Widget *wdg = get_child_at(x, y);
-		if(wdg)
+		set_pointer_focus(get_child_at(x, y));
+		if(click_focus)
 		{
-			const Geometry &cgeom = wdg->get_geometry();
-			wdg->pointer_motion(x-cgeom.x, y-cgeom.y);
+			const Geometry &cgeom = click_focus->get_geometry();
+			click_focus->pointer_motion(x-cgeom.x, y-cgeom.y);
+		}
+		else
+		{
+			Widget *wdg = get_child_at(x, y);
+			if(wdg)
+			{
+				const Geometry &cgeom = wdg->get_geometry();
+				wdg->pointer_motion(x-cgeom.x, y-cgeom.y);
+			}
 		}
 	}
 }
@@ -142,6 +225,31 @@ void Container::pointer_leave()
 {
 	Widget::pointer_leave();
 	click_focus = 0;
+	set_pointer_focus(0);
+}
+
+void Container::key_press(unsigned key, unsigned mod)
+{
+	if(input_focus)
+		input_focus->key_press(key, mod);
+}
+
+void Container::key_release(unsigned key, unsigned mod)
+{
+	if(input_focus)
+		input_focus->key_release(key, mod);
+}
+
+void Container::character(wchar_t ch)
+{
+	if(input_focus)
+		input_focus->character(ch);
+}
+
+void Container::focus_out()
+{
+	set_input_focus(0);
+	Widget::focus_out();
 }
 
 void Container::on_reparent()
@@ -160,18 +268,55 @@ Container::Child::Child(Container &c, Widget *w):
 	widget(w)
 {
 	widget->signal_visibility_changed.connect(sigc::mem_fun(this, &Child::visibility_changed));
+	widget->signal_request_focus.connect(sigc::mem_fun(this, &Child::request_focus));
+	widget->signal_grab_pointer.connect(sigc::mem_fun(this, &Child::grab_pointer));
+	widget->signal_ungrab_pointer.connect(sigc::mem_fun(this, &Child::ungrab_pointer));
 }
 
 Container::Child::~Child()
 {
-	if(widget==container.click_focus)
-		container.click_focus = 0;
+	visibility_changed(false);
 }
 
 void Container::Child::visibility_changed(bool v)
 {
-	if(!v && widget==container.click_focus)
-		container.click_focus = 0;
+	if(!v)
+	{
+		if(widget==container.click_focus)
+			container.click_focus = 0;
+		if(widget==container.pointer_focus)
+			container.set_pointer_focus(0);
+		if(widget==container.input_focus)
+			container.set_input_focus(0);
+	}
+}
+
+void Container::Child::request_focus()
+{
+	container.set_input_focus(widget);
+	if(container.parent && container.visible)
+		container.set_focus();
+}
+
+void Container::Child::grab_pointer()
+{
+	if(!container.pointer_grabbed)
+	{
+		container.set_pointer_focus(widget);
+		container.pointer_grabbed = true;
+		container.signal_grab_pointer.emit();
+	}
+}
+
+void Container::Child::ungrab_pointer()
+{
+	if(container.pointer_grabbed && container.pointer_focus==widget)
+	{
+		// XXX Should set to the widget under pointer
+		container.set_pointer_focus(0);
+		container.pointer_grabbed = false;
+		container.signal_ungrab_pointer.emit();
+	}
 }
 
 } // namespace GLtk