#include "client.hh"
#include "openbox.hh"
#include "frame.hh"
+#include "bindings.hh"
#include "otk/display.hh"
static bool running;
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);
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
// Set the netwm atoms for geomtery and viewport
- unsigned long geometry[] = { _info->getWidth(),
- _info->getHeight() };
- 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);
+ // create the window which gets focus when no clients get it
+ XSetWindowAttributes attr;
+ attr.override_redirect = true;
+ _focuswindow = XCreateWindow(otk::OBDisplay::display, _info->rootWindow(),
+ -100, -100, 1, 1, 0, 0, InputOnly,
+ _info->visual(), CWOverrideRedirect, &attr);
+ XMapWindow(otk::OBDisplay::display, _focuswindow);
+
// these may be further updated if any pre-existing windows are found in
// the manageExising() function
setClientList(); // initialize the client lists, which will be empty
if (! _managed) return;
// unmanage all windows
- while (!_clients.empty())
- unmanageWindow(_clients.front());
+ while (!clients.empty())
+ unmanageWindow(clients.front());
delete _image_control;
}
{
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
}
_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
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();
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);
// 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
// create the decoration frame for the client window
client->frame = new OBFrame(client, &_style);
+ // 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->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->grip_left(), client);
+ Openbox::instance->addClient(client->frame->grip_right(), client);
+
// XXX: if on the current desktop..
client->frame->show();
otk::OBDisplay::ungrab();
// add to the screen's list
- _clients.push_back(client);
+ clients.push_back(client);
// update the root properties
setClientList();
+
+ // grab buttons on the window
+ Openbox::instance->bindings()->grabMouse(true, client);
}
{
OBFrame *frame = client->frame;
+ // ungrab buttons on the window
+ Openbox::instance->bindings()->grabMouse(false, client);
+
// 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);
XSelectInput(otk::OBDisplay::display, client->window(), NoEventMask);
frame->hide();
-
- // we dont want a border on the client
- XSetWindowBorderWidth(otk::OBDisplay::display, client->window(),
- client->borderWidth());
+
+ // give the client its border back
+ client->toggleClientBorder(true);
delete client->frame;
client->frame = 0;
// remove from the screen's list
- _clients.remove(client);
+ clients.remove(client);
delete client;
// update the root properties
projects / chaz / openbox / blobdiff