aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c7fe1d3..b18dcb8 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -229,9 +229,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
229 // after fbwinframe have resized them 229 // after fbwinframe have resized them
230 m_winbutton_theme(new WinButtonTheme(scrn, *m_windowtheme)), 230 m_winbutton_theme(new WinButtonTheme(scrn, *m_windowtheme)),
231 m_menutheme(new MenuTheme(scrn)), 231 m_menutheme(new MenuTheme(scrn)),
232 m_root_theme(new
233 RootTheme(scrn,
234 *resource.rootcommand)),
235 m_root_window(scrn), 232 m_root_window(scrn),
236 m_geom_window(m_root_window, 233 m_geom_window(m_root_window,
237 0, 0, 10, 10, 234 0, 0, 10, 10,
@@ -249,8 +246,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
249 m_shutdown(false) { 246 m_shutdown(false) {
250 247
251 248
252 Fluxbox *fluxbox = Fluxbox::instance(); 249 Display *disp = m_root_window.display();
253 Display *disp = fluxbox->display();
254 250
255 initXinerama(); 251 initXinerama();
256 252
@@ -261,7 +257,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
261 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask | 257 SubstructureRedirectMask | KeyPressMask | KeyReleaseMask |
262 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask); 258 ButtonPressMask | ButtonReleaseMask| SubstructureNotifyMask);
263 259
264 fluxbox->sync(false); 260 FbTk::App::instance()->sync(false);
265 261
266 XSetErrorHandler((XErrorHandler) old); 262 XSetErrorHandler((XErrorHandler) old);
267 263
@@ -286,14 +282,18 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
286 rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr)); 282 rootWindow().setCursor(XCreateFontCursor(disp, XC_left_ptr));
287 283
288 // load this screens resources 284 // load this screens resources
285 Fluxbox *fluxbox = Fluxbox::instance();
289 fluxbox->load_rc(*this); 286 fluxbox->load_rc(*this);
290 287
291 // setup image cache engine 288 // setup image cache engine
292 m_image_control.reset(new FbTk::ImageControl(scrn, true, fluxbox->colorsPerChannel(), 289 m_image_control.reset(new FbTk::ImageControl(scrn, true,
290 fluxbox->colorsPerChannel(),
293 fluxbox->getCacheLife(), fluxbox->getCacheMax())); 291 fluxbox->getCacheLife(), fluxbox->getCacheMax()));
294 imageControl().installRootColormap(); 292 imageControl().installRootColormap();
295 root_colormap_installed = true; 293 root_colormap_installed = true;
296 294
295 m_root_theme.reset(new RootTheme(*resource.rootcommand, imageControl()));
296
297 m_windowtheme->setFocusedAlpha(*resource.focused_alpha); 297 m_windowtheme->setFocusedAlpha(*resource.focused_alpha);
298 m_windowtheme->setUnfocusedAlpha(*resource.unfocused_alpha); 298 m_windowtheme->setUnfocusedAlpha(*resource.unfocused_alpha);
299 m_menutheme->setAlpha(*resource.menu_alpha); 299 m_menutheme->setAlpha(*resource.menu_alpha);
@@ -778,12 +778,12 @@ void BScreen::reconfigure() {
778 for_each(m_workspaces_list.begin(), 778 for_each(m_workspaces_list.begin(),
779 m_workspaces_list.end(), 779 m_workspaces_list.end(),
780 mem_fun(&Workspace::reconfigure)); 780 mem_fun(&Workspace::reconfigure));
781 781
782 // reconfigure Icons 782 // reconfigure Icons
783 for_each(m_icon_list.begin(), 783 for_each(m_icon_list.begin(),
784 m_icon_list.end(), 784 m_icon_list.end(),
785 mem_fun(&FluxboxWindow::reconfigure)); 785 mem_fun(&FluxboxWindow::reconfigure));
786 786
787 imageControl().cleanCache(); 787 imageControl().cleanCache();
788 // notify objects that the screen is reconfigured 788 // notify objects that the screen is reconfigured
789 m_reconfigure_sig.notify(); 789 m_reconfigure_sig.notify();