diff options
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index fe8d127..5734d86 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "WinButtonTheme.hh" | 31 | #include "WinButtonTheme.hh" |
32 | #include "FbWinFrameTheme.hh" | 32 | #include "FbWinFrameTheme.hh" |
33 | #include "TooltipWindow.hh" | 33 | #include "TooltipWindow.hh" |
34 | #include "ScreenResource.hh" | ||
34 | 35 | ||
35 | #include "FbTk/MenuTheme.hh" | 36 | #include "FbTk/MenuTheme.hh" |
36 | #include "FbTk/EventHandler.hh" | 37 | #include "FbTk/EventHandler.hh" |
@@ -522,32 +523,12 @@ private: | |||
522 | std::auto_ptr<RootTheme> m_root_theme; | 523 | std::auto_ptr<RootTheme> m_root_theme; |
523 | 524 | ||
524 | FbRootWindow m_root_window; | 525 | FbRootWindow m_root_window; |
525 | std::auto_ptr<OSDWindow> m_geom_window, m_pos_window; | 526 | std::auto_ptr<OSDWindow> m_geom_window; |
527 | std::auto_ptr<OSDWindow> m_pos_window; | ||
526 | std::auto_ptr<TooltipWindow> m_tooltip_window; | 528 | std::auto_ptr<TooltipWindow> m_tooltip_window; |
527 | FbTk::FbWindow m_dummy_window; | 529 | FbTk::FbWindow m_dummy_window; |
528 | 530 | ||
529 | struct ScreenResource { | 531 | ScreenResource resource; |
530 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | ||
531 | const std::string &altscrname); | ||
532 | |||
533 | FbTk::Resource<bool> opaque_move, full_max, | ||
534 | max_ignore_inc, max_disable_move, max_disable_resize, | ||
535 | workspace_warping, show_window_pos, auto_raise, click_raises; | ||
536 | FbTk::Resource<std::string> default_deco; | ||
537 | FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; | ||
538 | FbTk::Resource<std::string> windowmenufile; | ||
539 | FbTk::Resource<unsigned int> typing_delay; | ||
540 | FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha, | ||
541 | unfocused_alpha, menu_alpha, menu_delay, | ||
542 | tab_width, tooltip_delay; | ||
543 | FbTk::Resource<bool> allow_remote_actions; | ||
544 | FbTk::Resource<bool> clientmenu_use_pixmap; | ||
545 | FbTk::Resource<bool> tabs_use_pixmap; | ||
546 | FbTk::Resource<bool> max_over_tabs; | ||
547 | FbTk::Resource<bool> default_internal_tabs; | ||
548 | |||
549 | |||
550 | } resource; | ||
551 | 532 | ||
552 | /// Holds manage resources that screen destroys | 533 | /// Holds manage resources that screen destroys |
553 | FbTk::ResourceManager::ResourceList m_managed_resources; | 534 | FbTk::ResourceManager::ResourceList m_managed_resources; |