From de8275f68860f8088c582f0e02494b5a46c871d5 Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Thu, 11 Sep 2008 15:48:46 -0700 Subject: fix some default values --- src/Screen.cc | 18 ++++++++---------- src/Screen.hh | 5 ----- src/ScreenPlacement.cc | 2 +- 3 files changed, 9 insertions(+), 16 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, tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"), windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"), typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"), - follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"), - user_follow_model(rm, FOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"), - workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"), + follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".followModel", altscrname+".followModel"), + user_follow_model(rm, SEMIFOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"), + workspaces(rm, 4, scrname+".workspaces", altscrname+".Workspaces"), edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"), focused_alpha(rm, 255, scrname+".window.focus.alpha", altscrname+".Window.Focus.Alpha"), unfocused_alpha(rm, 255, scrname+".window.unfocus.alpha", altscrname+".Window.Unfocus.Alpha"), @@ -326,8 +326,6 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm, FbTk::GContext::CAPNOTLAST, scrname+".overlay.capStyle", altscrname+".overlay.CapStyle"), - scroll_action(rm, "", scrname+".windowScrollAction", altscrname+".WindowScrollAction"), - scroll_reverse(rm, false, scrname+".windowScrollReverse", altscrname+".WindowScrollReverse"), allow_remote_actions(rm, false, scrname+".allowRemoteActions", altscrname+".AllowRemoteActions"), clientmenu_use_pixmap(rm, true, scrname+".clientMenu.usePixmap", altscrname+".ClientMenu.UsePixmap"), tabs_use_pixmap(rm, true, scrname+".tabs.usePixmap", altscrname+".Tabs.UsePixmap"), @@ -506,6 +504,11 @@ BScreen::BScreen(FbTk::ResourceManager &rm, renderPosWindow(); m_tooltip_window->setDelay(*resource.tooltip_delay); + + //!! TODO: we shouldn't do this more than once, but since slit handles their + // own resources we must do this. + fluxbox->load_rc(*this); + // setup workspaces and workspace menu int nr_ws = *resource.workspaces; addWorkspace(); // at least one @@ -515,11 +518,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, m_current_workspace = m_workspaces_list.front(); - - //!! TODO: we shouldn't do this more than once, but since slit handles their - // own resources we must do this. - fluxbox->load_rc(*this); - m_windowmenu.reset(createMenu("")); m_windowmenu->setInternalMenu(); m_windowmenu->setReloadHelper(new FbTk::AutoReloadHelper()); diff --git a/src/Screen.hh b/src/Screen.hh index ecf2f05..038570e 100644 --- a/src/Screen.hh +++ b/src/Screen.hh @@ -136,9 +136,6 @@ public: unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } FollowModel getFollowModel() const { return *resource.follow_model; } FollowModel getUserFollowModel() const { return *resource.user_follow_model; } - - const std::string &getScrollAction() const { return *resource.scroll_action; } - const bool getScrollReverse() const { return *resource.scroll_reverse; } const bool allowRemoteActions() const { return *resource.allow_remote_actions; } const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; } const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } @@ -565,8 +562,6 @@ private: FbTk::Resource gc_line_style; FbTk::Resource gc_join_style; FbTk::Resource gc_cap_style; - FbTk::Resource scroll_action; - FbTk::Resource scroll_reverse; FbTk::Resource allow_remote_actions; FbTk::Resource clientmenu_use_pixmap; FbTk::Resource tabs_use_pixmap; diff --git a/src/ScreenPlacement.cc b/src/ScreenPlacement.cc index fa6aefc..a617956 100644 --- a/src/ScreenPlacement.cc +++ b/src/ScreenPlacement.cc @@ -47,7 +47,7 @@ ScreenPlacement::ScreenPlacement(BScreen &screen): m_col_direction(screen.resourceManager(), TOPBOTTOM, screen.name()+".colPlacementDirection", screen.altName()+".ColPlacementDirection"), - m_placement_policy(screen.resourceManager(), ROWSMARTPLACEMENT, + m_placement_policy(screen.resourceManager(), ROWMINOVERLAPPLACEMENT, screen.name()+".windowPlacement", screen.altName()+".WindowPlacement"), m_old_policy(ROWSMARTPLACEMENT), -- cgit v0.11.2