X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcontainer.cpp;h=a806ccd3ce6cd3cecb9cb02f0b8eb9d8051f81dd;hb=2e3bb9608ef4c74a8ba9c101ba24b68285405090;hp=a755644bab6283bf3b6f7eb575befba32a3003d6;hpb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;p=libs%2Fgltk.git diff --git a/source/container.cpp b/source/container.cpp index a755644..a806ccd 100644 --- a/source/container.cpp +++ b/source/container.cpp @@ -1,10 +1,3 @@ -/* $Id$ - -This file is part of libmspgltk -Copyright © 2009 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - #include "container.h" using namespace std; @@ -12,10 +5,17 @@ using namespace std; namespace Msp { namespace GLtk { -Container::Container(const Resources &r): - Widget(r), +hierarchy_error::hierarchy_error(const string &w): + logic_error(w) +{ } + + +Container::Container(): click_focus(0), - click_button(0) + click_button(0), + pointer_focus(0), + pointer_grabbed(false), + input_focus(0) { } Container::~Container() @@ -26,8 +26,9 @@ Container::~Container() void Container::add(Widget &wdg) { - set_parent(wdg, this); + wdg.set_parent(this); children.push_back(create_child(&wdg)); + on_child_added(wdg); } void Container::remove(Widget &wdg) @@ -35,13 +36,19 @@ void Container::remove(Widget &wdg) for(list::iterator i=children.begin(); i!=children.end(); ++i) if((*i)->widget==&wdg) { - set_parent(wdg, 0); + wdg.set_parent(0); delete *i; children.erase(i); + on_child_removed(wdg); return; } - throw InvalidState("That Widget is not in this Container"); + throw hierarchy_error("widget not in container"); +} + +Container::Child *Container::create_child(Widget *wdg) +{ + return new Child(*this, wdg); } list Container::get_children() const @@ -63,84 +70,171 @@ Widget *Container::get_child_at(int x, int y) Widget *Container::get_descendant_at(int x, int y) { - Widget *wdg=get_child_at(x, y); - if(Container *cont=dynamic_cast(wdg)) + Widget *wdg = get_child_at(x, y); + if(Container *cont = dynamic_cast(wdg)) { - const Geometry &cgeom=wdg->get_geometry(); - return cont->get_descendant_at(x-cgeom.x, y-cgeom.y); + const Geometry &cgeom = wdg->get_geometry(); + Widget *wdg2 = cont->get_descendant_at(x-cgeom.x, y-cgeom.y); + if(wdg2) + return wdg2; } return wdg; } -void Container::button_press(int x, int y, unsigned btn) +void Container::raise(Widget &wdg) { - if(click_focus) + for(list::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) { - const Geometry &cgeom=click_focus->get_geometry(); - click_focus->button_press(x-cgeom.x, y-cgeom.y, btn); + if(pointer_focus) + pointer_focus->pointer_leave(); + + pointer_focus = wdg; + + if(pointer_focus) + pointer_focus->pointer_enter(); } - else +} + +void Container::set_input_focus(Widget *wdg) +{ + if(wdg!=input_focus) { - if(Widget *wdg=get_child_at(x, y)) - { - click_focus=wdg; - click_button=btn; + if(input_focus) + input_focus->focus_out(); + + input_focus = wdg; - const Geometry &cgeom=wdg->get_geometry(); - wdg->button_press(x-cgeom.x, y-cgeom.y, btn); + if(input_focus) + { + raise(*wdg); + input_focus->focus_in(); } } } -void Container::button_release(int x, int y, unsigned btn) +Widget *Container::get_final_input_focus() const +{ + if(Container *container = dynamic_cast(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(Widget *child = get_pointer_target(x, y)) { - Widget *wdg=click_focus; + if(!click_focus) + { + set_pointer_focus(child); + if(child->is_focusable()) + set_input_focus(child); - if(btn==click_button) - click_focus=0; + click_focus = child; + click_button = btn; + } - const Geometry &cgeom=wdg->get_geometry(); - wdg->button_release(x-cgeom.x, y-cgeom.y, btn); + const Geometry &cgeom = child->get_geometry(); + child->button_press(x-cgeom.x, y-cgeom.y, btn); } - else +} + +void Container::button_release(int x, int y, unsigned btn) +{ + if(Widget *child = get_pointer_target(x, y)) { - if(Widget *wdg=get_child_at(x, y)) + if(child==click_focus && btn==click_button) { - const Geometry &cgeom=wdg->get_geometry(); - wdg->button_release(x-cgeom.x, y-cgeom.y, btn); + click_focus = 0; + if(!pointer_focus) + set_pointer_focus(get_child_at(x, y)); } + + const Geometry &cgeom = child->get_geometry(); + child->button_release(x-cgeom.x, y-cgeom.y, btn); } } void Container::pointer_motion(int x, int y) { - if(click_focus) + Widget *child = get_pointer_target(x, y); + if(!pointer_grabbed) + set_pointer_focus((!click_focus || child->get_geometry().is_inside(x, y)) ? child : 0); + + if(child) { - const Geometry &cgeom=click_focus->get_geometry(); - click_focus->pointer_motion(x-cgeom.x, y-cgeom.y); + const Geometry &cgeom = child->get_geometry(); + child->pointer_motion(x-cgeom.x, y-cgeom.y); } +} + +Widget *Container::get_pointer_target(int x, int y) +{ + if(pointer_grabbed) + return pointer_focus; + else if(click_focus) + return click_focus; 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); - } + Widget *child = get_child_at(x, y); + if(child && child->is_enabled()) + return child; + else + return 0; } } void Container::pointer_leave() { Widget::pointer_leave(); - click_focus=0; + set_pointer_focus(0); } -Container::Child *Container::create_child(Widget *wdg) +void Container::key_press(unsigned key, unsigned mod) { - return new Child(*this, wdg); + 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() +{ + for(list::iterator i=children.begin(); i!=children.end(); ++i) + { + if(Container *c = dynamic_cast((*i)->widget)) + c->on_reparent(); + (*i)->widget->update_style(); + } } @@ -149,18 +243,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