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
#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
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());