aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/Window.hh b/src/Window.hh
index ee53036..6d0c77f 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -31,7 +31,6 @@
31#include "FbTk/Subject.hh" 31#include "FbTk/Subject.hh"
32#include "FbTk/EventHandler.hh" 32#include "FbTk/EventHandler.hh"
33#include "FbTk/XLayerItem.hh" 33#include "FbTk/XLayerItem.hh"
34
35#include "FbWinFrame.hh" 34#include "FbWinFrame.hh"
36 35
37#include <X11/Xlib.h> 36#include <X11/Xlib.h>
@@ -153,8 +152,6 @@ public:
153 } BlackboxAttributes; 152 } BlackboxAttributes;
154 153
155 typedef std::list<WinClient *> ClientList; 154 typedef std::list<WinClient *> ClientList;
156 // this should perhaps be a refcount??
157 typedef std::list<std::pair<const char *, FbTk::Menu *> > ExtraMenus;
158 155
159 /// create a window from a client 156 /// create a window from a client
160 FluxboxWindow(WinClient &client, 157 FluxboxWindow(WinClient &client,
@@ -322,18 +319,8 @@ public:
322 FbTk::FbWindow &fbWindow(); 319 FbTk::FbWindow &fbWindow();
323 const FbTk::FbWindow &fbWindow() const; 320 const FbTk::FbWindow &fbWindow() const;
324 321
325 FbTk::Menu &menu() { return *m_windowmenu.get(); } 322 FbTk::Menu &menu();
326 const FbTk::Menu &menu() const { return *m_windowmenu.get(); } 323 const FbTk::Menu &menu() const;
327
328
329 // for extras to add menus.
330 // These menus will be marked internal,
331 // and deleted when the window dies (as opposed to Screen
332 void addExtraMenu(const char *label, FbTk::Menu *menu);
333 void removeExtraMenu(FbTk::Menu *menu);
334
335 ExtraMenus &extraMenus() { return m_extramenus; }
336 const ExtraMenus &extraMenus() const { return m_extramenus; }
337 324
338 const FbTk::FbWindow &parent() const { return m_parent; } 325 const FbTk::FbWindow &parent() const { return m_parent; }
339 FbTk::FbWindow &parent() { return m_parent; } 326 FbTk::FbWindow &parent() { return m_parent; }
@@ -398,7 +385,6 @@ private:
398 static const int PropBlackboxAttributesElements = 8; 385 static const int PropBlackboxAttributesElements = 8;
399 386
400 void setupWindow(); 387 void setupWindow();
401 void setupMenu();
402 388
403 void init(); 389 void init();
404 /// applies a shape mask to the window if it has one 390 /// applies a shape mask to the window if it has one
@@ -474,8 +460,6 @@ private:
474 Display *display; /// display connection 460 Display *display; /// display connection
475 BlackboxAttributes m_blackbox_attrib; 461 BlackboxAttributes m_blackbox_attrib;
476 462
477 std::auto_ptr<FbTk::Menu> m_windowmenu;
478
479 timeval m_last_focus_time; 463 timeval m_last_focus_time;
480 464
481 int m_button_grab_x, m_button_grab_y; // handles last button press event for move 465 int m_button_grab_x, m_button_grab_y; // handles last button press event for move
@@ -524,7 +508,6 @@ private:
524 508
525 ResizeCorner m_resize_corner; 509 ResizeCorner m_resize_corner;
526 510
527 ExtraMenus m_extramenus;
528 static int s_num_grabs; ///< number of XGrabPointer's 511 static int s_num_grabs; ///< number of XGrabPointer's
529}; 512};
530 513