aboutsummaryrefslogtreecommitdiff
path: root/src/FocusControl.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:09:37 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:10:41 (GMT)
commit3b1abf8f8f812a9e97cc1b7f6fe95a1bf07d3246 (patch)
tree9e498bb21445968481fc71ab6059df6aa3877f65 /src/FocusControl.cc
parent75ad307a404e4e259a028f2dab73e1b370642318 (diff)
downloadfluxbox_paul-3b1abf8f8f812a9e97cc1b7f6fe95a1bf07d3246.zip
fluxbox_paul-3b1abf8f8f812a9e97cc1b7f6fe95a1bf07d3246.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.cc9
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),