diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 20:36:18 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:11:28 (GMT) |
commit | dbb84308855de040c043cf1c1f0ab941d6bd3be7 (patch) | |
tree | a46416d288c0d66f6113600c5bcb61f0339009f0 /src/Screen.hh | |
parent | fadff675a5163dea6f78c53d7b157faed42f02ec (diff) | |
download | fluxbox_paul-dbb84308855de040c043cf1c1f0ab941d6bd3be7.zip fluxbox_paul-dbb84308855de040c043cf1c1f0ab941d6bd3be7.tar.bz2 |
Make session.screenX.workspace_names a real FbTk::Resource
instead of the add-on hack it was.
This also fixes a lot of problems with saving of config.
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index 05005f0..8c89ab2 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -191,7 +191,7 @@ public: | |||
191 | 191 | ||
192 | const Workspaces &getWorkspacesList() const { return m_workspaces_list; } | 192 | const Workspaces &getWorkspacesList() const { return m_workspaces_list; } |
193 | Workspaces &getWorkspacesList() { return m_workspaces_list; } | 193 | Workspaces &getWorkspacesList() { return m_workspaces_list; } |
194 | const WorkspaceNames &getWorkspaceNames() const { return m_workspace_names; } | 194 | const WorkspaceNames &getWorkspaceNames() const { return *resource.workspace_names; } |
195 | /** | 195 | /** |
196 | @name Screen signals | 196 | @name Screen signals |
197 | */ | 197 | */ |
@@ -322,7 +322,7 @@ public: | |||
322 | /// remove all workspace names | 322 | /// remove all workspace names |
323 | void removeWorkspaceNames(); | 323 | void removeWorkspaceNames(); |
324 | /// add a workspace name to the end of the workspace name list | 324 | /// add a workspace name to the end of the workspace name list |
325 | void addWorkspaceName(const char *name); | 325 | void addWorkspaceName(const std::string &name); |
326 | /// add a window to the icon list | 326 | /// add a window to the icon list |
327 | void addIcon(FluxboxWindow *win); | 327 | void addIcon(FluxboxWindow *win); |
328 | /// remove a window from the icon list | 328 | /// remove a window from the icon list |
@@ -510,7 +510,6 @@ private: | |||
510 | 510 | ||
511 | Workspace *m_current_workspace; | 511 | Workspace *m_current_workspace; |
512 | 512 | ||
513 | WorkspaceNames m_workspace_names; | ||
514 | Workspaces m_workspaces_list; | 513 | Workspaces m_workspaces_list; |
515 | 514 | ||
516 | std::auto_ptr<FbWinFrameTheme> m_focused_windowtheme, | 515 | std::auto_ptr<FbWinFrameTheme> m_focused_windowtheme, |
@@ -528,6 +527,12 @@ private: | |||
528 | struct ScreenResource { | 527 | struct ScreenResource { |
529 | ScreenResource(FbTk::ResourceManager_base &rm, const std::string &scrname); | 528 | ScreenResource(FbTk::ResourceManager_base &rm, const std::string &scrname); |
530 | 529 | ||
530 | static const char workspace_names_delim[]; | ||
531 | FbTk::Resource< | ||
532 | std::vector<std::string>, | ||
533 | FbTk::VectorTraits<FbTk::StringTraits, workspace_names_delim> | ||
534 | > workspace_names; | ||
535 | |||
531 | FbTk::BoolResource opaque_move, full_max, | 536 | FbTk::BoolResource opaque_move, full_max, |
532 | max_ignore_inc, max_disable_move, max_disable_resize, | 537 | max_ignore_inc, max_disable_move, max_disable_resize, |
533 | workspace_warping, show_window_pos, auto_raise, click_raises; | 538 | workspace_warping, show_window_pos, auto_raise, click_raises; |