aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Screen.cc18
-rw-r--r--src/Screen.hh5
-rw-r--r--src/ScreenPlacement.cc2
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,
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());
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:
136 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } 136 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; }
137 FollowModel getFollowModel() const { return *resource.follow_model; } 137 FollowModel getFollowModel() const { return *resource.follow_model; }
138 FollowModel getUserFollowModel() const { return *resource.user_follow_model; } 138 FollowModel getUserFollowModel() const { return *resource.user_follow_model; }
139
140 const std::string &getScrollAction() const { return *resource.scroll_action; }
141 const bool getScrollReverse() const { return *resource.scroll_reverse; }
142 const bool allowRemoteActions() const { return *resource.allow_remote_actions; } 139 const bool allowRemoteActions() const { return *resource.allow_remote_actions; }
143 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; } 140 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; }
144 const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } 141 const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
@@ -565,8 +562,6 @@ private:
565 FbTk::Resource<FbTk::GContext::LineStyle> gc_line_style; 562 FbTk::Resource<FbTk::GContext::LineStyle> gc_line_style;
566 FbTk::Resource<FbTk::GContext::JoinStyle> gc_join_style; 563 FbTk::Resource<FbTk::GContext::JoinStyle> gc_join_style;
567 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style; 564 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
568 FbTk::Resource<std::string> scroll_action;
569 FbTk::Resource<bool> scroll_reverse;
570 FbTk::Resource<bool> allow_remote_actions; 565 FbTk::Resource<bool> allow_remote_actions;
571 FbTk::Resource<bool> clientmenu_use_pixmap; 566 FbTk::Resource<bool> clientmenu_use_pixmap;
572 FbTk::Resource<bool> tabs_use_pixmap; 567 FbTk::Resource<bool> 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):
47 m_col_direction(screen.resourceManager(), TOPBOTTOM, 47 m_col_direction(screen.resourceManager(), TOPBOTTOM,
48 screen.name()+".colPlacementDirection", 48 screen.name()+".colPlacementDirection",
49 screen.altName()+".ColPlacementDirection"), 49 screen.altName()+".ColPlacementDirection"),
50 m_placement_policy(screen.resourceManager(), ROWSMARTPLACEMENT, 50 m_placement_policy(screen.resourceManager(), ROWMINOVERLAPPLACEMENT,
51 screen.name()+".windowPlacement", 51 screen.name()+".windowPlacement",
52 screen.altName()+".WindowPlacement"), 52 screen.altName()+".WindowPlacement"),
53 m_old_policy(ROWSMARTPLACEMENT), 53 m_old_policy(ROWSMARTPLACEMENT),