// -*- 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 <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif // HAVE_STRING_H
-
#ifdef HAVE_UNISTD_H
# include <sys/types.h>
# include <unistd.h>
#include <vector>
#include <algorithm>
+#include <cstdio>
+#include <cstring>
static bool running;
static int anotherWMRunning(Display *display, XErrorEvent *) {
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);
_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());
// 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()) {
}
_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);
// Set the net_desktop_names property
std::vector<otk::ustring> 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);
_desktop = 0;
- if (!python_get_long("number_of_desktops", &_num_desktops))
+ if (!python_get_long("NUMBER_OF_DESKTOPS", &_num_desktops))
_num_desktops = 1;
changeNumDesktops(_num_desktops); // set the hint
{
_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);
#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
if (old_area != _area) {
// the area has changed, adjust all the maximized windows
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it)
(*it)->remaximize();
}
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
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
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
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();
// 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());
// influence
updateStrut();
+ // unset modal before dropping our focus
+ client->setModal(false);
+
// unfocus the client (calls the focus callbacks)
client->unfocus();
assert(!_stacking.empty()); // this would be bad
- Client::List::iterator it = --_stacking.end();
- const Client::List::iterator end = _stacking.begin();
+ ClientList::iterator it = --_stacking.end();
+ const ClientList::iterator end = _stacking.begin();
if (client->modal() && client->transientFor()) {
// don't let a modal window lower below its transient_for
assert(it != _stacking.end());
wins[0] = (it == _stacking.begin() ? _focuswindow :
- ((*(--Client::List::const_iterator(it)))->frame->window()));
+ ((*(--ClientList::const_iterator(it)))->frame->window()));
wins[1] = client->frame->window();
if (wins[0] == wins[1]) return; // already right above the window
// remove the client before looking so we can't run into ourselves
_stacking.remove(client);
- Client::List::iterator it = _stacking.begin();
- const Client::List::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);
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);
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();
if (!(num > 0)) return;
// move windows on desktops that will no longer exist!
- Client::List::iterator it, end = clients.end();
+ ClientList::iterator it, end = clients.end();
for (it = clients.begin(); it != end; ++it) {
int d = (*it)->desktop();
if (d >= num && !(d == (signed) 0xffffffff ||
}
+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);