summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-11 23:14:31 (GMT)
committerfluxgen <fluxgen>2001-12-11 23:14:31 (GMT)
commite3850b1dc0a71f9620b44507b24fcfed099b4993 (patch)
treee3d53ff41515150b892ae0b95e58bfcf2da88714
parent18830ac9add80cbd3bf7369307d7e35a519dca9b (diff)
downloadfluxbox_lack-e3850b1dc0a71f9620b44507b24fcfed099b4993.zip
fluxbox_lack-e3850b1dc0a71f9620b44507b24fcfed099b4993.tar.bz2
Fixed Alt+resizing + Button1 bugg
-rw-r--r--src/Window.cc20
1 files changed, 4 insertions, 16 deletions
diff --git a/src/Window.cc b/src/Window.cc
index a2aacf4..06a544b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2703,6 +2703,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
2703 XAllowEvents(display, ReplayPointer, be->time); 2703 XAllowEvents(display, ReplayPointer, be->time);
2704 2704
2705 } else { 2705 } else {
2706
2706 if (frame.title == be->window || frame.label == be->window) { 2707 if (frame.title == be->window || frame.label == be->window) {
2707 if (((be->time - lastButtonPressTime) <= 2708 if (((be->time - lastButtonPressTime) <=
2708 fluxbox->getDoubleClickInterval()) || 2709 fluxbox->getDoubleClickInterval()) ||
@@ -2712,23 +2713,9 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
2712 if (tab) //shade windows in the tablist too 2713 if (tab) //shade windows in the tablist too
2713 tab->shade(); 2714 tab->shade();
2714 } else 2715 } else
2715 lastButtonPressTime = be->time; 2716 lastButtonPressTime = be->time;
2716 } 2717 }
2717 2718
2718 /*
2719 if (be->window == frame.title)
2720 fprintf(stderr, "title\n");
2721 else if (be->window == frame.label)
2722 fprintf(stderr, "label\n");
2723 else if (be->window == frame.plate)
2724 fprintf(stderr, "plate\n");
2725 else if (be->window == frame.handle)
2726 fprintf(stderr, "handle\n");
2727 else if (be->window == frame.window)
2728 fprintf(stderr, "window\n");
2729 else
2730 fprintf(stderr, "unknown window\n");
2731 */
2732 2719
2733 frame.grab_x = be->x_root - frame.x - screen->getBorderWidth(); 2720 frame.grab_x = be->x_root - frame.x - screen->getBorderWidth();
2734 frame.grab_y = be->y_root - frame.y - screen->getBorderWidth(); 2721 frame.grab_y = be->y_root - frame.y - screen->getBorderWidth();
@@ -2738,6 +2725,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent *be) {
2738 //raise tab first if there is any 2725 //raise tab first if there is any
2739 if (tab) 2726 if (tab)
2740 tab->raise(); 2727 tab->raise();
2728
2741 screen->getWorkspace(workspace_number)->raiseWindow(this); 2729 screen->getWorkspace(workspace_number)->raiseWindow(this);
2742 } 2730 }
2743 /*} else if (be->button == 2 && (be->window != frame.iconify_button) && 2731 /*} else if (be->button == 2 && (be->window != frame.iconify_button) &&
@@ -2877,7 +2865,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent *me) {
2877 Fluxbox *fluxbox = Fluxbox::instance(); 2865 Fluxbox *fluxbox = Fluxbox::instance();
2878 if ((me->state & Button1Mask) && functions.move && 2866 if ((me->state & Button1Mask) && functions.move &&
2879 (frame.title == me->window || frame.label == me->window || 2867 (frame.title == me->window || frame.label == me->window ||
2880 frame.handle == me->window || frame.window == me->window)) { 2868 frame.handle == me->window || frame.window == me->window) && !resizing) {
2881 2869
2882 if (! moving) { 2870 if (! moving) {
2883 XGrabPointer(display, me->window, False, Button1MotionMask | 2871 XGrabPointer(display, me->window, False, Button1MotionMask |