diff options
author | fluxgen <fluxgen> | 2003-06-11 14:51:56 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-06-11 14:51:56 (GMT) |
commit | 127778b167888bdd8e19d798512b251ee8ca7dfd (patch) | |
tree | 7af181f05114794a41a5ca3affad4a6db06b6c39 /src | |
parent | 735776fbeb0d8818f45ff8f0b4928c9315ad682c (diff) | |
download | fluxbox-127778b167888bdd8e19d798512b251ee8ca7dfd.zip fluxbox-127778b167888bdd8e19d798512b251ee8ca7dfd.tar.bz2 |
moved cursor to FbWinFrameTheme
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Window.cc b/src/Window.cc index 2c580d5..82d5e65 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -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.cc,v 1.188 2003/06/06 14:45:13 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.189 2003/06/11 14:51:56 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -370,8 +370,8 @@ void FluxboxWindow::init() { | |||
370 | Fluxbox &fluxbox = *Fluxbox::instance(); | 370 | Fluxbox &fluxbox = *Fluxbox::instance(); |
371 | 371 | ||
372 | // setup cursors for resize grips | 372 | // setup cursors for resize grips |
373 | frame().gripLeft().setCursor(fluxbox.getLowerLeftAngleCursor()); | 373 | frame().gripLeft().setCursor(frame().theme().lowerLeftAngleCursor()); |
374 | frame().gripRight().setCursor(fluxbox.getLowerRightAngleCursor()); | 374 | frame().gripRight().setCursor(frame().theme().lowerRightAngleCursor()); |
375 | 375 | ||
376 | frame().resize(m_client->width(), m_client->height()); | 376 | frame().resize(m_client->width(), m_client->height()); |
377 | TextButton *btn = new TextButton(frame().label(), | 377 | TextButton *btn = new TextButton(frame().label(), |
@@ -824,20 +824,20 @@ void FluxboxWindow::grabButtons() { | |||
824 | 824 | ||
825 | XGrabButton(display, Button1, Mod1Mask, frame().window().window(), True, | 825 | XGrabButton(display, Button1, Mod1Mask, frame().window().window(), True, |
826 | ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, | 826 | ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, |
827 | GrabModeAsync, None, fluxbox->getMoveCursor()); | 827 | GrabModeAsync, None, frame().theme().moveCursor()); |
828 | 828 | ||
829 | //----grab with "all" modifiers | 829 | //----grab with "all" modifiers |
830 | grabButton(display, Button1, frame().window().window(), fluxbox->getMoveCursor()); | 830 | grabButton(display, Button1, frame().window().window(), frame().theme().moveCursor()); |
831 | 831 | ||
832 | XGrabButton(display, Button2, Mod1Mask, frame().window().window(), True, | 832 | XGrabButton(display, Button2, Mod1Mask, frame().window().window(), True, |
833 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None); | 833 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, None, None); |
834 | 834 | ||
835 | XGrabButton(display, Button3, Mod1Mask, frame().window().window(), True, | 835 | XGrabButton(display, Button3, Mod1Mask, frame().window().window(), True, |
836 | ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, | 836 | ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, |
837 | GrabModeAsync, None, fluxbox->getLowerRightAngleCursor()); | 837 | GrabModeAsync, None, frame().theme().lowerRightAngleCursor()); |
838 | 838 | ||
839 | //---grab with "all" modifiers | 839 | //---grab with "all" modifiers |
840 | grabButton(display, Button3, frame().window().window(), fluxbox->getLowerRightAngleCursor()); | 840 | grabButton(display, Button3, frame().window().window(), frame().theme().lowerRightAngleCursor()); |
841 | } | 841 | } |
842 | 842 | ||
843 | 843 | ||
@@ -2525,7 +2525,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2525 | 2525 | ||
2526 | XGrabPointer(display, me.window, False, Button2MotionMask | | 2526 | XGrabPointer(display, me.window, False, Button2MotionMask | |
2527 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, | 2527 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, |
2528 | None, Fluxbox::instance()->getMoveCursor(), CurrentTime); | 2528 | None, frame().theme().moveCursor(), CurrentTime); |
2529 | m_last_move_x = me.x_root - 1; | 2529 | m_last_move_x = me.x_root - 1; |
2530 | m_last_move_y = me.y_root - 1; | 2530 | m_last_move_y = me.y_root - 1; |
2531 | 2531 | ||
@@ -2786,7 +2786,7 @@ void FluxboxWindow::startMoving(Window win) { | |||
2786 | // freely map and unmap the window we're moving. | 2786 | // freely map and unmap the window we're moving. |
2787 | XGrabPointer(display, screen().rootWindow().window(), False, Button1MotionMask | | 2787 | XGrabPointer(display, screen().rootWindow().window(), False, Button1MotionMask | |
2788 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, | 2788 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, |
2789 | screen().rootWindow().window(), fluxbox->getMoveCursor(), CurrentTime); | 2789 | screen().rootWindow().window(), frame().theme().moveCursor(), CurrentTime); |
2790 | 2790 | ||
2791 | if (m_windowmenu.isVisible()) | 2791 | if (m_windowmenu.isVisible()) |
2792 | m_windowmenu.hide(); | 2792 | m_windowmenu.hide(); |
@@ -2971,7 +2971,7 @@ void FluxboxWindow::startResizing(Window win, int x, int y, bool left) { | |||
2971 | Fluxbox *fluxbox = Fluxbox::instance(); | 2971 | Fluxbox *fluxbox = Fluxbox::instance(); |
2972 | XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask, | 2972 | XGrabPointer(display, win, false, ButtonMotionMask | ButtonReleaseMask, |
2973 | GrabModeAsync, GrabModeAsync, None, | 2973 | GrabModeAsync, GrabModeAsync, None, |
2974 | (left ? fluxbox->getLowerLeftAngleCursor() : fluxbox->getLowerRightAngleCursor()), | 2974 | (left ? frame().theme().lowerLeftAngleCursor() : frame().theme().lowerRightAngleCursor()), |
2975 | CurrentTime); | 2975 | CurrentTime); |
2976 | 2976 | ||
2977 | int gx = 0, gy = 0; | 2977 | int gx = 0, gy = 0; |