aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:09:37 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:19 (GMT)
commite3feca08ce0f6753f7e71ccb9088cf9003d41fc2 (patch)
treeabf0dafc53405d67fdf5ccc285961a37603092d3 /src/Window.cc
parent0e8a7bfb12e6d03ec288cd1fdd0a1453d5e814e1 (diff)
downloadfluxbox_pavel-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.zip
fluxbox_pavel-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.tar.bz2
Replace ResourceManager with the lua version
Loading of an init file with the new manager works ok. Saving and restarting is still not completed. This touches many files because i removed the alternative name of resources. Unlike Xrm, lua does not have native support for alt names. It should be fairly easy to add them, but I think that is unnecessary and would be confusing.
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 551836c..ad68e6d 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3436,17 +3436,13 @@ void FluxboxWindow::setupWindow() {
3436 // we allow both to be done at once to share the commands 3436 // we allow both to be done at once to share the commands
3437 3437
3438 string titlebar_name[2]; 3438 string titlebar_name[2];
3439 string titlebar_alt_name[2];
3440 titlebar_name[0] = screen().name() + ".titlebar.left"; 3439 titlebar_name[0] = screen().name() + ".titlebar.left";
3441 titlebar_alt_name[0] = screen().altName() + ".Titlebar.Left";
3442 titlebar_name[1] = screen().name() + ".titlebar.right"; 3440 titlebar_name[1] = screen().name() + ".titlebar.right";
3443 titlebar_alt_name[1] = screen().altName() + ".Titlebar.Right";
3444 3441
3445 WinButtonsResource *titlebar_side[2]; 3442 WinButtonsResource *titlebar_side[2];
3446 3443
3447 3444
3448 3445 ResourceManager_base &rm = screen().resourceManager();
3449 ResourceManager &rm = screen().resourceManager();
3450 3446
3451 // create resource for titlebar 3447 // create resource for titlebar
3452 for (int i=0; i < 2; ++i) { 3448 for (int i=0; i < 2; ++i) {
@@ -3480,7 +3476,7 @@ void FluxboxWindow::setupWindow() {
3480 titlebar_side[i] = 3476 titlebar_side[i] =
3481 new WinButtonsResource(rm, 3477 new WinButtonsResource(rm,
3482 WinButtonsResource::Type(begin, end), 3478 WinButtonsResource::Type(begin, end),
3483 titlebar_name[i], titlebar_alt_name[i]); 3479 titlebar_name[i]);
3484 3480
3485 3481
3486 screen().addManagedResource(titlebar_side[i]); 3482 screen().addManagedResource(titlebar_side[i]);
@@ -3498,7 +3494,7 @@ void FluxboxWindow::updateButtons() {
3498 titlebar_name[1] = screen().name() + ".titlebar.right"; 3494 titlebar_name[1] = screen().name() + ".titlebar.right";
3499 3495
3500 WinButtonsResource *titlebar_side[2]; 3496 WinButtonsResource *titlebar_side[2];
3501 ResourceManager &rm = screen().resourceManager(); 3497 ResourceManager_base &rm = screen().resourceManager();
3502 3498
3503 bool need_update = false; 3499 bool need_update = false;
3504 // get resource for titlebar 3500 // get resource for titlebar