aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-09-11 22:48:46 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-09-11 22:48:46 (GMT)
commitde8275f68860f8088c582f0e02494b5a46c871d5 (patch)
tree1efae49a105942aae385b4fcb5a4c3301bdc93dc /src/Screen.cc
parent3ac1ab023e33487ed9b851cef9c82d144ed62bc8 (diff)
downloadfluxbox-de8275f68860f8088c582f0e02494b5a46c871d5.zip
fluxbox-de8275f68860f8088c582f0e02494b5a46c871d5.tar.bz2
fix some default values
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 4412d29..23bc417 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -300,9 +300,9 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
300 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"), 300 tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
301 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"), 301 windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"),
302 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"), 302 typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"),
303 follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"), 303 follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".followModel", altscrname+".followModel"),
304 user_follow_model(rm, FOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"), 304 user_follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"),
305 workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"), 305 workspaces(rm, 4, scrname+".workspaces", altscrname+".Workspaces"),
306 edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"), 306 edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
307 focused_alpha(rm, 255, scrname+".window.focus.alpha", altscrname+".Window.Focus.Alpha"), 307 focused_alpha(rm, 255, scrname+".window.focus.alpha", altscrname+".Window.Focus.Alpha"),
308 unfocused_alpha(rm, 255, scrname+".window.unfocus.alpha", altscrname+".Window.Unfocus.Alpha"), 308 unfocused_alpha(rm, 255, scrname+".window.unfocus.alpha", altscrname+".Window.Unfocus.Alpha"),
@@ -326,8 +326,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
326 FbTk::GContext::CAPNOTLAST, 326 FbTk::GContext::CAPNOTLAST,
327 scrname+".overlay.capStyle", 327 scrname+".overlay.capStyle",
328 altscrname+".overlay.CapStyle"), 328 altscrname+".overlay.CapStyle"),
329 scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"),
330 scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"),
331 allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), 329 allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"),
332 clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), 330 clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"),
333 tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), 331 tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"),
@@ -506,6 +504,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
506 renderPosWindow(); 504 renderPosWindow();
507 m_tooltip_window->setDelay(*resource.tooltip_delay); 505 m_tooltip_window->setDelay(*resource.tooltip_delay);
508 506
507
508 //!! TODO: we shouldn't do this more than once, but since slit handles their
509 // own resources we must do this.
510 fluxbox->load_rc(*this);
511
509 // setup workspaces and workspace menu 512 // setup workspaces and workspace menu
510 int nr_ws = *resource.workspaces; 513 int nr_ws = *resource.workspaces;
511 addWorkspace(); // at least one 514 addWorkspace(); // at least one
@@ -515,11 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
515 518
516 m_current_workspace = m_workspaces_list.front(); 519 m_current_workspace = m_workspaces_list.front();
517 520
518
519 //!! TODO: we shouldn't do this more than once, but since slit handles their
520 // own resources we must do this.
521 fluxbox->load_rc(*this);
522
523 m_windowmenu.reset(createMenu("")); 521 m_windowmenu.reset(createMenu(""));
524 m_windowmenu->setInternalMenu(); 522 m_windowmenu->setInternalMenu();
525 m_windowmenu->setReloadHelper(new FbTk::AutoReloadHelper()); 523 m_windowmenu->setReloadHelper(new FbTk::AutoReloadHelper());