aboutsummaryrefslogtreecommitdiff
path: root/src/FocusControl.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:09:37 (GMT)
committerPavel Labath <pavelo@centrum.sk>2013-02-16 23:54:31 (GMT)
commit9f2c3883b7cf08a5f9d311fd8f7fc317574b605b (patch)
tree55461e357b95ddaa582b73c840f4c5e6846b0f69 /src/FocusControl.cc
parent590efd07bb2ed1ce78ce6e5e6750b57311904f1f (diff)
downloadfluxbox_pavel-9f2c3883b7cf08a5f9d311fd8f7fc317574b605b.zip
fluxbox_pavel-9f2c3883b7cf08a5f9d311fd8f7fc317574b605b.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.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 8f1a94f..317b73a 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -68,19 +68,15 @@ 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#ifdef XINERAMA 77#ifdef XINERAMA
81 m_focus_same_head(screen.resourceManager(), false, 78 m_focus_same_head(screen.resourceManager(), false,
82 screen.name()+".focusSameHead", 79 screen.name()+".focusSameHead"),
83 screen.altName()+".FocusSameHead"),
84#endif // XINERAMA 80#endif // XINERAMA
85 m_focused_list(screen), m_creation_order_list(screen), 81 m_focused_list(screen), m_creation_order_list(screen),
86 m_focused_win_list(screen), m_creation_order_win_list(screen), 82 m_focused_win_list(screen), m_creation_order_win_list(screen),