diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 19:09:37 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:10:41 (GMT) |
commit | 3b1abf8f8f812a9e97cc1b7f6fe95a1bf07d3246 (patch) | |
tree | 9e498bb21445968481fc71ab6059df6aa3877f65 /src/Screen.hh | |
parent | 75ad307a404e4e259a028f2dab73e1b370642318 (diff) | |
download | fluxbox_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/Screen.hh')
-rw-r--r-- | src/Screen.hh | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 44f91d0..05005f0 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -89,8 +89,8 @@ public: | |||
89 | typedef std::vector<std::string> WorkspaceNames; | 89 | typedef std::vector<std::string> WorkspaceNames; |
90 | typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus; | 90 | typedef std::list<std::pair<FbTk::FbString, FbTk::Menu *> > ExtraMenus; |
91 | 91 | ||
92 | BScreen(FbTk::ResourceManager &rm, | 92 | BScreen(FbTk::ResourceManager_base &rm, |
93 | const std::string &screenname, const std::string &altscreenname, | 93 | const std::string &screenname, |
94 | int scrn, int number_of_layers); | 94 | int scrn, int number_of_layers); |
95 | ~BScreen(); | 95 | ~BScreen(); |
96 | 96 | ||
@@ -284,10 +284,9 @@ public: | |||
284 | 284 | ||
285 | FbTk::MultLayers &layerManager() { return m_layermanager; } | 285 | FbTk::MultLayers &layerManager() { return m_layermanager; } |
286 | const FbTk::MultLayers &layerManager() const { return m_layermanager; } | 286 | const FbTk::MultLayers &layerManager() const { return m_layermanager; } |
287 | FbTk::ResourceManager &resourceManager() { return m_resource_manager; } | 287 | FbTk::ResourceManager_base &resourceManager() { return m_resource_manager; } |
288 | const FbTk::ResourceManager &resourceManager() const { return m_resource_manager; } | 288 | const FbTk::ResourceManager_base &resourceManager() const { return m_resource_manager; } |
289 | const std::string &name() const { return m_name; } | 289 | const std::string &name() const { return m_name; } |
290 | const std::string &altName() const { return m_altname; } | ||
291 | bool isShuttingdown() const { return m_shutdown; } | 290 | bool isShuttingdown() const { return m_shutdown; } |
292 | bool isRestart(); | 291 | bool isRestart(); |
293 | 292 | ||
@@ -527,8 +526,7 @@ private: | |||
527 | FbTk::FbWindow m_dummy_window; | 526 | FbTk::FbWindow m_dummy_window; |
528 | 527 | ||
529 | struct ScreenResource { | 528 | struct ScreenResource { |
530 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 529 | ScreenResource(FbTk::ResourceManager_base &rm, const std::string &scrname); |
531 | const std::string &altscrname); | ||
532 | 530 | ||
533 | FbTk::BoolResource opaque_move, full_max, | 531 | FbTk::BoolResource opaque_move, full_max, |
534 | max_ignore_inc, max_disable_move, max_disable_resize, | 532 | max_ignore_inc, max_disable_move, max_disable_resize, |
@@ -552,8 +550,8 @@ private: | |||
552 | /// Holds manage resources that screen destroys | 550 | /// Holds manage resources that screen destroys |
553 | FbTk::ResourceManager::ResourceList m_managed_resources; | 551 | FbTk::ResourceManager::ResourceList m_managed_resources; |
554 | 552 | ||
555 | FbTk::ResourceManager &m_resource_manager; | 553 | FbTk::ResourceManager_base &m_resource_manager; |
556 | const std::string m_name, m_altname; | 554 | const std::string m_name; |
557 | 555 | ||
558 | FocusControl *m_focus_control; | 556 | FocusControl *m_focus_control; |
559 | ScreenPlacement *m_placement_strategy; | 557 | ScreenPlacement *m_placement_strategy; |