diff options
author | fluxgen <fluxgen> | 2003-06-12 14:35:36 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-06-12 14:35:36 (GMT) |
commit | 4223370926da86b3d4b541dd910626b78db6a00a (patch) | |
tree | 3c5ba0ca0ed8b950d244b152be5ff36a90b7fa73 | |
parent | bb004b632580f977d6af498e339f2637aba8eb30 (diff) | |
download | fluxbox-4223370926da86b3d4b541dd910626b78db6a00a.zip fluxbox-4223370926da86b3d4b541dd910626b78db6a00a.tar.bz2 |
minor fixes
-rw-r--r-- | src/Window.cc | 7 | ||||
-rw-r--r-- | src/Window.hh | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/Window.cc b/src/Window.cc index 82d5e65..61bf3ee 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,12 +22,12 @@ | |||
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.cc,v 1.189 2003/06/11 14:51:56 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.190 2003/06/12 14:35:36 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
29 | #include "WinClient.hh" | 29 | #include "WinClient.hh" |
30 | #include "i18n.hh" | 30 | #include "I18n.hh" |
31 | #include "fluxbox.hh" | 31 | #include "fluxbox.hh" |
32 | #include "Screen.hh" | 32 | #include "Screen.hh" |
33 | #include "StringUtil.hh" | 33 | #include "StringUtil.hh" |
@@ -814,7 +814,6 @@ void FluxboxWindow::associateClientWindow() { | |||
814 | 814 | ||
815 | 815 | ||
816 | void FluxboxWindow::grabButtons() { | 816 | void FluxboxWindow::grabButtons() { |
817 | Fluxbox *fluxbox = Fluxbox::instance(); | ||
818 | 817 | ||
819 | XGrabButton(display, Button1, AnyModifier, | 818 | XGrabButton(display, Button1, AnyModifier, |
820 | frame().clientArea().window(), True, ButtonPressMask, | 819 | frame().clientArea().window(), True, ButtonPressMask, |
@@ -2968,7 +2967,7 @@ void FluxboxWindow::doSnapping(int &orig_left, int &orig_top) { | |||
2968 | 2967 | ||
2969 | void FluxboxWindow::startResizing(Window win, int x, int y, bool left) { | 2968 | void FluxboxWindow::startResizing(Window win, int x, int y, bool left) { |
2970 | resizing = true; | 2969 | resizing = true; |
2971 | Fluxbox *fluxbox = Fluxbox::instance(); | 2970 | |
2972 | XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask, | 2971 | XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask, |
2973 | GrabModeAsync, GrabModeAsync, None, | 2972 | GrabModeAsync, GrabModeAsync, None, |
2974 | (left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()), | 2973 | (left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()), |
diff --git a/src/Window.hh b/src/Window.hh index 3a06702..7a150e8 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.76 2003/05/26 04:24:24 rathnor Exp $ | 25 | // $Id: Window.hh,v 1.77 2003/06/12 14:34:28 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef WINDOW_HH | 27 | #ifndef WINDOW_HH |
28 | #define WINDOW_HH | 28 | #define WINDOW_HH |
@@ -346,6 +346,7 @@ public: | |||
346 | 346 | ||
347 | private: | 347 | private: |
348 | void init(); | 348 | void init(); |
349 | /// applies a shape mask to the window if it has one | ||
349 | void shape(); | 350 | void shape(); |
350 | 351 | ||
351 | void grabButtons(); | 352 | void grabButtons(); |
@@ -371,8 +372,6 @@ private: | |||
371 | void saveBlackboxHints(); | 372 | void saveBlackboxHints(); |
372 | void setNetWMAttributes(); | 373 | void setNetWMAttributes(); |
373 | void associateClientWindow(); | 374 | void associateClientWindow(); |
374 | void createWinButtons(); | ||
375 | void decorateLabel(); | ||
376 | 375 | ||
377 | void restoreGravity(); | 376 | void restoreGravity(); |
378 | void setGravityOffsets(); | 377 | void setGravityOffsets(); |
@@ -396,6 +395,7 @@ private: | |||
396 | // Window states | 395 | // Window states |
397 | bool moving, resizing, shaded, maximized, iconic, | 396 | bool moving, resizing, shaded, maximized, iconic, |
398 | focused, stuck, send_focus_message, m_managed; | 397 | focused, stuck, send_focus_message, m_managed; |
398 | |||
399 | WinClient *m_attaching_tab; | 399 | WinClient *m_attaching_tab; |
400 | 400 | ||
401 | BScreen &m_screen; /// screen on which this window exist | 401 | BScreen &m_screen; /// screen on which this window exist |