aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-09 17:38:40 (GMT)
committerfluxgen <fluxgen>2003-01-09 17:38:40 (GMT)
commita22aa6fa52b1c26ba3672a1363acb8b3ed761a47 (patch)
tree09d9edcb5024cee4859b509ce06ee2d9f81a2baf
parent51c33a318d66cb6c5f54b7ee9ebea06c7898fbcf (diff)
downloadfluxbox-a22aa6fa52b1c26ba3672a1363acb8b3ed761a47.zip
fluxbox-a22aa6fa52b1c26ba3672a1363acb8b3ed761a47.tar.bz2
removed iconmenu changed workspacemenu and rootmenu to FbTk Menu and removed setAutoGroupWindow
-rw-r--r--src/Screen.hh30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 8d93227..f080db4 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.58 2003/01/07 02:50:20 fluxgen Exp $ 25// $Id: Screen.hh,v 1.59 2003/01/09 17:38:40 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -51,12 +51,12 @@
51class Configmenu; 51class Configmenu;
52class Workspacemenu; 52class Workspacemenu;
53class Iconmenu; 53class Iconmenu;
54class Rootmenu;
55class Netizen; 54class Netizen;
56class Slit; 55class Slit;
57 56
58namespace FbTk { 57namespace FbTk {
59class MenuTheme; 58class MenuTheme;
59class Menu;
60}; 60};
61 61
62/// Handles screen connection and screen clients 62/// Handles screen connection and screen clients
@@ -96,8 +96,8 @@ public:
96 96
97 inline const FbTk::Color *getBorderColor() const { return &theme->getBorderColor(); } 97 inline const FbTk::Color *getBorderColor() const { return &theme->getBorderColor(); }
98 inline BImageControl *getImageControl() { return image_control; } 98 inline BImageControl *getImageControl() { return image_control; }
99 const Rootmenu * const getRootmenu() const { return m_rootmenu.get(); } 99 const FbTk::Menu * const getRootmenu() const { return m_rootmenu.get(); }
100 Rootmenu * const getRootmenu() { return m_rootmenu.get(); } 100 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
101 101
102 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 102 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
103 103
@@ -117,14 +117,14 @@ public:
117 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; } 117 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; }
118 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; } 118 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; }
119 119
120 inline const Toolbar * const getToolbar() const { return m_toolbar.get(); } 120 inline const Toolbar *getToolbar() const { return m_toolbar.get(); }
121 inline Toolbar * const getToolbar() { return m_toolbar.get(); } 121 inline Toolbar *getToolbar() { return m_toolbar.get(); }
122 122
123 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); } 123 inline Workspace *getWorkspace(unsigned int w) { return ( w < workspacesList.size() ? workspacesList[w] : 0); }
124 inline Workspace *getCurrentWorkspace() { return current_workspace; } 124 inline Workspace *getCurrentWorkspace() { return current_workspace; }
125 125
126 const Workspacemenu * const getWorkspacemenu() const { return workspacemenu; } 126 const FbTk::Menu *getWorkspacemenu() const { return workspacemenu.get(); }
127 Workspacemenu * const getWorkspacemenu() { return workspacemenu; } 127 FbTk::Menu *getWorkspacemenu() { return workspacemenu.get(); }
128 128
129 inline unsigned int getHandleWidth() const { return theme->getHandleWidth(); } 129 inline unsigned int getHandleWidth() const { return theme->getHandleWidth(); }
130 inline unsigned int getBevelWidth() const { return theme->getBevelWidth(); } 130 inline unsigned int getBevelWidth() const { return theme->getBevelWidth(); }
@@ -214,8 +214,7 @@ public:
214 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; } 214 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; }
215 inline void saveDesktopWheeling(bool s) { resource.desktop_wheeling = s; } 215 inline void saveDesktopWheeling(bool s) { resource.desktop_wheeling = s; }
216 void iconUpdate(); 216 void iconUpdate();
217 inline const Iconmenu *getIconmenu() const { return m_iconmenu; } 217
218 inline void setAutoGroupWindow(Window w = 0) { auto_group_window = w; }
219 void setAntialias(bool value); 218 void setAntialias(bool value);
220 219
221 inline const char *getStrftimeFormat() { return resource.strftime_format.c_str(); } 220 inline const char *getStrftimeFormat() { return resource.strftime_format.c_str(); }
@@ -310,9 +309,9 @@ public:
310 }; 309 };
311 310
312private: 311private:
313 void createStyleMenu(Rootmenu *menu, bool newmenu, const char *label, const char *directory); 312 void createStyleMenu(FbTk::Menu &menu, bool newmenu, const char *label, const char *directory);
314 313
315 bool parseMenuFile(std::ifstream &, Rootmenu *, int&); 314 bool parseMenuFile(std::ifstream &filestream, FbTk::Menu &menu, int &row);
316 315
317 void initMenu(); 316 void initMenu();
318 317
@@ -334,11 +333,10 @@ private:
334 333
335 BImageControl *image_control; 334 BImageControl *image_control;
336 Configmenu *configmenu; 335 Configmenu *configmenu;
337 Iconmenu *m_iconmenu;
338 336
339 std::auto_ptr<Rootmenu> m_rootmenu; 337 std::auto_ptr<FbTk::Menu> m_rootmenu;
340 338
341 typedef std::list<Rootmenu *> Rootmenus; 339 typedef std::list<FbTk::Menu *> Rootmenus;
342 typedef std::list<Netizen *> Netizens; 340 typedef std::list<Netizen *> Netizens;
343 341
344 Rootmenus rootmenuList; 342 Rootmenus rootmenuList;
@@ -349,7 +347,7 @@ private:
349#endif // SLIT 347#endif // SLIT
350 std::auto_ptr<Toolbar> m_toolbar; 348 std::auto_ptr<Toolbar> m_toolbar;
351 Workspace *current_workspace; 349 Workspace *current_workspace;
352 Workspacemenu *workspacemenu; 350 std::auto_ptr<FbTk::Menu> workspacemenu;
353 351
354 unsigned int geom_w, geom_h; 352 unsigned int geom_w, geom_h;
355 unsigned long event_mask; 353 unsigned long event_mask;