X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=9ff1f2b7a14414ce24adbcb86d943edf8512f2b9;hb=f26ebce547f9b42429d6f7189b3eb6246fcc9164;hp=b95c1908a1b8aae6e51cc5ffb5a47dd53c13202b;hpb=5cc40ecc8f4ae3c875d61b3e844c22c89c019c58;p=chaz%2Fopenbox diff --git a/src/screen.cc b/src/screen.cc index b95c1908..9ff1f2b7 100644 --- a/src/screen.cc +++ b/src/screen.cc @@ -48,7 +48,8 @@ namespace ob { Screen::Screen(int screen) : WidgetBase(WidgetBase::Type_Root), - _number(screen) + _number(screen), + _style(screen, "") { assert(screen >= 0); assert(screen < ScreenCount(**otk::display)); _info = otk::display->screenInfo(screen); @@ -63,8 +64,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()); @@ -73,15 +76,10 @@ Screen::Screen(int screen) XDefineCursor(**otk::display, _info->rootWindow(), openbox->cursors().session); - // initialize the shit that is used for all drawing on the screen - _image_control = new otk::ImageControl(_info, true); - _image_control->installRootColormap(); - _root_cmap_installed = True; - - // initialize the screen's style - _style.setImageControl(_image_control); + // XXX: initialize the screen's style + /* otk::ustring stylepath; - python_get_string("theme", &stylepath); + python_get_string("THEME", &stylepath); otk::Configuration sconfig(false); sconfig.setFile(otk::expandTilde(stylepath.c_str())); if (!sconfig.load()) { @@ -92,6 +90,8 @@ Screen::Screen(int screen) } } _style.load(sconfig); + */ + otk::display->renderControl(_number)->drawRoot(*_style.rootColor()); // set up notification of netwm support changeSupportedAtoms(); @@ -105,18 +105,19 @@ Screen::Screen(int screen) // Set the net_desktop_names property std::vector names; - python_get_stringlist("desktop_names", &names); + python_get_stringlist("DESKTOP_NAMES", &names); otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_desktop_names, otk::Property::utf8, names); // the above set() will cause the updateDesktopNames to fire right away so // we have a list of desktop names - if (!python_get_long("number_of_desktops", &_num_desktops)) + _desktop = 0; + + if (!python_get_long("NUMBER_OF_DESKTOPS", &_num_desktops)) _num_desktops = 1; changeNumDesktops(_num_desktops); // set the hint - _desktop = 0; changeDesktop(0); // set the hint // create the window which gets focus when no clients get it @@ -136,7 +137,7 @@ Screen::Screen(int screen) openbox->registerHandler(_info->rootWindow(), this); // call the python Startup callbacks - EventData data(_number, 0, EventShutdown, 0); + EventData data(_number, 0, EventAction::Startup, 0); openbox->bindings()->fireEvent(&data); } @@ -152,13 +153,11 @@ Screen::~Screen() unmanageWindow(clients.front()); // call the python Shutdown callbacks - EventData data(_number, 0, EventShutdown, 0); + EventData data(_number, 0, EventAction::Shutdown, 0); openbox->bindings()->fireEvent(&data); XDestroyWindow(**otk::display, _focuswindow); XDestroyWindow(**otk::display, _supportwindow); - - delete _image_control; } @@ -214,7 +213,7 @@ void Screen::updateStrut() { _strut.left = _strut.right = _strut.top = _strut.bottom = 0; - Client::List::iterator it, end = clients.end(); + ClientList::iterator it, end = clients.end(); for (it = clients.begin(); it != end; ++it) { const otk::Strut &s = (*it)->strut(); _strut.left = std::max(_strut.left, s.left); @@ -264,9 +263,13 @@ void Screen::calcArea() } #endif // XINERAMA */ - - if (old_area != _area) - // XXX: re-maximize windows + + if (old_area != _area) { + // the area has changed, adjust all the maximized windows + ClientList::iterator it, end = clients.end(); + for (it = clients.begin(); it != end; ++it) + (*it)->remaximize(); + } changeWorkArea(); } @@ -328,16 +331,18 @@ void Screen::changeSupportedAtoms() otk::Property::atoms.net_wm_moveresize_size_bottomright, otk::Property::atoms.net_wm_moveresize_move, */ -/* otk::Property::atoms.net_wm_allowed_actions, otk::Property::atoms.net_wm_action_move, otk::Property::atoms.net_wm_action_resize, + otk::Property::atoms.net_wm_action_minimize, otk::Property::atoms.net_wm_action_shade, +/* otk::Property::atoms.net_wm_action_stick,*/ otk::Property::atoms.net_wm_action_maximize_horz, otk::Property::atoms.net_wm_action_maximize_vert, + otk::Property::atoms.net_wm_action_fullscreen, otk::Property::atoms.net_wm_action_change_desktop, otk::Property::atoms.net_wm_action_close, -*/ + otk::Property::atoms.net_wm_state, otk::Property::atoms.net_wm_state_modal, otk::Property::atoms.net_wm_state_maximized_vert, @@ -368,8 +373,8 @@ void Screen::changeClientList() windows = new Window[size]; win_it = windows; - Client::List::const_iterator it = clients.begin(); - const Client::List::const_iterator end = clients.end(); + ClientList::const_iterator it = clients.begin(); + const ClientList::const_iterator end = clients.end(); for (; it != end; ++it, ++win_it) *win_it = (*it)->window(); } else @@ -399,8 +404,8 @@ void Screen::changeStackingList() windows = new Window[size]; win_it = windows; - Client::List::const_reverse_iterator it = _stacking.rbegin(); - const Client::List::const_reverse_iterator end = _stacking.rend(); + ClientList::const_reverse_iterator it = _stacking.rbegin(); + const ClientList::const_reverse_iterator end = _stacking.rend(); for (; it != end; ++it, ++win_it) *win_it = (*it)->window(); } else @@ -418,7 +423,6 @@ void Screen::changeStackingList() void Screen::changeWorkArea() { unsigned long *dims = new unsigned long[4 * _num_desktops]; for (long i = 0; i < _num_desktops; ++i) { - // XXX: this could be different for each workspace dims[(i * 4) + 0] = _area.x(); dims[(i * 4) + 1] = _area.y(); dims[(i * 4) + 2] = _area.width(); @@ -435,16 +439,34 @@ void Screen::manageWindow(Window window) Client *client = 0; XWMHints *wmhint; XSetWindowAttributes attrib_set; + XEvent e; + XWindowAttributes attrib; otk::display->grab(); + // check if it has already been unmapped by the time we started mapping + // the grab does a sync so we don't have to here + if (XCheckTypedWindowEvent(**otk::display, window, DestroyNotify, &e) || + XCheckTypedWindowEvent(**otk::display, window, UnmapNotify, &e)) { + XPutBackEvent(**otk::display, &e); + + otk::display->ungrab(); + return; // don't manage it + } + + if (!XGetWindowAttributes(**otk::display, window, &attrib) || + attrib.override_redirect) { + otk::display->ungrab(); + return; // don't manage it + } + // is the window a docking app if ((wmhint = XGetWMHints(**otk::display, window))) { if ((wmhint->flags & StateHint) && wmhint->initial_state == WithdrawnState) { //slit->addClient(w); // XXX: make dock apps work! - otk::display->ungrab(); + otk::display->ungrab(); XFree(wmhint); return; } @@ -473,6 +495,12 @@ void Screen::manageWindow(Window window) // create the decoration frame for the client window client->frame = new Frame(client, &_style); + // 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 + // plate except for events for the client (SubstructureRedirectMask) + openbox->clearHandler(client->frame->plate()); + openbox->registerHandler(client->frame->plate(), client); // add to the wm's map openbox->addClient(client->frame->window(), client); @@ -481,7 +509,7 @@ void Screen::manageWindow(Window window) 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_stick(), 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); @@ -490,26 +518,31 @@ void Screen::manageWindow(Window window) // reparent the client to the frame client->frame->grabClient(); - if (!(openbox->state() == Openbox::State_Starting || - client->positionRequested())) { + if (openbox->state() != Openbox::State_Starting) { // position the window intelligenty .. hopefully :) // call the python PLACEWINDOW binding - EventData data(_number, client, EventPlaceWindow, 0); + EventData data(_number, client, EventAction::PlaceWindow, 0); openbox->bindings()->fireEvent(&data); } + EventData ddata(_number, client, EventAction::DisplayingWindow, 0); + openbox->bindings()->fireEvent(&ddata); + // if on the current desktop.. (or all desktops) if (client->desktop() == _desktop || client->desktop() == (signed)0xffffffff) { client->frame->show(); } - - // XXX: handle any requested states such as maximized + + client->applyStartupState(); otk::display->ungrab(); // add to the screen's list clients.push_back(client); + // once the client is in the list, update our strut to include the new + // client's (it is good that this happens after window placement!) + updateStrut(); // this puts into the stacking order, then raises it _stacking.push_back(client); raiseWindow(client); @@ -518,12 +551,12 @@ void Screen::manageWindow(Window window) openbox->bindings()->grabButtons(true, client); - // call the python NEWWINDOW binding - EventData data(_number, client, EventNewWindow, 0); - openbox->bindings()->fireEvent(&data); + EventData ndata(_number, client, EventAction::NewWindow, 0); + openbox->bindings()->fireEvent(&ndata); #ifdef DEBUG - printf("Managed window 0x%lx\n", window); + printf("Managed window 0x%lx frame 0x%lx\n", + window, client->frame->window()); #endif } @@ -533,7 +566,7 @@ void Screen::unmanageWindow(Client *client) Frame *frame = client->frame; // call the python CLOSEWINDOW binding - EventData data(_number, client, EventCloseWindow, 0); + EventData data(_number, client, EventAction::CloseWindow, 0); openbox->bindings()->fireEvent(&data); openbox->bindings()->grabButtons(false, client); @@ -546,7 +579,7 @@ void Screen::unmanageWindow(Client *client) openbox->removeClient(frame->label()); openbox->removeClient(frame->button_max()); openbox->removeClient(frame->button_iconify()); - openbox->removeClient(frame->button_stick()); + openbox->removeClient(frame->button_alldesk()); openbox->removeClient(frame->button_close()); openbox->removeClient(frame->handle()); openbox->removeClient(frame->grip_left()); @@ -568,6 +601,9 @@ void Screen::unmanageWindow(Client *client) // reparent the window out of the frame frame->releaseClient(); +#ifdef DEBUG + Window framewin = client->frame->window(); +#endif delete client->frame; client->frame = 0; @@ -577,11 +613,18 @@ void Screen::unmanageWindow(Client *client) // remove from the screen's list clients.remove(client); + // once the client is out of the list, update our strut to remove it's + // influence + updateStrut(); + + // unset modal before dropping our focus + client->setModal(false); + // unfocus the client (calls the focus callbacks) client->unfocus(); #ifdef DEBUG - printf("Unmanaged window 0x%lx\n", client->window()); + printf("Unmanaged window 0x%lx frame 0x%lx\n", client->window(), framewin); #endif delete client; @@ -596,17 +639,31 @@ void Screen::lowerWindow(Client *client) assert(!_stacking.empty()); // this would be bad - Client::List::iterator it = --_stacking.end(); - Client::List::const_iterator end = _stacking.begin(); + ClientList::iterator it = --_stacking.end(); + const ClientList::iterator end = _stacking.begin(); - for (; it != end && (*it)->layer() < client->layer(); --it); - if (*it == client) return; // already the bottom, return + if (client->modal() && client->transientFor()) { + // don't let a modal window lower below its transient_for + it = std::find(_stacking.begin(), _stacking.end(), client->transientFor()); + assert(it != _stacking.end()); - wins[0] = (*it)->frame->window(); - wins[1] = client->frame->window(); + wins[0] = (it == _stacking.begin() ? _focuswindow : + ((*(--ClientList::const_iterator(it)))->frame->window())); + wins[1] = client->frame->window(); + if (wins[0] == wins[1]) return; // already right above the window - _stacking.remove(client); - _stacking.insert(++it, client); + _stacking.remove(client); + _stacking.insert(it, client); + } else { + for (; it != end && (*it)->layer() < client->layer(); --it); + if (*it == client) return; // already the bottom, return + + wins[0] = (*it)->frame->window(); + wins[1] = client->frame->window(); + + _stacking.remove(client); + _stacking.insert(++it, client); + } XRestackWindows(**otk::display, wins, 2); changeStackingList(); @@ -621,8 +678,8 @@ void Screen::raiseWindow(Client *client) // remove the client before looking so we can't run into ourselves _stacking.remove(client); - Client::List::iterator it = _stacking.begin(); - Client::List::const_iterator end = _stacking.end(); + ClientList::iterator it = _stacking.begin(); + const ClientList::iterator end = _stacking.end(); // the stacking list is from highest to lowest for (; it != end && (*it)->layer() > client->layer(); ++it); @@ -632,13 +689,18 @@ void Screen::raiseWindow(Client *client) otherwise, we want to stack under the previous window in the stack. */ wins[0] = (it == _stacking.begin() ? _focuswindow : - ((*(--Client::List::const_iterator(it)))->frame->window())); + ((*(--ClientList::const_iterator(it)))->frame->window())); wins[1] = client->frame->window(); _stacking.insert(it, client); XRestackWindows(**otk::display, wins, 2); - changeStackingList(); + + // 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! } void Screen::changeDesktop(long desktop) @@ -656,7 +718,7 @@ void Screen::changeDesktop(long desktop) if (old == _desktop) return; - Client::List::iterator it, end = clients.end(); + ClientList::iterator it, end = clients.end(); for (it = clients.begin(); it != end; ++it) { if ((*it)->desktop() == old) { (*it)->frame->hide(); @@ -676,8 +738,24 @@ void Screen::changeNumDesktops(long num) if (!(num > 0)) return; - // XXX: move windows on desktops that will no longer exist! - + // move windows on desktops that will no longer exist! + ClientList::iterator it, end = clients.end(); + for (it = clients.begin(); it != end; ++it) { + int d = (*it)->desktop(); + if (d >= num && !(d == (signed) 0xffffffff || + d == Client::ICONIC_DESKTOP)) { + XEvent ce; + ce.xclient.type = ClientMessage; + ce.xclient.message_type = otk::Property::atoms.net_wm_desktop; + ce.xclient.display = **otk::display; + ce.xclient.window = (*it)->window(); + ce.xclient.format = 32; + ce.xclient.data.l[0] = num - 1; + XSendEvent(**otk::display, _info->rootWindow(), False, + SubstructureNotifyMask | SubstructureRedirectMask, &ce); + } + } + _num_desktops = num; otk::Property::set(_info->rootWindow(), otk::Property::atoms.net_number_of_desktops, @@ -694,6 +772,10 @@ void Screen::changeNumDesktops(long num) // update the work area hint changeWorkArea(); + + // change our desktop if we're on one that no longer exists! + if (_desktop >= num) + changeDesktop(num - 1); } @@ -724,13 +806,23 @@ void Screen::setDesktopName(long i, const otk::ustring &name) } +void Screen::installColormap(bool install) const +{ + if (install) + XInstallColormap(**otk::display, _info->colormap()); + else + XUninstallColormap(**otk::display, _info->colormap()); +} + + void Screen::propertyHandler(const XPropertyEvent &e) { otk::EventHandler::propertyHandler(e); // compress changes to a single property into a single change XEvent ce; - while (XCheckTypedEvent(**otk::display, e.type, &ce)) { + while (XCheckTypedWindowEvent(**otk::display, _info->rootWindow(), + e.type, &ce)) { // XXX: it would be nice to compress ALL changes to a property, not just // changes in a row without other props between. if (ce.xproperty.atom != e.atom) { @@ -755,7 +847,6 @@ void Screen::clientMessageHandler(const XClientMessageEvent &e) } else if (e.message_type == otk::Property::atoms.net_number_of_desktops) { changeNumDesktops(e.data.l[0]); } - // XXX: so many client messages to handle here! ..or not.. they go to clients } @@ -767,30 +858,13 @@ void Screen::mapRequestHandler(const XMapRequestEvent &e) printf("MapRequest for 0x%lx\n", e.window); #endif // DEBUG - /* - MapRequest events come here even after the window exists instead of going - right to the client window, because of how they are sent and their struct - layout. - */ Client *c = openbox->findClient(e.window); - if (c) { - // send a net_active_window message - XEvent ce; - ce.xclient.type = ClientMessage; - ce.xclient.message_type = otk::Property::atoms.net_active_window; - ce.xclient.display = **otk::display; - ce.xclient.window = c->window(); - ce.xclient.format = 32; - ce.xclient.data.l[0] = 0l; - ce.xclient.data.l[1] = 0l; - ce.xclient.data.l[2] = 0l; - ce.xclient.data.l[3] = 0l; - ce.xclient.data.l[4] = 0l; - XSendEvent(**otk::display, _info->rootWindow(), false, - SubstructureRedirectMask | SubstructureNotifyMask, - &ce); +#ifdef DEBUG + printf("DEBUG: MAP REQUEST CAUGHT IN SCREEN. IGNORED.\n"); +#endif } else manageWindow(e.window); } + }