summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2002-04-16 23:50:53 +0000
committerDana Jansens <danakj@orodu.net>2002-04-16 23:50:53 +0000
commit73a3c979b39ae0b51298d16bc5e76b61d31c89d5 (patch)
treebb9fc01c03957c308b2bd2878e910fe57940f7c8 /src/Screen.cc
parentfe9b1efde5e46c00679d0435601f915099a574b0 (diff)
Slit loads its own settings and saves them as they are changed
added an assert in Resource
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 08c2d9ee..7a3b9d7b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -185,7 +185,9 @@ static const char *getFontSize(const char *pattern, int *size) {
}
-BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
+BScreen::BScreen(Openbox &ob, int scrn, Resource &conf) : ScreenInfo(ob, scrn),
+ openbox(ob), config(conf)
+{
event_mask = ColormapChangeMask | EnterWindowMask | PropertyChangeMask |
SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
ButtonPressMask | ButtonReleaseMask;
@@ -419,7 +421,7 @@ BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
toolbar = new Toolbar(*this);
#ifdef SLIT
- slit = new Slit(*this);
+ slit = new Slit(*this, config);
#endif // SLIT
InitMenu();
@@ -1545,7 +1547,7 @@ void BScreen::raiseWindows(Window *workspace_stack, int num) {
*(session_stack + i++) = toolbar->getWindowID();
#ifdef SLIT
- if (slit->isOnTop())
+ if (slit->onTop())
*(session_stack + i++) = slit->getWindowID();
#endif // SLIT