X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fscreen.cc;h=947471c241b8341ca50976b646b450e0b268e27a;hb=3c61812e588fb3c34d0713d7f82ccbf21091f032;hp=3c63aa3489445276886f2a9cf35bfdb7bafae70e;hpb=06a80ce2c7a189e26063d5e4e475ca500778aba5;p=chaz%2Fopenbox diff --git a/src/screen.cc b/src/screen.cc index 3c63aa34..947471c2 100644 --- a/src/screen.cc +++ b/src/screen.cc @@ -37,14 +37,15 @@ namespace ob { OBScreen::OBScreen(int screen, const otk::Configuration &config) - : _number(screen) + : _number(screen), + _root(screen) { assert(screen >= 0); assert(screen < ScreenCount(otk::OBDisplay::display)); _info = otk::OBDisplay::screenInfo(screen); ::running = false; XErrorHandler old = XSetErrorHandler(::anotherWMRunning); - XSelectInput(otk::OBDisplay::display, _info->getRootWindow(), + XSelectInput(otk::OBDisplay::display, _info->rootWindow(), OBScreen::event_mask); XSync(otk::OBDisplay::display, false); XSetErrorHandler(old); @@ -53,15 +54,15 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config) if (! _managed) return; // was unable to manage the screen printf(_("Managing screen %d: visual 0x%lx, depth %d\n"), - _number, XVisualIDFromVisual(_info->getVisual()), _info->getDepth()); + _number, XVisualIDFromVisual(_info->visual()), _info->depth()); - Openbox::instance->property()->set(_info->getRootWindow(), + Openbox::instance->property()->set(_info->rootWindow(), otk::OBProperty::openbox_pid, otk::OBProperty::Atom_Cardinal, (unsigned long) getpid()); // set the mouse cursor for the root window (the default cursor) - XDefineCursor(otk::OBDisplay::display, _info->getRootWindow(), + XDefineCursor(otk::OBDisplay::display, _info->rootWindow(), Openbox::instance->cursors().session); // initialize the shit that is used for all drawing on the screen @@ -76,14 +77,14 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config) // Set the netwm atoms for geomtery and viewport - unsigned long geometry[] = { _size.x(), - _size.y() }; - Openbox::instance->property()->set(_info->getRootWindow(), + unsigned long geometry[] = { _info->width(), + _info->height() }; + Openbox::instance->property()->set(_info->rootWindow(), otk::OBProperty::net_desktop_geometry, otk::OBProperty::Atom_Cardinal, geometry, 2); unsigned long viewport[] = { 0, 0 }; - Openbox::instance->property()->set(_info->getRootWindow(), + Openbox::instance->property()->set(_info->rootWindow(), otk::OBProperty::net_desktop_viewport, otk::OBProperty::Atom_Cardinal, viewport, 2); @@ -92,10 +93,6 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config) // the manageExising() function setClientList(); // initialize the client lists, which will be empty calcArea(); // initialize the available working area - - manageExisting(); - - // XXX: "change to" the first workspace to initialize stuff } @@ -104,8 +101,8 @@ OBScreen::~OBScreen() if (! _managed) return; // unmanage all windows - while (!_clients.empty()) - unmanageWindow(_clients[0]); + while (!clients.empty()) + unmanageWindow(clients.front()); delete _image_control; } @@ -115,7 +112,7 @@ void OBScreen::manageExisting() { unsigned int i, j, nchild; Window r, p, *children; - XQueryTree(otk::OBDisplay::display, _info->getRootWindow(), &r, &p, + XQueryTree(otk::OBDisplay::display, _info->rootWindow(), &r, &p, &children, &nchild); // preen the window list of all icon windows... for better dockapp support @@ -208,8 +205,8 @@ void OBScreen::calcArea() } _area.setRect(current_left, current_top, - _info->getWidth() - (current_left + current_right), - _info->getHeight() - (current_top + current_bottom)); + _info->width() - (current_left + current_right), + _info->height() - (current_top + current_bottom)); /* #ifdef XINERAMA @@ -246,24 +243,24 @@ void OBScreen::setClientList() Window *windows; // create an array of the window ids - if (_clients.size() > 0) { + if (clients.size() > 0) { Window *win_it; - windows = new Window[_clients.size()]; + windows = new Window[clients.size()]; win_it = windows; - ClientList::const_iterator it = _clients.begin(); - const ClientList::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 windows = (Window*) 0; - Openbox::instance->property()->set(_info->getRootWindow(), + Openbox::instance->property()->set(_info->rootWindow(), otk::OBProperty::net_client_list, otk::OBProperty::Atom_Window, - windows, _clients.size()); + windows, clients.size()); - if (_clients.size()) + if (clients.size()) delete [] windows; setStackingList(); @@ -291,7 +288,7 @@ void OBScreen::setStackingList() void OBScreen::setWorkArea() { unsigned long area[] = { _area.x(), _area.y(), _area.width(), _area.height() }; - Openbox::instance->property()->set(_info->getRootWindow(), + Openbox::instance->property()->set(_info->rootWindow(), otk::OBProperty::net_workarea, otk::OBProperty::Atom_Cardinal, area, 4); @@ -331,8 +328,6 @@ void OBScreen::manageWindow(Window window) XWMHints *wmhint; XSetWindowAttributes attrib_set; - // XXX: manage the window, i.e. grab events n shit - // is the window a docking app if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) { if ((wmhint->flags & StateHint) && @@ -344,18 +339,23 @@ void OBScreen::manageWindow(Window window) XFree(wmhint); } + otk::OBDisplay::grab(); + // choose the events we want to receive on the CLIENT window attrib_set.event_mask = OBClient::event_mask; - attrib_set.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask; + attrib_set.do_not_propagate_mask = OBClient::no_propagate_mask; XChangeWindowAttributes(otk::OBDisplay::display, window, CWEventMask|CWDontPropagate, &attrib_set); // create the OBClient class, which gets all of the hints on the window - Openbox::instance->addClient(window, client = new OBClient(_number, window)); + client = new OBClient(_number, window); + // register for events + Openbox::instance->registerHandler(window, client); + // add to the wm's map + Openbox::instance->addClient(window, client); // we dont want a border on the client - XSetWindowBorderWidth(otk::OBDisplay::display, window, 0); + client->toggleClientBorder(false); // specify that if we exit, the window should not be destroyed and should be // reparented back to root automatically @@ -368,25 +368,29 @@ void OBScreen::manageWindow(Window window) // create the decoration frame for the client window client->frame = new OBFrame(client, &_style); - // add all the client's decoration windows as event handlers for the client + // add to the wm's map Openbox::instance->addClient(client->frame->window(), client); + Openbox::instance->addClient(client->frame->plate(), client); Openbox::instance->addClient(client->frame->titlebar(), client); - Openbox::instance->addClient(client->frame->buttonIconify(), client); - Openbox::instance->addClient(client->frame->buttonMax(), client); - Openbox::instance->addClient(client->frame->buttonStick(), client); - Openbox::instance->addClient(client->frame->buttonClose(), client); Openbox::instance->addClient(client->frame->label(), client); + Openbox::instance->addClient(client->frame->button_max(), client); + Openbox::instance->addClient(client->frame->button_iconify(), client); + Openbox::instance->addClient(client->frame->button_stick(), client); + Openbox::instance->addClient(client->frame->button_close(), client); Openbox::instance->addClient(client->frame->handle(), client); - Openbox::instance->addClient(client->frame->gripLeft(), client); - Openbox::instance->addClient(client->frame->gripRight(), client); - + Openbox::instance->addClient(client->frame->grip_left(), client); + Openbox::instance->addClient(client->frame->grip_right(), client); + // XXX: if on the current desktop.. - XMapWindow(otk::OBDisplay::display, client->frame->window()); + client->frame->show(); // XXX: handle any requested states such as shaded/maximized + otk::OBDisplay::ungrab(); - _clients.push_back(client); + // add to the screen's list + clients.push_back(client); + // update the root properties setClientList(); } @@ -396,6 +400,22 @@ void OBScreen::unmanageWindow(OBClient *client) OBFrame *frame = client->frame; // XXX: pass around focus if this window was focused + + // remove from the wm's map + Openbox::instance->removeClient(client->window()); + Openbox::instance->removeClient(frame->window()); + Openbox::instance->removeClient(frame->plate()); + Openbox::instance->removeClient(frame->titlebar()); + Openbox::instance->removeClient(frame->label()); + Openbox::instance->removeClient(frame->button_max()); + Openbox::instance->removeClient(frame->button_iconify()); + Openbox::instance->removeClient(frame->button_stick()); + Openbox::instance->removeClient(frame->button_close()); + Openbox::instance->removeClient(frame->handle()); + Openbox::instance->removeClient(frame->grip_left()); + Openbox::instance->removeClient(frame->grip_right()); + // unregister for handling events + Openbox::instance->clearHandler(client->window()); // remove the window from our save set XChangeSaveSet(otk::OBDisplay::display, client->window(), SetModeDelete); @@ -403,37 +423,19 @@ void OBScreen::unmanageWindow(OBClient *client) // we dont want events no more XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask); - XUnmapWindow(otk::OBDisplay::display, frame->window()); - - // we dont want a border on the client - XSetWindowBorderWidth(otk::OBDisplay::display, client->window(), - client->borderWidth()); + frame->hide(); - // remove the client class from the search list - Openbox::instance->removeClient(client->window()); - // remove the frame's decor elements as event handlers for the client - Openbox::instance->removeClient(frame->window()); - Openbox::instance->removeClient(frame->titlebar()); - Openbox::instance->removeClient(frame->buttonIconify()); - Openbox::instance->removeClient(frame->buttonMax()); - Openbox::instance->removeClient(frame->buttonStick()); - Openbox::instance->removeClient(frame->buttonClose()); - Openbox::instance->removeClient(frame->label()); - Openbox::instance->removeClient(frame->handle()); - Openbox::instance->removeClient(frame->gripLeft()); - Openbox::instance->removeClient(frame->gripRight()); + // give the client its border back + client->toggleClientBorder(true); delete client->frame; client->frame = 0; - ClientList::iterator it = _clients.begin(), end = _clients.end(); - for (; it != end; ++it) - if (*it == client) { - _clients.erase(it); - break; - } + // remove from the screen's list + clients.remove(client); delete client; + // update the root properties setClientList(); }