X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpanel.cpp;h=14e9b6ea8cc3dbf97b9c57f4f673df53870bacc2;hb=8a0058b5b90bb7e9eacf1646142f4d73b426fd66;hp=ac277a98ae1bfaa4b4823fd0ffe83401f2d73eb4;hpb=3fb1cc7fe7ffa3948af1a81d1cac91d1313b2452;p=libs%2Fgltk.git diff --git a/source/panel.cpp b/source/panel.cpp index ac277a9..14e9b6e 100644 --- a/source/panel.cpp +++ b/source/panel.cpp @@ -1,7 +1,7 @@ /* $Id$ This file is part of libmspgltk -Copyright © 2007 Mikko Rasa, Mikkosoft Productions +Copyright © 2007-2009 Mikko Rasa, Mikkosoft Productions Distributed under the LGPL */ @@ -27,112 +27,73 @@ namespace GLtk { Panel::Panel(const Resources &r): Widget(r), + Container(r), pointer_focus(0), - pointer_grab(0), + pointer_grabbed(false), input_focus(0) { update_style(); } -Panel::~Panel() -{ - while(!children.empty()) - delete children.front(); -} - -void Panel::add(Widget &wdg) -{ - set_parent(wdg, this); - children.push_back(&wdg); -} - -void Panel::remove(Widget &wdg) -{ - ChildSeq::iterator i=find(children.begin(), children.end(), &wdg); - if(i!=children.end()) - { - if(&wdg==pointer_focus) - set_pointer_focus(0, 0); - if(&wdg==input_focus) - set_input_focus(0); - - set_parent(wdg, 0); - children.erase(i); - } -} - void Panel::raise(Widget &wdg) { - ChildSeq::iterator i=find(children.begin(), children.end(), &wdg); - if(i!=children.end()) - { - children.erase(i); - children.push_back(&wdg); - } + for(list::iterator i=children.begin(); i!=children.end(); ++i) + if((*i)->widget==&wdg) + { + children.splice(children.end(), children, i); + return; + } + + throw InvalidState("That Widget is not in this Panel"); } void Panel::button_press(int x, int y, unsigned btn) { - if(pointer_grab>0) + if(pointer_grabbed) { const Geometry &cgeom=pointer_focus->get_geometry(); pointer_focus->button_press(x-cgeom.x, y-cgeom.y, btn); } - else if(geom.is_inside_relative(x, y)) + else { if(Widget *wdg=get_child_at(x, y)) { - set_pointer_focus(wdg, btn); + set_pointer_focus(wdg); set_input_focus(wdg); - - const Geometry &cgeom=wdg->get_geometry(); - wdg->button_press(x-cgeom.x, y-cgeom.y, btn); } + Container::button_press(x, y, btn); } } void Panel::button_release(int x, int y, unsigned btn) { - if(pointer_grab>0) + if(pointer_grabbed) { const Geometry &cgeom=pointer_focus->get_geometry(); pointer_focus->button_release(x-cgeom.x, y-cgeom.y, btn); - - if(btn==pointer_grab) - set_pointer_focus(get_child_at(x, y), 0); - } - else if(geom.is_inside_relative(x, y)) - { - if(Widget *wdg=get_child_at(x, y)) - { - const Geometry &cgeom=wdg->get_geometry(); - wdg->button_release(x-cgeom.x, y-cgeom.y, btn); - } } + else + Container::button_release(x, y, btn); } void Panel::pointer_motion(int x, int y) { - if(pointer_grab>0) + if(pointer_grabbed) { const Geometry &cgeom=pointer_focus->get_geometry(); pointer_focus->pointer_motion(x-cgeom.x, y-cgeom.y); } - else if(geom.is_inside_relative(x, y)) + else { - Widget *wdg=get_child_at(x, y); - set_pointer_focus(wdg, 0); - if(wdg) - { - const Geometry &cgeom=wdg->get_geometry(); - wdg->pointer_motion(x-cgeom.x, y-cgeom.y); - } + set_pointer_focus(get_child_at(x, y)); + Container::pointer_motion(x, y); } } void Panel::pointer_leave() { - set_pointer_focus(0, 0); + Container::pointer_leave(); + set_pointer_focus(0); } void Panel::key_press(unsigned key, unsigned mod, wchar_t ch) @@ -152,43 +113,23 @@ void Panel::focus_out() set_input_focus(0); } -void Panel::child_hidden(Widget &wdg) -{ - if(&wdg==pointer_focus) - set_pointer_focus(0, 0); -} - -void Panel::grab_pointer(Widget &wdg) -{ - if(pointer_grab==0 || pointer_focus==&wdg) - set_pointer_focus(&wdg, 255); - else - throw InvalidState("Pointer is already grabbed"); -} - -void Panel::ungrab_pointer(Widget &wdg) -{ - if(pointer_focus==&wdg) - set_pointer_focus(0, 0); - else if(pointer_grab>0) - throw Exception("Someone is trying to steal the pointer!"); -} - void Panel::render_special(const Part &part) const { if(part.get_name()=="children") { - for(ChildSeq::const_iterator i=children.begin(); i!=children.end(); ++i) - if((*i)->is_visible()) - (*i)->render(); + for(list::const_iterator i=children.begin(); i!=children.end(); ++i) + if((*i)->widget->is_visible()) + (*i)->widget->render(); } } -void Panel::set_pointer_focus(Widget *wdg, int grab) +Panel::Child *Panel::create_child(Widget *wdg) { - if(grab>0 && !wdg) - throw InvalidParameterValue("Can't grab on null widget"); + return new Child(*this, wdg); +} +void Panel::set_pointer_focus(Widget *wdg) +{ if(wdg!=pointer_focus) { if(pointer_focus) @@ -199,8 +140,6 @@ void Panel::set_pointer_focus(Widget *wdg, int grab) if(pointer_focus) pointer_focus->pointer_enter(); } - - pointer_grab=grab; } void Panel::set_input_focus(Widget *wdg) @@ -213,19 +152,13 @@ void Panel::set_input_focus(Widget *wdg) input_focus=wdg; if(input_focus) + { + raise(*wdg); input_focus->focus_in(); + } } } -Widget *Panel::get_child_at(int x, int y) -{ - for(ChildSeq::reverse_iterator i=children.rbegin(); i!=children.rend(); ++i) - if((*i)->is_visible() && (*i)->get_geometry().is_inside(x, y)) - return *i; - - return 0; -} - Panel::Loader::Loader(Panel &p, map &m): Widget::Loader(p), @@ -262,5 +195,60 @@ void Panel::Loader::panel(const string &n) wdg_map[n]=p.release(); } + +Panel::Child::Child(Panel &p, Widget *w): + Container::Child(p, 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)); +} + +Panel::Child::~Child() +{ + visibility_changed(false); +} + +void Panel::Child::visibility_changed(bool v) +{ + if(!v) + { + Panel &panel=static_cast(container); + if(widget==panel.pointer_focus) + panel.set_pointer_focus(0); + if(widget==panel.input_focus) + panel.set_input_focus(0); + } +} + +void Panel::Child::request_focus() +{ + static_cast(container).set_input_focus(widget); +} + +void Panel::Child::grab_pointer() +{ + Panel &panel=static_cast(container); + if(!panel.pointer_grabbed) + { + panel.set_pointer_focus(widget); + panel.pointer_grabbed=true; + panel.signal_grab_pointer.emit(); + } +} + +void Panel::Child::ungrab_pointer() +{ + Panel &panel=static_cast(container); + if(panel.pointer_grabbed && panel.pointer_focus==widget) + { + // XXX Should set to the widget under pointer + panel.set_pointer_focus(0); + panel.pointer_grabbed=false; + panel.signal_ungrab_pointer.emit(); + } +} + } // namespace GLtk } // namespace Msp