summaryrefslogtreecommitdiff
path: root/src/screen.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-01-23 00:14:44 +0000
committerDana Jansens <danakj@orodu.net>2003-01-23 00:14:44 +0000
commitdd6f90684899e8e26e653af4b2e7e7eab1abf798 (patch)
tree6abc26138d2e929dc05cad1435ec02664eb4c988 /src/screen.cc
parent17d63184998b747e1a0554dc4364a36238b039e1 (diff)
compiles with the new render subsystem...
Diffstat (limited to 'src/screen.cc')
-rw-r--r--src/screen.cc15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/screen.cc b/src/screen.cc
index 0bbcebc6..6bc04ad1 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);
@@ -73,13 +74,8 @@ 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);
otk::Configuration sconfig(false);
@@ -92,6 +88,7 @@ Screen::Screen(int screen)
}
}
_style.load(sconfig);
+ */
// set up notification of netwm support
changeSupportedAtoms();
@@ -157,8 +154,6 @@ Screen::~Screen()
XDestroyWindow(**otk::display, _focuswindow);
XDestroyWindow(**otk::display, _supportwindow);
-
- delete _image_control;
}