X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=2c49c6cc5c16684cbfaae773af7b9271a5156a2d;hb=43c1f2a8f84d8008155d6df8e2bcd35534c62893;hp=db0cb862919c91860aeef2311a09fffef055cae3;hpb=220b5c40f91c6509951ccd0d506a9bd77d9d6bac;p=chaz%2Fopenbox diff --git a/src/screen.cc b/src/screen.cc index db0cb862..2c49c6cc 100644 --- a/src/screen.cc +++ b/src/screen.cc @@ -1,18 +1,8 @@ // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*- -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif +#include "config.h" extern "C" { -#ifdef HAVE_STDIO_H -# include -#endif // HAVE_STDIO_H - -#ifdef HAVE_STRING_H -# include -#endif // HAVE_STRING_H - #ifdef HAVE_UNISTD_H # include # include @@ -33,6 +23,8 @@ extern "C" { #include #include +#include +#include static bool running; static int anotherWMRunning(Display *display, XErrorEvent *) { @@ -47,9 +39,7 @@ namespace ob { Screen::Screen(int screen) - : WidgetBase(WidgetBase::Type_Root), - _number(screen), - _style(screen, "") + : _number(screen) { assert(screen >= 0); assert(screen < ScreenCount(**otk::display)); _info = otk::display->screenInfo(screen); @@ -64,8 +54,10 @@ Screen::Screen(int screen) _managed = !::running; if (! _managed) return; // was unable to manage the screen +#ifdef DEBUG printf(_("Managing screen %d: visual 0x%lx, depth %d\n"), _number, XVisualIDFromVisual(_info->visual()), _info->depth()); +#endif otk::Property::set(_info->rootWindow(), otk::Property::atoms.openbox_pid, otk::Property::atoms.cardinal, (unsigned long) getpid()); @@ -89,14 +81,15 @@ Screen::Screen(int screen) } _style.load(sconfig); */ - otk::display->renderControl(_number)->drawRoot(*_style.rootColor()); + otk::display->renderControl(_number)-> + drawRoot(*otk::RenderStyle::style(_number)->rootColor()); // set up notification of netwm support changeSupportedAtoms(); // Set the netwm properties for geometry - unsigned long geometry[] = { _info->width(), - _info->height() }; + unsigned long geometry[] = { _info->size().width(), + _info->size().height() }; otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_desktop_geometry, otk::Property::atoms.cardinal, geometry, 2); @@ -235,9 +228,9 @@ void Screen::calcArea() #endif // XINERAMA */ - _area.setRect(_strut.left, _strut.top, - _info->width() - (_strut.left + _strut.right), - _info->height() - (_strut.top + _strut.bottom)); + _area = otk::Rect(_strut.left, _strut.top, + _info->size().width() - (_strut.left + _strut.right), + _info->size().height() - (_strut.top + _strut.bottom)); /* #ifdef XINERAMA @@ -492,7 +485,7 @@ void Screen::manageWindow(Window window) XChangeSaveSet(**otk::display, window, SetModeInsert); // create the decoration frame for the client window - client->frame = new Frame(client, &_style); + client->frame = new Frame(client); // register the plate for events (map req's) // this involves removing itself from the handler list first, since it is // auto added to the list, being a widget. we won't get any events on the @@ -501,17 +494,10 @@ void Screen::manageWindow(Window window) openbox->registerHandler(client->frame->plate(), client); // add to the wm's map - openbox->addClient(client->frame->window(), client); - openbox->addClient(client->frame->plate(), client); - openbox->addClient(client->frame->titlebar(), client); - openbox->addClient(client->frame->label(), client); - openbox->addClient(client->frame->button_max(), client); - openbox->addClient(client->frame->button_iconify(), client); - openbox->addClient(client->frame->button_alldesk(), client); - openbox->addClient(client->frame->button_close(), client); - openbox->addClient(client->frame->handle(), client); - openbox->addClient(client->frame->grip_left(), client); - openbox->addClient(client->frame->grip_right(), client); + Window *w = client->frame->allWindows(); + for (unsigned int i = 0; w[i]; ++i) + openbox->addClient(w[i], client); + delete [] w; // reparent the client to the frame client->frame->grabClient(); @@ -571,17 +557,10 @@ void Screen::unmanageWindow(Client *client) // remove from the wm's map openbox->removeClient(client->window()); - openbox->removeClient(frame->window()); - openbox->removeClient(frame->plate()); - openbox->removeClient(frame->titlebar()); - openbox->removeClient(frame->label()); - openbox->removeClient(frame->button_max()); - openbox->removeClient(frame->button_iconify()); - openbox->removeClient(frame->button_alldesk()); - openbox->removeClient(frame->button_close()); - openbox->removeClient(frame->handle()); - openbox->removeClient(frame->grip_left()); - openbox->removeClient(frame->grip_right()); + Window *w = frame->allWindows(); + for (unsigned int i = 0; w[i]; ++i) + openbox->addClient(w[i], client); + delete [] w; // unregister for handling events openbox->clearHandler(client->window()); @@ -616,7 +595,7 @@ void Screen::unmanageWindow(Client *client) updateStrut(); // unset modal before dropping our focus - client->setModal(false); + client->_modal = false; // unfocus the client (calls the focus callbacks) client->unfocus(); @@ -673,6 +652,10 @@ void Screen::raiseWindow(Client *client) assert(!_stacking.empty()); // this would be bad + Client *m = client->findModalChild(); + // if we have a modal child, raise it instead, we'll go along tho later + if (m) raiseWindow(m); + // remove the client before looking so we can't run into ourselves _stacking.remove(client); @@ -680,7 +663,10 @@ void Screen::raiseWindow(Client *client) const ClientList::iterator end = _stacking.end(); // the stacking list is from highest to lowest - for (; it != end && (*it)->layer() > client->layer(); ++it); +// for (;it != end, ++it) { +// if ((*it)->layer() <= client->layer() && m != *it) break; +// } + for (; it != end && ((*it)->layer() > client->layer() || m == *it); ++it); /* if our new position is the top, we want to stack under the _focuswindow @@ -694,11 +680,7 @@ void Screen::raiseWindow(Client *client) XRestackWindows(**otk::display, wins, 2); - // if the window has a modal child, then raise it after us to put it on top - if (client->modalChild()) - raiseWindow(client->modalChild()); - else - changeStackingList(); // no need to do this twice! + changeStackingList(); } void Screen::changeDesktop(long desktop)