diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 19:09:37 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 09:57:19 (GMT) |
commit | e3feca08ce0f6753f7e71ccb9088cf9003d41fc2 (patch) | |
tree | abf0dafc53405d67fdf5ccc285961a37603092d3 /src/FocusControl.cc | |
parent | 0e8a7bfb12e6d03ec288cd1fdd0a1453d5e814e1 (diff) | |
download | fluxbox_paul-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.zip fluxbox_paul-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/FocusControl.cc')
-rw-r--r-- | src/FocusControl.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 4f3b390..d8aca85 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -68,15 +68,12 @@ FocusControl::FocusControl(BScreen &screen): | |||
68 | m_screen(screen), | 68 | m_screen(screen), |
69 | m_focus_model(screen.resourceManager(), | 69 | m_focus_model(screen.resourceManager(), |
70 | CLICKFOCUS, | 70 | CLICKFOCUS, |
71 | screen.name()+".focusModel", | 71 | screen.name()+".focusModel"), |
72 | screen.altName()+".FocusModel"), | ||
73 | m_tab_focus_model(screen.resourceManager(), | 72 | m_tab_focus_model(screen.resourceManager(), |
74 | CLICKTABFOCUS, | 73 | CLICKTABFOCUS, |
75 | screen.name()+".tabFocusModel", | 74 | screen.name()+".tabFocusModel"), |
76 | screen.altName()+".TabFocusModel"), | ||
77 | m_focus_new(screen.resourceManager(), true, | 75 | m_focus_new(screen.resourceManager(), true, |
78 | screen.name()+".focusNewWindows", | 76 | screen.name()+".focusNewWindows"), |
79 | screen.altName()+".FocusNewWindows"), | ||
80 | m_focused_list(screen), m_creation_order_list(screen), | 77 | m_focused_list(screen), m_creation_order_list(screen), |
81 | m_focused_win_list(screen), m_creation_order_win_list(screen), | 78 | m_focused_win_list(screen), m_creation_order_win_list(screen), |
82 | m_cycling_list(0), | 79 | m_cycling_list(0), |