diff options
author | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
---|---|---|
committer | Mathias Gumz <akira at fluxbox dot org> | 2007-12-29 21:38:53 (GMT) |
commit | e1f362ae764884a4cd1e1673292cb37d5a85f89c (patch) | |
tree | 137430b26aee6f3638f27281d3757c2c75ef4b20 /src/Window.hh | |
parent | e90c3678d9e54bc9251619fdee2d7341f042167b (diff) | |
download | fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.zip fluxbox-e1f362ae764884a4cd1e1673292cb37d5a85f89c.tar.bz2 |
'inline' in class declaration is implicitly inline
Diffstat (limited to 'src/Window.hh')
-rw-r--r-- | src/Window.hh | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/src/Window.hh b/src/Window.hh index fc44610..3ea5f55 100644 --- a/src/Window.hh +++ b/src/Window.hh | |||
@@ -24,8 +24,8 @@ | |||
24 | 24 | ||
25 | // $Id$ | 25 | // $Id$ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
29 | 29 | ||
30 | #include "FbTk/DefaultValue.hh" | 30 | #include "FbTk/DefaultValue.hh" |
31 | #include "FbTk/Timer.hh" | 31 | #include "FbTk/Timer.hh" |
@@ -67,7 +67,7 @@ public: | |||
67 | /// Motif wm Hints | 67 | /// Motif wm Hints |
68 | enum { | 68 | enum { |
69 | MwmHintsFunctions = (1l << 0), ///< use motif wm functions | 69 | MwmHintsFunctions = (1l << 0), ///< use motif wm functions |
70 | MwmHintsDecorations = (1l << 1) ///< use motif wm decorations | 70 | MwmHintsDecorations = (1l << 1) ///< use motif wm decorations |
71 | }; | 71 | }; |
72 | 72 | ||
73 | /// Motif wm functions | 73 | /// Motif wm functions |
@@ -99,7 +99,7 @@ public: | |||
99 | ATTRIB_OMNIPRESENT = 0x08, ///< omnipresent (sticky) | 99 | ATTRIB_OMNIPRESENT = 0x08, ///< omnipresent (sticky) |
100 | ATTRIB_WORKSPACE = 0x10, ///< workspace | 100 | ATTRIB_WORKSPACE = 0x10, ///< workspace |
101 | ATTRIB_STACK = 0x20, ///< stack | 101 | ATTRIB_STACK = 0x20, ///< stack |
102 | ATTRIB_DECORATION = 0x40, ///< decorations | 102 | ATTRIB_DECORATION = 0x40, ///< decorations |
103 | ATTRIB_HIDDEN = 0x80, ///< hidden | 103 | ATTRIB_HIDDEN = 0x80, ///< hidden |
104 | }; | 104 | }; |
105 | 105 | ||
@@ -114,7 +114,7 @@ public: | |||
114 | }; | 114 | }; |
115 | 115 | ||
116 | /// Different resize modes when resizing a window | 116 | /// Different resize modes when resizing a window |
117 | enum ResizeModel { | 117 | enum ResizeModel { |
118 | QUADRANTRESIZE, ///< resizes from one quadrant | 118 | QUADRANTRESIZE, ///< resizes from one quadrant |
119 | CENTERRESIZE, ///< resizes from center | 119 | CENTERRESIZE, ///< resizes from center |
120 | NEARESTEDGERESIZE, ///< resizes the nearest edge | 120 | NEARESTEDGERESIZE, ///< resizes the nearest edge |
@@ -133,13 +133,13 @@ public: | |||
133 | * Resize direction while resizing | 133 | * Resize direction while resizing |
134 | */ | 134 | */ |
135 | enum ResizeDirection { | 135 | enum ResizeDirection { |
136 | NOCORNER = -1, | 136 | NOCORNER = -1, |
137 | LEFTTOP = 0, | 137 | LEFTTOP = 0, |
138 | TOP = 1, | 138 | TOP = 1, |
139 | RIGHTTOP = 2, | 139 | RIGHTTOP = 2, |
140 | RIGHT = 3, | 140 | RIGHT = 3, |
141 | RIGHTBOTTOM = 4, | 141 | RIGHTBOTTOM = 4, |
142 | BOTTOM = 5, | 142 | BOTTOM = 5, |
143 | LEFTBOTTOM = 6, | 143 | LEFTBOTTOM = 6, |
144 | LEFT = 7, | 144 | LEFT = 7, |
145 | ALLCORNERS = 8 | 145 | ALLCORNERS = 8 |
@@ -172,7 +172,7 @@ public: | |||
172 | /// set new current client and raise it | 172 | /// set new current client and raise it |
173 | bool setCurrentClient(WinClient &client, bool setinput = true); | 173 | bool setCurrentClient(WinClient &client, bool setinput = true); |
174 | /** | 174 | /** |
175 | * Searches for a client | 175 | * Searches for a client |
176 | * @param win the client X window | 176 | * @param win the client X window |
177 | * @return pointer to client matching the window or NULL | 177 | * @return pointer to client matching the window or NULL |
178 | */ | 178 | */ |
@@ -316,7 +316,7 @@ public: | |||
316 | void moveResizeForClient(int x, int y, unsigned int width, unsigned int height, int gravity = ForgetGravity, unsigned int client_bw = 0); | 316 | void moveResizeForClient(int x, int y, unsigned int width, unsigned int height, int gravity = ForgetGravity, unsigned int client_bw = 0); |
317 | /** | 317 | /** |
318 | * Determines maximum size using all clients that this window can have. | 318 | * Determines maximum size using all clients that this window can have. |
319 | * @param width will be filled in with maximum width | 319 | * @param width will be filled in with maximum width |
320 | * @param height will be filled in with maximum height | 320 | * @param height will be filled in with maximum height |
321 | */ | 321 | */ |
322 | void maxSize(unsigned int &width, unsigned int &height); | 322 | void maxSize(unsigned int &width, unsigned int &height); |
@@ -391,55 +391,55 @@ public: | |||
391 | @name accessors | 391 | @name accessors |
392 | */ | 392 | */ |
393 | //@{ | 393 | //@{ |
394 | 394 | ||
395 | // whether this window can be tabbed with other windows, | 395 | // whether this window can be tabbed with other windows, |
396 | // and others tabbed with it | 396 | // and others tabbed with it |
397 | inline void setTabable(bool tabable) { functions.tabable = tabable; } | 397 | void setTabable(bool tabable) { functions.tabable = tabable; } |
398 | inline bool isTabable() { return functions.tabable; } | 398 | bool isTabable() { return functions.tabable; } |
399 | inline void setMovable(bool movable) { functions.move = movable; } | 399 | void setMovable(bool movable) { functions.move = movable; } |
400 | inline void setResizable(bool resizable) { functions.resize = resizable; } | 400 | void setResizable(bool resizable) { functions.resize = resizable; } |
401 | 401 | ||
402 | inline bool isFocusHidden() const { return m_focus_hidden; } | 402 | bool isFocusHidden() const { return m_focus_hidden; } |
403 | inline bool isIconHidden() const { return m_icon_hidden; } | 403 | bool isIconHidden() const { return m_icon_hidden; } |
404 | inline bool isManaged() const { return m_initialized; } | 404 | bool isManaged() const { return m_initialized; } |
405 | bool isVisible() const; | 405 | bool isVisible() const; |
406 | inline bool isIconic() { return iconic; } | 406 | bool isIconic() { return iconic; } |
407 | inline bool isIconic() const { return iconic; } | 407 | bool isIconic() const { return iconic; } |
408 | inline bool isShaded() { return shaded; } | 408 | bool isShaded() { return shaded; } |
409 | inline bool isShaded() const { return shaded; } | 409 | bool isShaded() const { return shaded; } |
410 | inline bool isFullscreen() const { return fullscreen; } | 410 | bool isFullscreen() const { return fullscreen; } |
411 | inline bool isMaximized() const { return maximized == MAX_FULL; } | 411 | bool isMaximized() const { return maximized == MAX_FULL; } |
412 | inline bool isMaximizedVert() const { return (bool)(maximized & MAX_VERT); } | 412 | bool isMaximizedVert() const { return (bool)(maximized & MAX_VERT); } |
413 | inline bool isMaximizedHorz() const { return (bool)(maximized & MAX_HORZ); } | 413 | bool isMaximizedHorz() const { return (bool)(maximized & MAX_HORZ); } |
414 | inline int maximizedState() const { return maximized; } | 414 | int maximizedState() const { return maximized; } |
415 | inline bool isIconifiable() const { return functions.iconify; } | 415 | bool isIconifiable() const { return functions.iconify; } |
416 | inline bool isMaximizable() const { return functions.maximize; } | 416 | bool isMaximizable() const { return functions.maximize; } |
417 | inline bool isResizable() const { return functions.resize; } | 417 | bool isResizable() const { return functions.resize; } |
418 | inline bool isClosable() const { return functions.close; } | 418 | bool isClosable() const { return functions.close; } |
419 | inline bool isMoveable() const { return functions.move; } | 419 | bool isMoveable() const { return functions.move; } |
420 | inline bool isStuck() const { return stuck; } | 420 | bool isStuck() const { return stuck; } |
421 | inline bool hasTitlebar() const { return decorations.titlebar; } | 421 | bool hasTitlebar() const { return decorations.titlebar; } |
422 | inline bool isMoving() const { return moving; } | 422 | bool isMoving() const { return moving; } |
423 | inline bool isResizing() const { return resizing; } | 423 | bool isResizing() const { return resizing; } |
424 | bool isGroupable() const; | 424 | bool isGroupable() const; |
425 | inline int numClients() const { return m_clientlist.size(); } | 425 | int numClients() const { return m_clientlist.size(); } |
426 | inline bool empty() const { return m_clientlist.empty(); } | 426 | bool empty() const { return m_clientlist.empty(); } |
427 | inline ClientList &clientList() { return m_clientlist; } | 427 | ClientList &clientList() { return m_clientlist; } |
428 | inline const ClientList &clientList() const { return m_clientlist; } | 428 | const ClientList &clientList() const { return m_clientlist; } |
429 | inline WinClient &winClient() { return *m_client; } | 429 | WinClient &winClient() { return *m_client; } |
430 | inline const WinClient &winClient() const { return *m_client; } | 430 | const WinClient &winClient() const { return *m_client; } |
431 | 431 | ||
432 | bool isTyping(); | 432 | bool isTyping(); |
433 | 433 | ||
434 | inline const FbTk::XLayerItem &layerItem() const { return m_frame.layerItem(); } | 434 | const FbTk::XLayerItem &layerItem() const { return m_frame.layerItem(); } |
435 | inline FbTk::XLayerItem &layerItem() { return m_frame.layerItem(); } | 435 | FbTk::XLayerItem &layerItem() { return m_frame.layerItem(); } |
436 | 436 | ||
437 | Window clientWindow() const; | 437 | Window clientWindow() const; |
438 | 438 | ||
439 | FbTk::FbWindow &fbWindow(); | 439 | FbTk::FbWindow &fbWindow(); |
440 | const FbTk::FbWindow &fbWindow() const; | 440 | const FbTk::FbWindow &fbWindow() const; |
441 | 441 | ||
442 | FbTk::Menu &menu(); | 442 | FbTk::Menu &menu(); |
443 | const FbTk::Menu &menu() const; | 443 | const FbTk::Menu &menu() const; |
444 | 444 | ||
445 | const FbTk::FbWindow &parent() const { return m_parent; } | 445 | const FbTk::FbWindow &parent() const { return m_parent; } |
@@ -448,27 +448,27 @@ public: | |||
448 | bool acceptsFocus() const; | 448 | bool acceptsFocus() const; |
449 | const FbTk::PixmapWithMask &icon() const; | 449 | const FbTk::PixmapWithMask &icon() const; |
450 | const std::string &title() const; | 450 | const std::string &title() const; |
451 | const std::string &getWMClassName() const; | 451 | const std::string &getWMClassName() const; |
452 | const std::string &getWMClassClass() const; | 452 | const std::string &getWMClassClass() const; |
453 | std::string getWMRole() const; | 453 | std::string getWMRole() const; |
454 | Focusable::WindowType getWindowType() const; | 454 | Focusable::WindowType getWindowType() const; |
455 | void setWindowType(Focusable::WindowType type); | 455 | void setWindowType(Focusable::WindowType type); |
456 | bool isTransient() const; | 456 | bool isTransient() const; |
457 | 457 | ||
458 | inline int x() const { return frame().x(); } | 458 | int x() const { return frame().x(); } |
459 | inline int y() const { return frame().y(); } | 459 | int y() const { return frame().y(); } |
460 | inline unsigned int width() const { return frame().width(); } | 460 | unsigned int width() const { return frame().width(); } |
461 | inline unsigned int height() const { return frame().height(); } | 461 | unsigned int height() const { return frame().height(); } |
462 | 462 | ||
463 | int normalX() const; | 463 | int normalX() const; |
464 | int normalY() const; | 464 | int normalY() const; |
465 | unsigned int normalWidth() const; | 465 | unsigned int normalWidth() const; |
466 | unsigned int normalHeight() const; | 466 | unsigned int normalHeight() const; |
467 | 467 | ||
468 | inline int xOffset() const { return frame().xOffset(); } | 468 | int xOffset() const { return frame().xOffset(); } |
469 | inline int yOffset() const { return frame().yOffset(); } | 469 | int yOffset() const { return frame().yOffset(); } |
470 | inline int widthOffset() const { return frame().widthOffset(); } | 470 | int widthOffset() const { return frame().widthOffset(); } |
471 | inline int heightOffset() const { return frame().heightOffset(); } | 471 | int heightOffset() const { return frame().heightOffset(); } |
472 | 472 | ||
473 | unsigned int workspaceNumber() const { return m_workspace_number; } | 473 | unsigned int workspaceNumber() const { return m_workspace_number; } |
474 | 474 | ||
@@ -481,8 +481,8 @@ public: | |||
481 | 481 | ||
482 | int initialState() const; | 482 | int initialState() const; |
483 | 483 | ||
484 | inline FbWinFrame &frame() { return m_frame; } | 484 | FbWinFrame &frame() { return m_frame; } |
485 | inline const FbWinFrame &frame() const { return m_frame; } | 485 | const FbWinFrame &frame() const { return m_frame; } |
486 | 486 | ||
487 | /** | 487 | /** |
488 | @name signals | 488 | @name signals |
@@ -556,9 +556,9 @@ private: | |||
556 | void associateClient(WinClient &client); | 556 | void associateClient(WinClient &client); |
557 | 557 | ||
558 | // state and hint signals | 558 | // state and hint signals |
559 | WinSubject m_hintsig, | 559 | WinSubject m_hintsig, |
560 | m_statesig, | 560 | m_statesig, |
561 | m_layersig, | 561 | m_layersig, |
562 | m_workspacesig; | 562 | m_workspacesig; |
563 | 563 | ||
564 | class ThemeListener: public FbTk::Observer { | 564 | class ThemeListener: public FbTk::Observer { |