summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc21
1 files changed, 13 insertions, 8 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 0d374ef..37efadd 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.120 2003/04/15 00:50:24 rathnor Exp $ 25// $Id: Screen.cc,v 1.121 2003/04/15 12:14:53 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -377,7 +377,8 @@ BScreen::ScreenResource::ScreenResource(ResourceManager &rm,
377 opaque_move(rm, false, "session.opaqueMove", "Session.OpaqueMove"), 377 opaque_move(rm, false, "session.opaqueMove", "Session.OpaqueMove"),
378 full_max(rm, true, scrname+".fullMaximization", altscrname+".FullMaximization"), 378 full_max(rm, true, scrname+".fullMaximization", altscrname+".FullMaximization"),
379 max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"), 379 max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"),
380 sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"), 380 sloppy_window_grouping(rm, true,
381 scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"),
381 workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"), 382 workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"),
382 desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"), 383 desktop_wheeling(rm, true, scrname+".desktopwheeling", altscrname+".DesktopWheeling"),
383 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"), 384 show_window_pos(rm, true, scrname+".showwindowposition", altscrname+".ShowWindowPosition"),
@@ -388,13 +389,17 @@ BScreen::ScreenResource::ScreenResource(ResourceManager &rm,
388 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 389 rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
389 focus_model(rm, Fluxbox::CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"), 390 focus_model(rm, Fluxbox::CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"),
390 workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"), 391 workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
391 toolbar_width_percent(rm, 65, scrname+".toolbar.widthPercent", altscrname+".Toolbar.WidthPercent"), 392 toolbar_width_percent(rm, 65,
393 scrname+".toolbar.widthPercent", altscrname+".Toolbar.WidthPercent"),
392 edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"), 394 edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
393 slit_layernum(rm, Fluxbox::instance()->getDockLayer(), scrname+".slit.layer", altscrname+".Slit.Layer"), 395 slit_layernum(rm, Fluxbox::Layer(Fluxbox::instance()->getDockLayer()),
394 toolbar_layernum(rm, Fluxbox::instance()->getDesktopLayer(), scrname+".toolbar.layer", altscrname+".Toolbar.Layer"), 396 scrname+".slit.layer", altscrname+".Slit.Layer"),
397 toolbar_layernum(rm, Fluxbox::Layer(Fluxbox::instance()->getDesktopLayer()),
398 scrname+".toolbar.layer", altscrname+".Toolbar.Layer"),
395 toolbar_mode(rm, ToolbarHandler::ICONS, scrname+".toolbar.mode", altscrname+".Toolbar.Mode"), 399 toolbar_mode(rm, ToolbarHandler::ICONS, scrname+".toolbar.mode", altscrname+".Toolbar.Mode"),
396 toolbar_on_head(rm, 0, scrname+".toolbar.onhead", altscrname+".Toolbar.onHead"), 400 toolbar_on_head(rm, 0, scrname+".toolbar.onhead", altscrname+".Toolbar.onHead"),
397 toolbar_placement(rm, Toolbar::BOTTOMCENTER, scrname+".toolbar.placement", altscrname+".Toolbar.Placement") 401 toolbar_placement(rm, Toolbar::BOTTOMCENTER,
402 scrname+".toolbar.placement", altscrname+".Toolbar.Placement")
398{ 403{
399 404
400}; 405};
@@ -460,7 +465,7 @@ BScreen::BScreen(ResourceManager &rm,
460 image_control->installRootColormap(); 465 image_control->installRootColormap();
461 root_colormap_installed = true; 466 root_colormap_installed = true;
462 467
463 fluxbox->load_rc(this); 468 fluxbox->load_rc(*this);
464 469
465 image_control->setDither(*resource.image_dither); 470 image_control->setDither(*resource.image_dither);
466 theme = new Theme(disp, getRootWindow(), colormap(), getScreenNumber(), 471 theme = new Theme(disp, getRootWindow(), colormap(), getScreenNumber(),
@@ -698,7 +703,7 @@ void BScreen::reconfigure() {
698#ifdef DEBUG 703#ifdef DEBUG
699 cerr<<__FILE__<<"("<<__LINE__<<"): BScreen::reconfigure"<<endl; 704 cerr<<__FILE__<<"("<<__LINE__<<"): BScreen::reconfigure"<<endl;
700#endif // DEBUG 705#endif // DEBUG
701 Fluxbox::instance()->loadRootCommand(this); 706 Fluxbox::instance()->loadRootCommand(*this);
702 theme->setRootCommand(getRootCommand()); 707 theme->setRootCommand(getRootCommand());
703 const string &filename = Fluxbox::instance()->getStyleFilename(); 708 const string &filename = Fluxbox::instance()->getStyleFilename();
704 theme->load(filename.c_str()); // old theme engine 709 theme->load(filename.c_str()); // old theme engine