aboutsummaryrefslogtreecommitdiff
path: root/src/Window.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.hh')
-rw-r--r--src/Window.hh47
1 files changed, 23 insertions, 24 deletions
diff --git a/src/Window.hh b/src/Window.hh
index 81e52df..585a176 100644
--- a/src/Window.hh
+++ b/src/Window.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: Window.hh,v 1.68 2003/05/10 14:23:29 fluxgen Exp $ 25// $Id: Window.hh,v 1.69 2003/05/10 16:51:39 fluxgen Exp $
26 26
27#ifndef WINDOW_HH 27#ifndef WINDOW_HH
28#define WINDOW_HH 28#define WINDOW_HH
@@ -153,7 +153,7 @@ public:
153 void nextClient(); 153 void nextClient();
154 void prevClient(); 154 void prevClient();
155 155
156 void setWindowNumber(int n) { window_number = n; } 156 void setWindowNumber(int n) { m_window_number = n; }
157 157
158 bool validateClient(); 158 bool validateClient();
159 bool setInputFocus(); 159 bool setInputFocus();
@@ -282,9 +282,12 @@ public:
282 inline const ClientList &clientList() const { return m_clientlist; } 282 inline const ClientList &clientList() const { return m_clientlist; }
283 inline WinClient &winClient() { return *m_client; } 283 inline WinClient &winClient() { return *m_client; }
284 inline const WinClient &winClient() const { return *m_client; } 284 inline const WinClient &winClient() const { return *m_client; }
285 // obsolete
286 inline const BScreen &getScreen() const { return m_screen; }
287 inline BScreen &getScreen() { return m_screen; }
285 288
286 inline const BScreen &getScreen() const { return screen; } 289 inline const BScreen &screen() const { return m_screen; }
287 inline BScreen &getScreen() { return screen; } 290 inline BScreen &screen() { return m_screen; }
288 291
289 inline const FbTk::XLayerItem &getLayerItem() const { return m_layeritem; } 292 inline const FbTk::XLayerItem &getLayerItem() const { return m_layeritem; }
290 inline FbTk::XLayerItem &getLayerItem() { return m_layeritem; } 293 inline FbTk::XLayerItem &getLayerItem() { return m_layeritem; }
@@ -306,8 +309,8 @@ public:
306 int getYFrame() const { return m_frame.y(); } 309 int getYFrame() const { return m_frame.y(); }
307 int getXClient() const; 310 int getXClient() const;
308 int getYClient() const; 311 int getYClient() const;
309 unsigned int getWorkspaceNumber() const { return workspace_number; } 312 unsigned int getWorkspaceNumber() const { return m_workspace_number; }
310 int getWindowNumber() const { return window_number; } 313 int getWindowNumber() const { return m_window_number; }
311 int getLayerNum() const { return m_layernum; } 314 int getLayerNum() const { return m_layernum; }
312 void setLayerNum(int layernum); 315 void setLayerNum(int layernum);
313 unsigned int getWidth() const { return m_frame.width(); } 316 unsigned int getWidth() const { return m_frame.width(); }
@@ -339,7 +342,7 @@ public:
339 const FbTk::Subject &dieSig() const { return m_diesig; } 342 const FbTk::Subject &dieSig() const { return m_diesig; }
340 /** @} */ // end group signals 343 /** @} */ // end group signals
341 344
342 const timeval &getLastFocusTime() const {return lastFocusTime;} 345 const timeval &getLastFocusTime() const { return m_last_focus_time;}
343 346
344 //@} 347 //@}
345 348
@@ -404,33 +407,31 @@ private:
404 std::string m_instance_name; /// instance name from WM_CLASS 407 std::string m_instance_name; /// instance name from WM_CLASS
405 std::string m_class_name; /// class name from WM_CLASS 408 std::string m_class_name; /// class name from WM_CLASS
406 409
407 //Window state 410 // Window states
408 bool moving, resizing, shaded, maximized, iconic, 411 bool moving, resizing, shaded, maximized, iconic,
409 focused, stuck, send_focus_message, m_managed; 412 focused, stuck, send_focus_message, m_managed;
410 WinClient *m_attaching_tab; 413 WinClient *m_attaching_tab;
411 414
412 BScreen &screen; /// screen on which this window exist 415 BScreen &m_screen; /// screen on which this window exist
413 FbTk::Timer timer; 416 FbTk::Timer m_timer;
414 Display *display; /// display connection 417 Display *display; /// display connection
415 BlackboxAttributes blackbox_attrib; 418 BlackboxAttributes m_blackbox_attrib;
416 419
417 Time lastButtonPressTime;
418 FbTk::Menu m_windowmenu; 420 FbTk::Menu m_windowmenu;
419 LayerMenu<FluxboxWindow> m_layermenu; 421 LayerMenu<FluxboxWindow> m_layermenu;
420 422
421 timeval lastFocusTime; 423 timeval m_last_focus_time;
422 424
423 int button_grab_x, button_grab_y; // handles last button press event for move 425 int m_button_grab_x, m_button_grab_y; // handles last button press event for move
424 int last_resize_x, last_resize_y; // handles last button press event for resize 426 int m_last_resize_x, m_last_resize_y; // handles last button press event for resize
425 int last_move_x, last_move_y; // handles last pos for non opaque moving 427 int m_last_move_x, m_last_move_y; // handles last pos for non opaque moving
426 unsigned int last_resize_h, last_resize_w; // handles height/width for resize "window" 428 unsigned int m_last_resize_h, m_last_resize_w; // handles height/width for resize "window"
427 unsigned int move_ws; // handles home workspace for opaque workspace warping
428 429
429 int focus_mode, window_number; 430 int m_focus_mode, m_window_number;
430 unsigned int workspace_number; 431 unsigned int m_workspace_number;
431 unsigned long current_state; 432 unsigned long m_current_state;
432 433
433 Decoration old_decoration; 434 Decoration m_old_decoration;
434 435
435 ClientList m_clientlist; 436 ClientList m_clientlist;
436 WinClient *m_client; 437 WinClient *m_client;
@@ -449,8 +450,6 @@ private:
449 bool resize, move, iconify, maximize, close; 450 bool resize, move, iconify, maximize, close;
450 } functions; 451 } functions;
451 452
452 int frame_resize_x, frame_resize_w;
453 int frame_resize_y, frame_resize_h;
454 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized 453 int m_old_pos_x, m_old_pos_y; ///< old position so we can restore from maximized
455 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state 454 unsigned int m_old_width, m_old_height; ///< old size so we can restore from maximized state
456 int m_last_button_x, ///< last known x position of the mouse button 455 int m_last_button_x, ///< last known x position of the mouse button